psfs / core

src/base/Security.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,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);
     }
 
     /**
@@ -109,7 +109,7 @@ 
                         ]);
                         $this->setSessionKey(AuthHelper::ADMIN_ID_TOKEN, $encrypted);
                     }
-                } else {
+                }else {
                     $this->admin = null;
                     $this->setSessionKey(AuthHelper::ADMIN_ID_TOKEN, null);
                 }

src/base/types/helpers/AuthHelper.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,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)
@@ -92,7 +92,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 = '';
@@ -113,8 +113,8 @@ 
         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
@@ -146,7 +146,7 @@ 
                                     $user = $admin;
                                     $hash = $profile['hash'];
                                 }
-                            } catch (\Exception $exception) {
+                            }catch (\Exception $exception) {
                                 Logger::log($exception->getMessage(), LOG_ERR);
                             }
                             break;

src/base/extension/CustomTranslateExtension.php

Spacing +17 added lines, -17 removed lines

@@ -54,7 +54,7 @@ 
         $locale = $locale ?? self::$locale;
         // Gather always the base translations
         $standardTranslations = [];
-        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $locale . '.json']);
+        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $locale.'.json']);
         if (file_exists(self::$filename)) {
             $standardTranslations = json_decode(file_get_contents(self::$filename), true);
         }
@@ -67,7 +67,7 @@ 
      */
     protected static function generateTranslationsKeys($locale) {
         self::$translationsKeys[$locale] = [];
-        foreach(self::$translations[$locale] as $key => $value) {
+        foreach (self::$translations[$locale] as $key => $value) {
             $tKey = mb_convert_case($key, MB_CASE_LOWER, "UTF-8");
             self::$translationsKeys[$locale][$tKey] = $key;
         }
@@ -86,42 +86,42 @@ 
         self::$locale = $forceReload ? $session_locale : I18nHelper::extractLocale($session_locale);
         $locale = self::$locale;
         $version = $session->getSessionKey(self::LOCALE_CACHED_VERSION);
-        $configVersion = self::$locale . '_' . Config::getParam('cache.var', 'v1');
+        $configVersion = self::$locale.'_'.Config::getParam('cache.var', 'v1');
         if ($forceReload) {
             Inspector::stats('[translationsCheckLoad] Force translations reload', Inspector::SCOPE_DEBUG);
             self::dropInstance();
             $version = null;
             self::$translations[self::$locale] = [];
         }
-        if((!array_key_exists($locale, self::$translations) || count(self::$translations[$locale]) === 0) && strlen($locale) === 2) {
-            $locale = $locale . '_' . strtoupper($locale);
-            if(array_key_exists($locale, self::$translations)) {
+        if ((!array_key_exists($locale, self::$translations) || count(self::$translations[$locale]) === 0) && strlen($locale) === 2) {
+            $locale = $locale.'_'.strtoupper($locale);
+            if (array_key_exists($locale, self::$translations)) {
                 self::$translations[self::$locale] = self::$translations[$locale];
                 self::generateTranslationsKeys(self::$locale);
             }
         }
-        if(!array_key_exists($locale, self::$translations) || count(self::$translations[$locale]) === 0) {
+        if (!array_key_exists($locale, self::$translations) || count(self::$translations[$locale]) === 0) {
             Inspector::stats('[translationsCheckLoad] Extracting translations', Inspector::SCOPE_DEBUG);
             self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-            if(null !== $version && $version === $configVersion) {
+            if (null !== $version && $version === $configVersion) {
                 Inspector::stats('[translationsCheckLoad] Translations loaded from session', Inspector::SCOPE_DEBUG);
                 self::$translations = $session->getSessionKey(self::LOCALE_CACHED_TAG);
-            } else {
+            }else {
                 if (!$useBase) {
                     $customKey = $customKey ?: $session->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
                 }
                 $standardTranslations = self::extractBaseTranslations();
                 // If the project has custom translations, gather them
                 if (null !== $customKey) {
-                    Logger::log('[' . self::class . '] Custom key detected: ' . $customKey, LOG_INFO);
-                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, $locale . '.json']);
+                    Logger::log('['.self::class.'] Custom key detected: '.$customKey, LOG_INFO);
+                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, $locale.'.json']);
                 } elseif (!empty($standardTranslations)) {
                     self::$translations[$locale] = $standardTranslations;
                     self::generateTranslationsKeys($locale);
                 }
                 // Finally we merge base and custom translations to complete all the i18n set
                 if (file_exists(self::$filename)) {
-                    Logger::log('[' . self::class . '] Custom locale detected: ' . $customKey . ' [' . $locale . ']', LOG_INFO);
+                    Logger::log('['.self::class.'] Custom locale detected: '.$customKey.' ['.$locale.']', LOG_INFO);
                     self::$translations[$locale] = array_merge($standardTranslations, json_decode(file_get_contents(self::$filename), true));
                     self::generateTranslationsKeys($locale);
                     $session->setSessionKey(self::LOCALE_CACHED_TAG, self::$translations);
@@ -148,7 +148,7 @@ 
     public function getFilters()
     {
         return array(
-            new TwigFilter('trans', function ($message) {
+            new TwigFilter('trans', function($message) {
                 return self::_($message);
             }),
         );
@@ -170,7 +170,7 @@ 
      */
     public static function _($message, $customKey = null, $forceReload = false)
     {
-        if(0 === count(self::$translations) || $forceReload) {
+        if (0 === count(self::$translations) || $forceReload) {
             self::translationsCheckLoad($customKey, $forceReload);
         }
         // Set default translation to catch missing strings
@@ -178,13 +178,13 @@ 
         $translation = $message;
         // Check if the message is already translated ignoring the string case
         $key = mb_convert_case($message, MB_CASE_LOWER, "UTF-8");
-        if(array_key_exists(self::$locale, self::$translationsKeys) && array_key_exists($key, self::$translationsKeys[self::$locale])) {
+        if (array_key_exists(self::$locale, self::$translationsKeys) && array_key_exists($key, self::$translationsKeys[self::$locale])) {
             $message = self::$translationsKeys[self::$locale][$key];
         }
         // Check if exists
         if (array_key_exists(self::$locale, self::$translations) && array_key_exists($message, self::$translations[self::$locale])) {
             $translation = self::$translations[self::$locale][$message];
-        } else if(!$forceReload && !$isDebugMode) {
+        }else if (!$forceReload && !$isDebugMode) {
             $translation = gettext($message);
         }
         if (self::$generate) {
@@ -199,7 +199,7 @@ 
      */
     protected static function generate($message, $translation)
     {
-        if(!array_key_exists(self::$locale, self::$translations)) {
+        if (!array_key_exists(self::$locale, self::$translations)) {
             self::$translations[self::$locale] = [];
             self::$translationsKeys[self::$locale] = [];
         }