las93 / venus3

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

Braces +5 added lines, -10 removed lines

@@ -50,8 +50,7 @@ 
 		/**
 		 * option -p [portail]
 		 */
-		if (isset($aOptions['p'])) { $sPortal = $aOptions['p']; }
-		else { $sPortal = 'Batch'; }
+		if (isset($aOptions['p'])) { $sPortal = $aOptions['p']; } else { $sPortal = 'Batch'; }
 
 		if (!preg_match('/^[a-zA-Z0-9]+$/', $sPortal)) {
 
@@ -67,16 +66,14 @@ 
 
             echo 'The batch can`t create public folders for '.$sPortal.'! Please check the rights.';
             throw new \Exception('The batch can`t create public folders for '.$sPortal.'! Please check the rights.');
-        }
-        else {
+        } else {
 
             if (!file_exists($sPrivatePath.'Controller')) {
 
                 mkdir($sPublicPath . 'css', 0777, true);
                 mkdir($sPublicPath . 'js', 0777, true);
                 mkdir($sPublicPath . 'img', 0777, true);
-            }
-            else {
+            } else {
 
                 echo 'The Project (public part) ' . $sPrivatePath . " exists\n";
             }
@@ -86,8 +83,7 @@ 
 
 			echo 'The batch can`t create private folders for '.$sPortal.'! Please check the rights.';
 			throw new \Exception('The batch can`t create private folders for '.$sPortal.'! Please check the rights.');
-		}
-		else {
+		} else {
 
 			if (!file_exists($sPrivatePath.'Controller')) {
 
@@ -130,8 +126,7 @@ 
 ";
 
                 file_put_contents($sPrivatePath.'Controller'.DIRECTORY_SEPARATOR.$sPortal.'.php', $content);
-			}
-			else {
+			} else {
 
 				echo 'The Project (private part) ' . $sPrivatePath . " exists\n";
 			}

bundles/core/Router.php

Braces +12 added lines, -24 removed lines

@@ -195,8 +195,7 @@ 
                                 if ($mReturn === 403) {
     
                                     $this->_getPage403();
-                                }
-                                else if ($mReturn === true) {
+                                } else if ($mReturn === true) {
     
                                     if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
     
@@ -211,8 +210,7 @@ 
             }
         } else if (Request::isCliRequest()) {
 
-            if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; }
-            else { $aArguments = []; }
+            if (isset($_SERVER['argv'])) { $aArguments = $_SERVER['argv']; } else { $aArguments = []; }
 
             define('PORTAL', 'Batch');
             set_include_path(get_include_path().PATH_SEPARATOR.'src'.PATH_SEPARATOR.PORTAL.PATH_SEPARATOR.'public');
@@ -314,8 +312,7 @@ 
                     }
                 }
             }
-        }
-        else if (defined('STDIN')) {
+        } else if (defined('STDIN')) {
 
             $oBatch = Config::get('Route')->batch->script->{$sRoute};
             echo $this->_loadController($oBatch->controller, $oBatch->action, $aParams);
@@ -377,8 +374,7 @@ 
                 },
                 $sRoute
             );
-        }
-        else {
+        } else {
 
             $sFinalRoute = '.*';
         }
@@ -428,8 +424,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);
 
@@ -459,8 +454,7 @@ 
 
                         header('Content-type: image/jpeg');
                     }
-                }
-                else {
+                } else {
 
                     header('Content-type: text/html; charset='.$sCharset.'');
                 }
@@ -503,8 +497,7 @@ 
                         $mReturn = $this->_loadController($oController, $sActionName, $aEntries);
 
                     }
-                }
-                else {
+                } else {
 
                     $mReturn = $this->_loadController($oController, $sActionName, $aEntries);
                 }
@@ -516,8 +509,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');
@@ -534,8 +526,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');
@@ -559,8 +550,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) {
 
@@ -614,8 +604,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']);
 
@@ -656,8 +645,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) {