las93 / venus3

bundles/lib/Cache/File.php

Doc Comments +2 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
      *
      * @access public
      * @param  string $sName name of the session
-     * @return mixed
+     * @return boolean
      */
     public function delete(string $sName)
     {
@@ -107,7 +107,6 @@ 
      * flush the cache
      *
      * @access public
-     * @param  string $sName name of the session
      * @return mixed
      */
     public function flush()
@@ -120,7 +119,7 @@ 
      *
      * @access public
      * @param  string $sName name of the session
-     * @return mixed
+     * @return string
      */
     private function _getSubDirectory($sName)
     {

Indentation +122 added lines, -122 removed lines

@@ -30,126 +30,126 @@
  */
 class File implements CacheInterface
 {
-    /**
-     * var containe this folder of cache
-     *
-     * @access private
-     * @var    string
-     */
-    private $_sFolder = '';
-
-    /**
-     * constructor
-     *
-     * @access public
-     * @return \Venus\lib\Cache\File
-     */
-    public function __construct()
-    {
-        $this->_sFolder = str_replace('bundles'.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'Cache', CACHE_DIR, __DIR__).DIRECTORY_SEPARATOR;
-    }
-
-    /**
-     * set a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag flags
-     * @param  int $iExpire expiration of cache
-     * @return \Venus\lib\Cache\File
-     */
-    public function set(string $sName, $mValue, int $iFlag, int $iExpire)
-    {
-        file_put_contents($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac', serialize($mValue));
-        return $this;
-    }
-
-    /**
-     * get a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  int $iFlags flags
-     * @param  int $iTimeout expiration of cache
-     * @return mixed
-     */
-    public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
-    {
-        if ($iTimeout > 0 && file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')
-            && time() - filemtime($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac') > $iTimeout) {
-
-            unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
-        }
-
-        if (file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')) {
-
-            return unserialize(file_get_contents($this->_sFolder . $this->_getSubDirectory($sName) . md5($sName) . '.fil.cac'));
-        } else {
-
-            return false;
-        }
-    }
-
-    /**
-     * delete a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    public function delete(string $sName)
-    {
-        return unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
-    }
-
-    /**
-     * flush the cache
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    public function flush()
-    {
-        $this->_removeDirectory($this->_sFolder);
-    }
-
-    /**
-     *
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    private function _getSubDirectory($sName)
-    {
-        if (!file_exists($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2))) {
-
-            mkdir($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2), 0777, true);
-        }
-
-        return substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2).DIRECTORY_SEPARATOR;
-    }
-
-    /**
-     * remove a directory recursivly
-     *
-     * @access private
-     * @param  string $sName nom du répertoire
-     * @return void
-     */
-    private function _removeDirectory($sName)
-    {
-        if ($rDirectory = opendir($sName)) {
-
-            while (($sFile = readdir($rDirectory)) !== false) {
-
-                if ($sFile > '0' && filetype($sName.$sFile) == "file") { unlink($sName.$sFile); } elseif ($sFile > '0' && filetype($sName.$sFile) == "dir") { remove_dir($sName.$sFile."\\"); }
-            }
-
-            closedir($rDirectory);
-            rmdir($sName);
-        }
-    }
+	/**
+	 * var containe this folder of cache
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	private $_sFolder = '';
+
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 * @return \Venus\lib\Cache\File
+	 */
+	public function __construct()
+	{
+		$this->_sFolder = str_replace('bundles'.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'Cache', CACHE_DIR, __DIR__).DIRECTORY_SEPARATOR;
+	}
+
+	/**
+	 * set a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iFlag flags
+	 * @param  int $iExpire expiration of cache
+	 * @return \Venus\lib\Cache\File
+	 */
+	public function set(string $sName, $mValue, int $iFlag, int $iExpire)
+	{
+		file_put_contents($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac', serialize($mValue));
+		return $this;
+	}
+
+	/**
+	 * get a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  int $iFlags flags
+	 * @param  int $iTimeout expiration of cache
+	 * @return mixed
+	 */
+	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+	{
+		if ($iTimeout > 0 && file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')
+			&& time() - filemtime($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac') > $iTimeout) {
+
+			unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
+		}
+
+		if (file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')) {
+
+			return unserialize(file_get_contents($this->_sFolder . $this->_getSubDirectory($sName) . md5($sName) . '.fil.cac'));
+		} else {
+
+			return false;
+		}
+	}
+
+	/**
+	 * delete a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	public function delete(string $sName)
+	{
+		return unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
+	}
+
+	/**
+	 * flush the cache
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	public function flush()
+	{
+		$this->_removeDirectory($this->_sFolder);
+	}
+
+	/**
+	 *
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	private function _getSubDirectory($sName)
+	{
+		if (!file_exists($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2))) {
+
+			mkdir($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2), 0777, true);
+		}
+
+		return substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2).DIRECTORY_SEPARATOR;
+	}
+
+	/**
+	 * remove a directory recursivly
+	 *
+	 * @access private
+	 * @param  string $sName nom du répertoire
+	 * @return void
+	 */
+	private function _removeDirectory($sName)
+	{
+		if ($rDirectory = opendir($sName)) {
+
+			while (($sFile = readdir($rDirectory)) !== false) {
+
+				if ($sFile > '0' && filetype($sName.$sFile) == "file") { unlink($sName.$sFile); } elseif ($sFile > '0' && filetype($sName.$sFile) == "dir") { remove_dir($sName.$sFile."\\"); }
+			}
+
+			closedir($rDirectory);
+			rmdir($sName);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,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)
     {
         if ($iTimeout > 0 && file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')
             && time() - filemtime($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac') > $iTimeout) {
@@ -84,7 +84,7 @@ 
 
         if (file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')) {
 
-            return unserialize(file_get_contents($this->_sFolder . $this->_getSubDirectory($sName) . md5($sName) . '.fil.cac'));
+            return unserialize(file_get_contents($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac'));
         } else {
 
             return false;

bundles/lib/Cache/Redis.php

Doc Comments +2 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
      * flush the cache
      *
      * @access public
-     * @return mixed
+     * @return boolean
      */
     public function flush()
     {
@@ -129,9 +129,8 @@ 
      * @access public
      * @param  string $sName name of the session
      * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag unused
      * @param  int $iExpire expiration of cache
-     * @return mixed
+     * @return Apc
      */
     public function add(string $sName, $mValue, int $iExpire = false)
     {

Indentation +95 added lines, -95 removed lines

@@ -32,109 +32,109 @@
  */
 class Redis extends RealRedis implements CacheInterface
 {
-    /**
-     * constructor with the connection to Redis
-     *
-     * @access public
-     * @param $oConf
-     * @throws \Exception
-     * @internal param string $sName name of the session
-     * @internal param int $iFlags flags
-     * @internal param int $iTimeout expiration of cache
-     */
-    public function __construct($oConf)
-    {
-        if (!$this->connect($oConf->host, $oConf->port)) {
+	/**
+	 * constructor with the connection to Redis
+	 *
+	 * @access public
+	 * @param $oConf
+	 * @throws \Exception
+	 * @internal param string $sName name of the session
+	 * @internal param int $iFlags flags
+	 * @internal param int $iTimeout expiration of cache
+	 */
+	public function __construct($oConf)
+	{
+		if (!$this->connect($oConf->host, $oConf->port)) {
 
-            throw new \Exception('Redis server unavailable');
-        }
+			throw new \Exception('Redis server unavailable');
+		}
     
-        // Select the REDIS db index
-        $this->select($oConf->index);
-    }
+		// Select the REDIS db index
+		$this->select($oConf->index);
+	}
 
-    /**
-     * get a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  int $iFlags flags
-     * @param  int $iTimeout expiration of cache
-     * @return mixed
-     */
-    public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
-    {
-        return parent::get($sName);
-    }
+	/**
+	 * get a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  int $iFlags flags
+	 * @param  int $iTimeout expiration of cache
+	 * @return mixed
+	 */
+	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+	{
+		return parent::get($sName);
+	}
 
-    /**
-     * set a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag unused
-     * @param  int $iExpire expiration of cache
-     * @return \Venus\lib\Cache\Apc
-     */
-    public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
-    {
-        if ($iExpire === false) {
+	/**
+	 * set a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iFlag unused
+	 * @param  int $iExpire expiration of cache
+	 * @return \Venus\lib\Cache\Apc
+	 */
+	public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
+	{
+		if ($iExpire === false) {
 
-            return parent::set($sName, $mValue);
-        }
-        else {
+			return parent::set($sName, $mValue);
+		}
+		else {
 
-            return parent::setex($sName, $iExpire, $mValue);
-        }
-    }
+			return parent::setex($sName, $iExpire, $mValue);
+		}
+	}
 
-    /**
-     * flush the cache
-     *
-     * @access public
-     * @return mixed
-     */
-    public function flush()
-    {
-        return false;
-    }
+	/**
+	 * flush the cache
+	 *
+	 * @access public
+	 * @return mixed
+	 */
+	public function flush()
+	{
+		return false;
+	}
 
-    /**
-     * delete a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    public function delete(string $sName)
-    {
-        return $this->del($sName);
-    }
+	/**
+	 * delete a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	public function delete(string $sName)
+	{
+		return $this->del($sName);
+	}
 
-    /**
-     * close the redis connecction
-     *
-     * @access public
-     * @return mixed
-     */
-    public function __sleep()
-    {
-        $this->close();
-    }
+	/**
+	 * close the redis connecction
+	 *
+	 * @access public
+	 * @return mixed
+	 */
+	public function __sleep()
+	{
+		$this->close();
+	}
 
-    /**
-     * add
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag unused
-     * @param  int $iExpire expiration of cache
-     * @return mixed
-     */
-    public function add(string $sName, $mValue, int $iExpire = false)
-    {
-        return $this->set($sName, $mValue, 0, $iExpire);
-    }
+	/**
+	 * add
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iFlag unused
+	 * @param  int $iExpire expiration of cache
+	 * @return mixed
+	 */
+	public function add(string $sName, $mValue, int $iExpire = false)
+	{
+		return $this->set($sName, $mValue, 0, $iExpire);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,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);
     }

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
             echo "\n\n";
             echo "        > Check realized on ".$options['a'];
             echo "\n\n";
-        }
-        else {
+        } else {
             echo "\n\n";
             echo Bash::setBackground("                                                                            ", 'red');
             echo Bash::setBackground("          [WARNING] A web server is not used                                ", 'red');

bundles/core/Router.php

Indentation +537 added lines, -537 removed lines

@@ -42,750 +42,750 @@
  */
 class Router implements LoggerAwareInterface
 {
-    /**
-     * The base Uri to construct the route
-     *
-     * @access private
-     * @var    string
-     */
-    private $_sBaseUri = '';
-
-    /**
-     * get the security of page
-     *
-     * @access private
-     * @var    \Venus\core\Security
-     */
-    private $_oSecurity = null;
-
-    /**
-     * The Routes of the actual host
-     *
-     * @access private
-     * @var    object
-     */
-    private $_oRoutes = null;
-
-    /**
-     * Logger
-     *
-     * @access private
-     * @var    object
-     */
-    private $_oLogger = null;
-
-    /**
-     * constructor
-     *
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        $oLogger = Debug::getInstance();
-        $this->setLogger($oLogger);
-    }
-
-    /**
-     * run the routeur
-     *
-     * @access public
-     * @return null|boolean
-     */
-    public function run()
-    {
-        date_default_timezone_set(Config::get('Const')->timezone);
-
-        $this->_create_constant();
-
-        if (Request::isHttpRequest()) {
+	/**
+	 * The base Uri to construct the route
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	private $_sBaseUri = '';
+
+	/**
+	 * get the security of page
+	 *
+	 * @access private
+	 * @var    \Venus\core\Security
+	 */
+	private $_oSecurity = null;
+
+	/**
+	 * The Routes of the actual host
+	 *
+	 * @access private
+	 * @var    object
+	 */
+	private $_oRoutes = null;
+
+	/**
+	 * Logger
+	 *
+	 * @access private
+	 * @var    object
+	 */
+	private $_oLogger = null;
+
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
+		$oLogger = Debug::getInstance();
+		$this->setLogger($oLogger);
+	}
+
+	/**
+	 * run the routeur
+	 *
+	 * @access public
+	 * @return null|boolean
+	 */
+	public function run()
+	{
+		date_default_timezone_set(Config::get('Const')->timezone);
+
+		$this->_create_constant();
+
+		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']))) {
+						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']))) {
+						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;
-                    }
-                }
-            }
+						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 (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();
-                        }
-                    }
-                }
-            }
-        } else if (Request::isCliRequest()) {
+							$this->_getPage404();
+						}
+					}
+				}
+			}
+		} else if (Request::isCliRequest()) {
 
-            if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; }
-            else { $aArguments = $argv; }
+			if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; }
+			else { $aArguments = $argv; }
 
-            define('PORTAL', 'Batch');
-            set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
+			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})) {
+			if (isset(Config::get('Route')->batch->script->{$sBatchName})) {
 
-                $oBatch = Config::get('Route')->batch->script->{$sBatchName};
-                array_shift($aArguments);
-                array_shift($aArguments);
+				$oBatch = Config::get('Route')->batch->script->{$sBatchName};
+				array_shift($aArguments);
+				array_shift($aArguments);
 
-                $aOptions = array();
+				$aOptions = array();
 
-                while (count($aArguments) > 0) {
+				while (count($aArguments) > 0) {
 
-                    if (preg_match('/^-[a-z]/', $aArguments[0])) {
+					if (preg_match('/^-[a-z]/', $aArguments[0])) {
 
-                        $sOptionName = str_replace('-', '', $aArguments[0]);
+						$sOptionName = str_replace('-', '', $aArguments[0]);
 
-                        if (isset($aArguments[1])) {
-                            $sOptionValue = $aArguments[1];
-                        } else {
-                            $sOptionValue = '';
-                        }
+						if (isset($aArguments[1])) {
+							$sOptionValue = $aArguments[1];
+						} else {
+							$sOptionValue = '';
+						}
 
-                        if (isset($oBatch->options->$sOptionName) && $oBatch->options->$sOptionName === false) {
+						if (isset($oBatch->options->$sOptionName) && $oBatch->options->$sOptionName === false) {
 
-                            $aOptions[$sOptionName] = true;
-                            array_shift($aArguments);
-                        } else if (isset($oBatch->options->$sOptionName) && ($oBatch->options->$sOptionName === 'string'
-                                || $oBatch->options->$sOptionName === 'int')
-                        ) {
+							$aOptions[$sOptionName] = true;
+							array_shift($aArguments);
+						} else if (isset($oBatch->options->$sOptionName) && ($oBatch->options->$sOptionName === 'string'
+								|| $oBatch->options->$sOptionName === 'int')
+						) {
 
-                            $aOptions[$sOptionName] = $sOptionValue;
-                            array_shift($aArguments);
-                            array_shift($aArguments);
-                        } else {
+							$aOptions[$sOptionName] = $sOptionValue;
+							array_shift($aArguments);
+							array_shift($aArguments);
+						} else {
 
-                            array_shift($aArguments);
-                        }
-                    } else {
+							array_shift($aArguments);
+						}
+					} else {
 
-                        array_shift($aArguments);
-                    }
-                }
-            }
+						array_shift($aArguments);
+					}
+				}
+			}
 
-            if (isset($oBatch->controller) && isset($oBatch->action)) {
+			if (isset($oBatch->controller) && isset($oBatch->action)) {
 
-                echo $this->_loadController($oBatch->controller, $oBatch->action, array($aOptions));
-            } else {
+				echo $this->_loadController($oBatch->controller, $oBatch->action, array($aOptions));
+			} else {
 
-                if (Request::isCliRequest()) {
+				if (Request::isCliRequest()) {
 
-                    echo "Error : The batch not exists - please verify your Route or the name passed in your command name.\n";
-                }
-            }
+					echo "Error : The batch not exists - please verify your Route or the name passed in your command name.\n";
+				}
+			}
 
-        }
-    }
+		}
+	}
 
-    /**
-     * run the routeur by the forwarsd metho (in the controller)
-     *
-     * @access public
-     * @param  string $sRoute route we wantload
-     * @param  array $aParams parameters to passe
-     * @return void
-     */
-    public function runByFoward(string $sRoute, array $aParams)
-    {
-        $this->_create_constant();
+	/**
+	 * run the routeur by the forwarsd metho (in the controller)
+	 *
+	 * @access public
+	 * @param  string $sRoute route we wantload
+	 * @param  array $aParams parameters to passe
+	 * @return void
+	 */
+	public function runByFoward(string $sRoute, array $aParams)
+	{
+		$this->_create_constant();
 
-        if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) {
+		if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) {
 
-            foreach (Config::get('Route') as $sHost => $oHost) {
+			foreach (Config::get('Route') as $sHost => $oHost) {
 
-                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);
+					}
 
-                    foreach ($oHost->routes as $sKey => $oRoute) {
+					foreach ($oHost->routes as $sKey => $oRoute) {
 
-                        $this->_route($oRoute, $sRoute);
-                    }
-                }
-            }
-        }
-        else if (defined('STDIN')) {
+						$this->_route($oRoute, $sRoute);
+					}
+				}
+			}
+		}
+		else if (defined('STDIN')) {
 
-            $oBatch = Config::get('Route')->batch->script->{$sRoute};
-            echo $this->_loadController($oBatch->controller, $oBatch->action, $aParams);
-        }
-    }
+			$oBatch = Config::get('Route')->batch->script->{$sRoute};
+			echo $this->_loadController($oBatch->controller, $oBatch->action, $aParams);
+		}
+	}
 
-    /**
-     * run the error http page
-     *
-     * @access public
-     * @param  int iError http error
-     * @return void
-     */
-    public function runHttpErrorPage(int $iError)
-    {
-        $this->_create_constant();
+	/**
+	 * run the error http page
+	 *
+	 * @access public
+	 * @param  int iError http error
+	 * @return void
+	 */
+	public function runHttpErrorPage(int $iError)
+	{
+		$this->_create_constant();
 
-        if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) {
+		if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) {
 
-            foreach (Config::get('Route') as $sHost => $oHost) {
+			foreach (Config::get('Route') as $sHost => $oHost) {
 
-                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->routes;
+					$this->_oRoutes = $oHost->routes;
 
-                    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);
+					}
 
-                    $sHttpErrorPageName = '_getPage'.iError;
-                    $this->$sHttpErrorPageName();
-                }
-            }
-        }
-    }
+					$sHttpErrorPageName = '_getPage'.iError;
+					$this->$sHttpErrorPageName();
+				}
+			}
+		}
+	}
 
-    /**
-     * load a route
-     *
-     * @access private
-     * @param  \stdClass $oRoute one route
-     * @param  string $RequestUri URI
-     * @return void
-     */
-    private function _route(\stdClass $oRoute, string $RequestUri)
-    {
-        $sCharset = 'UTF-8';
+	/**
+	 * load a route
+	 *
+	 * @access private
+	 * @param  \stdClass $oRoute one route
+	 * @param  string $RequestUri URI
+	 * @return void
+	 */
+	private function _route(\stdClass $oRoute, string $RequestUri)
+	{
+		$sCharset = 'UTF-8';
 
-        if (isset($oRoute->route)) {
+		if (isset($oRoute->route)) {
 
-            $sRoute = str_replace("*", ".*", $oRoute->route);
+			$sRoute = str_replace("*", ".*", $oRoute->route);
 
-            $sFinalRoute = preg_replace_callback(
-                '|\[/{0,1}:([a-zA-Z_]+)\]|',
-                function($aMatches) use ($oRoute) {
-                    return "/{0,1}(?P<".$aMatches[1].">".$oRoute->constraints->{$aMatches[1]}.")";
-                },
-                $sRoute
-            );
-        }
-        else {
+			$sFinalRoute = preg_replace_callback(
+				'|\[/{0,1}:([a-zA-Z_]+)\]|',
+				function($aMatches) use ($oRoute) {
+					return "/{0,1}(?P<".$aMatches[1].">".$oRoute->constraints->{$aMatches[1]}.")";
+				},
+				$sRoute
+			);
+		}
+		else {
 
-            $sFinalRoute = '.*';
-        }
+			$sFinalRoute = '.*';
+		}
 
-        $RequestUri = preg_replace('/^([^?]+)\?.*$/', '$1', $RequestUri);
-        $RequestUri = preg_replace('#^'.$this->_sBaseUri.'#', '', $RequestUri);
+		$RequestUri = preg_replace('/^([^?]+)\?.*$/', '$1', $RequestUri);
+		$RequestUri = preg_replace('#^'.$this->_sBaseUri.'#', '', $RequestUri);
 
-        if (preg_match('#^'.$sFinalRoute.'$#', $RequestUri, $aMatch)) {
+		if (preg_match('#^'.$sFinalRoute.'$#', $RequestUri, $aMatch)) {
 
-            if (isset($oRoute->location)) {
+			if (isset($oRoute->location)) {
 
-                $aParamEntries = array();
+				$aParamEntries = array();
 
-                foreach ($oRoute->constraints as $sName => $sType) {
+				foreach ($oRoute->constraints as $sName => $sType) {
 
-                    if (isset($aMatch[$sName])) {
+					if (isset($aMatch[$sName])) {
 
-                        $aParamEntries[$sName] = $aMatch[$sName];
-                    }
-                }
+						$aParamEntries[$sName] = $aMatch[$sName];
+					}
+				}
 
-                $oUrlManager = new UrlManager;
-                header('Status: 301 Moved Permanently', false, 301);
-                header('Location: '.$oUrlManager->getUrl($oRoute->location, $aParamEntries));
-                exit;
-            }
+				$oUrlManager = new UrlManager;
+				header('Status: 301 Moved Permanently', false, 301);
+				header('Location: '.$oUrlManager->getUrl($oRoute->location, $aParamEntries));
+				exit;
+			}
 
-            $this->_oSecurity = new Security;
+			$this->_oSecurity = new Security;
 
-            if (!$this->_oSecurity->checkSecurity()) { return 403; }
+			if (!$this->_oSecurity->checkSecurity()) { return 403; }
 
-            // create the $_GET by the URL
+			// create the $_GET by the URL
 
-            foreach ($aMatch as $mKey => $sResults) {
+			foreach ($aMatch as $mKey => $sResults) {
 
-                if (is_string($mKey)) {
+				if (is_string($mKey)) {
 
-                    $_GET[$mKey] = $sResults;
-                }
-            }
+					$_GET[$mKey] = $sResults;
+				}
+			}
 
-            if (isset($oRoute->methods) && $oRoute->methods != $_SERVER['REQUEST_METHOD']) { return false; }
+			if (isset($oRoute->methods) && $oRoute->methods != $_SERVER['REQUEST_METHOD']) { return false; }
 
-            if (isset($oRoute->schemes) && $oRoute->schemes == 'https' && !Request::isHttpsRequest()) { return false; }
+			if (isset($oRoute->schemes) && $oRoute->schemes == 'https' && !Request::isHttpsRequest()) { return false; }
 
-            if (isset($oRoute->cache) && isset($oRoute->cache->max_age) && !isset($_GET['flush'])) {
+			if (isset($oRoute->cache) && isset($oRoute->cache->max_age) && !isset($_GET['flush'])) {
 
-                $oMobileDetect = new \Mobile_Detect;
+				$oMobileDetect = new \Mobile_Detect;
 
-                if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-                else { $sCacheExt = ''; }
+				if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
+				else { $sCacheExt = ''; }
 
-                $mCacheReturn = Cache::get($RequestUri.$sCacheExt, $oRoute->cache->max_age);
+				$mCacheReturn = Cache::get($RequestUri.$sCacheExt, $oRoute->cache->max_age);
 
-                if ($mCacheReturn && count($_POST) < 1) {
+				if ($mCacheReturn && count($_POST) < 1) {
 
-                    echo $mCacheReturn;
-                    return true;
-                }
-            }
+					echo $mCacheReturn;
+					return true;
+				}
+			}
 
-            if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
+			if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
 
-            if (isset($oRoute->controller)) {
+			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)) {
+				if (isset($oRoute->content_type)) {
 
-                    if ($oRoute->content_type == 'json') {
+					if ($oRoute->content_type == 'json') {
 
-                        header('Content-type: application/json; charset='.$sCharset.'');
-                    } else if ($oRoute->content_type == 'html') {
+						header('Content-type: application/json; charset='.$sCharset.'');
+					} else if ($oRoute->content_type == 'html') {
 
-                        header('Content-type: text/html; charset='.$sCharset.'');
-                    } else if ($oRoute->content_type == 'jpeg') {
+						header('Content-type: text/html; charset='.$sCharset.'');
+					} else if ($oRoute->content_type == 'jpeg') {
 
-                        header('Content-type: image/jpeg');
-                    }
-                }
-                else {
+						header('Content-type: image/jpeg');
+					}
+				}
+				else {
 
-                    header('Content-type: text/html; charset='.$sCharset.'');
-                }
+					header('Content-type: text/html; charset='.$sCharset.'');
+				}
 
-                $sControllerName = $oRoute->controller;
-                $sActionName = $oRoute->action;
+				$sControllerName = $oRoute->controller;
+				$sActionName = $oRoute->action;
 
-                $oController = new $sControllerName;
+				$oController = new $sControllerName;
 
-                $aEntries = array();
+				$aEntries = array();
 
-                if (isset($oRoute->constraints) && is_object($oRoute->constraints)) {
+				if (isset($oRoute->constraints) && is_object($oRoute->constraints)) {
 
-                    $mReturn = null;
+					$mReturn = null;
 
-                    foreach ($oRoute->constraints as $sName => $sType) {
+					foreach ($oRoute->constraints as $sName => $sType) {
 
-                        if (isset($_GET[$sName]) && $_GET[$sName] != '') {
+						if (isset($_GET[$sName]) && $_GET[$sName] != '') {
 
-                            $aEntries[] = $_GET[$sName];
-                        } else if (isset($oRoute->defaults_constraints) && is_object($oRoute->defaults_constraints)
-                            && isset($oRoute->defaults_constraints->{$sName})) {
+							$aEntries[] = $_GET[$sName];
+						} else if (isset($oRoute->defaults_constraints) && is_object($oRoute->defaults_constraints)
+							&& isset($oRoute->defaults_constraints->{$sName})) {
 
-                            $aEntries[] = $oRoute->defaults_constraints->{$sName};
-                        } else if (isset($_GET[$sName])) {
+							$aEntries[] = $oRoute->defaults_constraints->{$sName};
+						} else if (isset($_GET[$sName])) {
 
-                            $aEntries[] = $_GET[$sName];
-                        } else if (preg_match('/'.$sType.'/', '')) {
+							$aEntries[] = $_GET[$sName];
+						} else if (preg_match('/'.$sType.'/', '')) {
 
-                            $aEntries[] = '';
-                        } else {
+							$aEntries[] = '';
+						} else {
 
-                            $this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
-                            break;
-                        }
-                    }
+							$this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
+							break;
+						}
+					}
 
-                    if ($mReturn === null) {
+					if ($mReturn === null) {
 
-                        $mReturn = $this->_loadController($oController, $sActionName, $aEntries);
+						$mReturn = $this->_loadController($oController, $sActionName, $aEntries);
 
-                    }
-                }
-                else {
+					}
+				}
+				else {
 
-                    $mReturn = $this->_loadController($oController, $sActionName, $aEntries);
-                }
+					$mReturn = $this->_loadController($oController, $sActionName, $aEntries);
+				}
 
-                if (isset($oRoute->content_type)) {
+				if (isset($oRoute->content_type)) {
 
-                    if ($oRoute->content_type === 'json') {
+					if ($oRoute->content_type === 'json') {
 
-                        $mReturn = json_encode($mReturn, JSON_PRETTY_PRINT);
-                    }
-                }
-            }
-            else if (isset($oRoute->template) && isset($oRoute->layout) && $oRoute->layout === true) {
+						$mReturn = json_encode($mReturn, JSON_PRETTY_PRINT);
+					}
+				}
+			}
+			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)) {
+				if (isset($oRoute->vars)) {
 
-                    foreach ($oRoute->vars as $sKey => $mValue) {
+					foreach ($oRoute->vars as $sKey => $mValue) {
 
-                        $oLayout->assign($sKey, $mValue);
-                    }
-                }
+						$oLayout->assign($sKey, $mValue);
+					}
+				}
 
-                $mReturn = $oLayout->assign('model', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$oRoute->template.'.tpl')
-                                   ->fetch();
-            }
-            else if (isset($oRoute->template)) {
+				$mReturn = $oLayout->assign('model', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$oRoute->template.'.tpl')
+								   ->fetch();
+			}
+			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');
+				$oTemplate = Vendor::getVendor('Apollina\Template', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$oRoute->template.'.tpl');
 
-                if (isset($oRoute->vars)) {
+				if (isset($oRoute->vars)) {
 
-                    foreach ($oRoute->vars as $sKey => $mValue) {
+					foreach ($oRoute->vars as $sKey => $mValue) {
 
-                        $oTemplate->assign($sKey, $mValue);
-                    }
-                }
+						$oTemplate->assign($sKey, $mValue);
+					}
+				}
 
-                $mReturn = $oTemplate->fetch();
-            }
+				$mReturn = $oTemplate->fetch();
+			}
 
-            // management of return or cache of it
+			// management of return or cache of it
 
-            if (isset($oRoute->cache) && isset($oRoute->cache->max_age) && $mReturn) {
+			if (isset($oRoute->cache) && isset($oRoute->cache->max_age) && $mReturn) {
 
-                $oMobileDetect = new \Mobile_Detect;
+				$oMobileDetect = new \Mobile_Detect;
 
-                if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-                else { $sCacheExt = ''; }
+				if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
+				else { $sCacheExt = ''; }
 
-                if (defined('COMPRESS_HTML') && COMPRESS_HTML) {
+				if (defined('COMPRESS_HTML') && COMPRESS_HTML) {
 
-                    $mReturn = str_replace(array("\t", "\r", "  "), array("", "", " "), $mReturn);
-                }
+					$mReturn = str_replace(array("\t", "\r", "  "), array("", "", " "), $mReturn);
+				}
 
-                Cache::set($RequestUri.$sCacheExt, $mReturn, $oRoute->cache->max_age);
-            }
+				Cache::set($RequestUri.$sCacheExt, $mReturn, $oRoute->cache->max_age);
+			}
 
-            if ($mReturn) {
+			if ($mReturn) {
 
-                echo $mReturn;
-                return true;
-            }
-        }
-    }
+				echo $mReturn;
+				return true;
+			}
+		}
+	}
 
-    /**
-     * create the constants
-     *
-     * @access private
-     * @return void
-     */
-    private function _create_constant()
-    {
-        foreach (Config::get('Const') as $sKey => $mValue) {
+	/**
+	 * create the constants
+	 *
+	 * @access private
+	 * @return void
+	 */
+	private function _create_constant()
+	{
+		foreach (Config::get('Const') as $sKey => $mValue) {
 
-            if (is_string($mValue) || is_int($mValue) || is_float($mValue) || is_bool($mValue)) {
+			if (is_string($mValue) || is_int($mValue) || is_float($mValue) || is_bool($mValue)) {
 
-                define(strtoupper($sKey), $mValue);
-            }
-        }
-    }
+				define(strtoupper($sKey), $mValue);
+			}
+		}
+	}
 
-    /**
-     * load the controller
-     *
-     * @access private
-     * @param  object $oControllerName controller name
-     * @param  string $sActionName method name
-     * @param  array $aParams parameters
-     * @return mixed
-     */
-    private function _loadController($oControllerName, string $sActionName, array $aParams = array())
-    {
-        $aPhpDoc = PhpDoc::getPhpDocOfMethod($oControllerName, $sActionName);
+	/**
+	 * load the controller
+	 *
+	 * @access private
+	 * @param  object $oControllerName controller name
+	 * @param  string $sActionName method name
+	 * @param  array $aParams parameters
+	 * @return mixed
+	 */
+	private function _loadController($oControllerName, string $sActionName, array $aParams = array())
+	{
+		$aPhpDoc = PhpDoc::getPhpDocOfMethod($oControllerName, $sActionName);
 
-        if (isset($aPhpDoc['Cache'])) {
+		if (isset($aPhpDoc['Cache'])) {
 
-            if (!isset($aPhpDoc['Cache']['maxage'])) { $aPhpDoc['Cache']['maxage'] = 0; }
+			if (!isset($aPhpDoc['Cache']['maxage'])) { $aPhpDoc['Cache']['maxage'] = 0; }
 
-            $oMobileDetect = new \Mobile_Detect;
+			$oMobileDetect = new \Mobile_Detect;
 
-            if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-            else { $sCacheExt = ''; }
+			if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
+			else { $sCacheExt = ''; }
 
-            $mCacheReturn = Cache::get($sActionName.$sCacheExt, $aPhpDoc['Cache']['maxage']);
+			$mCacheReturn = Cache::get($sActionName.$sCacheExt, $aPhpDoc['Cache']['maxage']);
 
-            if ($mCacheReturn !== false) { return $mCacheReturn; }
-        }
+			if ($mCacheReturn !== false) { return $mCacheReturn; }
+		}
 
-        if (isset($aPhpDoc['Secure'])) {
+		if (isset($aPhpDoc['Secure'])) {
 
-            if (isset($aPhpDoc['Secure']['roles']) && $this->_oSecurity->getUserRole() != $aPhpDoc['Secure']['roles']) {
+			if (isset($aPhpDoc['Secure']['roles']) && $this->_oSecurity->getUserRole() != $aPhpDoc['Secure']['roles']) {
 
-                $this->_getPage403();
-            }
-        }
+				$this->_getPage403();
+			}
+		}
 
-        $oController = new $oControllerName;
+		$oController = new $oControllerName;
 
-        ob_start();
+		ob_start();
 
-        if (!defined('PORTAL')) { define('PORTAL', 'Batch'); }
+		if (!defined('PORTAL')) { define('PORTAL', 'Batch'); }
 
-        if (method_exists($oController, 'beforeExecuteRoute')) {
+		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);
+		$mReturnController = call_user_func_array(array($oController, $sActionName), $aParams);
 
-        if (method_exists($oController, 'afterExecuteRoute')) {
+		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();
+		$mReturn = ob_get_clean();
 
-        if ($mReturn == '') { $mReturn = $mReturnController; }
+		if ($mReturn == '') { $mReturn = $mReturnController; }
 
-        if (isset($aPhpDoc['Cache'])) {
+		if (isset($aPhpDoc['Cache'])) {
 
-            $oMobileDetect = new \Mobile_Detect;
+			$oMobileDetect = new \Mobile_Detect;
 
-            if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-            else { $sCacheExt = ''; }
+			if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
+			else { $sCacheExt = ''; }
 
-            if (defined('COMPRESS_HTML') && COMPRESS_HTML) {
+			if (defined('COMPRESS_HTML') && COMPRESS_HTML) {
 
-                $mReturn = str_replace(array("\t", "\r", "  "), array("", "", "", " "), $mReturn);
-            }
+				$mReturn = str_replace(array("\t", "\r", "  "), array("", "", "", " "), $mReturn);
+			}
 
-            Cache::set($sActionName.$sCacheExt, $mReturn, $aPhpDoc['Cache']['maxage']);
-        }
+			Cache::set($sActionName.$sCacheExt, $mReturn, $aPhpDoc['Cache']['maxage']);
+		}
 
-        return $mReturn;
-    }
+		return $mReturn;
+	}
 
-    /**
-     * get the page 403
-     *
-     * @access private
-     * @return void
-     */
-    private function _getPage403()
-    {
-        header("HTTP/1.0 403 Forbidden");
+	/**
+	 * get the page 403
+	 *
+	 * @access private
+	 * @return void
+	 */
+	private function _getPage403()
+	{
+		header("HTTP/1.0 403 Forbidden");
 
-        if (isset($this->_oRoutes->e403)) {
+		if (isset($this->_oRoutes->e403)) {
 
-            $this->_oRoutes->e403->route = '/';
-            $_SERVER['REQUEST_URI'] = '/';
-            $this->_route($this->_oRoutes->e403, $_SERVER['REQUEST_URI']);
-        }
+			$this->_oRoutes->e403->route = '/';
+			$_SERVER['REQUEST_URI'] = '/';
+			$this->_route($this->_oRoutes->e403, $_SERVER['REQUEST_URI']);
+		}
 
-        exit;
-    }
+		exit;
+	}
 
-    /**
-     * get the page 404
-     *
-     * @access private
-     * @return void
-     */
-    private function _getPage404()
-    {
-        header("HTTP/1.0 404 Not Found");
+	/**
+	 * get the page 404
+	 *
+	 * @access private
+	 * @return void
+	 */
+	private function _getPage404()
+	{
+		header("HTTP/1.0 404 Not Found");
 
-        if (isset($this->_oRoutes->e404)) {
+		if (isset($this->_oRoutes->e404)) {
 
-            $this->_oRoutes->e404->route = '/';
-            $_SERVER['REQUEST_URI'] = '/';
-            $this->_route($this->_oRoutes->e404, $_SERVER['REQUEST_URI']);
-        }
+			$this->_oRoutes->e404->route = '/';
+			$_SERVER['REQUEST_URI'] = '/';
+			$this->_route($this->_oRoutes->e404, $_SERVER['REQUEST_URI']);
+		}
 
-        exit;
-    }
+		exit;
+	}
 
-    /**
-     * check the cache - just if it's not yet defined
-     *
-     * @access private
-     * @param  \stdClass $oCache object of cache configuration
-     * @return void
-     */
-    private function _checkCache(\stdClass $oCache)
-    {
-        /**
-         * cache-control http
-         */
+	/**
+	 * check the cache - just if it's not yet defined
+	 *
+	 * @access private
+	 * @param  \stdClass $oCache object of cache configuration
+	 * @return void
+	 */
+	private function _checkCache(\stdClass $oCache)
+	{
+		/**
+		 * cache-control http
+		 */
 
-        $sHearderValidity = false;
-        $sHeader = "Cache-Control:";
+		$sHearderValidity = false;
+		$sHeader = "Cache-Control:";
 
-        if (isset($oCache->visibility) && ($oCache->visibility = 'public' || $oCache->visibility = 'private')) {
+		if (isset($oCache->visibility) && ($oCache->visibility = 'public' || $oCache->visibility = 'private')) {
 
-            $sHearderValidity = true;
-            $sHeader .= " ".$oCache->visibility.",";
-        }
+			$sHearderValidity = true;
+			$sHeader .= " ".$oCache->visibility.",";
+		}
 
-        if (isset($oCache->max_age)) {
+		if (isset($oCache->max_age)) {
 
-            $sHearderValidity = true;
-            $sHeader .= " maxage=".$oCache->max_age.",";
-        }
+			$sHearderValidity = true;
+			$sHeader .= " maxage=".$oCache->max_age.",";
+		}
 
-        if (isset($oCache->must_revalidate) && $oCache->must_revalidate === true) {
+		if (isset($oCache->must_revalidate) && $oCache->must_revalidate === true) {
 
-            $sHearderValidity = true;
-            $sHeader .= " must-revalidate,";
-        }
+			$sHearderValidity = true;
+			$sHeader .= " must-revalidate,";
+		}
 
-        if ($sHearderValidity === true) {
+		if ($sHearderValidity === true) {
 
-            $sHeader = substr($sHeader, 0, -1);
+			$sHeader = substr($sHeader, 0, -1);
 
-            if (!headers_sent()) { header($sHeader); }
-        }
+			if (!headers_sent()) { header($sHeader); }
+		}
 
-        /**
-         * ETag http
-         */
+		/**
+		 * ETag http
+		 */
 
-        if (isset($oCache->ETag)) { header("ETag: \"".$oCache->ETag."\""); }
+		if (isset($oCache->ETag)) { header("ETag: \"".$oCache->ETag."\""); }
 
-        /**
-         * expire
-         */
+		/**
+		 * expire
+		 */
 
-        if (isset($oCache->max_age)) { if (!headers_sent()) { header('Expires: '.gmdate('D, d M Y H:i:s', time() + $oCache->max_age).' GMT'); } }
+		if (isset($oCache->max_age)) { if (!headers_sent()) { header('Expires: '.gmdate('D, d M Y H:i:s', time() + $oCache->max_age).' GMT'); } }
 
-        /**
-         * Last-Modified http
-         */
+		/**
+		 * Last-Modified http
+		 */
 
-        if (isset($oCache->last_modified)) { if (!headers_sent()) { header('Last-Modified: '.gmdate('D, d M Y H:i:s', time() + $oCache->last_modified).' GMT'); } }
+		if (isset($oCache->last_modified)) { if (!headers_sent()) { header('Last-Modified: '.gmdate('D, d M Y H:i:s', time() + $oCache->last_modified).' GMT'); } }
 
-        /**
-         * vary http
-         */
+		/**
+		 * vary http
+		 */
 
-        if (isset($oCache->vary)) { header('Vary: '.$oCache->vary); }
-    }
+		if (isset($oCache->vary)) { header('Vary: '.$oCache->vary); }
+	}
 
-    /**
-     * Sets a logger instance on the object
-     *
-     * @access private
-     * @param  LoggerInterface $logger
-     * @return null
-     */
-    public function setLogger(LoggerInterface $logger) {
+	/**
+	 * Sets a logger instance on the object
+	 *
+	 * @access private
+	 * @param  LoggerInterface $logger
+	 * @return null
+	 */
+	public function setLogger(LoggerInterface $logger) {
 
-        $this->_oLogger = $logger;
-    }
+		$this->_oLogger = $logger;
+	}
 }

Braces +12 added lines, -24 removed lines

@@ -196,8 +196,7 @@ 
                                 if ($mReturn === 403) {
     
                                     $this->_getPage403();
-                                }
-                                else if ($mReturn === true) {
+                                } else if ($mReturn === true) {
     
                                     if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
     
@@ -212,8 +211,7 @@ 
             }
         } else if (Request::isCliRequest()) {
 
-            if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; }
-            else { $aArguments = $argv; }
+            if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; } else { $aArguments = $argv; }
 
             define('PORTAL', 'Batch');
             set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
@@ -315,8 +313,7 @@ 
                     }
                 }
             }
-        }
-        else if (defined('STDIN')) {
+        } else if (defined('STDIN')) {
 
             $oBatch = Config::get('Route')->batch->script->{$sRoute};
             echo $this->_loadController($oBatch->controller, $oBatch->action, $aParams);
@@ -378,8 +375,7 @@ 
                 },
                 $sRoute
             );
-        }
-        else {
+        } else {
 
             $sFinalRoute = '.*';
         }
@@ -429,8 +425,7 @@ 
 
                 $oMobileDetect = new \Mobile_Detect;
 
-                if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-                else { $sCacheExt = ''; }
+                if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; } else { $sCacheExt = ''; }
 
                 $mCacheReturn = Cache::get($RequestUri.$sCacheExt, $oRoute->cache->max_age);
 
@@ -460,8 +455,7 @@ 
 
                         header('Content-type: image/jpeg');
                     }
-                }
-                else {
+                } else {
 
                     header('Content-type: text/html; charset='.$sCharset.'');
                 }
@@ -504,8 +498,7 @@ 
                         $mReturn = $this->_loadController($oController, $sActionName, $aEntries);
 
                     }
-                }
-                else {
+                } else {
 
                     $mReturn = $this->_loadController($oController, $sActionName, $aEntries);
                 }
@@ -517,8 +510,7 @@ 
                         $mReturn = json_encode($mReturn, JSON_PRETTY_PRINT);
                     }
                 }
-            }
-            else if (isset($oRoute->template) && isset($oRoute->layout) && $oRoute->layout === true) {
+            } 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');
@@ -535,8 +527,7 @@ 
 
                 $mReturn = $oLayout->assign('model', DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.PORTAL.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$oRoute->template.'.tpl')
                                    ->fetch();
-            }
-            else if (isset($oRoute->template)) {
+            } 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');
@@ -560,8 +551,7 @@ 
 
                 $oMobileDetect = new \Mobile_Detect;
 
-                if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-                else { $sCacheExt = ''; }
+                if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; } else { $sCacheExt = ''; }
 
                 if (defined('COMPRESS_HTML') && COMPRESS_HTML) {
 
@@ -615,8 +605,7 @@ 
 
             $oMobileDetect = new \Mobile_Detect;
 
-            if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-            else { $sCacheExt = ''; }
+            if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; } else { $sCacheExt = ''; }
 
             $mCacheReturn = Cache::get($sActionName.$sCacheExt, $aPhpDoc['Cache']['maxage']);
 
@@ -657,8 +646,7 @@ 
 
             $oMobileDetect = new \Mobile_Detect;
 
-            if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; }
-            else { $sCacheExt = ''; }
+            if ($oMobileDetect->isMobile()) { $sCacheExt = '.mobi'; } else { $sCacheExt = ''; }
 
             if (defined('COMPRESS_HTML') && COMPRESS_HTML) {
 

bundles/core/Config.php

Indentation +61 added lines, -61 removed lines

@@ -49,11 +49,11 @@ 
 	 */
 	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);
@@ -70,93 +70,93 @@ 
 
 			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 === '') {
+			if ($base === '') {
 				
 				trigger_error("Error in your Json format in this file : ".$sJsonFile, E_USER_NOTICE);
 			}
 
 			if (isset($base->redirect) && $bNoDoRedirect === false) {
 			
-                $base = self::get($sName, $base->redirect);
+				$base = self::get($sName, $base->redirect);
 			}
 			
 			self::$_aConfCache[$sNameCache] = $base;
@@ -180,9 +180,9 @@ 
 	 */
 	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; }
 	}
 
 	/**
@@ -206,7 +206,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");
 		}
 	}
 
@@ -228,7 +228,7 @@ 
 			} else if (is_array($oConfFiles) && is_array($base) && !isset($base[$sKey])) {
 
 				$base[$sKey] = $oConfFiles[$sKey];
-            } else if (!isset($base->$sKey) && is_array($mOne)) {
+			} else if (!isset($base->$sKey) && is_array($mOne)) {
 
 				$base->$sKey = new \StdClass;
 				list($oConfFiles, $base) = self::_recursiveGet($mOne, $base->$sKey);

bundles/core/Controller.php

Indentation +134 added lines, -134 removed lines

@@ -43,139 +43,139 @@
 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
-     *
-     * @access public
-     * @return object
-     */
-    public function __construct()
-    {
-        $aClass = explode('\\', get_called_class());
-        $sClassName = $aClass[count($aClass) - 1];
-        $sNamespaceName = preg_replace('/\\\\'.$sClassName.'$/', '', get_called_class());
-
-        if (isset($sClassName)) {
-
-            $sNamespaceBaseName = str_replace('\Controller', '', $sNamespaceName);
-            $sDefaultModel = $sNamespaceBaseName.'\Model\\'.$sClassName;
-            $sDefaultView = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$sClassName.'.tpl';
-            $sDefaultLayout = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl';
-
-            $this->model = function() use ($sDefaultModel) { return new $sDefaultModel; };
-
-            $this->view = function() use ($sDefaultView) { return Vendor::getVendor('Apollina\Template', $sDefaultView); };
-
-            $this->layout = function() use ($sDefaultLayout) { return Vendor::getVendor('Apollina\Template', $sDefaultLayout, true); };
-
-            $this->layout->assign('model', $sDefaultView);
-        }
-
-        $this->form = function() { return new Form(); };
-        $this->security = function() { return new Security(); };
-        $this->router = function() { return new Router; };
-        $this->mail = function() { return new Mail; };
-        $this->session = function() { return new Session; };
-        $this->translator = function() { return new I18n; };
-        $this->url = function() { return new UrlManager; };
-        $this->cookie = function() { return new Cookie; };
-        $this->di = function() { return new Di; };
-        $this->request = function() { return new Request; };
-
-        /**
-         * Trigger on a model to initialize it. You could fill entity with it.
-         */
-        if (method_exists(get_called_class(), 'initialize')) {
-
-            if (!isset(self::$_aInitialize[get_called_class()])) {
-
-                static::initialize();
-                self::$_aInitialize[get_called_class()] = true;
-            }
-        }
-
-        /**
-         * Trigger on a model to initialize it every time you construct it
-         */
-        if (method_exists(get_called_class(), 'onConstruct')) { static::onConstruct(); }
-    }
-
-    /**
-     * redirection HTTP
-     *
-     * @access public
-     * @param  string $sUrl url for the redirection
-     * @param int $iHttpCode code of the http request
-     * @return void
-     */
-    public function redirect(string $sUrl, int $iHttpCode = 301)
-    {
-        if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); }
-        else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
-
-        header('Location: '.$sUrl);
-        exit;
-    }
-
-    /**
-     * call an other action as you call action with URL/Cli
-     *
-     * @access public
-     * @param  string $sUri uri for the redirection
-     * @param  array $aParams parameters
-     * @return void
-     */
-    public function forward(string $sUri, array $aParams = array())
-    {
-        $this->router->runByFoward($sUri, $aParams);
-    }
-
-    /**
-     * call the 404 Not Found page
-     *
-     * @access public
-     * @return void
-     */
-    public function notFound()
-    {
-        $$this->router->runHttpErrorPage(404);
-    }
-
-    /**
-     * call the 403 Forbidden page
-     *
-     * @access public
-     * @return void
-     */
-    public function forbidden()
-    {
-        $$this->router->runHttpErrorPage(403);
-    }
-
-    /**
-     * get a property
-     *
-     * @access public
-     * @param  unknown_type $mKey
-     * @return void
-     */
-    public function __get($mKey)
-    {
-        if (isset($this->di) && property_exists($this, 'di')) {
-
-            $mDi = $this->di->get($mKey);
-
-            if (isset($mDi) && $mDi !== false) { return $mDi; }
-        }
-
-        return parent::__get($mKey);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function __construct()
+	{
+		$aClass = explode('\\', get_called_class());
+		$sClassName = $aClass[count($aClass) - 1];
+		$sNamespaceName = preg_replace('/\\\\'.$sClassName.'$/', '', get_called_class());
+
+		if (isset($sClassName)) {
+
+			$sNamespaceBaseName = str_replace('\Controller', '', $sNamespaceName);
+			$sDefaultModel = $sNamespaceBaseName.'\Model\\'.$sClassName;
+			$sDefaultView = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$sClassName.'.tpl';
+			$sDefaultLayout = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl';
+
+			$this->model = function() use ($sDefaultModel) { return new $sDefaultModel; };
+
+			$this->view = function() use ($sDefaultView) { return Vendor::getVendor('Apollina\Template', $sDefaultView); };
+
+			$this->layout = function() use ($sDefaultLayout) { return Vendor::getVendor('Apollina\Template', $sDefaultLayout, true); };
+
+			$this->layout->assign('model', $sDefaultView);
+		}
+
+		$this->form = function() { return new Form(); };
+		$this->security = function() { return new Security(); };
+		$this->router = function() { return new Router; };
+		$this->mail = function() { return new Mail; };
+		$this->session = function() { return new Session; };
+		$this->translator = function() { return new I18n; };
+		$this->url = function() { return new UrlManager; };
+		$this->cookie = function() { return new Cookie; };
+		$this->di = function() { return new Di; };
+		$this->request = function() { return new Request; };
+
+		/**
+		 * Trigger on a model to initialize it. You could fill entity with it.
+		 */
+		if (method_exists(get_called_class(), 'initialize')) {
+
+			if (!isset(self::$_aInitialize[get_called_class()])) {
+
+				static::initialize();
+				self::$_aInitialize[get_called_class()] = true;
+			}
+		}
+
+		/**
+		 * Trigger on a model to initialize it every time you construct it
+		 */
+		if (method_exists(get_called_class(), 'onConstruct')) { static::onConstruct(); }
+	}
+
+	/**
+	 * redirection HTTP
+	 *
+	 * @access public
+	 * @param  string $sUrl url for the redirection
+	 * @param int $iHttpCode code of the http request
+	 * @return void
+	 */
+	public function redirect(string $sUrl, int $iHttpCode = 301)
+	{
+		if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); }
+		else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
+
+		header('Location: '.$sUrl);
+		exit;
+	}
+
+	/**
+	 * call an other action as you call action with URL/Cli
+	 *
+	 * @access public
+	 * @param  string $sUri uri for the redirection
+	 * @param  array $aParams parameters
+	 * @return void
+	 */
+	public function forward(string $sUri, array $aParams = array())
+	{
+		$this->router->runByFoward($sUri, $aParams);
+	}
+
+	/**
+	 * call the 404 Not Found page
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function notFound()
+	{
+		$$this->router->runHttpErrorPage(404);
+	}
+
+	/**
+	 * call the 403 Forbidden page
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function forbidden()
+	{
+		$$this->router->runHttpErrorPage(403);
+	}
+
+	/**
+	 * get a property
+	 *
+	 * @access public
+	 * @param  unknown_type $mKey
+	 * @return void
+	 */
+	public function __get($mKey)
+	{
+		if (isset($this->di) && property_exists($this, 'di')) {
+
+			$mDi = $this->di->get($mKey);
+
+			if (isset($mDi) && $mDi !== false) { return $mDi; }
+		}
+
+		return parent::__get($mKey);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
      */
     public function redirect(string $sUrl, int $iHttpCode = 301)
     {
-        if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); }
-        else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
+        if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); } else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
 
         header('Location: '.$sUrl);
         exit;

bundles/core/Security.php

Braces +2 added lines, -5 removed lines

@@ -103,8 +103,7 @@ 
 					if (!$this->_checkAccess()) { return false; }
 					if (!$this->_checkBlackListIps()) { return false; }
 				}
-			}
-			else if (isset($oSecurity->authentification) && $oSecurity->authentification === 'http_basic_validate_by_controller') {
+			} else if (isset($oSecurity->authentification) && $oSecurity->authentification === 'http_basic_validate_by_controller') {
 
 				if (!isset($_SERVER['PHP_AUTH_USER'])) {
 
@@ -217,9 +216,7 @@ 
 		$sLogin = self::$_sLogin;
 		$sPassword = Config::get('Security')->users->$sLogin->password;
 
-		if ($sPassword == self::$_sPassword) { return true; }
-		else if ($sPassword == md5(self::$_sPassword)) { return true; }
-		else { return false; }
+		if ($sPassword == self::$_sPassword) { return true; } else if ($sPassword == md5(self::$_sPassword)) { return true; } else { return false; }
 	}
 
 	/**

bundles/lib/Response/Yaml.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
  */
 class Yaml implements ResponseInterface
 {
-    /**
-     * translate the content
-     * @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);
-    }
+	/**
+	 * translate the content
+	 * @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);
+	}
 
 }

bundles/lib/Response/Json.php

Indentation +12 added lines, -12 removed lines

@@ -33,17 +33,17 @@
  */
 class Json implements ResponseInterface
 {
-    /**
-     * translate the content
-     * @see \Venus\lib\Response\ResponseInterface::translate()
-     *
-     * @access public
-     * @param  mixed $mContent content to translate
-     * @return mixed
-     */
-    public static function translate($mContent)
-    {
-        return json_encode(ObjectOperation::objectToArray($mContent));
-    }
+	/**
+	 * translate the content
+	 * @see \Venus\lib\Response\ResponseInterface::translate()
+	 *
+	 * @access public
+	 * @param  mixed $mContent content to translate
+	 * @return mixed
+	 */
+	public static function translate($mContent)
+	{
+		return json_encode(ObjectOperation::objectToArray($mContent));
+	}
 
 }

bundles/lib/Response/Mock.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
  */
 class Mock implements ResponseInterface
 {
-    /**
-     * translate the content
-     * @see \Venus\lib\Response\ResponseInterface::translate()
-     *
-     * @access public
-     * @param  mixed $mContent content to translate
-     * @return mixed
-     */
-    public static function translate($mContent)
-    {
-        return $mContent;
-    }
+	/**
+	 * translate the content
+	 * @see \Venus\lib\Response\ResponseInterface::translate()
+	 *
+	 * @access public
+	 * @param  mixed $mContent content to translate
+	 * @return mixed
+	 */
+	public static function translate($mContent)
+	{
+		return $mContent;
+	}
 
 }