las93 / venus3

bundles/lib/Object.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 				$sKey = preg_replace("/^\\0(.*)\\0/", "", $sKey);
 				$aNew[$sKey] = self::object_to_array($mValues);
 			}
-		}
-		else {
+		} else {
 
 			$aNew = $mObject;
 		}

bundles/lib/Upload.php

Braces +2 added lines, -4 removed lines

@@ -110,8 +110,7 @@ 
 
 		if ($this->_sExtension === null) { $this->setExtension($sExtension); }
 
-		if ($this->_sName) { $sName = $sPath.$this->_sName.'.'.$this->_sExtension; }
-		else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension;}
+		if ($this->_sName) { $sName = $sPath.$this->_sName.'.'.$this->_sExtension; } else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension;}
 
 		if ($this->_bProportion == true && ($this->_iWidth || $this->_iHeight)) {
 
@@ -129,8 +128,7 @@ 
 			imagecopyresampled($rNewImgTrueColor , $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2);
 
 			imagejpeg($rNewImgTrueColor , $sName, 100);
-		}
-		else {
+		} else {
 
 			$bResultat = move_uploaded_file($_FILES[$sFile]['tmp_name'], $sName);
 

bundles/lib/Functions/Asset.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
     		    if (strstr($sTemplate, 'css/')) {
     			
     		        $sGetUrl .= $sTemplate.'&';
-    		    }
-    		    else if (strstr($sTemplate, 'js/')) {
+    		    } else if (strstr($sTemplate, 'js/')) {
     		        
     		        $sGetUrl .= $sTemplate.'&';
     		    }

bundles/lib/Typescript.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
 	        
 	        $sCmd = self::TYPESCRIPT_WINDOWS." ".$sFile." --outDir ".__DIR__.'../../'.CACHE_DIR.$sFolder.'/';
             $sContent = shell_exec($sCmd);
-	    }
-	    else {
+	    } else {
 	       
 	        $sCmd = "tsc ".$sFile." --outDir ".__DIR__.'../../'.CACHE_DIR.$sFolder.'/';
             $sContent = shell_exec($sCmd);

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

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/core/Security.php

Braces +9 added lines, -19 removed lines

@@ -95,8 +95,7 @@ 
 					header('HTTP/1.0 401 Unauthorized');
 					echo $oSecurity->cancelled;
 					exit;
-				}
-				else {
+				} else {
 
 					self::$_sLogin = $_SERVER['PHP_AUTH_USER'];
 					self::$_sPassword = $_SERVER['PHP_AUTH_PW'];
@@ -105,8 +104,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'])) {
 
@@ -117,8 +115,7 @@ 
 					header('HTTP/1.0 401 Unauthorized');
 					echo $oSecurity->cancelled;
 					exit;
-				}
-				else {
+				} else {
 
 					self::$_sLogin = $_SERVER['PHP_AUTH_USER'];
 					self::$_sPassword = $_SERVER['PHP_AUTH_PW'];
@@ -132,8 +129,7 @@ 
 					if (!$this->_checkAccess()) { return false; }
 					if (!$this->_checkBlackListIps()) { return false; }
 				}
-			}
-			else if (isset($oSecurity->authentification) && $oSecurity->authentification === 'controller') {
+			} else if (isset($oSecurity->authentification) && $oSecurity->authentification === 'controller') {
 
 				// it's an action of one controller that it return true or false for the authentification
 
@@ -152,8 +148,7 @@ 
 			if (isset($oSecurity->requires_channel) && $oSecurity->requires_channel == 'https' && !Request::isHttpsRequest()) {
 
 				return false;
-			}
-			else if (isset($oSecurity->requires_channel) && $oSecurity->requires_channel == 'http' && ((Request::isHttpRequest()
+			} else if (isset($oSecurity->requires_channel) && $oSecurity->requires_channel == 'http' && ((Request::isHttpRequest()
 				&& Request::isHttpsRequest()) || !Request::isHttpRequest())) {
 
 				return false;
@@ -180,8 +175,7 @@ 
 
 				if (preg_match('#'.$sPathAccess.'#', str_replace($this->_sBaseUri, '', $_SERVER['REQUEST_URI']))) {
 
-					if (in_array($this->getUserRole(), $aParams->roles)) { return true; }
-					else { return false; }
+					if (in_array($this->getUserRole(), $aParams->roles)) { return true; } else { return false; }
 				}
 			}
 		}
@@ -223,9 +217,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; }
 	}
 
 	/**
@@ -241,8 +233,7 @@ 
 
 			$sLogin = self::$_sLogin;
 			return Config::get('Security')->users->$sLogin->roles;
-		}
-		else {
+		} else {
 
 			return '';
 		}
@@ -259,8 +250,7 @@ 
 
 	public function isGranted(string $sRole) : bool {
 
-		if ($sRole == $this->getUserRole() || $this->getUserRole() == '') { return true; }
-		else { return false; }
+		if ($sRole == $this->getUserRole() || $this->getUserRole() == '') { return true; } else { return false; }
 	}
 
 	/**

bundles/core/Config.php

Braces +6 added lines, -12 removed lines

@@ -50,8 +50,7 @@ 
 	 */
 	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)) {
 		    
@@ -59,8 +58,7 @@ 
 
 				$sPortal = PORTAL;
 				$aDirectories = array($sPortal);
-			}
-		    else {
+			} else {
 
 				$sPortal = '';
 				$aDirectories = scandir(str_replace('core', 'src', __DIR__));
@@ -187,8 +185,7 @@ 
 	{
 	    $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; }
 	}
 
 	/**
@@ -207,8 +204,7 @@ 
 
 			list($oConfFiles, $base) = self::_recursiveGet($oConfFiles, $base);
 			return $base;
-		}
-		else {
+		} else {
 
 			echo "The Json ".$sFileToMerge." has an error! Please verify!\n";
 			$oDebug = Debug::getInstance();
@@ -232,12 +228,10 @@ 
 			if (is_object($oConfFiles) && is_object($base) && !isset($base->$sKey)) {
 
 				$base->$sKey = $oConfFiles->$sKey;
-			}
-			else if (is_array($oConfFiles) && is_array($base) && !isset($base[$sKey])) {
+			} 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/UrlManager.php

Braces +2 added lines, -4 removed lines

@@ -96,12 +96,10 @@
 
 										if (preg_match('#'.$sType.'#', $aParams[$sName])) {
 
-											if ($aParams[$sName]) { $sRoute = str_replace('[/:'.$sName.']', '/'.$aParams[$sName], $sRoute); }
-											else { $sRoute = str_replace('[/:'.$sName.']', '', $sRoute); }
+											if ($aParams[$sName]) { $sRoute = str_replace('[/:'.$sName.']', '/'.$aParams[$sName], $sRoute); } else { $sRoute = str_replace('[/:'.$sName.']', '', $sRoute); }
 											$sRoute = str_replace('[:'.$sName.']', $aParams[$sName], $sRoute);
 											continue;
-										}
-										else if (isset($oRoute->defaults_constraints) 
+										} else if (isset($oRoute->defaults_constraints) 
 											&& isset($oRoute->defaults_constraints->{$sName}) 
 											&& preg_match('#'.$sType.'#', $oRoute->defaults_constraints->{$sName})) {