las93 / venus3

bundles/lib/Request/Files.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 
 class Files implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset($_FILES[$name]) && $_FILES[$name] != '') {
-            return $_FILES[$name];
-        }
-        else if ($default != null) {
-            return $default;
-        }
-    }
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string
+	{
+		if (isset($_FILES[$name]) && $_FILES[$name] != '') {
+			return $_FILES[$name];
+		}
+		else if ($default != null) {
+			return $default;
+		}
+	}
 }
\ No newline at end of file

bundles/lib/Request/Headers.php

Indentation +31 added lines, -31 removed lines

@@ -9,37 +9,37 @@
 
 class Headers implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset(apache_request_headers()[$name]) && apache_request_headers()[$name] != '') {
-            return apache_request_headers()[$name];
-        }
-        else if ($default != null) {
-            return $default;
-        }
-    }
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string
+	{
+		if (isset(apache_request_headers()[$name]) && apache_request_headers()[$name] != '') {
+			return apache_request_headers()[$name];
+		}
+		else if ($default != null) {
+			return $default;
+		}
+	}
 
-    /**
-     * set a new header
-     * @param string $name
-     * @param string $value
-     * @return string|Headers
-     */
-    public function set(string $name, string $value = null) : Headers
-    {
-        if ($value !== null) {
-            header($name . ': ' . $value);
-        }
-        else {
-            header($name);
-        }
+	/**
+	 * set a new header
+	 * @param string $name
+	 * @param string $value
+	 * @return string|Headers
+	 */
+	public function set(string $name, string $value = null) : Headers
+	{
+		if ($value !== null) {
+			header($name . ': ' . $value);
+		}
+		else {
+			header($name);
+		}
         
-        return $this;
-    }
+		return $this;
+	}
 }
\ No newline at end of file

bundles/lib/Request/RequestInterface.php

Indentation +7 added lines, -7 removed lines

@@ -9,11 +9,11 @@
 
 interface RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string;
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string;
 }
\ No newline at end of file

bundles/lib/Request/Request.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 
 class Request implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset($_POST[$name]) && $_POST[$name] != '') {
-            return $_POST[$name];
-        }
-        else if ($default != null) {
-            return $default;
-        }
-    }
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string
+	{
+		if (isset($_POST[$name]) && $_POST[$name] != '') {
+			return $_POST[$name];
+		}
+		else if ($default != null) {
+			return $default;
+		}
+	}
 }
\ No newline at end of file

bundles/lib/Request/Query.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 
 class Query implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset($_GET[$name]) && $_GET[$name] != '') {
-            return $_GET[$name];
-        }
-        else if ($default != null) {
-            return $default;
-        }
-    }
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string
+	{
+		if (isset($_GET[$name]) && $_GET[$name] != '') {
+			return $_GET[$name];
+		}
+		else if ($default != null) {
+			return $default;
+		}
+	}
 }
\ No newline at end of file

bundles/lib/Request/Cookies.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 
 class Cookies implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset($_COOKIE[$name]) && $_COOKIE[$name] != '') {
-            return $_COOKIE[$name];
-        }
-        else if ($default != null) {
-            return $default;
-        }
-    }
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string
+	{
+		if (isset($_COOKIE[$name]) && $_COOKIE[$name] != '') {
+			return $_COOKIE[$name];
+		}
+		else if ($default != null) {
+			return $default;
+		}
+	}
 }
\ No newline at end of file

bundles/core/Config.php

Indentation +60 added lines, -60 removed lines

@@ -50,17 +50,17 @@ 
 	 */
 	public static function get(string $sName, string $sPortal = null, bool $bNoDoRedirect = false)
 	{
-	    if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; }
-	    else { $sNameCache = $sName; }
+		if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; }
+		else { $sNameCache = $sName; }
 	    
 		if ($sPortal === null || !is_string($sPortal)) {
 		    
-		    if (defined('PORTAL')) {
+			if (defined('PORTAL')) {
 
 				$sPortal = PORTAL;
 				$aDirectories = array($sPortal);
 			}
-		    else {
+			else {
 
 				$sPortal = '';
 				$aDirectories = scandir(str_replace('core', 'src', __DIR__));
@@ -73,84 +73,84 @@ 
 
 			foreach ($aDirectories as $sPortal) {
 			
-			    if ($sPortal != '..' && $sPortal != '.') {
+				if ($sPortal != '..' && $sPortal != '.') {
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         				
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf')) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
         
-        			$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
-        			$base = self::_mergeAndGetConf($sJsonFile, $base);
-			    }
-		    }
+					$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
+					$base = self::_mergeAndGetConf($sJsonFile, $base);
+				}
+			}
 
 			if ($base === '') {
 				
@@ -185,10 +185,10 @@ 
 	 */
 	public static function getBundleLocationName(string $sName): string
 	{
-	    $oConfig = self::get($sName, null, true);
+		$oConfig = self::get($sName, null, true);
 
-	    if (isset($oConfig->redirect)) { return $oConfig->redirect; }
-	    else { return PORTAL; }
+		if (isset($oConfig->redirect)) { return $oConfig->redirect; }
+		else { return PORTAL; }
 	}
 
 	/**

bundles/core/Router.php

Indentation +106 added lines, -106 removed lines

@@ -82,8 +82,8 @@ 
 	 */
 	public function __construct() 
 	{
-	    $oLogger = Debug::getInstance();
-	    $this->setLogger($oLogger);
+		$oLogger = Debug::getInstance();
+		$this->setLogger($oLogger);
 	}
 
 	/**
@@ -100,120 +100,120 @@ 
 
 		if (Request::isHttpRequest()) {
         
-		    // Search if a Less file exists
-		    if (defined('LESS_ACTIVE') && LESS_ACTIVE === true) {
+			// Search if a Less file exists
+			if (defined('LESS_ACTIVE') && LESS_ACTIVE === true) {
 		        
-		        if (strstr($_SERVER['REQUEST_URI'], '.css')
-                    && file_exists(preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
+				if (strstr($_SERVER['REQUEST_URI'], '.css')
+					&& file_exists(preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
 		        
-		            Less::toCss($_SERVER['REQUEST_URI']);
-		            exit;
-		        }
-		    }
+					Less::toCss($_SERVER['REQUEST_URI']);
+					exit;
+				}
+			}
 		    
-		    // Search if a typescript file exists
-		    if (defined('TYPESCRIPT_ACTIVE') && TYPESCRIPT_ACTIVE === true) {
+			// Search if a typescript file exists
+			if (defined('TYPESCRIPT_ACTIVE') && TYPESCRIPT_ACTIVE === true) {
 		    
-		        if (strstr($_SERVER['REQUEST_URI'], '.js')
-		        && file_exists(preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
+				if (strstr($_SERVER['REQUEST_URI'], '.js')
+				&& file_exists(preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
 		    
-		            Typescript::toJs($_SERVER['REQUEST_URI']);
-		            exit;
-		        }
-		    }
+					Typescript::toJs($_SERVER['REQUEST_URI']);
+					exit;
+				}
+			}
 		    
-		    // Search public files in all plugins
-		    if ($_SERVER['REQUEST_URI'] !== '/') {
+			// Search public files in all plugins
+			if ($_SERVER['REQUEST_URI'] !== '/') {
 	
-    		    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.'public'.$_SERVER['REQUEST_URI'])) {
+					if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.$_SERVER['REQUEST_URI'])) {
     		            
-    		            echo file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.$_SERVER['REQUEST_URI']);
-                        exit;
-    		        }
-                    else if (strstr($_SERVER['REQUEST_URI'], '.css')
-		                && file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
-
-		                Less::toCss(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']));
-		                exit;
-                    }
-		            else if (strstr($_SERVER['REQUEST_URI'], '.js')
-		                && file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
-
-		                Typescript::toJs(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']));
-		                exit;
-		            }
-		        }
-	        }
+						echo file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.$_SERVER['REQUEST_URI']);
+						exit;
+					}
+					else if (strstr($_SERVER['REQUEST_URI'], '.css')
+						&& file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']))) {
+
+						Less::toCss(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.css/', '.less', $_SERVER['REQUEST_URI']));
+						exit;
+					}
+					else if (strstr($_SERVER['REQUEST_URI'], '.js')
+						&& file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']))) {
+
+						Typescript::toJs(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$sPlugin.DIRECTORY_SEPARATOR.'public'.preg_replace('/\.js/', '.ts', $_SERVER['REQUEST_URI']));
+						exit;
+					}
+				}
+			}
 		    
 			foreach (Config::get('Route') as $sMultiHost => $oHost) {
 
-			    foreach (explode(',', $sMultiHost) as $sHost) {
+				foreach (explode(',', $sMultiHost) as $sHost) {
 
-    				if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST']) || (strstr($sHost, '/')
-    					&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
+					if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST']) || (strstr($sHost, '/')
+						&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
     
-    					$this->_oRoutes = $oHost;
+						$this->_oRoutes = $oHost;
 
-    					if (strstr($sHost, '/')
-    						&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost)) {
+						if (strstr($sHost, '/')
+							&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost)) {
 
-    						$this->_sBaseUri = preg_replace('#^[^/]+#', '', $sHost);
-    					}
+							$this->_sBaseUri = preg_replace('#^[^/]+#', '', $sHost);
+						}
     
-    					if (isset($oHost->location)) {
+						if (isset($oHost->location)) {
     
-    						header('Status: 301 Moved Permanently', false, 301);
-    	  					header('Location: '.$oHost->location);
-    	  					exit;
-    					}
-    					else if (preg_match('#getCss\?#', $_SERVER['REQUEST_URI'])) {
+							header('Status: 301 Moved Permanently', false, 301);
+		  					header('Location: '.$oHost->location);
+		  					exit;
+						}
+						else if (preg_match('#getCss\?#', $_SERVER['REQUEST_URI'])) {
     					    
-    					    foreach ($_GET as $sKey => $sValue) {
+							foreach ($_GET as $sKey => $sValue) {
 
-    					        if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')) {
+								if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')) {
     					            
-    					            echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')."\n";
-    					        }
-    					    }
+									echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.css')."\n";
+								}
+							}
     					    
-    					    exit;
-    					}
-    					else if (preg_match('#getJs\?#', $_SERVER['REQUEST_URI'])) {
+							exit;
+						}
+						else if (preg_match('#getJs\?#', $_SERVER['REQUEST_URI'])) {
     					    
-    					    foreach ($_GET as $sKey => $sValue) {
+							foreach ($_GET as $sKey => $sValue) {
 
-    					        if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')) {
+								if (file_exists(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')) {
     					            
-    					            echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')."\n";
-    					        }
-    					    }
+									echo file_get_contents(str_replace(DIRECTORY_SEPARATOR.'core', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, __DIR__).$sKey.'.js')."\n";
+								}
+							}
     					    
-    					    exit;
-    					}
-    					else if (isset($oHost->routes)) {
+							exit;
+						}
+						else if (isset($oHost->routes)) {
     
-    						foreach($oHost->routes as $sKey => $oRoute) {
+							foreach($oHost->routes as $sKey => $oRoute) {
 
-    							$mReturn = $this->_route($oRoute, $_SERVER['REQUEST_URI']);
+								$mReturn = $this->_route($oRoute, $_SERVER['REQUEST_URI']);
 
-    							if ($mReturn === 403) {
+								if ($mReturn === 403) {
     
-    								$this->_getPage403();
-    							}
-    							else if ($mReturn == true) {
+									$this->_getPage403();
+								}
+								else if ($mReturn == true) {
     
-    								if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
+									if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
     
-    								return true;
-    							}							
-    						}
+									return true;
+								}							
+							}
     
-    						$this->_getPage404();
-    					}
-    				}
-			    }
+							$this->_getPage404();
+						}
+					}
+				}
 
 				//@todo fait l'erreur à chaque passage
 //				if ($sHost !== $_SERVER['HTTP_HOST']) {
@@ -227,7 +227,7 @@ 
 //				}
 			}
 		}
-        else if (Request::isCliRequest()) {
+		else if (Request::isCliRequest()) {
 
 			if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; }
 			else { $aArguments = $argv; }
@@ -235,15 +235,15 @@ 
 			define('PORTAL', 'Batch');
 			set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 
-            if (!isset($aArguments[1]) && strstr($aArguments[0], '/phpunit')) {
+			if (!isset($aArguments[1]) && strstr($aArguments[0], '/phpunit')) {
 
-                $sBatchName = "phpunit";
-                $aArguments[0] = "bin/console";
-                $aArguments[1] = "phpunit";
-            }
-            else {
-                $sBatchName = $aArguments[1];
-            }
+				$sBatchName = "phpunit";
+				$aArguments[0] = "bin/console";
+				$aArguments[1] = "phpunit";
+			}
+			else {
+				$sBatchName = $aArguments[1];
+			}
 
 			if (isset(Config::get('Route')->batch->script->{$sBatchName})) {
 
@@ -285,7 +285,7 @@ 
 						array_shift($aArguments);
 					}
 				}
-      		}
+	  		}
 
 			if (isset($oBatch->controller) && isset($oBatch->action)) {
 
@@ -358,7 +358,7 @@ 
 			foreach (Config::get('Route') as $sHost => $oHost) {
 
 				if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST'])
-				    || (strstr($sHost, '/') && strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
+					|| (strstr($sHost, '/') && strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
 
 					$this->_oRoutes = $oHost->routes;
 
@@ -388,7 +388,7 @@ 
 
 		if (isset($oRoute->route)) {
 
-		    $sRoute = str_replace("*", ".*", $oRoute->route);
+			$sRoute = str_replace("*", ".*", $oRoute->route);
 
 			$sFinalRoute = preg_replace_callback(
 				'|\[/{0,1}:([a-zA-Z_]+)\]|',
@@ -464,8 +464,8 @@ 
 
 			if (isset($oRoute->controller)) {
 
-			    define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->controller));
-			    set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
+				define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->controller));
+				set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 			     
 				if (isset($oRoute->content_type)) {
 
@@ -519,7 +519,7 @@ 
 						}
 						else {
 
-						    $this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
+							$this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
 							break;
 						}
 					}
@@ -545,10 +545,10 @@ 
 			}
 			else if (isset($oRoute->template) && isset($oRoute->layout) && $oRoute->layout === true) {
 
-			    define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
-			    set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
+				define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
+				set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 			    
-			    $oLayout = Vendor::getVendor('Apollina\Template', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl');
+				$oLayout = Vendor::getVendor('Apollina\Template', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl');
 
 				if (isset($oRoute->vars)) {
 
@@ -563,8 +563,8 @@ 
 			}
 			else if (isset($oRoute->template)) {
 
-			    define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
-			    set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
+				define('PORTAL', preg_replace('/^\\\\Venus\\\\src\\\\([a-zA-Z0-9_]+)\\\\.+$/', '$1', $oRoute->template));
+				set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
 			    
 				$oTemplate = Vendor::getVendor('Apollina\Template', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$oRoute->template.'.tpl');
 
@@ -664,14 +664,14 @@ 
 		
 		if (method_exists($oController, 'beforeExecuteRoute')) { 
 		    
-		    call_user_func_array(array($oController, 'beforeExecuteRoute'), array());
+			call_user_func_array(array($oController, 'beforeExecuteRoute'), array());
 		}
 
 		$mReturnController = call_user_func_array(array($oController, $sActionName), $aParams);
 
 		if (method_exists($oController, 'afterExecuteRoute')) { 
 		    
-		    call_user_func_array(array($oController, 'afterExecuteRoute'), array());
+			call_user_func_array(array($oController, 'afterExecuteRoute'), array());
 		}
 		
 		$mReturn = ob_get_clean();
@@ -811,6 +811,6 @@ 
 	 */
 	public function setLogger(LoggerInterface $logger) {
 	    
-	    $this->_oLogger = $logger;
+		$this->_oLogger = $logger;
 	}
 }

bundles/core/Controller.php

Indentation +15 added lines, -15 removed lines

@@ -43,13 +43,13 @@ 
 abstract class Controller extends Mother 
 {
 	
-    /**
-     * Cache to know if a model was initialize or not because we must initialize it just one time by script
-     * 
-     * @access private
-     * @var    array
-     */
-    private static $_aInitialize = array();
+	/**
+	 * Cache to know if a model was initialize or not because we must initialize it just one time by script
+	 * 
+	 * @access private
+	 * @var    array
+	 */
+	private static $_aInitialize = array();
     
 	/**
 	 * Constructor
@@ -95,11 +95,11 @@ 
 		 */
 		if (method_exists(get_called_class(), 'initialize')) {
 		    
-		    if (!isset(self::$_aInitialize[get_called_class()])) { 
+			if (!isset(self::$_aInitialize[get_called_class()])) { 
 		        
-		        static::initialize();
-		        self::$_aInitialize[get_called_class()] = true;
-		    }
+				static::initialize();
+				self::$_aInitialize[get_called_class()] = true;
+			}
 		}
 		
 		/**
@@ -169,12 +169,12 @@ 
 	 */
 	public function __get($mKey)
 	{
-	    if (isset($this->di) && property_exists($this, 'di')) {
+		if (isset($this->di) && property_exists($this, 'di')) {
 
-    	    $mDi = $this->di->get($mKey);
+			$mDi = $this->di->get($mKey);
 
-    		if (isset($mDi) && $mDi != false) { return $mDi; }
-	    }
+			if (isset($mDi) && $mDi != false) { return $mDi; }
+		}
 		
 		return parent::__get($mKey);
 	}