From d0ec3320c8be741fa1b204dfb4df45a530623f8b Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Thu, 9 Jun 2016 20:09:34 +0300
Subject: [PATCH] Move lessc and Emogrifier classes to RainLoopVendor namespace

---
 .../v/0.0.0/app/libraries/RainLoop/Actions.php     |  6 +++---
 .../app/libraries/RainLoop/ServiceActions.php      |  2 +-
 .../0.0.0/app/libraries/emogrifier/Emogrifier.php  |  4 ++--
 .../v/0.0.0/app/libraries/lessphp/lessc.inc.php    | 14 ++++++++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 8fbf44f33..13b5633c5 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -9970,15 +9970,15 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 					$fAdditionalDomReader = null;
 					if (0 < \strlen($sHtml) && $this->Config()->Get('labs', 'emogrifier', false))
 					{
-						if (!\class_exists('Pelago\Emogrifier', false))
+						if (!\class_exists('RainLoopVendor\Pelago\Emogrifier', false))
 						{
 							include_once APP_VERSION_ROOT_PATH.'app/libraries/emogrifier/Emogrifier.php';
 						}
 
-						if (\class_exists('Pelago\Emogrifier', false))
+						if (\class_exists('RainLoopVendor\Pelago\Emogrifier', false))
 						{
 							$fAdditionalDomReader = function ($oDom) {
-								$oEmogrifier = new \Pelago\Emogrifier();
+								$oEmogrifier = new \RainLoopVendor\Pelago\Emogrifier();
 								$oEmogrifier->preserveEncoding = false;
 								return $oEmogrifier->emogrify($oDom);
 							};
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index c875d1c9c..e87d5560b 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -731,7 +731,7 @@ class ServiceActions
 					include_once APP_VERSION_ROOT_PATH.'app/libraries/lessphp/ctype.php';
 					include_once APP_VERSION_ROOT_PATH.'app/libraries/lessphp/lessc.inc.php';
 
-					$oLess = new \lessc();
+					$oLess = new \RainLoopVendor\lessc();
 					$oLess->setFormatter('compressed');
 
 					$aResult = array();
diff --git a/rainloop/v/0.0.0/app/libraries/emogrifier/Emogrifier.php b/rainloop/v/0.0.0/app/libraries/emogrifier/Emogrifier.php
index 57774bfba..1d97f5741 100644
--- a/rainloop/v/0.0.0/app/libraries/emogrifier/Emogrifier.php
+++ b/rainloop/v/0.0.0/app/libraries/emogrifier/Emogrifier.php
@@ -1,5 +1,5 @@
 <?php
-namespace Pelago;
+namespace RainLoopVendor\Pelago;
 
 /**
  * This class provides functions for converting CSS styles into inline style attributes in your HTML code.
@@ -320,7 +320,7 @@ class Emogrifier
 		{
 			return $xmlDocument;
 		}
-		
+
         if ($this->preserveEncoding) {
 			 return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES');
         } else {
diff --git a/rainloop/v/0.0.0/app/libraries/lessphp/lessc.inc.php b/rainloop/v/0.0.0/app/libraries/lessphp/lessc.inc.php
index 411ca2fab..3a185030d 100644
--- a/rainloop/v/0.0.0/app/libraries/lessphp/lessc.inc.php
+++ b/rainloop/v/0.0.0/app/libraries/lessphp/lessc.inc.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace RainLoopVendor;
+
+class stdClass extends \stdClass {};
+class Exception extends \Exception {};
+
 /**
  * lessphp v0.3.9
  * http://leafo.net/lessphp
@@ -1814,6 +1819,7 @@ class lessc {
 			$className = "lessc_formatter_$this->formatterName";
 		}
 
+		$className = 'RainLoopVendor\\'.$className;
 		return new $className;
 	}
 
@@ -2093,7 +2099,7 @@ class lessc_parser {
 
 		if (!self::$operatorString) {
 			self::$operatorString =
-				'('.implode('|', array_map(array('lessc', 'preg_quote'),
+				'('.implode('|', array_map(array('RainLoopVendor\\lessc', 'preg_quote'),
 					array_keys(self::$precedence))).')';
 
 			$commentSingle = lessc::preg_quote(self::$commentSingle);
@@ -2322,8 +2328,8 @@ class lessc_parser {
 
 	protected function isDirective($dirname, $directives) {
 		// TODO: cache pattern in parser
-		$pattern = implode("|",
-			array_map(array("lessc", "preg_quote"), $directives));
+		$pattern = implode('|',
+			array_map(array('RainLoopVendor\\lessc', 'preg_quote'), $directives));
 		$pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
 
 		return preg_match($pattern, $dirname);
@@ -2611,7 +2617,7 @@ class lessc_parser {
 		$this->eatWhiteDefault = false;
 
 		$stop = array("'", '"', "@{", $end);
-		$stop = array_map(array("lessc", "preg_quote"), $stop);
+		$stop = array_map(array('RainLoopVendor\\lessc', 'preg_quote'), $stop);
 		// $stop[] = self::$commentMulti;
 
 		if (!is_null($rejectStrs)) {