psfs / core

src/base/extension/AssetsParser.php

Spacing +58 added lines, -58 removed lines

@@ -35,7 +35,7 @@ 
     public function __construct($type = 'js')
     {
         $this->type = $type;
-        $this->path = WEB_DIR . DIRECTORY_SEPARATOR;
+        $this->path = WEB_DIR.DIRECTORY_SEPARATOR;
         $this->domains = Template::getDomains(true);
         $this->debug = Config::getParam('debug', true);
         $this->cdnPath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl());
@@ -58,7 +58,7 @@ 
             $sourceFile = explode("?", $sourceFile);
             $sourceFile = $sourceFile[0];
         }
-        $orig = realpath(dirname($filenamePath) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($filenamePath).DIRECTORY_SEPARATOR.$sourceFile);
         return $orig;
     }
 
@@ -71,12 +71,12 @@ 
      */
     public function addFile($filename)
     {
-        if (file_exists($this->path . $filename) && preg_match('/\.' . $this->type . '$/i', $filename)) {
+        if (file_exists($this->path.$filename) && preg_match('/\.'.$this->type.'$/i', $filename)) {
             $this->files[] = $filename;
         } elseif (!empty($this->domains)) {
             foreach ($this->domains as $domain => $paths) {
                 $domainFilename = str_replace($domain, $paths["public"], $filename);
-                if (file_exists($domainFilename) && preg_match('/\.' . $this->type . '$/i', $domainFilename)) {
+                if (file_exists($domainFilename) && preg_match('/\.'.$this->type.'$/i', $domainFilename)) {
                     $this->files[] = $domainFilename;
                 }
             }
@@ -93,7 +93,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getParam('cache.var', '');
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -127,8 +127,8 @@ 
      */
     protected function compileCss()
     {
-        $base = $this->path . "css" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".css")) {
+        $base = $this->path."css".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".css")) {
             $data = '';
             if (0 < count($this->files)) {
                 $minifier = new CSS();
@@ -136,15 +136,15 @@ 
                     $data = $this->processCssLine($file, $base, $data);
                 }
             }
-            if($this->debug) {
-                $this->storeContents($base . $this->hash . ".css", $data);
-            } else {
+            if ($this->debug) {
+                $this->storeContents($base.$this->hash.".css", $data);
+            }else {
                 $minifier = new CSS();
                 $minifier->add($data);
                 ini_set('max_execution_time', -1);
                 ini_set('memory_limit', -1);
                 GeneratorHelper::createDir($base);
-                $minifier->minify($base . $this->hash . ".css");
+                $minifier->minify($base.$this->hash.".css");
                 ini_restore('memory_limit');
                 ini_restore('max_execution_time');
             }
@@ -160,8 +160,8 @@ 
      */
     protected function compileJs()
     {
-        $base = $this->path . "js" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".js")) {
+        $base = $this->path."js".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".js")) {
             $data = '';
             if (0 < count($this->files)) {
                 $minifier = new JS();
@@ -170,19 +170,19 @@ 
                     if (file_exists($file)) {
                         if ($this->debug) {
                             $data = $this->putDebugJs($pathParts, $base, $file);
-                        } elseif (!file_exists($base . $this->hash . ".js")) {
+                        } elseif (!file_exists($base.$this->hash.".js")) {
                             $minifier->add($file);
                             //$data = $this->putProductionJs($base, $file, $data);
                         }
                     }
                 }
-                if($this->debug) {
-                    $this->storeContents($base . $this->hash . ".js", $data);
-                } else {
+                if ($this->debug) {
+                    $this->storeContents($base.$this->hash.".js", $data);
+                }else {
                     ini_set('max_execution_time', -1);
                     ini_set('memory_limit', -1);
                     GeneratorHelper::createDir($base);
-                    $minifier->minify($base . $this->hash . ".js");
+                    $minifier->minify($base.$this->hash.".js");
                     ini_restore('memory_limit');
                     ini_restore('max_execution_time');
                 }
@@ -202,7 +202,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if ("" !== $content && false === file_put_contents($path, $content)) {
-            throw new ConfigException(t('No se tienen permisos para escribir en ' . $path));
+            throw new ConfigException(t('No se tienen permisos para escribir en '.$path));
         }
     }
 
@@ -231,9 +231,9 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
+        }else {
             $basePath = $this->cdnPath ?: '';
-            echo "\t\t<script type='text/javascript' src='" . $basePath . "/js/" . $this->hash . ".js'></script>\n";
+            echo "\t\t<script type='text/javascript' src='".$basePath."/js/".$this->hash.".js'></script>\n";
         }
     }
 
@@ -246,9 +246,9 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
+        }else {
             $basePath = $this->cdnPath ?: '';
-            echo "\t\t<link href='" . $basePath . "/css/" . $this->hash . ".css' rel='stylesheet'>";
+            echo "\t\t<link href='".$basePath."/css/".$this->hash.".css' rel='stylesheet'>";
         }
     }
 
@@ -259,20 +259,20 @@ 
     protected function extractCssResources($source, $file)
     {
         $sourceFile = $this->extractSourceFilename($source);
-        $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$sourceFile);
         $origPart = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig);
         try {
             if (count($source) > 1 && array_key_exists(1, $origPart)) {
-                $dest = $this->path . $origPart[1];
+                $dest = $this->path.$origPart[1];
                 GeneratorHelper::createDir(dirname($dest));
                 if (!file_exists($dest) || filemtime($orig) > filemtime($dest)) {
                     if (@copy($orig, $dest) === FALSE) {
-                        throw new \RuntimeException('Can\' copy ' . $dest . '');
+                        throw new \RuntimeException('Can\' copy '.$dest.'');
                     }
                     Logger::log("$orig copiado a $dest", LOG_INFO);
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -289,21 +289,21 @@ 
     {
         if (file_exists($file)) {
             $pathParts = explode("/", $file);
-            $filePath = $this->hash . "_" . $pathParts[count($pathParts) - 1];
-            if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file) || $this->debug) {
+            $filePath = $this->hash."_".$pathParts[count($pathParts) - 1];
+            if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file) || $this->debug) {
                 //Si tenemos modificaciones tenemos que compilar de nuevo todos los ficheros modificados
-                if (file_exists($base . $this->hash . ".css") && @unlink($base . $this->hash . ".css") === false) {
-                    throw new ConfigException("Can't unlink file " . $base . $this->hash . ".css");
+                if (file_exists($base.$this->hash.".css") && @unlink($base.$this->hash.".css") === false) {
+                    throw new ConfigException("Can't unlink file ".$base.$this->hash.".css");
                 }
                 $this->loopCssLines($file);
             }
             if ($this->debug) {
                 $data = file_get_contents($file);
-                $this->storeContents($base . $filePath, $data);
-            } else {
+                $this->storeContents($base.$filePath, $data);
+            }else {
                 $data .= file_get_contents($file);
             }
-            $this->compiled_files[] = "/css/" . $filePath;
+            $this->compiled_files[] = "/css/".$filePath;
         }
 
         return $data;
@@ -318,12 +318,12 @@ 
      */
     protected function putDebugJs($pathParts, $base, $file)
     {
-        $filePath = $this->hash . "_" . $pathParts[count($pathParts) - 1];
-        $this->compiled_files[] = "/js/" . $filePath;
+        $filePath = $this->hash."_".$pathParts[count($pathParts) - 1];
+        $this->compiled_files[] = "/js/".$filePath;
         $data = "";
-        if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file)) {
+        if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file)) {
             $data = file_get_contents($file);
-            $this->storeContents($base . $filePath, $data);
+            $this->storeContents($base.$filePath, $data);
         }
         return $data;
     }
@@ -365,60 +365,60 @@ 
     {
         $ppath = explode("/", $string);
         $originalFilename = $ppath[count($ppath) - 1];
-        $base = WEB_DIR . DIRECTORY_SEPARATOR;
+        $base = WEB_DIR.DIRECTORY_SEPARATOR;
         $file = "";
         $htmlBase = "";
         $debug = Config::getInstance()->getDebugMode();
         $cache = Config::getInstance()->get('cache.var');
-        $cache = $cache ? '.' . $cache : '';
+        $cache = $cache ? '.'.$cache : '';
         $finfo = finfo_open(FILEINFO_MIME_TYPE); // devuelve el tipo mime de su extensión
         $mime = finfo_file($finfo, $filenamePath);
         finfo_close($finfo);
         if (preg_match('/\.css$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.css";
+            $file = "/".substr(md5($string), 0, 8)."$cache.css";
             $htmlBase = "css";
             if ($debug) {
-                $file = str_replace(".css", "_" . $originalFilename, $file);
+                $file = str_replace(".css", "_".$originalFilename, $file);
             }
         } elseif (preg_match('/\.js$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.js";
+            $file = "/".substr(md5($string), 0, 8)."$cache.js";
             $htmlBase = "js";
             if ($debug) {
-                $file = str_replace(".js", "_" . $originalFilename, $file);
+                $file = str_replace(".js", "_".$originalFilename, $file);
             }
         } elseif (preg_match("/image/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $htmlBase = "img";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file);
             }
         } elseif (preg_match("/(doc|pdf)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $htmlBase = "docs";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file);
             }
         } elseif (preg_match("/(video|audio|ogg)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $htmlBase = "media";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file);
             }
         } elseif (preg_match("/(text|html)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $htmlBase = "templates";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file);
             }
         } elseif (!$return && !is_null($name)) {
             $htmlBase = '';
             $file = $name;
         }
-        $filePath = $htmlBase . $file;
+        $filePath = $htmlBase.$file;
 
         return array($base, $htmlBase, $filePath);
     }
@@ -436,15 +436,15 @@ 
         if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) {
             foreach ($urls as $source) {
                 $orig = self::calculateResourcePathname($filenamePath, $source);
-                if(!empty($orig)) {
+                if (!empty($orig)) {
                     $origPart = preg_split("/Public/i", $orig);
-                    $dest = WEB_DIR . $origPart[1];
+                    $dest = WEB_DIR.$origPart[1];
                     GeneratorHelper::createDir(dirname($dest));
                     if (@copy($orig, $dest) === false) {
-                        throw new ConfigException("Can't copy " . $orig . " to " . $dest);
+                        throw new ConfigException("Can't copy ".$orig." to ".$dest);
                     }
-                } else {
-                    Logger::log($filenamePath . ' has an empty origin with the url ' . $source, LOG_WARNING);
+                }else {
+                    Logger::log($filenamePath.' has an empty origin with the url '.$source, LOG_WARNING);
                 }
             }
         }

src/base/extension/CustomTranslateExtension.php

Spacing +15 added lines, -15 removed lines

@@ -29,24 +29,24 @@ 
      * @param bool $useBase
      */
     protected static function checkLoad($customKey = null, $forceReload = false, $useBase = false) {
-        if($forceReload) {
+        if ($forceReload) {
             self::dropInstance();
         }
         self::$locale = I18nHelper::extractLocale(Security::getInstance()->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY));
         self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-        if(!$useBase) {
+        if (!$useBase) {
             $customKey = $customKey ?: Security::getInstance()->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
         }
-        if(null !== $customKey) {
-            Logger::log('[' . self::class . '] Custom key detected: ' . $customKey, LOG_INFO);
-            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale . '.json']);
-        } else {
-            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
+        if (null !== $customKey) {
+            Logger::log('['.self::class.'] Custom key detected: '.$customKey, LOG_INFO);
+            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale.'.json']);
+        }else {
+            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
         }
-        if(file_exists(self::$filename)) {
-            Logger::log('[' . self::class . '] Custom locale detected: ' . $customKey . ' [' . self::$locale . ']', LOG_INFO);
+        if (file_exists(self::$filename)) {
+            Logger::log('['.self::class.'] Custom locale detected: '.$customKey.' ['.self::$locale.']', LOG_INFO);
             self::$translations = json_decode(file_get_contents(self::$filename), true);
-        } elseif(null !== $customKey) {
+        } elseif (null !== $customKey) {
             self::checkLoad(null, $forceReload, true);
         }
     }
@@ -87,12 +87,12 @@ 
      */
     public static function _($message, $customKey = null, $forceReload = false) {
         self::checkLoad($customKey, $forceReload);
-        if(array_key_exists($message, self::$translations)) {
-            $translation =  self::$translations[$message];
-        } else {
+        if (array_key_exists($message, self::$translations)) {
+            $translation = self::$translations[$message];
+        }else {
             $translation = gettext($message);
         }
-        if(self::$generate) {
+        if (self::$generate) {
             self::generate($message, $translation);
         }
         return $translation;
@@ -103,7 +103,7 @@ 
      * @param string $translation
      */
     protected static function generate($message, $translation) {
-        if(!array_key_exists($message, self::$translations)) {
+        if (!array_key_exists($message, self::$translations)) {
             self::$translations[$message] = $translation;
         }
         file_put_contents(self::$filename, json_encode(array_unique(self::$translations), JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));