psfs / core

src/base/Router.php

Spacing +41 added lines, -41 removed lines

@@ -59,12 +59,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);
             }
         }
 
@@ -84,7 +84,7 @@ 
                     "success" => FALSE,
                     "error"   => $e->getMessage(),
                 )), 'application/json');
-            } else {
+            }else {
                 if (NULL === $e) {
                     $e = new \Exception(_('Página no encontrada'), 404);
                 }
@@ -124,24 +124,24 @@ 
 
                 //Search action and execute
                 return $this->searchAction($route);
-            } catch (AccessDeniedException $e) {
+            }catch (AccessDeniedException $e) {
                 Logger::getInstance()->debugLog(_('Solicitamos credenciales de acceso a zona restringida'));
                 if ('login' === Config::getInstance()->get('admin_login')) {
                     return $this->redirectLogin($route);
-                } else {
+                }else {
                     return $this->sentAuthHeader();
                 }
-            } catch (RouterException $r) {
+            }catch (RouterException $r) {
                 if (FALSE !== preg_match('/\/$/', $route)) {
                     if (preg_match('/admin/', $route)) {
                         $default = Config::getInstance()->get('admin_action');
-                    } else {
+                    }else {
                         $default = Config::getInstance()->get('home_action');
                     }
 
                     return $this->execute($this->getRoute($default));
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
                 throw $e;
             }
@@ -157,7 +157,7 @@ 
             $corsEnabled = Config::getInstance()->get('cors.enabled');
             $request = Request::getInstance();
             if (NULL !== $corsEnabled && null !== $request->getServer('HTTP_REFERER')) {
-                if($corsEnabled == '*' || preg_match($corsEnabled, $request->getServer('HTTP_REFERER'))) {
+                if ($corsEnabled == '*' || preg_match($corsEnabled, $request->getServer('HTTP_REFERER'))) {
                     if (!$this->headersSent) {
                         header("Access-Control-Allow-Credentials: true");
                         header("Access-Control-Allow-Origin: *");
@@ -165,8 +165,8 @@ 
                         header("Access-Control-Allow-Headers: Access-Control-Allow-Methods, Access-Control-Allow-Headers, Access-Control-Allow-Origin, Origin, X-Requested-With, Content-Type, Accept, Authorization");
                         $this->headersSent = true;
                     }
-                    if(Request::getInstance()->getMethod() == 'OPTIONS') {
-                        header( "HTTP/1.1 200 OK" );
+                    if (Request::getInstance()->getMethod() == 'OPTIONS') {
+                        header("HTTP/1.1 200 OK");
                         exit();
                     }
                 }
@@ -195,7 +195,7 @@ 
                     $class = $this->getClassToCall($action);
                     try {
                         return $this->executeCachedRoute($route, $action, $class, $get);
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::getInstance()->debugLog($e->getMessage(), array($e->getFile(), $e->getLine()));
                         throw new RouterException($e->getMessage(), 404, $e);
                     }
@@ -283,13 +283,13 @@ 
             if (file_exists($modules)) {
                 $this->routing = $this->inspectDir($modules, "", $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);
             $home = Config::getInstance()->get('home_action');
             if (NULL !== $home || $home !== '') {
                 $home_params = NULL;
                 foreach ($this->routing as $pattern => $params) {
                     list($method, $route) = $this->extractHttpRoute($pattern);
-                    if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
+                    if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
                         $home_params = $params;
                     }
                 }
@@ -314,7 +314,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();
 
@@ -355,7 +355,7 @@ 
                                 $httpMethod = $this->extractReflectionHttpMethod($docComments);
                                 $visible = $this->extractReflectionVisibility($docComments);
                                 $expiration = $this->extractReflectionCacheability($docComments);
-                                $routing[$httpMethod . "#|#" . $regex] = array(
+                                $routing[$httpMethod."#|#".$regex] = array(
                                     "class"   => $namespace,
                                     "method"  => $method->getName(),
                                     "params"  => $params,
@@ -385,9 +385,9 @@ 
         {
             //Calculamos los dominios para las plantillas
             if ($class->hasConstant("DOMAIN")) {
-                $domain = "@" . $class->getConstant("DOMAIN") . "/";
-                $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-                $path = realpath($path) . DIRECTORY_SEPARATOR;
+                $domain = "@".$class->getConstant("DOMAIN")."/";
+                $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+                $path = realpath($path).DIRECTORY_SEPARATOR;
                 $tpl_path = "templates";
                 $public_path = "public";
                 $model_path = "models";
@@ -397,12 +397,12 @@ 
                     $model_path = ucfirst($model_path);
                 }
                 if ($class->hasConstant("TPL")) {
-                    $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+                    $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
                 }
                 $this->domains[$domain] = array(
-                    "template" => $path . $tpl_path,
-                    "model"    => $path . $model_path,
-                    "public"   => $path . $public_path,
+                    "template" => $path.$tpl_path,
+                    "model"    => $path.$model_path,
+                    "public"   => $path.$public_path,
                 );
             }
 
@@ -415,11 +415,11 @@ 
          */
         private 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;
         }
@@ -470,16 +470,16 @@ 
         public function getRoute($slug = '', $absolute = FALSE, $params = NULL)
         {
             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);
@@ -497,12 +497,12 @@ 
                 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)) {
                         $_profile = ($params["visible"]) ? $profile : 'adminhidden';
-                        if(!array_key_exists($_profile, $routes)) {
+                        if (!array_key_exists($_profile, $routes)) {
                             $routes[$_profile] = array();
                         }
                         $routes[$_profile][] = $params["slug"];
@@ -571,7 +571,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;
         }
@@ -609,9 +609,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);
         }
@@ -668,16 +668,16 @@ 
          */
         protected function executeCachedRoute($route, $action, $class, $params = NULL)
         {
-            Logger::getInstance()->debugLog(_('Ruta resuelta para ') . $route);
+            Logger::getInstance()->debugLog(_('Ruta resuelta para ').$route);
             $this->session->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 () {
+                    $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers", $cache, function() {
                     }, Cache::JSON);
                     Template::getInstance()->renderCache($cachedData, $headers);
                     $execute = FALSE;
@@ -726,7 +726,7 @@ 
             $translations = array();
             if (file_exists($absoluteTranslationFileName)) {
                 include($absoluteTranslationFileName);
-            } else {
+            }else {
                 Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
             }