psfs / core

src/base/extension/AssetsParser.php

Spacing +4 added lines, -4 removed lines

@@ -197,7 +197,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
+        }else {
             echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
         }
     }
@@ -211,7 +211,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
+        }else {
             echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet' media='screen, print'>";
         }
     }
@@ -236,7 +236,7 @@ 
                     $this->log->infoLog("$orig copiado a $dest");
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->log->errorLog($e->getMessage());
         }
     }
@@ -265,7 +265,7 @@ 
             if ($this->debug) {
                 $data = file_get_contents($file);
                 $this->storeContents($base.$file_path, $data);
-            } else {
+            }else {
                 $data .= file_get_contents($file);
             }
             $this->compiled_files[] = "/css/".$file_path;

src/base/Security.php

Spacing +17 added lines, -17 removed lines

@@ -97,13 +97,13 @@ 
         public static function save($user)
         {
             $admins = array();
-            if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-                $admins = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json'), TRUE);
+            if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+                $admins = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json'), TRUE);
             }
-            $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+            $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
             $admins[$user['username']]['profile'] = $user['profile'];
 
-            return (FALSE !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', json_encode($admins, JSON_PRETTY_PRINT)));
+            return (FALSE !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', json_encode($admins, JSON_PRETTY_PRINT)));
         }
 
         /**
@@ -113,7 +113,7 @@ 
          */
         public function saveUser($user) {
             $saved = false;
-            if(!empty($user)) {
+            if (!empty($user)) {
                 $saved = static::save($user);
             }
             return $saved;
@@ -136,8 +136,8 @@ 
         public function getAdmins()
         {
             $admins = array();
-            if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-                $admins = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json'), TRUE);
+            if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+                $admins = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json'), TRUE);
             }
 
             return $admins;
@@ -157,7 +157,7 @@ 
             Logger::log('Checking admin session');
             if (!$this->authorized) {
                 $request = Request::getInstance();
-                if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+                if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
                     //Si no hay fichero de usuarios redirigimos directamente al gestor
                     return Router::getInstance()->getAdmin()->adminers();
                 }
@@ -170,7 +170,7 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth == sha1($user . $pass));
+                    $this->authorized = ($auth == sha1($user.$pass));
                     $this->admin = array(
                         'alias'   => $user,
                         'profile' => $admins[$user]['profile'],
@@ -389,12 +389,12 @@ 
             $axis = 0;
             $parts = array();
             try {
-                $partLength = floor(strlen($token) / 10);
-                for ($i = 0, $ct = ceil(strlen($token) / $partLength); $i < $ct; $i++) {
+                $partLength = floor(strlen($token)/10);
+                for ($i = 0, $ct = ceil(strlen($token)/$partLength); $i < $ct; $i++) {
                     $parts[] = substr($token, $axis, $partLength);
                     $axis += $partLength;
                 }
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 $partLength = 0;
             }
 
@@ -434,7 +434,7 @@ 
             $decoded = NULL;
             list($partLength, $parts) = self::extractTokenParts($token);
             list($ts, $mod) = self::extractTsAndMod($parts, $partLength);
-            $hashMod = substr(strtoupper(sha1($module)), strlen($ts) / 2, strlen($ts) * 2);
+            $hashMod = substr(strtoupper(sha1($module)), strlen($ts)/2, strlen($ts)*2);
             if (time() - (integer)$ts < 300 && $hashMod === $mod) {
                 $decoded = implode('', $parts);
             }
@@ -451,16 +451,16 @@ 
         public static function generateToken($secret, $module = 'PSFS')
         {
             $ts = time();
-            $hashModule = substr(strtoupper(sha1($module)), strlen($ts) / 2, strlen($ts) * 2);
+            $hashModule = substr(strtoupper(sha1($module)), strlen($ts)/2, strlen($ts)*2);
             $hash = hash('sha256', $secret);
-            $insert = floor(strlen($hash) / strlen($ts));
+            $insert = floor(strlen($hash)/strlen($ts));
             $j = 0;
             $token = '';
             for ($i = 0, $ct = strlen($ts); $i < $ct; $i++) {
-                $token .= substr($ts, $i, 1) . substr($hash, $j, $insert) . substr($hashModule, $i, 2);
+                $token .= substr($ts, $i, 1).substr($hash, $j, $insert).substr($hashModule, $i, 2);
                 $j += $insert;
             }
-            $token .= substr($hash, ($insert * strlen($ts)), strlen($hash) - ($insert * strlen($ts)));
+            $token .= substr($hash, ($insert*strlen($ts)), strlen($hash) - ($insert*strlen($ts)));
             return $token;
         }
 

src/Dispatcher.php

Spacing +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
     use PSFS\base\Logger;
     use PSFS\base\Singleton;
 
-    require_once __DIR__ . DIRECTORY_SEPARATOR . "bootstrap.php";
+    require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
 
     /**
      * Class Dispatcher
@@ -74,13 +74,13 @@ 
         private function setLocale()
         {
             $this->locale = $this->config->get("default_language");
-            Logger::log('Set locale to project [' . $this->locale . ']');
+            Logger::log('Set locale to project ['.$this->locale.']');
             // Load translations
-            putenv("LC_ALL=" . $this->locale);
+            putenv("LC_ALL=".$this->locale);
             setlocale(LC_ALL, $this->locale);
             // Load the locale path
-            $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-            Logger::log('Set locale dir ' . $locale_path);
+            $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+            Logger::log('Set locale dir '.$locale_path);
             Config::createDir($locale_path);
             bindtextdomain('translations', $locale_path);
             textdomain('translations');
@@ -100,16 +100,16 @@ 
                     if (!$this->parser->isFile()) {
                         return $this->router->execute($this->actualUri);
                     }
-                } else {
+                }else {
                     return $this->router->getAdmin()->config();
                 }
-            } catch (ConfigException $c) {
+            }catch (ConfigException $c) {
                 return $this->dumpException($c);
-            } catch (SecurityException $s) {
+            }catch (SecurityException $s) {
                 return $this->security->notAuthorized($this->actualUri);
-            } catch (RouterException $r) {
+            }catch (RouterException $r) {
                 return $this->router->httpNotFound($r);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 return $this->dumpException($e);
             }
         }
@@ -151,7 +151,7 @@ 
                     $use /= 1024;
                     break;
                 case "MBytes":
-                    $use /= (1024 * 1024);
+                    $use /= (1024*1024);
                     break;
                 case "Bytes":
                 default:
@@ -177,7 +177,7 @@ 
             if ($this->config->getDebugMode()) {
                 Logger::log('Added handlers for errors');
                 //Warning & Notice handler
-                set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+                set_error_handler(function($errno, $errstr, $errfile, $errline) {
                     Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline]);
                     throw new \Exception($errstr, 500);
                 });
@@ -190,9 +190,9 @@ 
         private function initiateStats()
         {
             Logger::log('Initialicing stats (mem + ts)');
-            if(null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
+            if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
                 $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-            } else {
+            }else {
                 $this->ts = $this->parser->getTs();
             }
             $this->mem = memory_get_usage();

src/services/AdminServices.php

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
     use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
-    class AdminServices extends Service{
+    class AdminServices extends Service {
 
         /**
          * @Inyectable
@@ -30,10 +30,10 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if ("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
-            header('WWW-Authenticate: Basic Realm="' . $platform. '"');
+            header('WWW-Authenticate: Basic Realm="'.$platform.'"');
             echo _("Zona restringida");
             exit();
         }
@@ -45,9 +45,9 @@ 
         public function getAdmins()
         {
             $admins = $this->security->getAdmins();
-            if(!empty($admins))
+            if (!empty($admins))
             {
-                if(!$this->security->checkAdmin())
+                if (!$this->security->checkAdmin())
                 {
                     $this->setAdminHeaders();
                 }
@@ -62,17 +62,17 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if (!empty($admins)) foreach ($admins as &$admin)
             {
-                if(isset($admin["profile"]))
+                if (isset($admin["profile"]))
                 {
-                    switch($admin["profile"]) {
+                    switch ($admin["profile"]) {
                         case sha1('admin'): $admin['class'] = 'warning'; break;
                         case sha1('superadmin'): $admin['class'] = 'info'; break;
                         default:
                         case sha1('user'): $admin['class'] = 'primary'; break;
                     }
-                }else{
+                }else {
                     $admin["class"] = "primary";
                 }
             }
@@ -88,12 +88,12 @@ 
             $files->files()->in(LOG_DIR)->name("*.log")->sortByModifiedTime();
             $logs = array();
             /** @var \SplFileInfo $file */
-            foreach($files as $file)
+            foreach ($files as $file)
             {
-                $size = $file->getSize() / 8 / 1024;
+                $size = $file->getSize()/8/1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -117,27 +117,27 @@ 
             $files->files()->in(LOG_DIR)->name($selectedLog);
             $file = null;
             $log = array();
-            foreach($files as $match)
+            foreach ($files as $match)
             {
                 $file = $match;
                 break;
             }
             /** @var \SplFileInfo $file */
-            if(!empty($file))
+            if (!empty($file))
             {
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
                 $monthOpen = $dateTime->format("m");
-                $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename());
+                $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename());
                 krsort($content);
                 $detailLog = array();
-                foreach($content as &$line)
+                foreach ($content as &$line)
                 {
                     list($line, $detail) = $this->parseLogLine($line, $match);
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if (count($detailLog) >= 1000) break;
                 }
                 $log = $detailLog;
             }
@@ -166,7 +166,7 @@ 
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';
                 $type = explode(".", $type);
-                $type = count($type)>1 ? $type[1] : $type[0];
+                $type = count($type) > 1 ? $type[1] : $type[0];
                 switch ($type) {
                     case 'INFO':
                         $detail["type"] = "success";
@@ -182,7 +182,7 @@ 
                         break;
                 }
 
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $detail = array(
                     "type" => "danger",
                 );

Braces +18 added lines, -7 removed lines

@@ -30,7 +30,9 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if("login" === $this->config->get("admin_login")) {
+                return Admin::getInstance()->adminLogin("admin-setup");
+            }
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
             header('WWW-Authenticate: Basic Realm="' . $platform. '"');
@@ -62,17 +64,20 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if(!empty($admins)) {
+                foreach($admins as &$admin)
             {
                 if(isset($admin["profile"]))
                 {
                     switch($admin["profile"]) {
-                        case sha1('admin'): $admin['class'] = 'warning'; break;
+                        case sha1('admin'): $admin['class'] = 'warning';
+            }
+            break;
                         case sha1('superadmin'): $admin['class'] = 'info'; break;
                         default:
                         case sha1('user'): $admin['class'] = 'primary'; break;
                     }
-                }else{
+                } else{
                     $admin["class"] = "primary";
                 }
             }
@@ -93,7 +98,9 @@ 
                 $size = $file->getSize() / 8 / 1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if(!isset($logs[$dateTime->format("Y")])) {
+                    $logs[$dateTime->format("Y")] = array();
+                }
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -137,7 +144,9 @@ 
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if(count($detailLog) >= 1000) {
+                        break;
+                    }
                 }
                 $log = $detailLog;
             }
@@ -161,7 +170,9 @@ 
 
                     $detail = json_decode($match[0][0], TRUE);
                 }
-                if (empty($detail)) $detail = array();
+                if (empty($detail)) {
+                    $detail = array();
+                }
                 preg_match_all('/\>\ (.*):/i', $line, $match);
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';