las93 / venus3

bundles/lib/Typescript.php

Indentation +16 added lines, -16 removed lines

@@ -30,10 +30,10 @@ 
  */
 class Typescript
 {
-    /**
-     * @var string
-     */
-    const TYPESCRIPT_WINDOWS = TYPESCRIPT_WINDOWS;
+	/**
+	 * @var string
+	 */
+	const TYPESCRIPT_WINDOWS = TYPESCRIPT_WINDOWS;
     
 	/**
 	 * translate the content
@@ -44,21 +44,21 @@ 
 	 */
 	public static function toJs(string $sFile) : string
 	{
-	    $aFile = pathinfo($sFile);
-	    $sFolder = uniqid();
+		$aFile = pathinfo($sFile);
+		$sFolder = uniqid();
 	    
-	    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 	        
-	        $sCmd = self::TYPESCRIPT_WINDOWS." ".$sFile." --outDir ".__DIR__.'../../'.CACHE_DIR.$sFolder.'/';
-            $sContent = shell_exec($sCmd);
-	    }
-	    else {
+			$sCmd = self::TYPESCRIPT_WINDOWS." ".$sFile." --outDir ".__DIR__.'../../'.CACHE_DIR.$sFolder.'/';
+			$sContent = shell_exec($sCmd);
+		}
+		else {
 	       
-	        $sCmd = "tsc ".$sFile." --outDir ".__DIR__.'../../'.CACHE_DIR.$sFolder.'/';
-            $sContent = shell_exec($sCmd);
-	    }
+			$sCmd = "tsc ".$sFile." --outDir ".__DIR__.'../../'.CACHE_DIR.$sFolder.'/';
+			$sContent = shell_exec($sCmd);
+		}
 	    
-        header("content-type:text/javascript");
-        return file_get_contents(__DIR__.'../../'.CACHE_DIR.$sFolder.'/'.$aFile['filename'].'.js');
+		header("content-type:text/javascript");
+		return file_get_contents(__DIR__.'../../'.CACHE_DIR.$sFolder.'/'.$aFile['filename'].'.js');
 	}
 }

bundles/src/plugins/common/Controller.php

Indentation +11 added lines, -11 removed lines

@@ -46,20 +46,20 @@
 		
 		$this->installDb = function()
 		{
-		    $oDb = Config::get('Db');
-		    $oTables = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.preg_replace('/^.*\\\\([a-zA-Z0-9]+)$/', '$1', get_called_class()).DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf'));
+			$oDb = Config::get('Db');
+			$oTables = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.preg_replace('/^.*\\\\([a-zA-Z0-9]+)$/', '$1', get_called_class()).DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf'));
 		    
-		    $oDb->configuration->tables = $oTables;
+			$oDb->configuration->tables = $oTables;
 		    
-    	    $aOptions = [
-	           "p" => CREATE_PORTAL,
-	           "c" => true,
-	           "e" => true,
-	           "b" => json_encode($oDb)
-    	    ];
+			$aOptions = [
+			   "p" => CREATE_PORTAL,
+			   "c" => true,
+			   "e" => true,
+			   "b" => json_encode($oDb)
+			];
     	    
-    	    $oEntity = new Entity;
-    	    $oEntity->runScaffolding($aOptions);
+			$oEntity = new Entity;
+			$oEntity->runScaffolding($aOptions);
 		};
 	}
 }

bundles/src/Batch/app/Controller/Entity.php

Indentation +8 added lines, -8 removed lines

@@ -50,20 +50,20 @@
 	 */
 	public function runScaffolding(array $aOptions = array())
 	{
-	    if (!isset($aOptions['p'])) { $aOptions['p'] = 'Batch'; }
+		if (!isset($aOptions['p'])) { $aOptions['p'] = 'Batch'; }
 	    
-	    if (!isset($aOptions['b'])) { $aOptions['b'] = json_encode(Config::get('Db', $aOptions['p'])); }
+		if (!isset($aOptions['b'])) { $aOptions['b'] = json_encode(Config::get('Db', $aOptions['p'])); }
 	    
-	    $aOptions['g'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR;
+		$aOptions['g'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR;
 	    
-	    $aOptions['h'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR;
+		$aOptions['h'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR;
 	    
 	    
-	    if (!defined('ENTITY_NAMESPACE')) { define('ENTITY_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Entity'); }
+		if (!defined('ENTITY_NAMESPACE')) { define('ENTITY_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Entity'); }
 	    
-	    if (!defined('MODEL_NAMESPACE')) { define('MODEL_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Model'); }
+		if (!defined('MODEL_NAMESPACE')) { define('MODEL_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Model'); }
 	    
-	    $oBatch = new BatchEntity;
-	    $oBatch->runScaffolding($aOptions);
+		$oBatch = new BatchEntity;
+		$oBatch->runScaffolding($aOptions);
 	}
 }

bundles/src/Batch/app/Controller/Plugin.php

Indentation +29 added lines, -29 removed lines

@@ -47,20 +47,20 @@ 
 	 */
 	public function install(array $aOptions = array())
 	{
-	    $sFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugins.conf');
-	    $aPlugins = json_decode($sFile);
+		$sFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugins.conf');
+		$aPlugins = json_decode($sFile);
 	    
-	    if (isset($aOptions['p'])) {
+		if (isset($aOptions['p'])) {
 	        
-	        define('CREATE_PORTAL', $aOptions['p']);
-	    }
+			define('CREATE_PORTAL', $aOptions['p']);
+		}
 	    
-	    foreach ($aPlugins->list as $sPluginName) {
+		foreach ($aPlugins->list as $sPluginName) {
 	        
-	        $sClassName = 'Venus\src\plugins\\'.$sPluginName.'\Controller\\'.$sPluginName;
-	        $oPlugin = new $sClassName;
-	        $oPlugin->install($aOptions['p']);
-	    }
+			$sClassName = 'Venus\src\plugins\\'.$sPluginName.'\Controller\\'.$sPluginName;
+			$oPlugin = new $sClassName;
+			$oPlugin->install($aOptions['p']);
+		}
 	}
 
 	/**
@@ -73,23 +73,23 @@ 
 	 */
 	public function create(array $aOptions = array())
 	{
-	    $sDefaultFolder = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$aOptions['n'];
-	    mkdir($sDefaultFolder, 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'conf', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'data', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'meta', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'css', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'img', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'js', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'View', 0777, true);
+		$sDefaultFolder = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$aOptions['n'];
+		mkdir($sDefaultFolder, 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'conf', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'data', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'meta', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'css', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'img', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'js', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'View', 0777, true);
 	    
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf', '{}');
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugin.conf', '{}');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf', '{}');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugin.conf', '{}');
 	    
-	    $sContent = "<?php
+		$sContent = "<?php
 
 /**
  * Controller of the plugin ".$aOptions['n']."
@@ -157,9 +157,9 @@ 
     }
 }";
 	    
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.$aOptions['n'].'.php', $sContent);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.'en_US'.DIRECTORY_SEPARATOR.'LC_MESSAGES', 0777, true);
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'LICENSE.md', '');
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'README.md', '');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.$aOptions['n'].'.php', $sContent);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.'en_US'.DIRECTORY_SEPARATOR.'LC_MESSAGES', 0777, true);
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'LICENSE.md', '');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'README.md', '');
 	}
 }

bundles/conf/AutoLoad.php

Indentation +33 added lines, -33 removed lines

@@ -17,45 +17,45 @@ 
 spl_autoload_register(function (string $sClassName)
 {
 
-    $sClassName = ltrim($sClassName, '\\');
-    $sFileName  = '';
-    $sNamespace = '';
-    $iLastNsPos = strrpos($sClassName, '\\');
+	$sClassName = ltrim($sClassName, '\\');
+	$sFileName  = '';
+	$sNamespace = '';
+	$iLastNsPos = strrpos($sClassName, '\\');
 
-    if ($iLastNsPos) {
+	if ($iLastNsPos) {
 
-        $sNamespace = substr($sClassName, 0, $iLastNsPos);
-        $sClassName = substr($sClassName, $iLastNsPos + 1);
+		$sNamespace = substr($sClassName, 0, $iLastNsPos);
+		$sClassName = substr($sClassName, $iLastNsPos + 1);
 		$sFileName  = str_replace('\\', DIRECTORY_SEPARATOR, $sNamespace).DIRECTORY_SEPARATOR;
-    }
+	}
 
-    $sFileName = str_replace('/', '\\', $sFileName);
+	$sFileName = str_replace('/', '\\', $sFileName);
     
-    $sFileName .= $sClassName.'.php';
+	$sFileName .= $sClassName.'.php';
 
-    if (defined('PORTAL')) {
+	if (defined('PORTAL')) {
 
-        $sFileClassName = str_replace(PORTAL, PORTAL.DIRECTORY_SEPARATOR.'app', str_replace(['\\', '/'], DIRECTORY_SEPARATOR, str_replace('conf', DIRECTORY_SEPARATOR, __DIR__).str_replace('Venus\\', '', $sFileName)));
-        $sFileClassName = preg_replace('/(tests\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
-        $sFileClassName = preg_replace('/(src\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
-        $sFileClassName = str_replace('\\\\', '\\', $sFileClassName);
-        $sFileClassName = preg_replace('#bundles//tests/([^/]+)#', 'bundles/tests/$1/app', $sFileClassName);
-        $sFileClassName = preg_replace('#bundles//src/([^/]+)#', 'bundles/src/$1/app', $sFileClassName);
-        $sFileClassName = str_replace('app\\app', 'app', $sFileClassName);
-        $sFileClassName = str_replace('app/app', 'app', $sFileClassName);
+		$sFileClassName = str_replace(PORTAL, PORTAL.DIRECTORY_SEPARATOR.'app', str_replace(['\\', '/'], DIRECTORY_SEPARATOR, str_replace('conf', DIRECTORY_SEPARATOR, __DIR__).str_replace('Venus\\', '', $sFileName)));
+		$sFileClassName = preg_replace('/(tests\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
+		$sFileClassName = preg_replace('/(src\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
+		$sFileClassName = str_replace('\\\\', '\\', $sFileClassName);
+		$sFileClassName = preg_replace('#bundles//tests/([^/]+)#', 'bundles/tests/$1/app', $sFileClassName);
+		$sFileClassName = preg_replace('#bundles//src/([^/]+)#', 'bundles/src/$1/app', $sFileClassName);
+		$sFileClassName = str_replace('app\\app', 'app', $sFileClassName);
+		$sFileClassName = str_replace('app/app', 'app', $sFileClassName);
 
-        if (strstr($sFileName, 'Venus\\') && file_exists($sFileClassName)) {
+		if (strstr($sFileName, 'Venus\\') && file_exists($sFileClassName)) {
 
-        	require $sFileClassName;
-        }
-    }
-    else {
+			require $sFileClassName;
+		}
+	}
+	else {
 
-        if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {
+		if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {
 
-            require preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName)));
-        }
-    }
+			require preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName)));
+		}
+	}
 });
 
 /**
@@ -64,7 +64,7 @@ 
 
 if (file_exists(preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php')) {
 
-    include preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php';
+	include preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php';
 }
 
 /**
@@ -75,10 +75,10 @@ 
 
 if (isset($oConfig) && isset($oConfig->autoload)) {
     
-    $oAutoloadConf = $oConfig->autoload;
+	$oAutoloadConf = $oConfig->autoload;
     
-    foreach ($oAutoloadConf as $sFile) {
+	foreach ($oAutoloadConf as $sFile) {
     
-        require __DIR__.'/../'.$sFile;
-    }
+		require __DIR__.'/../'.$sFile;
+	}
 }

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);
 	}

bundles/core/Config.php

Indentation +61 added lines, -61 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 === '') {
 				
@@ -183,10 +183,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; }
 	}
 
 	/**
@@ -211,7 +211,7 @@ 
 			echo "The Json ".$sFileToMerge." has an error! Please verify!\n";
 			$oDebug = Debug::getInstance();
 			$oDebug->error("The Json ".$sFileToMerge." has an error! Please verify!\n");
-            new \Exception("The Json ".$sFileToMerge." has an error! Please verify!\n");
+			new \Exception("The Json ".$sFileToMerge." has an error! Please verify!\n");
 		}
 	}
 

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,123 +100,123 @@ 
 
 		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();
+						}
+					}
+				}
 			}
 		}
-        else if (Request::isCliRequest()) {
+		else if (Request::isCliRequest()) {
 
 			if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; }
 			else { $aArguments = $argv; }
@@ -224,15 +224,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})) {
 
@@ -274,7 +274,7 @@ 
 						array_shift($aArguments);
 					}
 				}
-      		}
+	  		}
 
 			if (isset($oBatch->controller) && isset($oBatch->action)) {
 
@@ -347,7 +347,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;
 
@@ -377,7 +377,7 @@ 
 
 		if (isset($oRoute->route)) {
 
-		    $sRoute = str_replace("*", ".*", $oRoute->route);
+			$sRoute = str_replace("*", ".*", $oRoute->route);
 
 			$sFinalRoute = preg_replace_callback(
 				'|\[/{0,1}:([a-zA-Z_]+)\]|',
@@ -453,8 +453,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)) {
 
@@ -508,7 +508,7 @@ 
 						}
 						else {
 
-						    $this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
+							$this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
 							break;
 						}
 					}
@@ -534,10 +534,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)) {
 
@@ -552,8 +552,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');
 
@@ -653,14 +653,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();
@@ -800,6 +800,6 @@ 
 	 */
 	public function setLogger(LoggerInterface $logger) {
 	    
-	    $this->_oLogger = $logger;
+		$this->_oLogger = $logger;
 	}
 }

bundles/lib/Response/Yaml.php

Indentation +5 added lines, -5 removed lines

@@ -34,15 +34,15 @@
 {
 	/**
 	 * translate the content
-     * @see \Venus\lib\Response\ResponseInterface::translate()
+	 * @see \Venus\lib\Response\ResponseInterface::translate()
 	 *
 	 * @access public
 	 * @param  mixed $mContent content to translate
 	 * @return mixed
 	 */
-    public static function translate($mContent)
-    {
-        return yaml_emit($mContent);
-    }
+	public static function translate($mContent)
+	{
+		return yaml_emit($mContent);
+	}
 
 }