las93 / venus3

bundles/core/Router.php

Braces +26 added lines, -52 removed lines

@@ -131,14 +131,12 @@ 
     		            
     		            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')
+    		        } 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')
+                    } 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']));
@@ -167,8 +165,7 @@ 
     						header('Status: 301 Moved Permanently', false, 301);
     	  					header('Location: '.$oHost->location);
     	  					exit;
-    					}
-    					else if (preg_match('#getCss\?#', $_SERVER['REQUEST_URI'])) {
+    					} else if (preg_match('#getCss\?#', $_SERVER['REQUEST_URI'])) {
     					    
     					    foreach ($_GET as $sKey => $sValue) {
 
@@ -179,8 +176,7 @@ 
     					    }
     					    
     					    exit;
-    					}
-    					else if (preg_match('#getJs\?#', $_SERVER['REQUEST_URI'])) {
+    					} else if (preg_match('#getJs\?#', $_SERVER['REQUEST_URI'])) {
     					    
     					    foreach ($_GET as $sKey => $sValue) {
 
@@ -191,8 +187,7 @@ 
     					    }
     					    
     					    exit;
-    					}
-    					else if (isset($oHost->routes)) {
+    					} else if (isset($oHost->routes)) {
     
     						foreach($oHost->routes as $sKey => $oRoute) {
 
@@ -201,8 +196,7 @@ 
     							if ($mReturn === 403) {
     
     								$this->_getPage403();
-    							}
-    							else if ($mReturn === true) {
+    							} else if ($mReturn === true) {
     
     								if (isset($oRoute->cache)) { $this->_checkCache($oRoute->cache); }
     
@@ -215,11 +209,9 @@ 
     				}
 			    }
 			}
-		}
-        else if (Request::isCliRequest()) {
+		} 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');
@@ -229,8 +221,7 @@ 
                 $sBatchName = "phpunit";
                 $aArguments[0] = "bin/console";
                 $aArguments[1] = "phpunit";
-            }
-            else {
+            } else {
                 $sBatchName = $aArguments[1];
             }
 
@@ -279,8 +270,7 @@ 
 			if (isset($oBatch->controller) && isset($oBatch->action)) {
 
 				echo $this->_loadController($oBatch->controller, $oBatch->action, array($aOptions));
-			}
-			else {
+			} else {
 
 				if (Request::isCliRequest()) {
 
@@ -323,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);
@@ -386,8 +375,7 @@ 
 				},
 				$sRoute
 			);
-		}
-		else {
+		} else {
 
 			$sFinalRoute = '.*';
 		}
@@ -437,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);
 
@@ -461,17 +448,14 @@ 
 					if ($oRoute->content_type == 'json') {
 
 						header('Content-type: application/json; charset='.$sCharset.'');
-					}
-					else if ($oRoute->content_type == 'html') {
+					} else if ($oRoute->content_type == 'html') {
 
 						header('Content-type: text/html; charset='.$sCharset.'');
-					}
-					else if ($oRoute->content_type == 'jpeg') {
+					} else if ($oRoute->content_type == 'jpeg') {
 
 						header('Content-type: image/jpeg');
 					}
-				}
-				else {
+				} else {
 
 					header('Content-type: text/html; charset='.$sCharset.'');
 				}
@@ -492,21 +476,17 @@ 
 						if (isset($_GET[$sName]) && $_GET[$sName] != '') {
 
 							$aEntries[] = $_GET[$sName];
-						}
-						else if (isset($oRoute->defaults_constraints) && is_object($oRoute->defaults_constraints)
+						} 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])) {
+						} else if (isset($_GET[$sName])) {
 
 							$aEntries[] = $_GET[$sName];
-						}
-						else if (preg_match('/'.$sType.'/', '')) {
+						} else if (preg_match('/'.$sType.'/', '')) {
 
 							$aEntries[] = '';
-						}
-						else {
+						} else {
 
 						    $this->_oLogger->warning('Error: Parameter '.$sName.' not exists!');
 							break;
@@ -518,8 +498,7 @@ 
 						$mReturn = $this->_loadController($oController, $sActionName, $aEntries);
 
 					}
-				}
-				else {
+				} else {
 
 					$mReturn = $this->_loadController($oController, $sActionName, $aEntries);
 				}
@@ -531,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');
@@ -549,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');
@@ -574,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) {
 
@@ -629,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']);
 
@@ -671,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/lib/Cache/File.php

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,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'));
-		}
-		else {
+		} else {
 
 			return false;
 		}
@@ -146,8 +145,7 @@ 
 
 			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."\\"); }
+				if ($sFile > '0' && filetype($sName.$sFile) == "file") { unlink($sName.$sFile); } elseif ($sFile > '0' && filetype($sName.$sFile) == "dir") { remove_dir($sName.$sFile."\\"); }
 			}
 
 			closedir($rDirectory);

bundles/lib/Request/Files.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     {
         if (isset($_FILES[$name]) && $_FILES[$name] != '') {
             return $_FILES[$name];
-        }
-        else if ($default !== null) {
+        } else if ($default !== null) {
             return $default;
         }
     }

bundles/lib/Request/Server.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     {
         if (isset($_SERVER[$name]) && $_SERVER[$name] != '') {
             return $_SERVER[$name];
-        }
-        else if ($default !== null) {
+        } else if ($default !== null) {
             return $default;
         }
     }

bundles/lib/Request/Request.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     {
         if (isset($_POST[$name]) && $_POST[$name] != '') {
             return $_POST[$name];
-        }
-        else if ($default !== null) {
+        } else if ($default !== null) {
             return $default;
         }
     }

bundles/lib/Request/Query.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     {
         if (isset($_GET[$name]) && $_GET[$name] != '') {
             return $_GET[$name];
-        }
-        else if ($default !== null) {
+        } else if ($default !== null) {
             return $default;
         }
     }

bundles/lib/Request/Cookies.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     {
         if (isset($_COOKIE[$name]) && $_COOKIE[$name] != '') {
             return $_COOKIE[$name];
-        }
-        else if ($default !== null) {
+        } else if ($default !== null) {
             return $default;
         }
     }

bundles/lib/Request/Headers.php

Braces +2 added lines, -4 removed lines

@@ -19,8 +19,7 @@ 
     {
         if (isset(apache_request_headers()[$name]) && apache_request_headers()[$name] != '') {
             return apache_request_headers()[$name];
-        }
-        else if ($default !== null) {
+        } else if ($default !== null) {
             return $default;
         }
     }
@@ -35,8 +34,7 @@ 
     {
         if ($value !== null) {
             header($name . ': ' . $value);
-        }
-        else {
+        } else {
             header($name);
         }