psfs / core

src/functions.php

Spacing +8 added lines, -8 removed lines

@@ -27,16 +27,16 @@
     {
         $html = '<style>*{margin: 0} body{background: rgb(36,36,36); padding: 5px;}</style>';
         $html .= '<pre style="padding: 10px; margin: 5px; display: block; background: rgb(41,41,41); color: white; border-radius: 5px;">';
-        if(is_null($var)) {
-            if($varName) $html .= $varName . ' ==> <b>NULL</b>';
-        } else {
-            $html .= print_r('(' . gettype($var) . ') ', TRUE);
-            if($varName) $html .= $varName . ' ==> ';
-            if("boolean" === gettype($var)) {
+        if (is_null($var)) {
+            if ($varName) $html .= $varName.' ==> <b>NULL</b>';
+        }else {
+            $html .= print_r('('.gettype($var).') ', TRUE);
+            if ($varName) $html .= $varName.' ==> ';
+            if ("boolean" === gettype($var)) {
                 $html .= print_r($var ? "TRUE" : "FALSE", TRUE);
-            } else if((is_array($var) && !empty($var)) || (!is_array($var)) ||  ($var === 0)) {
+            }else if ((is_array($var) && !empty($var)) || (!is_array($var)) || ($var === 0)) {
                 $html .= print_r($var, TRUE);
-            } else {
+            }else {
                 $html .= 'empty';
             }
         }

Braces +6 added lines, -2 removed lines

@@ -28,10 +28,14 @@
         $html = '<style>*{margin: 0} body{background: rgb(36,36,36); padding: 5px;}</style>';
         $html .= '<pre style="padding: 10px; margin: 5px; display: block; background: rgb(41,41,41); color: white; border-radius: 5px;">';
         if(is_null($var)) {
-            if($varName) $html .= $varName . ' ==> <b>NULL</b>';
+            if($varName) {
+                $html .= $varName . ' ==> <b>NULL</b>';
+            }
         } else {
             $html .= print_r('(' . gettype($var) . ') ', TRUE);
-            if($varName) $html .= $varName . ' ==> ';
+            if($varName) {
+                $html .= $varName . ' ==> ';
+            }
             if("boolean" === gettype($var)) {
                 $html .= print_r($var ? "TRUE" : "FALSE", TRUE);
             } else if((is_array($var) && !empty($var)) || (!is_array($var)) ||  ($var === 0)) {

src/base/types/helpers/I18nHelper.php

Spacing +19 added lines, -19 removed lines

@@ -46,8 +46,8 @@ 
         // TODO check more en locales
         if (strtolower($locale) === 'en') {
             $locale = 'en_GB';
-        } else {
-            $locale = $locale . '_' . strtoupper($locale);
+        }else {
+            $locale = $locale.'_'.strtoupper($locale);
         }
         $defaultLocales = explode(',', Config::getParam('i18n.locales', ''));
         if (!in_array($locale, array_merge($defaultLocales, self::$langs))) {
@@ -66,7 +66,7 @@ 
         $translations = array();
         if (file_exists($absoluteFileName)) {
             @include($absoluteFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 
@@ -83,13 +83,13 @@ 
     public static function setLocale(string $default = null, string $customKey = null, bool $force = false): void
     {
         $locale = $force ? $default : self::extractLocale($default);
-        Inspector::stats('[i18NHelper] Set locale to project [' . $locale . ']', Inspector::SCOPE_DEBUG);
+        Inspector::stats('[i18NHelper] Set locale to project ['.$locale.']', Inspector::SCOPE_DEBUG);
         // Load translations
-        putenv("LC_ALL=" . $locale);
+        putenv("LC_ALL=".$locale);
         setlocale(LC_ALL, $locale);
         // Load the locale path
-        $localePath = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-        Logger::log('Set locale dir ' . $localePath);
+        $localePath = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$localePath);
         GeneratorHelper::createDir($localePath);
         bindtextdomain('translations', $localePath);
         textdomain('translations');
@@ -112,7 +112,7 @@ 
             }
         } elseif (is_object($data)) {
             $properties = get_class_vars($data);
-            if(is_array($properties)) {
+            if (is_array($properties)) {
                 foreach (array_keys($properties) as $property) {
                     $data->$property = self::utf8Encode($data->$property);
                 }
@@ -159,7 +159,7 @@ 
             ['i', 'i', 'i', 'i', 'I', 'I', 'I', 'I'],
             ['o', 'o', 'o', 'o', 'O', 'O', 'O', 'O'],
             ['u', 'u', 'u', 'u', 'U', 'U', 'U', 'U'],
-            ['n', 'N', 'c', 'C',],
+            ['n', 'N', 'c', 'C', ],
         ];
 
         $text = htmlspecialchars($string);
@@ -179,24 +179,24 @@ 
      */
     public static function findTranslations(string $path, string $locale): array
     {
-        $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         $translations = array();
         if (file_exists($path)) {
             $directory = dir($path);
             while (false !== ($fileName = $directory->read())) {
                 GeneratorHelper::createDir($localePath);
-                if (!file_exists($localePath . 'translations.po')) {
-                    file_put_contents($localePath . 'translations.po', '');
+                if (!file_exists($localePath.'translations.po')) {
+                    file_put_contents($localePath.'translations.po', '');
                 }
-                $inspectPath = realpath($path . DIRECTORY_SEPARATOR . $fileName);
-                $cmdPhp = "export PATH=\$PATH:/opt/local/bin; xgettext " .
-                    $inspectPath . DIRECTORY_SEPARATOR .
+                $inspectPath = realpath($path.DIRECTORY_SEPARATOR.$fileName);
+                $cmdPhp = "export PATH=\$PATH:/opt/local/bin; xgettext ".
+                    $inspectPath.DIRECTORY_SEPARATOR.
                     "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$localePath}translations.po";
-                if (is_dir($path . DIRECTORY_SEPARATOR . $fileName) && preg_match('/^\./', $fileName) == 0) {
-                    $res = t('Revisando directorio: ') . $inspectPath;
-                    $res .= t('Comando ejecutado: ') . $cmdPhp;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$fileName) && preg_match('/^\./', $fileName) == 0) {
+                    $res = t('Revisando directorio: ').$inspectPath;
+                    $res .= t('Comando ejecutado: ').$cmdPhp;
                     $res .= shell_exec($cmdPhp);
                     usleep(10);
                     $translations[] = $res;

src/base/types/helpers/AuthHelper.php

Spacing +6 added lines, -6 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)
@@ -62,7 +62,7 @@ 
             foreach ($admins as $admin => $profile) {
                 list($decrypted_user, $timestamp, $userAgent) = self::decodeToken($token, $profile['hash']);
                 if (!empty($decrypted_user) && !empty($timestamp)) {
-                    if(!empty($userAgent) && $userAgent === $reqUserAgent) {
+                    if (!empty($userAgent) && $userAgent === $reqUserAgent) {
                         $expiration = \DateTime::createFromFormat(self::EXPIRATION_TIMESTAMP_FORMAT, $timestamp);
                         if (false !== $expiration && $decrypted_user === $admin && $expiration > $now) {
                             $user = $admin;
@@ -89,7 +89,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 = '';
@@ -110,15 +110,15 @@ 
         if (null === $userAgent && array_key_exists('HTTP_USER_AGENT', $_SERVER)) {
             $userAgent = $_SERVER['HTTP_USER_AGENT'];
         }
-        $data = $user . Security::LOGGED_USER_TOKEN . $timestamp->format(self::EXPIRATION_TIMESTAMP_FORMAT) . Security::LOGGED_USER_TOKEN . ($userAgent ?? 'psfs');
-        return self::encrypt($data, sha1($user . $password));
+        $data = $user.Security::LOGGED_USER_TOKEN.$timestamp->format(self::EXPIRATION_TIMESTAMP_FORMAT).Security::LOGGED_USER_TOKEN.($userAgent ?? 'psfs');
+        return self::encrypt($data, sha1($user.$password));
     }
 
     public static function decodeToken(string $token, string $password): array
     {
         $user = $timestamp = $userAgent = 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, $userAgent) = explode(Security::LOGGED_USER_TOKEN, $secret);
         }
         return [$user, $timestamp, $userAgent];

src/base/types/traits/OutputTrait.php

Spacing +15 added lines, -15 removed lines

@@ -127,7 +127,7 @@ 
                 $this->setStatusCode(Template::STATUS_OK);
                 break;
             default:
-                $this->setStatusCode('HTTP/1.0 ' . ($status ?: 200));
+                $this->setStatusCode('HTTP/1.0 '.($status ?: 200));
                 break;
         }
         return $this;
@@ -140,11 +140,11 @@ 
      */
     private function setResponseHeaders($contentType = 'text/html', array $cookies = array()): void
     {
-        ResponseHelper::setHeader('X-Powered-By: ' . Config::getParam('poweredBy', 'PSFS'));
+        ResponseHelper::setHeader('X-Powered-By: '.Config::getParam('poweredBy', 'PSFS'));
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        ResponseHelper::setHeader('Content-type: ' . $contentType);
+        ResponseHelper::setHeader('Content-type: '.$contentType);
 
     }
 
@@ -162,16 +162,16 @@ 
             Logger::log('Start output response');
             ob_start();
             $this->setResponseHeaders($contentType, $cookies);
-            ResponseHelper::setHeader('Content-length: ' . strlen($output));
-            ResponseHelper::setHeader('CRC: ' . crc32($output));
+            ResponseHelper::setHeader('Content-length: '.strlen($output));
+            ResponseHelper::setHeader('CRC: '.crc32($output));
 
             $needCache = Cache::needCache();
             $cache = Cache::getInstance();
             list($path, $cacheDataName) = $cache->getRequestCacheHash();
             if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) {
                 Logger::log('Saving output response into cache');
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output);
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON);
             } elseif (Request::getInstance()->getMethod() !== 'GET') {
                 $cache->flushCache();
             }
@@ -181,7 +181,7 @@ 
             ob_end_clean();
             Logger::log('End output response');
             $this->closeRender();
-        } else {
+        }else {
             return $output;
         }
     }
@@ -194,12 +194,12 @@ 
         Logger::log('Close template render');
         $uri = Request::requestUri();
         Security::getInstance()->setSessionKey('lastRequest', array(
-            'url' => Request::getInstance()->getRootUrl() . $uri,
+            'url' => Request::getInstance()->getRootUrl().$uri,
             'ts' => microtime(true),
         ));
         Security::getInstance()->updateSession();
         EventHelper::handleEvents(EventHelper::EVENT_END_REQUEST);
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -237,17 +237,17 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         ResponseHelper::setHeader('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
-        ResponseHelper::setHeader('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        ResponseHelper::setHeader('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         ResponseHelper::setHeader('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         ResponseHelper::setHeader('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         ResponseHelper::setHeader('Pragma: no-cache');
         ResponseHelper::setHeader('Expires: 0');
         ResponseHelper::setHeader('Content-Transfer-Encoding: binary');
-        ResponseHelper::setHeader('Content-type: ' . $content);
-        ResponseHelper::setHeader('Content-length: ' . strlen($data));
-        ResponseHelper::setHeader('Content-Disposition: attachment; filename="' . $filename . '"');
+        ResponseHelper::setHeader('Content-type: '.$content);
+        ResponseHelper::setHeader('Content-length: '.strlen($data));
+        ResponseHelper::setHeader('Content-Disposition: attachment; filename="'.$filename.'"');
         ResponseHelper::setHeader('Access-Control-Expose-Headers: Filename');
-        ResponseHelper::setHeader('Filename: ' . $filename);
+        ResponseHelper::setHeader('Filename: '.$filename);
         echo $data;
         ob_flush();
         ob_end_clean();

src/base/types/traits/Security/ProfileTrait.php

Spacing +5 added lines, -5 removed lines

@@ -89,11 +89,11 @@ 
     public static function save($user)
     {
         $saved = true;
-        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
-        $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
+        $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
         $admins[$user['username']]['profile'] = $user['profile'];
 
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
         return $saved;
     }
 
@@ -113,9 +113,9 @@ 
 
     public function deleteUser($user)
     {
-        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
+        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
         unset($admins[$user]);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
     }
 
     /**

src/base/types/traits/Helper/ServerTrait.php

Spacing +2 added lines, -2 removed lines

@@ -54,10 +54,10 @@
     public function getServerName()
     {
         $serverName = $this->getServer('SERVER_NAME');
-        if(empty($serverName)) {
+        if (empty($serverName)) {
             $serverName = $this->getServer('HTTP_HOST');
         }
-        if(str_contains($serverName, ':')) {
+        if (str_contains($serverName, ':')) {
             $pieces = explode(':', $serverName);
             $serverName = $pieces[0];
         }

src/base/types/traits/CurlTrait.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         $this->params = [];
         $this->headers = [];
         $this->debug = 'debug' === strtolower(Config::getParam('log.level', 'notice'));
-        Logger::log('Context service for ' . static::class . ' cleared!');
+        Logger::log('Context service for '.static::class.' cleared!');
         $this->closeConnection();
     }
 

src/base/types/traits/Api/ManagerTrait.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function admin()
     {
-        if(Security::getInstance()->isUser()) {
+        if (Security::getInstance()->isUser()) {
             throw new ApiException(t('You are not authorized to access this resource'), 403);
         }
         return AuthAdminController::getInstance()->render('api.admin.html.twig', array(
@@ -45,8 +45,8 @@ 
             "domain" => $this->getDomain(),
             "listLabel" => Api::API_LIST_NAME_FIELD,
             'modelId' => Api::API_MODEL_KEY_FIELD,
-            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-' . $this->getDomain() . '-' . $this->getApi()), TRUE)),
-            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain() . '-' . 'api-' . $this->getApi() . "-pk"), TRUE)),
+            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-'.$this->getDomain().'-'.$this->getApi()), TRUE)),
+            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain().'-'.'api-'.$this->getApi()."-pk"), TRUE)),
         ), [], '');
     }