las93 / venus3

bundles/core/Router.php

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/Controller.php

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/Cache/Redis.php

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/lib/Debug.php

Braces +5 added lines, -10 removed lines

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