psfs / core

src/base/Security.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace PSFS\base;
 
 use PSFS\base\types\SingletonTrait;
-use PSFS\controller\UserController;
 
 
 /**

Spacing +18 added lines, -18 removed lines

@@ -62,7 +62,7 @@ 
         }
         $this->user = (array_key_exists(self::USER_ID_TOKEN, $this->session)) ? unserialize($this->session[self::USER_ID_TOKEN]) : NULL;
         $this->admin = (array_key_exists(self::ADMIN_ID_TOKEN, $this->session)) ? unserialize($this->session[self::ADMIN_ID_TOKEN]) : NULL;
-        if(null === $this->admin) {
+        if (null === $this->admin) {
             $this->checkAdmin();
         }
     }
@@ -121,13 +121,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)));
     }
 
     /**
@@ -161,8 +161,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;
@@ -181,7 +181,7 @@ 
     {
         Logger::log('Checking admin session');
         if (!$this->authorized && !$this->checked) {
-            if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+            if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
                 $request = Request::getInstance();
                 $admins = $this->getAdmins();
                 //Sacamos las credenciales de la petición
@@ -192,8 +192,8 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth == sha1($user . $pass));
-                    if($this->authorized) {
+                    $this->authorized = ($auth == sha1($user.$pass));
+                    if ($this->authorized) {
                         $this->admin = array(
                             'alias' => $user,
                             'profile' => $admins[$user]['profile'],
@@ -416,12 +416,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;
         }
 
@@ -461,7 +461,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);
         }
@@ -478,16 +478,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/base/config/Config.php

Spacing +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
      */
     protected function init()
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json")) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json")) {
             $this->loadConfigData();
         }
         return $this;
@@ -117,7 +117,7 @@ 
      */
     public function getTemplatePath()
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -136,7 +136,7 @@ 
                     break;
                 }
             }
-            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();
             }
@@ -168,10 +168,10 @@ 
         $final_data = self::saveExtraParams($data);
         $saved = false;
         try {
-            Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json", $final_data, Cache::JSON, true);
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", $final_data, Cache::JSON, true);
             Config::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -203,7 +203,7 @@ 
      */
     public function getPropelParams()
     {
-        return Cache::getInstance()->getDataFromFile(__DIR__ . DIRECTORY_SEPARATOR . 'properties.json', Cache::JSON, true);
+        return Cache::getInstance()->getDataFromFile(__DIR__.DIRECTORY_SEPARATOR.'properties.json', Cache::JSON, true);
     }
 
     /**
@@ -215,12 +215,12 @@ 
     {
         try {
             if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                throw new \Exception(_('Can\'t create directory ') . $dir);
+                throw new \Exception(_('Can\'t create directory ').$dir);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             if (!file_exists(dirname($dir))) {
-                throw new ConfigException($e->getMessage() . $dir);
+                throw new ConfigException($e->getMessage().$dir);
             }
         }
     }
@@ -232,10 +232,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    @shell_exec("rm -rf " . WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (\Exception $e) {
+                    @shell_exec("rm -rf ".WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage());
                 }
             }
@@ -247,7 +247,7 @@ 
      */
     public function loadConfigData()
     {
-        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json",
+        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json",
             Cache::JSON,
             TRUE) ?: [];
         $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE;