las93 / venus3

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/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})) {
 

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

Braces +3 added lines, -6 removed lines

@@ -62,15 +62,13 @@ 
 			if (!is_callable($data = $this->_aDataType[$mKey][$mKey]) || (is_string($data) && function_exists($data))) {
 
 				return $data;
-			}
-			else {
+			} else {
 
 				$dataStore = &$this->_aDataType[$mKey];
 				$dataStore[$mKey] = call_user_func($data, null);
 				return $dataStore[$mKey];
 			}
-		}
-		else {
+		} else {
 
 			return null;
 		}
@@ -89,8 +87,7 @@ 
 
 			$this->_aClosures[$mKey] = $mValue;
 			$this->_aDataType[$mKey] = &$this->_aClosures;
-		}
-		else {
+		} else {
 
 			$this->_aData[$mKey] = $mValue;
 			$this->_aDataType[$mKey] = &$this->_aData;

bundles/src/Batch/app/Controller/Server.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/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')) {
 
@@ -97,8 +93,7 @@ 
 				mkdir($sPrivatePath . 'View', 0777, true);
 				mkdir($sPrivatePath . 'conf', 0777, true);
 				mkdir($sPrivatePath . 'common', 0777, true);
-			}
-			else {
+			} else {
 
 				echo 'The Project (private part) ' . $sPrivatePath . " exists\n";
 			}

bundles/conf/AutoLoad.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         	require $sFileClassName;
         }
-    }
-    else {
+    } else {
 
         if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {