injitools / cms-Inji

system/modules/StaticLoader/StaticLoader.php

Spacing +20 added lines, -20 removed lines

@@ -26,16 +26,16 @@ 
         }
         $app = substr($path, 0, strpos($path, '/'));
        
-        if ($app && file_exists(INJI_SYSTEM_DIR . '/program/' . $app)) {
+        if ($app && file_exists(INJI_SYSTEM_DIR.'/program/'.$app)) {
             $path = substr($path, strpos($path, '/') + 1);
             if (\App::$cur->name != $app) {
                 $scriptApp = new App();
                 $scriptApp->name = $app;
                 $scriptApp->system = true;
-                $scriptApp->staticPath = "/" . $scriptApp->name . "/static";
-                $scriptApp->templatesPath = "/" . $scriptApp->name . "/static/templates";
-                $scriptApp->path = INJI_SYSTEM_DIR . '/program/' . $scriptApp->name;
-                $scriptApp->type = 'app' . ucfirst(strtolower($scriptApp->name));
+                $scriptApp->staticPath = "/".$scriptApp->name."/static";
+                $scriptApp->templatesPath = "/".$scriptApp->name."/static/templates";
+                $scriptApp->path = INJI_SYSTEM_DIR.'/program/'.$scriptApp->name;
+                $scriptApp->type = 'app'.ucfirst(strtolower($scriptApp->name));
                 $scriptApp->installed = true;
                 $scriptApp->params = [];
                 $scriptApp->config = Config::app($scriptApp);
@@ -53,13 +53,13 @@ 
         $type = substr($path, 0, strpos($path, '/'));
         switch ($type) {
             case 'libs':
-                return App::$cur->Libs->getPath(array_slice(explode('/', $path),2));
+                return App::$cur->Libs->getPath(array_slice(explode('/', $path), 2));
             case 'templates':
                 $path = substr($path, strpos($path, '/') + 1);
-                return $scriptApp->view->templatesPath . '/' . $path;
+                return $scriptApp->view->templatesPath.'/'.$path;
             case 'system':
                 $path = substr($path, strpos($path, '/') + 1);
-                return INJI_SYSTEM_DIR . '/static/' . $path;
+                return INJI_SYSTEM_DIR.'/static/'.$path;
             case 'moduleAsset':
                 $path = substr($path, strpos($path, '/') + 1);
                 if (!strpos($path, '/')) {
@@ -72,11 +72,11 @@ 
                 }
                 $path = substr($path, strpos($path, '/') + 1);
                 if (is_callable([$module, 'staticCalled'])) {
-                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path . '/static/');
+                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path.'/static/');
                 }
-                return $scriptApp->$module->path . '/static/' . $path;
+                return $scriptApp->$module->path.'/static/'.$path;
             default:
-                return $scriptApp->path . '/static/' . $path;
+                return $scriptApp->path.'/static/'.$path;
         }
     }
 
@@ -139,9 +139,9 @@ 
                         $pos = $_GET['resize_pos'];
                     }
                     $dirnoslash = str_replace('/', '', substr($fileinfo['dirname'], strpos($fileinfo['dirname'], '/static')));
-                    $path = $dir . '/static/cache/' . $dirnoslash . $fileinfo['filename'] . '.' . $sizes[0] . 'x' . $sizes[1] . $crop . $pos . '.' . $fileinfo['extension'];
+                    $path = $dir.'/static/cache/'.$dirnoslash.$fileinfo['filename'].'.'.$sizes[0].'x'.$sizes[1].$crop.$pos.'.'.$fileinfo['extension'];
                     if (!file_exists($path)) {
-                        Tools::createDir($dir . '/static/cache/');
+                        Tools::createDir($dir.'/static/cache/');
                         copy($file, $path);
                         Tools::resizeImage($path, $sizes[0], $sizes[1], $crop, $pos);
                     }
@@ -166,9 +166,9 @@ 
         header("Cache-control: public");
         header("Accept-Ranges: bytes");
         header("Pragma: public");
-        header("Content-Length: " . filesize($file));
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($file)) . ' GMT');
-        header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256) . ' GMT');
+        header("Content-Length: ".filesize($file));
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($file)).' GMT');
+        header('Expires: '.gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256).' GMT');
         if (filemtime($file) <= $modifiedSince && (!isset($_SERVER['HTTP_CACHE_CONTROL']) || $_SERVER['HTTP_CACHE_CONTROL'] != 'no-cache')) {
             // Разгружаем канал передачи данных!
             header('HTTP/1.1 304 Not Modified');
@@ -179,19 +179,19 @@ 
         header('Content-Description: File Transfer');
         //}
         if (isset($this->mimes[strtolower($fileinfo['extension'])])) {
-            header("Content-Type: " . $this->mimes[strtolower($fileinfo['extension'])]);
+            header("Content-Type: ".$this->mimes[strtolower($fileinfo['extension'])]);
         }
 
         if (isset($_GET['frustrate_dl']) || in_array($fileinfo['extension'], array('doc', 'docx', 'xls', 'xlsx'))) {
 
-            $fileName = $fileinfo['filename'] . '.' . $fileinfo['extension'];
+            $fileName = $fileinfo['filename'].'.'.$fileinfo['extension'];
             if (App::$cur->db->connect) {
-                $fileObj = Files\File::get([ 'path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
+                $fileObj = Files\File::get(['path', '%/'.$fileinfo['filename'].'.'.$fileinfo['extension'], 'LIKE']);
                 if ($fileObj) {
                     $fileName = $fileObj->original_name;
                 }
             }
-            header('Content-Disposition: attachment; filename="' . $fileName . '"');
+            header('Content-Disposition: attachment; filename="'.$fileName.'"');
         }
 
         header('Content-Transfer-Encoding: binary');