psfs / core

src/base/types/helpers/GeneratorHelper.php

Spacing +33 added lines, -33 removed lines

@@ -26,10 +26,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -44,10 +44,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 {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (Exception $e) {
                     syslog(LOG_INFO, $e->getMessage());
                 }
             }
@@ -64,12 +64,12 @@ 
         if (!empty($dir)) {
             try {
                 if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                    throw new Exception(t('Can\'t create directory ') . $dir);
+                    throw new Exception(t('Can\'t create directory ').$dir);
                 }
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 syslog(LOG_WARNING, $e->getMessage());
                 if (!file_exists(dirname($dir))) {
-                    throw new GeneratorException($e->getMessage() . $dir);
+                    throw new GeneratorException($e->getMessage().$dir);
                 }
             }
         }
@@ -81,7 +81,7 @@ 
      */
     public static function getTemplatePath(): string
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -109,7 +109,7 @@ 
                 } elseif (!$reflector->isAbstract()) {
                     throw new GeneratorException(t('La clase definida debe ser abstracta'), 501);
                 }
-            } else {
+            }else {
                 throw new GeneratorException(t('La clase definida para extender la API no existe'), 501);
             }
         }
@@ -131,7 +131,7 @@ 
         GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -141,35 +141,35 @@ 
             'crossdomain' => 'crossdomain.xml',
             'humans' => 'humans.txt',
             'robots' => 'robots.txt',
-            'docker' => '..' . DIRECTORY_SEPARATOR . 'docker-compose.yml',
+            'docker' => '..'.DIRECTORY_SEPARATOR.'docker-compose.yml',
         ];
         $verificable = ['humans', 'robots', 'docker'];
         if (!$quiet) {
             $output->writeln('Start creating html files');
         }
         foreach ($files as $template => $filename) {
-            if (in_array($template, $verificable) && file_exists($path . DIRECTORY_SEPARATOR . $filename)) {
+            if (in_array($template, $verificable) && file_exists($path.DIRECTORY_SEPARATOR.$filename)) {
                 if (!$quiet) {
-                    $output->writeln($filename . ' already exists');
+                    $output->writeln($filename.' already exists');
                 }
                 continue;
             }
-            $text = Template::getInstance()->dump("generator/html/" . $template . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
+            $text = Template::getInstance()->dump("generator/html/".$template.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
                 if (!$quiet) {
-                    $output->writeln('Can\t create the file ' . $filename);
+                    $output->writeln('Can\t create the file '.$filename);
                 }
-            } else {
+            }else {
                 if (!$quiet) {
-                    $output->writeln($filename . ' created successfully');
+                    $output->writeln($filename.' created successfully');
                 }
             }
         }
 
         //Export base locale translations
-        if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) {
-            GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            self::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            self::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
     }
 
@@ -185,12 +185,12 @@ 
     {
         if (file_exists($filenamePath)) {
             $destfolder = basename($filenamePath);
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
                 if (is_dir($filenamePath)) {
-                    self::copyr($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
-                } else {
-                    if (@copy($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
-                        throw new ConfigException("Can't copy " . $filenamePath . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
+                    self::copyr($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }else {
+                    if (@copy($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
+                        throw new ConfigException("Can't copy ".$filenamePath." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                     }
                 }
             }
@@ -209,10 +209,10 @@ 
         self::createDir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
+                if (is_dir($src.'/'.$file)) {
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
                 }
             }
         }

src/base/types/helpers/AuthHelper.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
         if (NULL === $user || (array_key_exists($user, $admins) && empty($admins[$user]))) {
             list($user, $pass) = self::getAdminFromCookie();
         }
-        return array_key_exists($user, $admins) ? [$user, sha1($user . $pass)] : [null, null];
+        return array_key_exists($user, $admins) ? [$user, sha1($user.$pass)] : [null, null];
     }
 
     public static function checkComplexAuth(array $admins)
@@ -86,7 +86,7 @@ 
         return base64_encode($encrypted_data);
     }
 
-    public static function decrypt(string $encrypted_data, string $key): false|string
+    public static function decrypt(string $encrypted_data, string $key): false | string
     {
         $encrypted_data = base64_decode($encrypted_data);
         $data = '';
@@ -104,15 +104,15 @@ 
         $tz = new \DateTimeZone('UTC');
         $timestamp = new \DateTime('now', $tz);
         $timestamp->modify(Config::getParam('auth.expiration', '+1 day'));
-        $data = $user . Security::LOGGED_USER_TOKEN . $timestamp->format(self::EXPIRATION_TIMESTAMP_FORMAT);
-        return self::encrypt($data, sha1($user . $password));
+        $data = $user.Security::LOGGED_USER_TOKEN.$timestamp->format(self::EXPIRATION_TIMESTAMP_FORMAT);
+        return self::encrypt($data, sha1($user.$password));
     }
 
     public static function decodeToken(string $token, string $password): array
     {
         $user = $timestamp = null;
         $secret = self::decrypt($token, $password);
-        if(!empty($secret) && str_contains($secret, Security::LOGGED_USER_TOKEN)) {
+        if (!empty($secret) && str_contains($secret, Security::LOGGED_USER_TOKEN)) {
             list($user, $timestamp) = explode(Security::LOGGED_USER_TOKEN, $secret);
         }
         return [$user, $timestamp];

src/base/Security.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function getAdmins()
     {
-        return Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true);
+        return Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true);
     }
 
     /**
@@ -77,12 +77,12 @@ 
             $admins = $this->getAdmins();
             $token = null;
             if (null !== $admins) {
-                if(empty($user)) {
+                if (empty($user)) {
                     // First try, traditional basic auth
                     Inspector::stats('[Auth] Checking Basic Auth');
                     list($user, $token) = AuthHelper::checkBasicAuth($user, $pass, $admins);
                 }
-                if(empty($user)) {
+                if (empty($user)) {
                     // Second try, cookie auth
                     Inspector::stats('[Auth] Checking Basic Auth PSFS');
                     list($user, $token) = AuthHelper::checkComplexAuth($admins);
@@ -103,7 +103,7 @@ 
                         ]);
                         $this->setSessionKey(AuthHelper::SESSION_TOKEN, $encrypted);
                     }
-                } else {
+                }else {
                     $this->admin = null;
                     $this->setSessionKey(AuthHelper::SESSION_TOKEN, null);
                 }