psfs / core

src/base/types/helpers/RouterHelper.php

Doc Comments +2 added lines, -2 removed lines

@@ -617,7 +617,7 @@ 
     /**
      * Método que extrae los parámetros de una función
      *
-     * @param array $sr
+     * @param string[] $sr
      * @param \ReflectionMethod $method
      *
      * @return array
@@ -670,7 +670,7 @@ 
      *
      * @param string $docComments
      *
-     * @return bool
+     * @return string
      */
     private function extractReflectionCacheability($docComments)
     {

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
     public static function getClassToCall($action)
     {
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\" . $action["class"];
+        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\".$action["class"];
         $class = (method_exists($actionClass, "getInstance")) ? $actionClass::getInstance() : new $actionClass;
         return $class;
     }
@@ -105,7 +105,7 @@ 
         $expr = preg_quote($expr, '/');
         $expr = str_replace('###', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -116,8 +116,8 @@ 
      */
     public static function extractDomainInfo(\ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-        $path = realpath($path) . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+        $path = realpath($path).DIRECTORY_SEPARATOR;
         $tpl_path = "templates";
         $public_path = "public";
         $model_path = "models";
@@ -127,12 +127,12 @@ 
             $model_path = ucfirst($model_path);
         }
         if ($class->hasConstant("TPL")) {
-            $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+            $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
         }
         return [
-            "template" => $path . $tpl_path,
-            "model" => $path . $model_path,
-            "public" => $path . $public_path,
+            "template" => $path.$tpl_path,
+            "model" => $path.$model_path,
+            "public" => $path.$public_path,
         ];
     }
 
@@ -154,9 +154,9 @@ 
         if (count($parameters) > 0) foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
-                $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
+                $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        }else $default = $regex;
 
         return array($regex, $default, $params);
     }
@@ -211,10 +211,10 @@ 
     {
         $is_enabled = true;
         // For non api routes
-        if(strlen($api) > 0 && preg_match('/admin/i', $route)) {
+        if (strlen($api) > 0 && preg_match('/admin/i', $route)) {
             // If route is for api, check if admin is enabled in config
             $admin_enabled = Config::getInstance()->get('api.admin');
-            if(empty($admin_enabled)) {
+            if (empty($admin_enabled)) {
                 $is_enabled = false;
             }
         }
@@ -238,8 +238,8 @@ 
                 $default = str_replace('{__API__}', $api, $default);
             }
             $httpMethod = RouterHelper::extractReflectionHttpMethod($docComments);
-            if(self::checkCanAddRoute($regex, $api)) {
-                $route = $httpMethod . "#|#" . $regex;
+            if (self::checkCanAddRoute($regex, $api)) {
+                $route = $httpMethod."#|#".$regex;
                 $info = [
                     "method" => $method->getName(),
                     "params" => $params,

Braces +9 added lines, -3 removed lines

@@ -56,8 +56,10 @@ 
         $_route = explode("/", $url['path']);
         $_pattern = explode("/", $pattern);
         $get = array();
-        if (!empty($_pattern)) foreach ($_pattern as $index => $component) {
+        if (!empty($_pattern)) {
+            foreach ($_pattern as $index => $component) {
             $_get = array();
+        }
             preg_match_all('/^\{(.*)\}$/i', $component, $_get);
             if (!empty($_get[1]) && isset($_route[$index])) {
                 $get[array_pop($_get[1])] = $_route[$index];
@@ -151,12 +153,16 @@ 
         $params = [];
         $parameters = $method->getParameters();
         /** @var \ReflectionParameter $param */
-        if (count($parameters) > 0) foreach ($parameters as $param) {
+        if (count($parameters) > 0) {
+            foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
+        }
                 $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        } else {
+            $default = $regex;
+        }
 
         return array($regex, $default, $params);
     }

src/services/AdminServices.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
     use PSFS\base\config\Config;
     use PSFS\base\Security;
     use PSFS\base\Service;
-    use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
     class AdminServices extends Service{

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
     use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
-    class AdminServices extends Service{
+    class AdminServices extends Service {
 
         /**
          * @Inyectable
@@ -33,7 +33,7 @@ 
         {
             $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 Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break;
                         case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break;
                         default:
                         case Security::USER_ID_TOKEN: $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 +15 added lines, -6 removed lines

@@ -62,17 +62,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 Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break;
+                        case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning';
+            }
+            break;
                         case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break;
                         default:
                         case Security::USER_ID_TOKEN: $admin['class'] = 'primary'; break;
                     }
-                }else{
+                } else{
                     $admin["class"] = "primary";
                 }
             }
@@ -93,7 +96,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 +142,9 @@ 
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if(count($detailLog) >= 1000) {
+                        break;
+                    }
                 }
                 $log = $detailLog;
             }
@@ -161,7 +168,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] : '';

src/base/Router.php

Spacing +34 added lines, -34 removed lines

@@ -57,12 +57,12 @@ 
      */
     public function init()
     {
-        if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json") || Config::getInstance()->getDebugMode()) {
+        if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json") || Config::getInstance()->getDebugMode()) {
             $this->hydrateRouting();
             $this->simpatize();
-        } else {
-            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", Cache::JSON, TRUE);
-            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, TRUE);
+        }else {
+            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", Cache::JSON, TRUE);
+            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, TRUE);
         }
     }
 
@@ -82,7 +82,7 @@ 
                 "success" => FALSE,
                 "error" => $e->getMessage(),
             )), 'application/json');
-        } else {
+        }else {
             if (NULL === $e) {
                 Logger::log('Not found page throwed without previus exception');
                 $e = new \Exception(_('Page not found'), 404);
@@ -111,8 +111,8 @@ 
      */
     public function getAllRoutes() {
         $routes = [];
-        foreach($this->routing as $path => $route) {
-            if(array_key_exists('slug', $route)) {
+        foreach ($this->routing as $path => $route) {
+            if (array_key_exists('slug', $route)) {
                 $routes[$route['slug']] = $path;
             }
         }
@@ -137,14 +137,14 @@ 
             SecurityHelper::checkRestrictedAccess($route);
             //Search action and execute
             $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
+        }catch (AccessDeniedException $e) {
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
             return Admin::staticAdminLogon($route);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             if (FALSE !== preg_match('/\/$/', $route)) {
                 if (preg_match('/admin/', $route)) {
                     $default = Config::getInstance()->get('admin_action') ?: 'admin-login';
-                } else {
+                }else {
                     $default = Config::getInstance()->get('home_action');
                 }
 
@@ -152,7 +152,7 @@ 
             }
             Logger::log($r->getMessage(), LOG_WARNING);
             throw $r;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -169,7 +169,7 @@ 
      */
     protected function searchAction($route)
     {
-        Logger::log('Searching action to execute: ' . $route, LOG_INFO);
+        Logger::log('Searching action to execute: '.$route, LOG_INFO);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route;
@@ -183,7 +183,7 @@ 
                 $class = RouterHelper::getClassToCall($action);
                 try {
                     $this->executeCachedRoute($route, $action, $class, $get);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw new RouterException($e->getMessage(), 404, $e);
                 }
@@ -211,13 +211,13 @@ 
         $this->routing = $this->inspectDir($base, "PSFS", array());
         if (file_exists($modules)) {
             $module = "";
-            if(file_exists($modules . DIRECTORY_SEPARATOR . 'module.json')) {
-                $mod_cfg = json_decode(file_get_contents($modules . DIRECTORY_SEPARATOR . 'module.json'), true);
+            if (file_exists($modules.DIRECTORY_SEPARATOR.'module.json')) {
+                $mod_cfg = json_decode(file_get_contents($modules.DIRECTORY_SEPARATOR.'module.json'), true);
                 $module = $mod_cfg['module'];
             }
             $this->routing = $this->inspectDir($modules, $module, $this->routing);
         }
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->domains, Cache::JSON, TRUE);
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->domains, Cache::JSON, TRUE);
     }
 
     /**
@@ -232,7 +232,7 @@ 
             $home_params = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
-                if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
+                if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
                     $home_params = $params;
                 }
             }
@@ -257,7 +257,7 @@ 
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->name("*.php");
         foreach ($files as $file) {
             $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname()));
-            $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing);
+            $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing);
         }
         $this->finder = new Finder();
 
@@ -296,7 +296,7 @@ 
                 }
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                     list($route, $info) = RouterHelper::extractRouteInfo($method, $api);
-                    if(null !== $route && null !== $info) {
+                    if (null !== $route && null !== $info) {
                         $info['class'] = $namespace;
                         $routing[$route] = $info;
                     }
@@ -319,7 +319,7 @@ 
     {
         //Calculamos los dominios para las plantillas
         if ($class->hasConstant("DOMAIN")) {
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
+            $domain = "@".$class->getConstant("DOMAIN")."/";
             $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
         }
 
@@ -332,11 +332,11 @@ 
      */
     public function simpatize()
     {
-        $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php";
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
+        $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php";
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
         $this->generateSlugs($absoluteTranslationFileName);
         Config::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
 
         return $this;
     }
@@ -387,16 +387,16 @@ 
     public function getRoute($slug = '', $absolute = FALSE, $params = [])
     {
         if (strlen($slug) === 0) {
-            return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (NULL === $slug || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(_("No existe la ruta especificada"));
         }
-        $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
+        $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug];
         if (!empty($params)) foreach ($params as $key => $value) {
-            $url = str_replace("{" . $key . "}", $value, $url);
+            $url = str_replace("{".$key."}", $value, $url);
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
-            $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
+            $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -414,7 +414,7 @@ 
             if (preg_match('/^\/admin(\/|$)/', $routePattern)) {
                 if (preg_match('/^\\\?PSFS/', $params["class"])) {
                     $profile = "superadmin";
-                } else {
+                }else {
                     $profile = "admin";
                 }
                 if (!empty($params["default"]) && preg_match('/(GET|ALL)/i', $httpMethod)) {
@@ -466,17 +466,17 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route, LOG_INFO);
+        Logger::log('Executing route '.$route, LOG_INFO);
         Security::getInstance()->setSessionKey("__CACHE__", $action);
         $cache = Cache::needCache();
         $execute = TRUE;
         if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) {
             $cacheDataName = $this->cache->getRequestCacheHash();
-            $cachedData = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName,
-                $cache, function () {});
+            $cachedData = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName,
+                $cache, function() {});
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName . ".headers",
-                    $cache, function () {}, Cache::JSON);
+                $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers",
+                    $cache, function() {}, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
             }
@@ -522,7 +522,7 @@ 
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 

Braces +3 added lines, -1 removed lines

@@ -393,8 +393,10 @@
             throw new RouterException(_("No existe la ruta especificada"));
         }
         $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
-        if (!empty($params)) foreach ($params as $key => $value) {
+        if (!empty($params)) {
+            foreach ($params as $key => $value) {
             $url = str_replace("{" . $key . "}", $value, $url);
+        }
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
             $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }

src/controller/UserController.php

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
                 Logger::log('Configuration saved successful');
                 Security::getInstance()->setFlash("callback_message", _("Usuario agregado correctamente"));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin"), true);
-            } else {
+            }else {
                 throw new ConfigException(_('Error al guardar los administradores, prueba a cambiar los permisos'));
             }
         }
@@ -74,9 +74,9 @@ 
      */
     public function adminLogin($route = null)
     {
-        if($this->isAdmin()) {
+        if ($this->isAdmin()) {
             return $this->redirect('admin');
-        } else {
+        }else {
             return Admin::staticAdminLogon($route);
         }
     }
@@ -108,7 +108,7 @@ 
                 $cookies = array(
                     array(
                         "name" => Security::getInstance()->getHash(),
-                        "value" => base64_encode($form->getFieldValue("user") . ":" . $form->getFieldValue("pass")),
+                        "value" => base64_encode($form->getFieldValue("user").":".$form->getFieldValue("pass")),
                         "expire" => time() + 3600,
                         "http" => true,
                     )
@@ -119,7 +119,7 @@ 
                     'status_message' => _("Acceso permitido... redirigiendo!!"),
                     'delay' => 1,
                 );
-            } else {
+            }else {
                 $form->setError("user", _("El usuario no tiene acceso a la web"));
             }
         }

src/controller/base/Admin.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
  * @package PSFS\controller
  * @domain ROOT
  */
-class Admin extends AuthAdminController{
+class Admin extends AuthAdminController {
 
     const DOMAIN = 'ROOT';
 
@@ -44,9 +44,9 @@ 
      * @throws \PSFS\base\exception\FormException
      */
     public static function staticAdminLogon($route = null) {
-        if('login' !== Config::getInstance()->get('admin_login')) {
+        if ('login' !== Config::getInstance()->get('admin_login')) {
             return AdminServices::getInstance()->setAdminHeaders();
-        } else {
+        }else {
             $form = new LoginForm();
             $form->setData(array("route" => $route));
             $form->build();

src/bootstrap.php

Spacing +11 added lines, -11 removed lines

@@ -4,16 +4,16 @@ 
 
 if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {
@@ -22,7 +22,7 @@ 
         $html = '<pre style="padding:10px;margin:0;display:block;background: #EEE; box-shadow: inset 0 0 3px 3px #DDD; color: #666; text-shadow: 1px 1px 1px #CCC;border-radius: 5px;">';
         $html .= (is_null($var)) ? '<b>NULL</b>' : print_r($var, TRUE);
         $html .= '</pre>';
-        if(class_exists('\\PSFS\\Dispatcher')) {
+        if (class_exists('\\PSFS\\Dispatcher')) {
             $html .= '<pre>['.round(\PSFS\Dispatcher::getInstance()->getMem('MBytes'), 3).'Mb - '.round(\PSFS\Dispatcher::getInstance()->getTs(), 3).'s]</pre>';
         }
         ob_start();
@@ -30,7 +30,7 @@ 
         ob_flush();
         ob_end_clean();
         if ($die) {
-            if(class_exists('\\PSFS\\base\\Logger')) {
+            if (class_exists('\\PSFS\\base\\Logger')) {
                 \PSFS\base\Logger::log('Execution finished via pre', LOG_WARNING);
             }
             die;

Braces +31 added lines, -11 removed lines

@@ -1,19 +1,39 @@
 <?php
-if (defined('PSFS_BOOTSTRAP_LOADED')) return;
+if (defined('PSFS_BOOTSTRAP_LOADED')) {
+    return;
+}
 use Symfony\Component\Finder\Finder;
 
-if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
+if (!defined('SOURCE_DIR')) {
+    define('SOURCE_DIR', __DIR__);
+}
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
+    }
+    } else {
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    }
+    }
+if (!defined('LOG_DIR')) {
+    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+}
+if (!defined('CACHE_DIR')) {
+    define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
+}
+if (!defined('CONFIG_DIR')) {
+    define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
+}
+if (!defined('WEB_DIR')) {
+    define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
 }
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {

src/base/Template.php

Spacing +15 added lines, -15 removed lines

@@ -127,7 +127,7 @@ 
         $this->setStatusHeader();
         $this->setAuthHeaders();
         $this->setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -143,14 +143,14 @@ 
         Logger::log('Start output response');
         ob_start();
         $this->setReponseHeaders($contentType, $cookies);
-        header('Content-length: ' . strlen($output));
+        header('Content-length: '.strlen($output));
 
         $cache = Cache::needCache();
         if (false !== $cache && $this->status_code === Template::STATUS_OK && $this->debug === false) {
             Logger::log('Saving output response into cache');
             $cacheName = $this->cache->getRequestCacheHash();
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $cacheName, $output);
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $cacheName . ".headers", headers_list(), Cache::JSON);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$cacheName, $output);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$cacheName.".headers", headers_list(), Cache::JSON);
         }
         echo $output;
 
@@ -167,11 +167,11 @@ 
     {
         Logger::log('Close template render');
         Security::getInstance()->setSessionKey("lastRequest", array(
-            "url" => Request::getInstance()->getRootUrl() . Request::requestUri(),
+            "url" => Request::getInstance()->getRootUrl().Request::requestUri(),
             "ts" => microtime(true),
         ));
         Security::getInstance()->updateSession();
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -220,7 +220,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -334,7 +334,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -356,8 +356,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->loadTemplate(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->loadTemplate(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -428,7 +428,7 @@ 
             unset($_SERVER["PHP_AUTH_USER"]);
             unset($_SERVER["PHP_AUTH_PW"]);
             header_remove("Authorization");
-        } else {
+        }else {
             header('Authorization:');
         }
     }
@@ -455,9 +455,9 @@ 
             Logger::log('Adding debug headers to render response');
             $vars["__DEBUG__"]["includes"] = get_included_files();
             $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s');
-            header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes');
-            header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened');
+            header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s');
+            header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes');
+            header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened');
         }
 
         return $vars;
@@ -499,7 +499,7 @@ 
         $this->cache = Cache::getInstance();
         $loader = new \Twig_Loader_Filesystem(Config::getInstance()->getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => Config::getInstance()->getCachePath() . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => Config::getInstance()->getCachePath().DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => TRUE,
         ));

src/base/types/Controller.php

Spacing +7 added lines, -7 removed lines

@@ -35,8 +35,8 @@ 
     public function render($template, array $vars = array(), $cookies = array(), $domain = null)
     {
         $vars['__menu__'] = $this->getMenu();
-        $domain = (null ===$domain) ? $this->getDomain() : $domain;
-        $this->tpl->render($domain . $template, $vars, $cookies);
+        $domain = (null === $domain) ? $this->getDomain() : $domain;
+        $this->tpl->render($domain.$template, $vars, $cookies);
     }
 
     /**
@@ -67,7 +67,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = $domain ?: $this->getDomain();
-        return $this->tpl->dump($domain . $template, $vars);
+        return $this->tpl->dump($domain.$template, $vars);
     }
 
     /**
@@ -96,15 +96,15 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         header("Pragma: no-cache");
         header("Expires: 0");
         header('Content-Transfer-Encoding: none');
-        header("Content-type: " . $content);
-        header("Content-length: " . strlen($data));
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header("Content-type: ".$content);
+        header("Content-length: ".strlen($data));
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
         echo $data;
         ob_flush();
         ob_end_clean();

src/base/dto/Dto.php

Spacing +7 added lines, -7 removed lines

@@ -30,14 +30,14 @@ 
             try {
                 $reflectionClass = new \ReflectionClass($this);
                 $properties = $reflectionClass->getProperties(\ReflectionProperty::IS_PUBLIC);
-                if(count($properties) > 0) {
+                if (count($properties) > 0) {
                     /** @var \ReflectionProperty $property */
-                    foreach($properties as $property) {
+                    foreach ($properties as $property) {
                         $dto[$property->getName()] = $property->getValue($this);
                     }
                 }
-            } catch(\Exception $e) {
-                Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+            }catch (\Exception $e) {
+                Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
             }
             return $dto;
         }
@@ -57,9 +57,9 @@ 
          */
         public function fromArray(array $object = array())
         {
-            if(count($object) > 0) {
-                foreach($object as $key => $value) {
-                    if(property_exists($this, $key)) {
+            if (count($object) > 0) {
+                foreach ($object as $key => $value) {
+                    if (property_exists($this, $key)) {
                         $this->$key = $value;
                     }
                 }