injitools / cms-Inji

system/modules/Materials/appControllers/MaterialsController.php

Spacing +7 added lines, -7 removed lines

@@ -97,8 +97,8 @@ 
         } else {
             $this->view->setTitle($category->name);
 
-            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE']]), 'limit' => 10]);
-            $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]);
+            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE']]), 'limit' => 10]);
+            $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]);
 
             $this->view->page(['page' => $category->resolveTemplate(), 'content' => $category->resolveViewer(), 'data' => compact('materials', 'pages', 'category')]);
         }
@@ -132,17 +132,17 @@ 
             $this->view->addMetaTag(['name' => 'description', 'content' => $material->description]);
         }
         $this->view->addMetaTag(['property' => 'og:title', 'content' => $material->name]);
-        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->alias]);
+        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->alias]);
         if ($material->description) {
-            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->description]);
+            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->description]);
         }
         if ($material->image) {
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $material->image->path]);
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$material->image->path]);
         } elseif ($logo = Files\File::get('site_logo', 'code')) {
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $logo->path]);
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$logo->path]);
         }
         $this->view->setTitle($material->name);
-        $bread[] = ['text' => $material->name, 'href' => '/' . $material->alias];
+        $bread[] = ['text' => $material->name, 'href' => '/'.$material->alias];
         $this->view->page([
             'page' => $material->resolveTemplate(),
             'content' => $material->resolveViewer(),

system/modules/Materials/Materials.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;
@@ -76,7 +76,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;

system/objects/CodeGenerator/Property.php

Spacing +3 added lines, -3 removed lines

@@ -20,13 +20,13 @@
 
     public function generate()
     {
-        $code = $this->security . ' ';
+        $code = $this->security.' ';
         $code .= $this->static ? 'static ' : '';
-        $code .= '$' . $this->name . ' = ';
+        $code .= '$'.$this->name.' = ';
         if (is_array($this->value)) {
             $code .= \CodeGenerator::genArray($this->value);
         } else {
-            $code .= '"' . str_replace('"', '\"', $this->value) . '";';
+            $code .= '"'.str_replace('"', '\"', $this->value).'";';
         }
         return $code;
     }

system/objects/CodeGenerator/Method.php

Spacing +6 added lines, -6 removed lines

@@ -21,16 +21,16 @@
 
     public function generate()
     {
-        $code = $this->security . ' ';
+        $code = $this->security.' ';
         $code .= $this->static ? 'static ' : '';
-        $code .= 'function ' . $this->name . '(';
+        $code .= 'function '.$this->name.'(';
         foreach ($this->propertys as $param) {
-            $code .= '$' . $param . ',';
+            $code .= '$'.$param.',';
         }
         $code = rtrim($code, ',');
-        $code.= ") {\n";
-        $code.= '    ' . str_replace("\n", "\n    ", $this->body);
-        $code .="\n}";
+        $code .= ") {\n";
+        $code .= '    '.str_replace("\n", "\n    ", $this->body);
+        $code .= "\n}";
         return $code;
     }
 

system/objects/CodeGenerator/ClassGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -39,16 +39,16 @@
 
     public function generate()
     {
-        $code = 'class ' . $this->name . ' ';
+        $code = 'class '.$this->name.' ';
         if ($this->extends) {
-            $code .= 'extends ' . $this->extends . ' ';
+            $code .= 'extends '.$this->extends.' ';
         }
         $code .= "{\n";
         foreach ($this->propertys as $property) {
-            $code .= '    ' . str_replace("\n", "\n    ", $property->generate()) . "\n";
+            $code .= '    '.str_replace("\n", "\n    ", $property->generate())."\n";
         }
         foreach ($this->methods as $method) {
-            $code .= '    ' . str_replace("\n", "\n    ", $method->generate()) . "\n";
+            $code .= '    '.str_replace("\n", "\n    ", $method->generate())."\n";
         }
         $code .= "}\n";
         return $code;

system/objects/CodeGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -16,17 +16,17 @@
         if ($level == 0)
             $return = "[";
         foreach ($data as $key => $item) {
-            $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
+            $return .= "\n".str_repeat(' ', ($level * 4 + 4))."'{$key}' => ";
             if (!is_array($item))
                 $return .= "'{$item}',";
             else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
-                $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
+                $return .= "\n".str_repeat(' ', ($level * 4 + 4))."],";
             }
         }
         if ($level == 0)
-            $return = rtrim($return, ',') . "\n];";
+            $return = rtrim($return, ',')."\n];";
 
         return $return;
     }

system/init.php

Spacing +14 added lines, -14 removed lines

@@ -13,8 +13,8 @@ 
 define('INJI_DOMAIN_NAME', $_SERVER['SERVER_NAME']);
 
 spl_autoload_register(function($class_name) {
-    if (file_exists(INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php')) {
-        include_once INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php';
+    if (file_exists(INJI_SYSTEM_DIR.'/Inji/'.$class_name.'.php')) {
+        include_once INJI_SYSTEM_DIR.'/Inji/'.$class_name.'.php';
     }
 });
 
@@ -49,39 +49,39 @@ 
 $params = Tools::uriParse($_SERVER['REQUEST_URI']);
 
 App::$cur->type = 'app';
-App::$cur->path = INJI_PROGRAM_DIR . '/' . App::$cur->dir;
+App::$cur->path = INJI_PROGRAM_DIR.'/'.App::$cur->dir;
 App::$cur->params = $params;
 App::$cur->config = Config::app(App::$cur);
 App::$primary = App::$cur;
 
-if (!empty($params[0]) && file_exists(INJI_SYSTEM_DIR . '/program/' . $params[0] . '/')) {
+if (!empty($params[0]) && file_exists(INJI_SYSTEM_DIR.'/program/'.$params[0].'/')) {
 
     App::$primary->params = [];
 
     App::$cur = new App();
     App::$cur->name = $params[0];
     App::$cur->system = true;
-    App::$cur->staticPath = "/" . App::$cur->name . "/static";
-    App::$cur->templatesPath = "/" . App::$cur->name . "/static/templates";
-    App::$cur->path = INJI_SYSTEM_DIR . '/program/' . App::$cur->name;
-    App::$cur->type = 'app' . ucfirst(strtolower(App::$cur->name));
+    App::$cur->staticPath = "/".App::$cur->name."/static";
+    App::$cur->templatesPath = "/".App::$cur->name."/static/templates";
+    App::$cur->path = INJI_SYSTEM_DIR.'/program/'.App::$cur->name;
+    App::$cur->type = 'app'.ucfirst(strtolower(App::$cur->name));
     App::$cur->installed = true;
     App::$cur->params = array_slice($params, 1);
     App::$cur->config = Config::app(App::$cur);
 
-    Inji::$inst->listen('Config-change-app-' . App::$primary->name, 'primaryAppConfig', function($event) {
+    Inji::$inst->listen('Config-change-app-'.App::$primary->name, 'primaryAppConfig', function($event) {
         App::$primary->config = $event['eventObject'];
     });
 }
-Inji::$inst->listen('Config-change-app-' . App::$cur->name, 'curAppConfig', function($event) {
+Inji::$inst->listen('Config-change-app-'.App::$cur->name, 'curAppConfig', function($event) {
     App::$cur->config = $event['eventObject'];
 });
 $shareConfig = Config::share();
 if (empty($shareConfig['installed']) && App::$cur->name != 'setup' && (empty(App::$cur->params[0]) || App::$cur->params[0] != 'static')) {
     Tools::redirect('/setup');
 }
-putenv('COMPOSER_HOME=' . getcwd());
-putenv('COMPOSER_CACHE_DIR=' . getcwd() . DIRECTORY_SEPARATOR . 'composerCache');
+putenv('COMPOSER_HOME='.getcwd());
+putenv('COMPOSER_CACHE_DIR='.getcwd().DIRECTORY_SEPARATOR.'composerCache');
 ComposerCmd::check();
 if (!function_exists('idn_to_utf8')) {
     ComposerCmd::requirePackage("mabrahamde/idna-converter", "dev-master", './');
@@ -97,8 +97,8 @@ 
 if (file_exists('vendor/autoload.php')) {
     include_once 'vendor/autoload.php';
 }
-if (file_exists(App::$primary->path . '/vendor/autoload.php')) {
-    include_once App::$primary->path . '/vendor/autoload.php';
+if (file_exists(App::$primary->path.'/vendor/autoload.php')) {
+    include_once App::$primary->path.'/vendor/autoload.php';
 }
 Module::$cur = Module::resolveModule(App::$cur);
 

system/Inji/ComposerCmd.php

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
             ;
             self::initComposer('./');
         }
-        if (!file_exists(App::$primary->path . '/vendor/autoload.php')) {
+        if (!file_exists(App::$primary->path.'/vendor/autoload.php')) {
             self::initComposer();
         }
     }
@@ -31,7 +31,7 @@ 
             if (!file_exists('composer/composer.phar')) {
                 file_put_contents('composer/composerInstall.php', file_get_contents('https://getcomposer.org/installer'));
                 $argv = ['install', '--install-dir', 'composer/'];
-                header("Location: " . filter_input(INPUT_SERVER, 'REQUEST_URI'));
+                header("Location: ".filter_input(INPUT_SERVER, 'REQUEST_URI'));
                 include_once 'composer/composerInstall.php';
             }
             $composer = new Phar('composer/composer.phar');
@@ -42,18 +42,18 @@ 
     public static function initComposer($path = '')
     {
         if (!$path) {
-            $path = App::$primary->path . '/';
+            $path = App::$primary->path.'/';
         }
-        if (!file_exists($path . 'composer.json')) {
+        if (!file_exists($path.'composer.json')) {
             $json = [
-                "name" => get_current_user() . "/" . App::$primary->name,
+                "name" => get_current_user()."/".App::$primary->name,
                 "config" => [
                     "cache-dir" => "./composerCache/"
                 ],
                 "authors" => [
                     [
                         "name" => get_current_user(),
-                        "email" => get_current_user() . "@" . INJI_DOMAIN_NAME
+                        "email" => get_current_user()."@".INJI_DOMAIN_NAME
                     ]
                 ],
                 "require" => [
@@ -61,7 +61,7 @@ 
                 ]
             ];
             Tools::createDir($path);
-            file_put_contents($path . 'composer.json', json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+            file_put_contents($path.'composer.json', json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
         }
         self::command('install', false, $path);
     }
@@ -74,8 +74,8 @@ 
         } else {
             $output = null;
         }
-        $path = str_replace('\\', '/', $path === null ? App::$primary->path . '/' : $path);
-        $input = new Symfony\Component\Console\Input\StringInput($command . ' -d ' . $path);
+        $path = str_replace('\\', '/', $path === null ? App::$primary->path.'/' : $path);
+        $input = new Symfony\Component\Console\Input\StringInput($command.' -d '.$path);
         $app = new Composer\Console\Application();
         $app->setAutoExit(false);
         $dir = getcwd();
@@ -86,10 +86,10 @@ 
     public static function requirePackage($packageName, $version = '', $path = '')
     {
         if (!$path) {
-            $path = App::$primary->path . '/';
+            $path = App::$primary->path.'/';
         }
-        if (file_exists($path . 'composer.lock')) {
-            $lockFile = json_decode(file_get_contents($path . 'composer.lock'), true);
+        if (file_exists($path.'composer.lock')) {
+            $lockFile = json_decode(file_get_contents($path.'composer.lock'), true);
         }
         if (!empty($lockFile['packages'])) {
             foreach ($lockFile['packages'] as $package) {
@@ -99,7 +99,7 @@ 
             }
         }
 
-        ComposerCmd::command('require ' . $packageName . ($version ? ':' . $version : ''), false, $path);
+        ComposerCmd::command('require '.$packageName.($version ? ':'.$version : ''), false, $path);
         return true;
     }
 

system/Inji/Statics.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
             $options['pos'] = $resizePos;
             $path = Cache::file($absolutePath, $options);
             $path = $convet ? mb_convert_encoding($path, 'UTF-8', 'Windows-1251') : $path;
-            return '/' . $path;
+            return '/'.$path;
         }
     }