psfs / core

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;
                     }
                 }

src/base/types/SingletonTrait.php

Spacing +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
          */
         private static function __init($instance) {
             $loaded = false;
-            if(method_exists($instance, 'isLoaded')) {
+            if (method_exists($instance, 'isLoaded')) {
                 $loaded = $instance->isLoaded();
             }
-            if(false === $loaded && method_exists($instance, "init")) {
+            if (false === $loaded && method_exists($instance, "init")) {
                 $instance->init();
             }
         }

src/base/types/helpers/InjectorHelper.php

Spacing +3 added lines, -3 removed lines

@@ -54,13 +54,13 @@ 
      */
     public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace);
+        Logger::log('Create inyectable instance for '.$classNameSpace);
         $reflector = new \ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, "getInstance")) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;
@@ -74,7 +74,7 @@ 
     public static function getClassProperties($class)
     {
         $properties = [];
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new \ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = self::getClassProperties($selfReflector->getParentClass()->getName());

src/base/types/helpers/SecurityHelper.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || NULL !== Config::getInstance()->get('restricted'))
         ) {
 
-            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 UserController::getInstance()->adminers();
             }