las93 / venus3

bundles/lib/Debug.php

Indentation +85 added lines, -85 removed lines

@@ -35,13 +35,13 @@ 
 class Debug extends AbstractLogger
 {
 	/**
-  	 * variable to activate or not the debug
-  	 * @var boolean
-  	 */
+	 * variable to activate or not the debug
+	 * @var boolean
+	 */
   	private static $_bActivateDebug = false;
 
   	/**
-   	 * variable to activate or not the error
+  	 * variable to activate or not the error
   	 * @var boolean
   	 */
   	private static $_bActivateError = false;
@@ -76,37 +76,37 @@ 
   	 */
   	private static $_oInstance;
  
-    /**
-     * Send back the isntance or create it
-     * 
-     * @access public
-     * @return \Venus\lib\Debug
-     */
-    public static function getInstance() : Debug
-    {    
-        if (!(self::$_oInstance instanceof self)) { self::$_oInstance = new self(); }
+	/**
+	 * Send back the isntance or create it
+	 * 
+	 * @access public
+	 * @return \Venus\lib\Debug
+	 */
+	public static function getInstance() : Debug
+	{    
+		if (!(self::$_oInstance instanceof self)) { self::$_oInstance = new self(); }
  
-        return self::$_oInstance;
-    }
+		return self::$_oInstance;
+	}
 
   	/**
   	 * activate debug
   	 *
   	 * @access public
   	 * @return void
-   	 */
+  	 */
 	public static function activateDebug()
 	{
 		if (self::$_bFirstActivation === true) {
 
 			self::_setFileNameInErrorFile();
 			self::$_bFirstActivation = false;
-    	}
+		}
 
-    	self::_initLogFile();
-    	self::$_bActivateDebug = true;
-    	self::activateError(E_ALL);
-    	self::activateException(E_ALL);
+		self::_initLogFile();
+		self::$_bActivateDebug = true;
+		self::activateError(E_ALL);
+		self::activateException(E_ALL);
 	}
 
   	/**
@@ -117,7 +117,7 @@ 
   	 */
   	public static function deactivateDebug()
   	{
-    	self::$_bActivateDebug = false;
+		self::$_bActivateDebug = false;
   	}
 
   	/**
@@ -125,54 +125,54 @@ 
   	 *
   	 * @access public
   	 * @return boolean
-	 */
+  	 */
   	public static function isDebug() : bool
   	{
 		return self::$_bActivateDebug;
   	}
 
 	/**
-  	 * activate error reporting
-  	 *
-  	 * @access public
-  	 * @param  int $iLevel level of error
-  	 * @return void
-  	 */
+	 * activate error reporting
+	 *
+	 * @access public
+	 * @param  int $iLevel level of error
+	 * @return void
+	 */
   	public static function activateError($iLevel)
   	{
-    	if (self::$_bFirstActivation === true) {
+		if (self::$_bFirstActivation === true) {
 
-      		self::_setFileNameInErrorFile();
-      		self::$_bFirstActivation = false;
-    	}
+	  		self::_setFileNameInErrorFile();
+	  		self::$_bFirstActivation = false;
+		}
 
-    	self::_initLogFile();
-    	self::$_bActivateError = true;
+		self::_initLogFile();
+		self::$_bActivateError = true;
 
-    	error_reporting($iLevel);
+		error_reporting($iLevel);
 
-    	set_error_handler(function ($iErrNo, $sErrStr, $sErrFile, $iErrLine)
-    	{    
+		set_error_handler(function ($iErrNo, $sErrStr, $sErrFile, $iErrLine)
+		{    
 			$aContext = array('file' => $sErrFile, 'line' => $iErrLine);
 			
 			$sType = self::getTranslateErrorCode($iErrNo);
 			
-            self::getInstance()->$sType($sErrStr, $aContext);
+			self::getInstance()->$sType($sErrStr, $aContext);
 
-      		return true;
+	  		return true;
 		}, $iLevel);
 
-    	register_shutdown_function(function()
-    	{
+		register_shutdown_function(function()
+		{
 			if (null !== ($aLastError = error_get_last())) {
 
-    			$aContext = array('file' => $aLastError['file'], 'line' => $aLastError['line']);
+				$aContext = array('file' => $aLastError['file'], 'line' => $aLastError['line']);
     			
-    			$sType = self::getTranslateErrorCode($aLastError['type']);
+				$sType = self::getTranslateErrorCode($aLastError['type']);
     			
-                self::getInstance()->$sType($aLastError['message'], $aContext);
-    		}
-    	});
+				self::getInstance()->$sType($aLastError['message'], $aContext);
+			}
+		});
   	}
 
   	/**
@@ -180,10 +180,10 @@ 
   	 *
   	 * @access public
   	 * @return void
-   	*/
+  	 */
   	public static function deactivateError()
   	{
-    	self::$_bActivateError = false;
+		self::$_bActivateError = false;
   	}
 
   	/**
@@ -194,7 +194,7 @@ 
   	 */
   	public static function isError() : bool
   	{
-    	return self::$_bActivateError;
+		return self::$_bActivateError;
   	}
 
 
@@ -295,7 +295,7 @@ 
   	 */
   	public function emergency($message, array $context = array())
   	{
-  	    $this->log(LogLevel::EMERGENCY, $message, $context);
+  		$this->log(LogLevel::EMERGENCY, $message, $context);
   	}
   	
   	/**
@@ -307,10 +307,10 @@ 
   	 * @param string $message
   	 * @param array $context
   	 * @return null
-  	*/
+  	 */
   	public function alert($message, array $context = array())
   	{
-  	    $this->log(LogLevel::ALERT, $message, $context);
+  		$this->log(LogLevel::ALERT, $message, $context);
   	}
   	
   	/**
@@ -321,10 +321,10 @@ 
   	 * @param string $message
   	 * @param array $context
   	 * @return null
-  	*/
+  	 */
   	public function critical($message, array $context = array())
   	{
-  	    $this->log(LogLevel::CRITICAL, $message, $context);
+  		$this->log(LogLevel::CRITICAL, $message, $context);
   	}
   	
   	/**
@@ -334,10 +334,10 @@ 
   	 * @param string $message
   	 * @param array $context
   	 * @return null
-  	*/
+  	 */
   	public function error($message, array $context = array())
   	{
-  	    $this->log(LogLevel::ERROR, $message, $context);
+  		$this->log(LogLevel::ERROR, $message, $context);
   	}
   	
   	/**
@@ -349,10 +349,10 @@ 
   	 * @param string $message
   	 * @param array $context
   	 * @return null
-  	*/
+  	 */
   	public function warning($message, array $context = array())
   	{
-  	    $this->log(LogLevel::WARNING, $message, $context);
+  		$this->log(LogLevel::WARNING, $message, $context);
   	}
   	
   	/**
@@ -361,10 +361,10 @@ 
   	 * @param string $message
   	 * @param array $context
   	 * @return null
-  	*/
+  	 */
   	public function notice($message, array $context = array())
   	{
-  	    $this->log(LogLevel::NOTICE, $message, $context);
+  		$this->log(LogLevel::NOTICE, $message, $context);
   	}
   	
   	/**
@@ -375,10 +375,10 @@ 
   	 * @param string $message
   	 * @param array $context
   	 * @return null
-  	*/
+  	 */
   	public function info($message, array $context = array())
   	{
-  	    $this->log(LogLevel::INFO, $message, $context);
+  		$this->log(LogLevel::INFO, $message, $context);
   	}
   	
   	/**
@@ -387,10 +387,10 @@ 
   	 * @param string $message
   	 * @param array $context
   	 * @return null
-  	*/
+  	 */
   	public function debug($message, array $context = array())
   	{
-  	    $this->log(LogLevel::DEBUG, $message, $context);
+  		$this->log(LogLevel::DEBUG, $message, $context);
   	}
   	 
   	/**
@@ -398,40 +398,40 @@ 
   	 *
   	 * @access public
   	 * @return void
-   	 */
+  	 */
   	private static function _setFileNameInErrorFile()
   	{
-    	/**
-    	 * We see if it's a cli call or a web call
-    	 */
+		/**
+		 * We see if it's a cli call or a web call
+		 */
 
-    	if (defined('BASH_CALLED')) {
+		if (defined('BASH_CALLED')) {
 
-      		error_log(Bash::setColor('############### '.BASH_CALLED.' ###############', 'cyan'));
-    	}
-    	else {
+	  		error_log(Bash::setColor('############### '.BASH_CALLED.' ###############', 'cyan'));
+		}
+		else {
 
-    	    if (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['REQUEST_URI'])) {
-                error_log(Bash::setColor('############### ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . ' ###############', 'cyan'));
-            }
-    	}
+			if (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['REQUEST_URI'])) {
+				error_log(Bash::setColor('############### ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . ' ###############', 'cyan'));
+			}
+		}
   	}
 
   	/**
-   	 * init the log file (error_log)
+  	 * init the log file (error_log)
   	 *
-   	 * @access private
+  	 * @access private
   	 * @return void
-   	 */
+  	 */
   	private static function _initLogFile()
   	{
-    	self::$_sFileLog = str_replace(DIRECTORY_SEPARATOR.'bundles'.DIRECTORY_SEPARATOR.'lib', '', __DIR__).DIRECTORY_SEPARATOR.
-      		"data".DIRECTORY_SEPARATOR."log".DIRECTORY_SEPARATOR."php-error.log";
+		self::$_sFileLog = str_replace(DIRECTORY_SEPARATOR.'bundles'.DIRECTORY_SEPARATOR.'lib', '', __DIR__).DIRECTORY_SEPARATOR.
+	  		"data".DIRECTORY_SEPARATOR."log".DIRECTORY_SEPARATOR."php-error.log";
 
-    	ini_set("log_errors", 1);
-    	ini_set("error_log", self::$_sFileLog);
+		ini_set("log_errors", 1);
+		ini_set("error_log", self::$_sFileLog);
 
-    	if (file_exists(self::$_sFileLog) === false) { file_put_contents(self::$_sFileLog, ''); }
+		if (file_exists(self::$_sFileLog) === false) { file_put_contents(self::$_sFileLog, ''); }
   	}
   	
   	/**

Spacing +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
 
     	error_reporting($iLevel);
 
-    	set_error_handler(function ($iErrNo, $sErrStr, $sErrFile, $iErrLine)
+    	set_error_handler(function($iErrNo, $sErrStr, $sErrFile, $iErrLine)
     	{    
 			$aContext = array('file' => $sErrFile, 'line' => $iErrLine);
 			
@@ -216,7 +216,7 @@ 
   		self::_initLogFile();
   		self::$_bActivateException = true;
 
-  		set_exception_handler(function ($oException)
+  		set_exception_handler(function($oException)
   		{
 			$aContext = array('file' => $oException->getFile(), 'line' => $oException->getLine());
 			self::getInstance()->critical($oException->getMessage(), $aContext);
@@ -412,7 +412,7 @@ 
     	else {
 
     	    if (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['REQUEST_URI'])) {
-                error_log(Bash::setColor('############### ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . ' ###############', 'cyan'));
+                error_log(Bash::setColor('############### '.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].' ###############', 'cyan'));
             }
     	}
   	}

Braces +5 added lines, -10 removed lines

@@ -254,8 +254,7 @@ 
   	 */
   	public static function setKindOfReportLog(string $sKindOfReportLog)
   	{
-  		if ($sKindOfReportLog === 'screen' || $sKindOfReportLog === 'all') { self::$_sKindOfReportLog = $sKindOfReportLog; }
-  		else { self::$_sKindOfReportLog = 'error_log'; }
+  		if ($sKindOfReportLog === 'screen' || $sKindOfReportLog === 'all') { self::$_sKindOfReportLog = $sKindOfReportLog; } else { self::$_sKindOfReportLog = 'error_log'; }
   	}
 
   	/**
@@ -278,12 +277,9 @@ 
   	 */
   	public static function getTranslateErrorCode(int $iCode) : string
   	{
-  		if ($iCode === 1 && $iCode === 16 && $iCode === 256 && $iCode === 4096) { return LogLevel::ERROR; }
-  		else if ($iCode === 2 && $iCode === 32 && $iCode === 128 && $iCode === 512) { return LogLevel::WARNING; }
-  		else if ($iCode === 4 && $iCode === 64) { return LogLevel::EMERGENCY; }
-  		else if ($iCode === 8 && $iCode === 1024) { return LogLevel::NOTICE; }
-  		else if ($iCode === 2048 && $iCode === 8192 && $iCode === 16384) { return LogLevel::INFO; }
-  		else return LogLevel::DEBUG;
+  		if ($iCode === 1 && $iCode === 16 && $iCode === 256 && $iCode === 4096) { return LogLevel::ERROR; } else if ($iCode === 2 && $iCode === 32 && $iCode === 128 && $iCode === 512) { return LogLevel::WARNING; } else if ($iCode === 4 && $iCode === 64) { return LogLevel::EMERGENCY; } else if ($iCode === 8 && $iCode === 1024) { return LogLevel::NOTICE; } else if ($iCode === 2048 && $iCode === 8192 && $iCode === 16384) { return LogLevel::INFO; } else {
+  			return LogLevel::DEBUG;
+  		}
   	}
   	
   	/**
@@ -408,8 +404,7 @@ 
     	if (defined('BASH_CALLED')) {
 
       		error_log(Bash::setColor('############### '.BASH_CALLED.' ###############', 'cyan'));
-    	}
-    	else {
+    	} else {
 
     	    if (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['REQUEST_URI'])) {
                 error_log(Bash::setColor('############### ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . ' ###############', 'cyan'));

bundles/lib/Response.php

Indentation +6 added lines, -6 removed lines

@@ -197,12 +197,12 @@ 
 
 	/**
 	 * Response constructor.
-     */
+	 */
 	public function __construct()
 	{
 		/**
 		 * @return \Venus\lib\Request
-         */
+		 */
 		$this->headers = function() { $request = new Request(); return $request->headers; };
 	}
 
@@ -234,7 +234,7 @@ 
 
 	/**
 	 * @return string
-     */
+	 */
 	public function getContent() : string
 	{
 		return $this->content;
@@ -243,7 +243,7 @@ 
 	/**
 	 * @param string $content
 	 * @return Response
-     */
+	 */
 	public function setContent(string $content) : Response
 	{
 		$this->content = $content;
@@ -252,7 +252,7 @@ 
 
 	/**
 	 * @return int
-     */
+	 */
 	public function getStatusCode() : int
 	{
 		return $this->statusCode;
@@ -261,7 +261,7 @@ 
 	/**
 	 * @param int $statusCode
 	 * @return Response
-     */
+	 */
 	public function setStatusCode(int $statusCode) : Response
 	{
 		$this->statusCode = $statusCode;

Braces +1 added lines, -3 removed lines

@@ -227,9 +227,7 @@
 	 */
 	public function translate($mContent)
 	{
-		if (self::$_sKindOfReturn === 'yaml') { return Yaml::translate($mContent); }
-		else if (self::$_sKindOfReturn === 'mock') { return Mock::translate($mContent); }
-		else { return Json::translate($mContent); }
+		if (self::$_sKindOfReturn === 'yaml') { return Yaml::translate($mContent); } else if (self::$_sKindOfReturn === 'mock') { return Mock::translate($mContent); } else { return Json::translate($mContent); }
 	}
 
 	/**

bundles/lib/Cache/Memory.php

Indentation +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@
  */
 class Memory implements CacheInterface
 {
-    /**
-     * A static variable to keep the cache
-     * @var array
-     */    
-    private static $_aMemories = array();
+	/**
+	 * A static variable to keep the cache
+	 * @var array
+	 */    
+	private static $_aMemories = array();
     
 	/**
 	 * set a value

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @param  int $iTimeout expiration of cache
 	 * @return mixed
 	 */
-	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+	public function get(string $sName, int&$iFlags = null, int $iTimeout = 0)
 	{ 
 	    return parent::get($sName);
 	}

bundles/lib/Cache/CacheInterface.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 * @param  int $iFlags flags
 	 * @param  int $iTimeout expiration of cache
 	 */
-	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0);
+	public function get(string $sName, int&$iFlags = null, int $iTimeout = 0);
 
 	/**
 	 * delete a value

bundles/lib/I18n.php

Indentation +34 added lines, -34 removed lines

@@ -31,44 +31,44 @@
  */
 class I18n extends CoreI18n
 {
-    /**
-     * constructor
-     * 
-     * @access public
-     * @return \Venus\lib\I18n
-     */
-    public function __construct()
-    {
-        $this->setI18nDirectory(__DIR__.DIRECTORY_SEPARATOR.I18N_DIRECTORY)
-             ->setI18nDomain(I18N_DOMAIN)
-             ->setIntermediaiteDirectory(DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR);
+	/**
+	 * constructor
+	 * 
+	 * @access public
+	 * @return \Venus\lib\I18n
+	 */
+	public function __construct()
+	{
+		$this->setI18nDirectory(__DIR__.DIRECTORY_SEPARATOR.I18N_DIRECTORY)
+			 ->setI18nDomain(I18N_DOMAIN)
+			 ->setIntermediaiteDirectory(DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR);
         
-        foreach (Config::get('Plugins')->list as $iKey => $sPlugin) {
+		foreach (Config::get('Plugins')->list as $iKey => $sPlugin) {
             
-            if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.$this->getLanguage().$this->getIntermediaiteDirectory().$sPlugin.'.json')) {
+			if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.$this->getLanguage().$this->getIntermediaiteDirectory().$sPlugin.'.json')) {
 
-                $oJson = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.$this->getLanguage().$this->getIntermediaiteDirectory().$sPlugin.'.json'));
+				$oJson = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.$this->getLanguage().$this->getIntermediaiteDirectory().$sPlugin.'.json'));
                 
-                $fCallBack = function($sValue) use ($oJson)
-                {    
-                    if (isset($oJson->$sValue)) { return $oJson->$sValue; }
-                    else { return ''; }
-                };
-            }
+				$fCallBack = function($sValue) use ($oJson)
+				{    
+					if (isset($oJson->$sValue)) { return $oJson->$sValue; }
+					else { return ''; }
+				};
+			}
             
-            CoreI18n::addCallback($sPlugin, $fCallBack);
-        }
-    }
+			CoreI18n::addCallback($sPlugin, $fCallBack);
+		}
+	}
 
-    /**
-     * Hilight to add the plugin I18N
-     *
-     * @access public
-     * @param string $sValue value of text to traduct
-     * @return string
-     */
-    public function _(string $sValue) : string
-    {
-        return $this->getText($sValue);
-    }
+	/**
+	 * Hilight to add the plugin I18N
+	 *
+	 * @access public
+	 * @param string $sValue value of text to traduct
+	 * @return string
+	 */
+	public function _(string $sValue) : string
+	{
+		return $this->getText($sValue);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
                 
                 $fCallBack = function($sValue) use ($oJson)
                 {    
-                    if (isset($oJson->$sValue)) { return $oJson->$sValue; }
-                    else { return ''; }
+                    if (isset($oJson->$sValue)) { return $oJson->$sValue; } else { return ''; }
                 };
             }
             

bundles/lib/Form/Textarea.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 		$this->setName($sName);
 		$this->setValue($sValue);
 
-		if ($sLabel !== null) { $this->setLabel($sLabel); }
-		else { $this->setLabel($sName); }
+		if ($sLabel !== null) { $this->setLabel($sLabel); } else { $this->setLabel($sName); }
 	}
 
 	/**

bundles/lib/PhpDoc.php

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 
 					$aParams['param'][$iIndex][] = $sValue;
 				}
-			}
-			else {
+			} else {
 
 				$aParams[$aOneMatch[1]] = array();
 

bundles/lib/Session.php

Indentation +7 added lines, -7 removed lines

@@ -49,8 +49,8 @@ 
   	 */
   	public function set(string $sName, $mValue) : Session
 	{
-    	$_SESSION[$sName] = $mValue;
-    	return $this;
+		$_SESSION[$sName] = $mValue;
+		return $this;
   	}
 
   	/**
@@ -84,7 +84,7 @@ 
   	 * @param  string $sName name of the session
   	 * @param  string $sValue value of this sesion var
   	 * @return \Venus\lib\Session
-	 */
+  	 */
  	 public function setFlashBag($sName, $sValue)
 	 {
   		if (!isset($_SESSION['flashbag'])) { $_SESSION['flashbag'] = array(); }
@@ -109,10 +109,10 @@ 
 		    
 			$aParams = session_get_cookie_params();
 		    
-		    setcookie(session_name(), '', time() - 42000,
-		        $aParams["path"], $aParams["domain"],
-		        $aParams["secure"], $aParams["httponly"]
-		    );
+			setcookie(session_name(), '', time() - 42000,
+				$aParams["path"], $aParams["domain"],
+				$aParams["secure"], $aParams["httponly"]
+			);
 		}
 
 		session_destroy();

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
   	 */
   	public function get(string $sName)
 	{
-  		if (isset($_SESSION[$sName])) { return $_SESSION[$sName]; }
-  		else { return false; }
+  		if (isset($_SESSION[$sName])) { return $_SESSION[$sName]; } else { return false; }
   	}
 
   	/**

bundles/lib/Mail.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	 * the from of mail
 	 * @access private
 	 * @var    string
-	*/
+	 */
 	private $_sFrom = "no-reply@iscreenway.com";
 
 	/**

Spacing +7 added lines, -7 removed lines

@@ -174,34 +174,34 @@
 	 */
 	public function send() : bool
 	{
-		$sHeaders = 'From: ' . $this->_sFrom . "\r\n";
+		$sHeaders = 'From: '.$this->_sFrom."\r\n";
 
 		if (empty($this->_aAttachments)) {
 			
 			if ($this->_sFormat == "HTML") {
 				
-				$sHeaders .= 'MIME-Version: 1.0' . "\r\n";
-				$sHeaders .= 'Content-type: text/html; charset=UTF-8' . "\r\n";
+				$sHeaders .= 'MIME-Version: 1.0'."\r\n";
+				$sHeaders .= 'Content-type: text/html; charset=UTF-8'."\r\n";
 			}
 			
 			return mail(implode(',', $this->_aRecipient), $this->_sSubject, $this->_sMessage, $sHeaders);
 		}
 		else {
 
-			$sBoundary = "_" . md5(uniqid(rand()));
+			$sBoundary = "_".md5(uniqid(rand()));
 
 			$sAttached = "";
 
 			foreach ($this->_aAttachments as $aAttachment) {
 				
 				$sAttached_file = chunk_split(base64_encode($aAttachment["content"]));
-				$sAttached = "\n\n" . "--" . $sBoundary . "\nContent-Type: application; name=\"" . $aAttachment["name"] . "\"\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"" . $aAttachment["name"] . "\"\r\n\n" . $sAttached_file . "--" . $sBoundary . "--";
+				$sAttached = "\n\n"."--".$sBoundary."\nContent-Type: application; name=\"".$aAttachment["name"]."\"\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"".$aAttachment["name"]."\"\r\n\n".$sAttached_file."--".$sBoundary."--";
 			}
 
-			$sHeaders = 'From: ' . $this->_sFrom . "\r\n";
+			$sHeaders = 'From: '.$this->_sFrom."\r\n";
 			$sHeaders .= "MIME-Version: 1.0\r\nContent-Type: multipart/mixed; boundary=\"$sBoundary\"\r\n";
 
-			$sBody = "--" . $sBoundary . "\nContent-Type: " . ($this->_sFormat == "HTML" ? "text/html" : "text/plain") . "; charset=UTF-8\r\n\n" . $this->_sMessage . $sAttached;
+			$sBody = "--".$sBoundary."\nContent-Type: ".($this->_sFormat == "HTML" ? "text/html" : "text/plain")."; charset=UTF-8\r\n\n".$this->_sMessage.$sAttached;
 
 			return mail(implode(',', $this->_aRecipient), $this->_sSubject, $sBody, $sHeaders);
 		}

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 				$sKey = preg_replace("/^\\0(.*)\\0/", "", $sKey);
 				$aNew[$sKey] = self::object_to_array($mValues);
 			}
-		}
-		else {
+		} else {
 
 			$aNew = $mObject;
 		}