bfw-systems / bfw

install/class/ReadDirectory.php

Spacing +6 added lines, -6 removed lines

@@ -32,22 +32,22 @@ 
     public function run($path)
     {
         $dir = opendir($path);
-        if($dir === false) {
+        if ($dir === false) {
             return;
         }
 
         //Tant qu'il y a des fichiers à lire dans le dossier
-        while(($file = readdir($dir)) !== false) {
+        while (($file = readdir($dir)) !== false) {
             $action = $this->fileAction($file, $dir);
 
-            if($action === 'continue') {
+            if ($action === 'continue') {
                 continue;
-            } elseif($action === 'break') {
+            } elseif ($action === 'break') {
                 break;
             }
 
             //If it's a directory and not a file
-            if(is_dir($dir.'/'.$file)) {
+            if (is_dir($dir.'/'.$file)) {
                 //We run the reading of this directory
                 $read = new readDirectory($this->list);
                 $read->run($dir.'/'.$file);
@@ -59,7 +59,7 @@ 
 
     protected function fileAction($fileName, $pathToFile)
     {
-        if(in_array($fileName, $this->ignore)) {
+        if (in_array($fileName, $this->ignore)) {
             return 'continue';
         }
     }

install/class/ReadDirLoadModule.php

Spacing +2 added lines, -2 removed lines

@@ -8,11 +8,11 @@
     {
         $parentAction = parent::fileAction($fileName, $pathToFile);
         
-        if($parentAction !== '') {
+        if ($parentAction !== '') {
             return $parentAction;
         }
         
-        if(file_exists($pathToFile.'/bfwModulesInfos.json')) {
+        if (file_exists($pathToFile.'/bfwModulesInfos.json')) {
             $this->itemList[] = $pathToFile;
             
             return 'break';

install/class/ModuleInstall.php

Spacing +20 added lines, -20 removed lines

@@ -103,15 +103,15 @@ 
         $this->srcPath    = $infos->srcPath;
         $this->configPath = $infos->srcPath;
 
-        if(property_exists($infos, 'configFiles')) {
+        if (property_exists($infos, 'configFiles')) {
             $this->configFiles = (array) $infos->configFiles;
         }
 
-        if(property_exists($infos, 'configPath')) {
+        if (property_exists($infos, 'configPath')) {
             $this->configPath = $infos->configPath;
         }
         
-        if(property_exists($infos, 'installScript')) {
+        if (property_exists($infos, 'installScript')) {
             $this->installScript = $infos->installScript;
         }
         
@@ -154,24 +154,24 @@ 
         $targetPath     = $this->bfwModulePath;
         $alreadyCreated = file_exists($targetPath);
         
-        if($alreadyCreated && $this->forceReinstall === true) {
+        if ($alreadyCreated && $this->forceReinstall === true) {
             echo '[Force Reinstall: Remove symlink] ';
             $alreadyCreated = false;
             
-            if(!unlink($targetPath)) {
+            if (!unlink($targetPath)) {
                 echo "\033[1;31m Symbolic link remove fail.\033[0m\n";
                 throw new Exception('Reinstall fail. Symlink remove error');
             }
         }
         
         //If module already exist in "modules" directory
-        if($alreadyCreated) {
+        if ($alreadyCreated) {
             echo "\033[1;33m Not created. Module already exist in 'modules' directory.\033[0m\n";
             return;
         }
 
         //If symbolic link create fail.
-        if(!symlink($this->srcPath, $targetPath))
+        if (!symlink($this->srcPath, $targetPath))
         {
             echo "...\033[1;31m Symbolic link creation fail.\033[0m\n";
             return;
@@ -190,20 +190,20 @@ 
     {
         echo ' > Copy config files : '."\n";
         
-        if($this->configFiles === []) {
+        if ($this->configFiles === []) {
             echo ' >> '."\033[1;33m".'No config file declared. Pass'."\033[0m\n";
             return;
         }
         
         $configDirStatus = $this->createConfigDirectory();
-        if($configDirStatus === false) {
+        if ($configDirStatus === false) {
             return;
         }
         
-        foreach($this->configFiles as $configFile) {
+        foreach ($this->configFiles as $configFile) {
             try {
                 $this->copyConfigFile($configFile);
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 trigger_error(
                     'Module '.$this->name.' Config file '.$configFile.' copy error: '.$e->getMessage(),
                     E_USER_WARNING
@@ -226,22 +226,22 @@ 
         $targetDirectory = $this->bfwConfigPath;
         $alreadyExist    = file_exists($targetDirectory);
         
-        if($alreadyExist && $this->forceReinstall === true) {
+        if ($alreadyExist && $this->forceReinstall === true) {
             echo '[Force Reinstall: Remove symlink] ';
             $alreadyExist = false;
             
-            if(!rmdir($targetDirectory)) {
+            if (!rmdir($targetDirectory)) {
                 echo "\033[1;31m Remove module config directory fail.\033[0m\n";
                 throw new Exception('Reinstall fail. Remove module config directory error.');
             }
         }
         
-        if($alreadyExist) {
+        if ($alreadyExist) {
             echo "\033[1;33m Already exist.\033[0m\n";
             return true;
         }
             
-        if(mkdir($targetDirectory, 0755)) {
+        if (mkdir($targetDirectory, 0755)) {
             echo "\033[1;32m Created. \033[0m\n";
             return true;
         }
@@ -269,19 +269,19 @@ 
         $targetFile = realpath($this->bfwConfigPath.'/'.$configFileName);
         
         //Check if config file already exist
-        if(file_exists($targetFile)) {
+        if (file_exists($targetFile)) {
             echo "\033[1;33m Existe déjà.\033[0m\n";
             return;
         }
         
         //If source file not exist
-        if(!file_exists($sourceFile)) {
+        if (!file_exists($sourceFile)) {
             echo "\033[1;31m Config file not exist in module source.\033[0m\n";
             throw new Exception('Source file not exist');
         }
             
         //Alors on copie le fichier vers le dossier /configs/[monModule]/
-        if(!copy($sourceFile, $targetFile))
+        if (!copy($sourceFile, $targetFile))
         {
             echo "\033[1;31m Copy fail.\033[0m\n";
             throw new Exception('Copy fail');
@@ -299,12 +299,12 @@ 
     {
         echo ' >> Run install specific script : ';
         
-        if($this->installScript === '' || $this->installScript === false) {
+        if ($this->installScript === '' || $this->installScript === false) {
             echo ' >> '."\033[1;33m".'No specific script declared. Pass'."\033[0m\n";
             return;
         }
         
-        if($this->installScript === true) {
+        if ($this->installScript === true) {
             $this->installScript = 'runInstallModule.php';
         }
         

install/skeleton/cli.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 define('cliMode', true);
 
 //If this file is not call from cli, we display an error
-if(PHP_SAPI !== 'cli') {
+if (PHP_SAPI !== 'cli') {
     echo 'cli.php should be used only from the command.';
     exit;
 }

install/skeleton/cli/exemple.php

Spacing +3 added lines, -3 removed lines

@@ -7,17 +7,17 @@
 
 $opt = getCliParams('vhp', array('version::', 'help::', 'parameters::'));
 
-if(isset($opt['v']) || isset($opt['version']))
+if (isset($opt['v']) || isset($opt['version']))
 {
     displayMsg('v0.2');
 }
 
-if(isset($opt['p']) || isset($opt['paramters']))
+if (isset($opt['p']) || isset($opt['paramters']))
 {
     displayMsg(print_r($opt, true));
 }
 
-if(isset($opt['h']) || isset($opt['help']))
+if (isset($opt['h']) || isset($opt['help']))
 {
     displayMsg('');
     displayMsg('Helping Informations : Parameters script');

src/fonctions/global.php

Spacing +25 added lines, -25 removed lines

@@ -27,21 +27,21 @@ 
     //--- Gestion de type de data ---
     $filterType = 'text';
 
-    if($type === 'int' || $type === 'integer') {
+    if ($type === 'int' || $type === 'integer') {
         $filterType = FILTER_VALIDATE_INT;
     }
-    elseif($type === 'float' || $type === 'double') {
+    elseif ($type === 'float' || $type === 'double') {
         $filterType = FILTER_VALIDATE_FLOAT;
     }
-    elseif($type === 'bool' || $type === 'boolean') {
+    elseif ($type === 'bool' || $type === 'boolean') {
         $filterType = FILTER_VALIDATE_BOOLEAN;
     }
-    elseif($type === 'email') {
+    elseif ($type === 'email') {
         $filterType = FILTER_VALIDATE_EMAIL;
     }
     //--- FIN Gestion de type de data ---
 
-    if($filterType === 'text') {
+    if ($filterType === 'text') {
         throw new Exception('Unknown type');
     }
 
@@ -50,8 +50,8 @@ 
 
 function securise($data, $type, $htmlentities)
 {
-    if(is_array($data)) {
-        foreach($data as $key => $val) {
+    if (is_array($data)) {
+        foreach ($data as $key => $val) {
             unset($data[$key]);
 
             $key = securise($key, true);
@@ -66,21 +66,21 @@ 
     try {
         return securiseKnownTypes($data, $type);
     }
-    catch(Exception $ex) {
-        if($ex->getMessage() !== 'Unknown type') {
+    catch (Exception $ex) {
+        if ($ex->getMessage() !== 'Unknown type') {
             throw new Exception($ex->getCode(), $ex->getMessage());
         }
         //Else : Use securise text type
     }
     
     $sqlSecureMethod = getSqlSecureMethod();
-    if($sqlSecureMethod !== false) {
+    if ($sqlSecureMethod !== false) {
         $data = $sqlSecureMethod($data);
     } else {
         $data = addslashes($data);
     }
 
-    if($htmlentities === false) {
+    if ($htmlentities === false) {
         $data = htmlentities($data, ENT_COMPAT | ENT_HTML401, 'UTF-8');
     }
 
@@ -93,7 +93,7 @@ 
     $fct = $app->getConfig('sqlSecureMethod');
 
     $callableName = '';
-    if(!is_callable($fct, true, $callableName)) {
+    if (!is_callable($fct, true, $callableName)) {
         return false;
     }
 
@@ -135,10 +135,10 @@ 
  * @param string $page    : la page vers laquelle rediriger
  * @param bool   $permaet : If it's a permanent redirection for this url or not
  */
-function redirection($page, $permanent=false)
+function redirection($page, $permanent = false)
 {
     $httpStatus = 302;
-    if($permanent === true) {
+    if ($permanent === true) {
         $httpStatus = 301;
     }
     
@@ -149,7 +149,7 @@ 
 
 function getSecurisedKeyInArray(&$array, $key, $type, $htmlentities = false)
 {
-    if(!isset($array[$key])) {
+    if (!isset($array[$key])) {
         throw new Exception('The key '.$key.' not exist');
     }
     
@@ -188,32 +188,32 @@ 
  */
 function verifTypeData($vars)
 {
-    if(!is_array($vars)) {
+    if (!is_array($vars)) {
         return false;
     }
 
-    foreach($vars as $var) {
-        if(!is_array($var)) {
+    foreach ($vars as $var) {
+        if (!is_array($var)) {
             return false;
         }
 
-        if(!(!empty($var['type']) && isset($var['data']))) {
+        if (!(!empty($var['type']) && isset($var['data']))) {
             return false;
         }
 
-        if(!is_string($var['type'])) {
+        if (!is_string($var['type'])) {
             return false;
         }
 
-        if($var['type'] === 'int') {
+        if ($var['type'] === 'int') {
             $var['type'] = 'integer';
         }
 
-        if($var['type'] === 'float') {
+        if ($var['type'] === 'float') {
             $var['type'] = 'double';
         }
 
-        if(gettype($var['data']) !== $var['type']) {
+        if (gettype($var['data']) !== $var['type']) {
             return false;
         }
     }
@@ -240,11 +240,11 @@ 
  */
 function sessionIsStarted()
 {
-    if(PHP_SAPI === 'cli') {
+    if (PHP_SAPI === 'cli') {
         return false;
     }
 
-    if(session_status() === PHP_SESSION_ACTIVE) {
+    if (session_status() === PHP_SESSION_ACTIVE) {
         return true;
     }
 

src/fonctions/cli.php

Spacing +10 added lines, -10 removed lines

@@ -53,31 +53,31 @@ 
  */
 function displayMsg($msg, $colorTxt = null, $colorBg = null, $style = 'normal')
 {
-    if($colorTxt == null) {
+    if ($colorTxt == null) {
         echo $msg."\n";
         return;
     }
 
     //Gestion cas avec couleur
     $styleNum = styleForShell($style);
-    if($styleNum === false) {
+    if ($styleNum === false) {
         $styleNum = styleForShell('normal');
     }
 
     $colorTxtNum = colorForShell('white', 'txt');
-    if($colorTxt !== null) {
+    if ($colorTxt !== null) {
         $colorTxtNumArg = colorForShell($colorTxt, 'txt');
 
-        if($colorTxtNumArg !== false) {
+        if ($colorTxtNumArg !== false) {
             $colorTxtNum = $colorTxtNumArg;
         }
     }
 
     $colorBgNum = colorForShell('black', 'bg');
-    if($colorBg !== null) {
+    if ($colorBg !== null) {
         $colorBgNumArg = colorForShell($colorBg, 'bg');
 
-        if($colorBgNumArg !== false) {
+        if ($colorBgNumArg !== false) {
             $colorBgNum = $colorBgNumArg;
         }
     }
@@ -109,14 +109,14 @@ 
         'white'   => 7
     ];
 
-    if(!in_array($color, $colorList)) {
+    if (!in_array($color, $colorList)) {
         throw new Exception('Color '.$color.' is not available in function.');
     }
 
-    if($type === 'txt') {
+    if ($type === 'txt') {
         return $colorList[$color] + 30;
     }
-    elseif($type === 'bg') {
+    elseif ($type === 'bg') {
         return $colorList[$color] + 40;
     }
 
@@ -140,7 +140,7 @@ 
         'not-reverse'   => 27
     ];
     
-    if(!in_array($style, $styleList)) {
+    if (!in_array($style, $styleList)) {
         return false;
     }
     

src/class/Dates.php

Spacing +15 added lines, -15 removed lines

@@ -91,7 +91,7 @@ 
 
     public function getZone()
     {
-        return parent::format('P');;
+        return parent::format('P'); ;
     }
     
     public function modify($modify)
@@ -99,7 +99,7 @@ 
         $dateDepart = clone $this;
         parent::modify($modify);
         
-        if($dateDepart == $this) {
+        if ($dateDepart == $this) {
             return $this;
         }
         
@@ -142,7 +142,7 @@ 
         $match    = [];
         
         //Regex sur le paramètre pour récupéré le type de modification
-        if(preg_match('#(\+|\-)([0-9]+) ([a-z]+)#i', $modify, $match) !== 1) {
+        if (preg_match('#(\+|\-)([0-9]+) ([a-z]+)#i', $modify, $match) !== 1) {
             throw new Exceptio('Date::modify pattern not match.');
         }
         
@@ -155,7 +155,7 @@ 
         $dateDepart = clone $this;
         parent::modify($match[1].$match[2].' '.$keyword);
         
-        if($dateDepart == $this) {
+        if ($dateDepart == $this) {
             throw new Exception('Parameter '.$match[3].' is unknown.');
         }
     }
@@ -175,7 +175,7 @@ 
         $date  = $this->format('Y-m-d');
         $heure = $this->format('H:i:s');
         
-        if($returnArray) {
+        if ($returnArray) {
             return [$date, $heure];
         }
         
@@ -226,10 +226,10 @@ 
         $return  = [];
         
         $pos = false;
-        foreach($lst_all as $val) {
+        foreach ($lst_all as $val) {
             $pos = strpos($val, $continent);
             
-            if($pos !== false) {
+            if ($pos !== false) {
                 $return[] = $val;
             }
         }
@@ -247,11 +247,11 @@ 
             'time' => ''
         ];
         
-        if($actual == $this) {
+        if ($actual == $this) {
             //A l'instant
             
             $returnTxt->date = self::$humainReadableI18n['now'];
-        } elseif($actual->format('d') !== parent::format('d')) {
+        } elseif ($actual->format('d') !== parent::format('d')) {
             //Hier
             
             $returnTxt->date = self::$humainReadableI18n['yesterday'];
@@ -260,21 +260,21 @@ 
                                 .parent::format(
                                     self::$humainReadableFormats['time']
                                 );
-        } elseif($diff->days === 0) {
+        } elseif ($diff->days === 0) {
             //Aujourd'hui
             
             $returnTxt->date = self::$humainReadableI18n['since'];
             
-            if($diff->h === 0 && $diff->m === 0) {
+            if ($diff->h === 0 && $diff->m === 0) {
                 $returnTxt->date .= $diff->s.'s';
-            } elseif($diff->h === 0) {
+            } elseif ($diff->h === 0) {
                 $returnTxt->date .= $diff->s.'min';
             } else {
                 $returnTxt->date .= $diff->h.'h';
             }
         } else {
             $dateFormat = self::$humainReadableFormats['dateDifferentYear'];
-            if($actual->format('Y') === parent::format('Y')) {
+            if ($actual->format('Y') === parent::format('Y')) {
                 $dateFormat = self::$humainReadableFormats['dateSameYear'];
             }
             
@@ -291,11 +291,11 @@ 
         }
         
         $txtReturn = $returnTxt->date;
-        if($returnDateAndTime === true && $returnTxt->time !== '') {
+        if ($returnDateAndTime === true && $returnTxt->time !== '') {
             $txtReturn .= ' '.$returnTxt->time;
         }
         
-        if($toLower === true) {
+        if ($toLower === true) {
             $txtReturn = mb_strtolower($txtReturn);
         }
         

src/class/Application.php

Spacing +17 added lines, -17 removed lines

@@ -39,7 +39,7 @@ 
     
     public static function getInstance($options = [])
     {
-        if(self::$instance === null) {
+        if (self::$instance === null) {
             self::$instance = new self($options);
         }
         
@@ -112,7 +112,7 @@ 
     
     protected function initSession()
     {
-        if($this->options->getOption('runSession') === false) {
+        if ($this->options->getOption('runSession') === false) {
             return;
         }
         
@@ -153,11 +153,11 @@ 
     
     public function run()
     {
-        foreach($this->runPhases as $action) {
+        foreach ($this->runPhases as $action) {
             $action();
             
             $notifyAction = $action;
-            if(is_array($action)) {
+            if (is_array($action)) {
                 $notifyAction = $action[1];
             }
             
@@ -171,16 +171,16 @@ 
     {
         $memcacheConfig = $this->getConfig('memcached');
         
-        if($memcacheConfig['enabled'] === false) {
+        if ($memcacheConfig['enabled'] === false) {
             return;
         }
         
         $class = $memcacheConfig['class'];
-        if(empty($class)) {
+        if (empty($class)) {
             throw new Exception('Memcached is active but no class is define');
         }
         
-        if(class_exists($class) === false) {
+        if (class_exists($class) === false) {
             throw new Exception('Memcache class '.$class.' not found.');
         }
         
@@ -191,10 +191,10 @@ 
     {
         $listModules = array_diff(scandir(MODULES_DIR), ['.', '..']);
         
-        foreach($listModules as $moduleName) {
+        foreach ($listModules as $moduleName) {
             $moduleName = realpath($moduleName); //Symlink
             
-            if(!is_dir($moduleName)) {
+            if (!is_dir($moduleName)) {
                 continue;
             }
             
@@ -206,11 +206,11 @@ 
     
     protected function loadAllCoreModules()
     {
-        foreach($this->getConfig('modules') as $moduleInfos) {
+        foreach ($this->getConfig('modules') as $moduleInfos) {
             $moduleName    = $moduleInfos['name'];
             $moduleEnabled = $moduleInfos['enabled'];
             
-            if(empty($moduleName) || $moduleEnabled === false) {
+            if (empty($moduleName) || $moduleEnabled === false) {
                 continue;
             }
             
@@ -222,11 +222,11 @@ 
     {
         $tree = $this->modules->getLoadTree();
         
-        foreach($tree as $firstLine)
+        foreach ($tree as $firstLine)
         {
-            foreach($firstLine as $secondLine)
+            foreach ($firstLine as $secondLine)
             {
-                foreach($secondLine as $moduleName)
+                foreach ($secondLine as $moduleName)
                 {
                     $this->loadModule($moduleName);
                 }
@@ -242,17 +242,17 @@ 
     
     protected function runCliFile()
     {
-        if(PHP_SAPI !== 'cli') {
+        if (PHP_SAPI !== 'cli') {
             return;
         }
         
         $opt = getopt('f:');
-        if(!isset($opt['f'])) {
+        if (!isset($opt['f'])) {
             throw new Exception('Error: No file specified.');
         }
         
         $file = $opt['f'];
-        if(!file_exists(CLI_DIR.$file.'.php')) {
+        if (!file_exists(CLI_DIR.$file.'.php')) {
             throw new Exception('File to execute not found.');
         }