injitools / cms-Inji

system/modules/Ecommerce/snippets/payTypeHandler/onlinePay.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
                         'currency_id' => $currency_id,
                         'user_id' => \Users\User::$cur->id,
                         'sum' => $sum,
-                        'description' => 'Оплата заказа №' . $cart->id . ' в онлайн-магазине',
+                        'description' => 'Оплата заказа №'.$cart->id.' в онлайн-магазине',
                         'type' => 'pay',
                         'pay_status_id' => 1,
                         'callback_module' => 'Ecommerce',
@@ -32,7 +32,7 @@ 
                     $pay->save();
                 }
             }
-            return ['/money/merchants/pay/?data=' . $cart->id, 'Ваш заказ был создан. Вам необходимо оплатить счета, после чего с вами свяжется администратор для уточнения дополнительной информации', 'success'];
+            return ['/money/merchants/pay/?data='.$cart->id, 'Ваш заказ был создан. Вам необходимо оплатить счета, после чего с вами свяжется администратор для уточнения дополнительной информации', 'success'];
         }
     }
         ];

system/modules/Ecommerce/Ecommerce.php

Spacing +33 added lines, -33 removed lines

@@ -52,7 +52,7 @@ 
         $name = '';
         foreach ($fields as $field) {
             if ($field->save && !empty($data[$field->id])) {
-                $name .= htmlspecialchars($data[$field->id]) . ' ';
+                $name .= htmlspecialchars($data[$field->id]).' ';
             }
         }
         $name = trim($name);
@@ -109,7 +109,7 @@ 
         $name = '';
         foreach ($fields as $field) {
             if ($field->save && !empty($data[$field->id])) {
-                $name .= htmlspecialchars($data[$field->id]) . ' ';
+                $name .= htmlspecialchars($data[$field->id]).' ';
             }
         }
         $name = trim($name);
@@ -196,7 +196,7 @@ 
             foreach ($options['sort'] as $col => $direction) {
                 switch ($col) {
                     case 'price':
-                        $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
+                        $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
                         break;
                     case 'name':
                         $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
@@ -217,10 +217,10 @@ 
         if (!empty($this->config['view_filter'])) {
             if (!empty($this->config['view_filter']['options'])) {
                 foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
-                    $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                        'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                        'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-                        'inner', 'option' . $optionId];
+                    $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+                        'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+                        'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
+                        'inner', 'option'.$optionId];
                 }
             }
         }
@@ -230,18 +230,18 @@ 
                 switch ($col) {
                     case 'price':
                         if (!empty($filter['min'])) {
-                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
+                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['min'], '>='];
                         }
                         if (!empty($filter['max'])) {
-                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
+                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['max'], '<='];
                         }
                         break;
                     case 'options':
                         foreach ($filter as $optionId => $optionValue) {
-                            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-                                'inner', 'option' . $optionId];
+                            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+                                'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+                                'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
+                                'inner', 'option'.$optionId];
                         }
                         break;
                 }
@@ -256,13 +256,13 @@ 
                     continue;
                 }
                 $category = \Ecommerce\Category::get($categoryId);
-                $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
+                $where[] = ['tree_path', $category->tree_path.(int) $categoryId.'/%', 'LIKE', $first ? 'AND' : 'OR'];
                 $first = false;
             }
             $selectOptions['where'][] = $where;
         } elseif (!empty($options['parent'])) {
             $category = \Ecommerce\Category::get($options['parent']);
-            $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
+            $selectOptions['where'][] = ['tree_path', $category->tree_path.(int) $options['parent'].'/%', 'LIKE'];
         }
 
         //search
@@ -272,7 +272,7 @@ 
             foreach (explode(' ', $searchStr) as $part) {
                 $part = trim($part);
                 if ($part && strlen($part) > 2) {
-                    $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+                    $searchArr[] = ['search_index', '%'.$part.'%', 'LIKE'];
                 }
             }
             if (!empty($searchArr)) {
@@ -282,18 +282,18 @@ 
         if (empty($this->config['view_empty_warehouse'])) {
             $selectOptions['where'][] = [
                 '(
-          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
-            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
+          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix().'count`),0) 
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Item\Offer\Warehouse::table().' iciw 
+            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().'
             )
           -
-          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0)
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Warehouse\Block::table() . ' iewb
-            inner JOIN ' . \App::$cur->db->table_prefix . \Ecommerce\Cart::table() . ' icc ON icc.' . \Ecommerce\Cart::index() . ' = iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index() . ' AND (
-                (`' . \Ecommerce\Cart::colPrefix() . 'warehouse_block` = 1 and `' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(2,3,6)) ||
-                (`' . \Ecommerce\Cart::colPrefix() . \Ecommerce\Cart\Status::index() . '` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix().'count) ,0)
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Warehouse\Block::table().' iewb
+            inner JOIN ' . \App::$cur->db->table_prefix.\Ecommerce\Cart::table().' icc ON icc.'.\Ecommerce\Cart::index().' = iewb.'.\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index().' AND (
+                (`' . \Ecommerce\Cart::colPrefix().'warehouse_block` = 1 and `'.\Ecommerce\Cart::colPrefix().'cart_status_id` in(2,3,6)) ||
+                (`' . \Ecommerce\Cart::colPrefix().\Ecommerce\Cart\Status::index().'` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
-            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
+            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().')
           )',
                 0,
                 '>'
@@ -301,15 +301,15 @@ 
         }
 
 
-        $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
+        $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index().' = '.Ecommerce\Item\Offer::colPrefix().Ecommerce\Item::index(), 'inner'];
         $selectOptions['join'][] = [Ecommerce\Item\Offer\Price::table(),
-            Ecommerce\Item\Offer::index() . ' = ' . Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer::index() . ' and ' . Ecommerce\Item\Offer\Price::colPrefix() . 'price>0', 'inner'];
+            Ecommerce\Item\Offer::index().' = '.Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer::index().' and '.Ecommerce\Item\Offer\Price::colPrefix().'price>0', 'inner'];
         $selectOptions['join'][] = [
-            Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index() . ' = ' . Ecommerce\Item\Offer\Price\Type::index() .
-            ' and (' . Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles="" || ' . Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles LIKE "%|' . \Users\User::$cur->role_id . '|%")'
+            Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index().' = '.Ecommerce\Item\Offer\Price\Type::index().
+            ' and ('.Ecommerce\Item\Offer\Price\Type::colPrefix().'roles="" || '.Ecommerce\Item\Offer\Price\Type::colPrefix().'roles LIKE "%|'.\Users\User::$cur->role_id.'|%")'
         ];
         $selectOptions['where'][] = [
-            [Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index(), 0],
+            [Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index(), 0],
             [Ecommerce\Item\Offer\Price\Type::index(), 0, '>', 'OR']
         ];
 
@@ -332,7 +332,7 @@ 
         $items = Ecommerce\Item::getList($selectOptions);
         $items = Ecommerce\Item\Param::getList([
                     'where' => ['item_id', array_keys($items), 'IN'],
-                    'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index() . ' = ' . \Ecommerce\Item\Param::colPrefix() .Ecommerce\Item\Option::index(). ' and ' . \Ecommerce\Item\Option::colPrefix() . 'searchable = 1', 'inner']],
+                    'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index().' = '.\Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' and '.\Ecommerce\Item\Option::colPrefix().'searchable = 1', 'inner']],
                     'distinct' => \Ecommerce\Item\Option::index()
         ]);
         return $items;
@@ -365,7 +365,7 @@ 
         if (is_array($counts)) {
             $sum = 0;
             foreach ($counts as $count) {
-                $sum +=$count['count'];
+                $sum += $count['count'];
             }
             return $sum;
         }
@@ -401,7 +401,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/modules/Libs/Libs.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
     public function loadLib($libName, $options = [])
     {
 
-        $className = 'Libs\\' . ucfirst($libName);
+        $className = 'Libs\\'.ucfirst($libName);
         if (class_exists($className)) {
             if (!empty($className::$composerPacks)) {
                 foreach ($className::$composerPacks as $packageName => $version) {
@@ -25,12 +25,12 @@ 
                     $this->loadLib($rLib);
                 }
             }
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
                 foreach ($className::$files['css'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('css', $file, $libName);
                     } else {
-                        App::$cur->view->customAsset('css', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
+                        App::$cur->view->customAsset('css', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
                     }
                 }
             }
@@ -39,7 +39,7 @@ 
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('js', $file, $libName);
                     } else {
-                        App::$cur->view->customAsset('js', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
+                        App::$cur->view->customAsset('js', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
                     }
                 }
             }
@@ -50,30 +50,30 @@ 
     {
         $libPath = preg_replace('!^libs/!', '', $file);
         $libName = substr($libPath, 0, strpos($libPath, '/'));
-        $className = 'Libs\\' . ucfirst($libName);
+        $className = 'Libs\\'.ucfirst($libName);
         if (class_exists($className)) {
             if (!empty($className::$programDirs)) {
                 $fileDir = substr($libPath, strlen($libName) + 1, strpos($libPath, '/', strlen($libName) + 1) - strlen($libName) - 1);
                 foreach ($className::$programDirs as $programDir) {
                     if ($programDir == $fileDir) {
-                        include $dir . $file;
+                        include $dir.$file;
                         exit();
                     }
                 }
             }
         }
-        return $dir . $file;
+        return $dir.$file;
     }
 
     public function getPath($args)
     {
         if (!empty($args[0])) {
-            $libName = 'Libs\\' . ucfirst($args[0]);
+            $libName = 'Libs\\'.ucfirst($args[0]);
             if (class_exists($libName)) {
                 $file = implode('/', array_slice($args, 1));
                 foreach ($libName::$staticDirs as $dir) {
                     if (strpos($file, $dir) === 0) {
-                        return \App::$primary->path . '/vendor/' . $file;
+                        return \App::$primary->path.'/vendor/'.$file;
                     }
                 }
             }

system/modules/View/appAdminControllers/content/index.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
     foreach ($templates['app']['installed'] as $template => $name) {
         $table->addRow([
             $name,
-            (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/' . $template . '">Установить по умолчанию</a>' : 'Тема по умолчанию',
-            '<a href = "/admin/view/editTemplate/' . $template . '">Редактировать</a>'
+            (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/'.$template.'">Установить по умолчанию</a>' : 'Тема по умолчанию',
+            '<a href = "/admin/view/editTemplate/'.$template.'">Редактировать</a>'
         ]);
     }
 $table->draw();
\ No newline at end of file

system/modules/View/appAdminControllers/ViewController.php

Spacing +7 added lines, -7 removed lines

@@ -48,9 +48,9 @@ 
             $templates = App::$primary->view->config;
             $templates['app']['installed'][$_POST['name']] = $_POST['name'];
             Config::save('module', $templates, 'View', App::$primary);
-            $path = App::$primary->path . '/templates/' . $_POST['name'] . '/index.html';
-            $pathMap = App::$primary->path . '/templates/' . $_POST['name'] . '/map.html';
-            Tools::createDir(App::$primary->path . '/templates/' . $_POST['name']);
+            $path = App::$primary->path.'/templates/'.$_POST['name'].'/index.html';
+            $pathMap = App::$primary->path.'/templates/'.$_POST['name'].'/map.html';
+            Tools::createDir(App::$primary->path.'/templates/'.$_POST['name']);
             file_put_contents($path, $text);
             file_put_contents($pathMap, trim($_POST['map']));
             $template = [
@@ -58,7 +58,7 @@ 
                 'name' => $_POST['name'],
                 'file' => 'index.html',
             ];
-            Config::save(App::$primary->path . '/templates/' . $_POST['name'] . '/config.php', $template);
+            Config::save(App::$primary->path.'/templates/'.$_POST['name'].'/config.php', $template);
             Tools::redirect('/admin/View');
         }
         $this->view->page();
@@ -69,8 +69,8 @@ 
         $this->view->setTitle('Редактирование шаблона');
         App::$cur->view->customAsset('css', '/static/moduleAsset/View/css/blockDrop.css');
         App::$cur->view->customAsset('js', '/static/moduleAsset/View/js/blockDrop.js');
-        $template = Config::custom(App::$primary->path . '/templates/' . $templateName . '/config.php');
-        $pathMap = App::$primary->path . '/templates/' . $templateName . '/map.html';
+        $template = Config::custom(App::$primary->path.'/templates/'.$templateName.'/config.php');
+        $pathMap = App::$primary->path.'/templates/'.$templateName.'/map.html';
         if (!empty($_POST)) {
             $templates = App::$primary->view->config;
             $templates['app']['installed'][$templateName] = $_POST['name'];
@@ -80,7 +80,7 @@ 
 
             $template['template_name'] = $templateName;
             $template['name'] = $templateName;
-            Config::save(App::$primary->path . '/templates/' . $_POST['name'] . '/config.php', $template);
+            Config::save(App::$primary->path.'/templates/'.$_POST['name'].'/config.php', $template);
             Tools::redirect('/admin/View');
         }
         $template['map'] = file_get_contents($pathMap);

system/modules/View/View.php

Spacing +47 added lines, -47 removed lines

@@ -37,17 +37,17 @@ 
         if (!empty($this->config[$this->app->type]['current'])) {
             $templateName = $this->config[$this->app->type]['current'];
             if (!empty($this->config[$this->app->type]['installed'][$templateName]['location'])) {
-                $this->templatesPath = App::$primary->path . "/templates";
+                $this->templatesPath = App::$primary->path."/templates";
             }
         }
         if (!$this->templatesPath) {
-            $this->templatesPath = $this->app->path . "/templates";
+            $this->templatesPath = $this->app->path."/templates";
         }
         $this->template = \View\Template::get($templateName, $this->app, $this->templatesPath);
         if (!$this->template) {
             $this->template = new \View\Template([
                 'name' => 'default',
-                'path' => $this->templatesPath . '/default',
+                'path' => $this->templatesPath.'/default',
                 'app' => $this->app
             ]);
         }
@@ -164,7 +164,7 @@ 
                 case 'WIDGET':
                     $source = $this->cutTag($source, $rawTag);
                     $params = array_slice($tag, 2);
-                    $this->widget($tag[1], ['params' => $params], ':' . implode(':', $params));
+                    $this->widget($tag[1], ['params' => $params], ':'.implode(':', $params));
                     break;
                 case 'HEAD':
                     $source = $this->cutTag($source, $rawTag);
@@ -187,18 +187,18 @@ 
     {
         $pos = strpos($source, $rawTag) - 1;
         echo substr($source, 0, $pos);
-        return substr($source, ( $pos + strlen($rawTag) + 2));
+        return substr($source, ($pos + strlen($rawTag) + 2));
     }
 
     public function getHref($type, $params)
     {
         $href = '';
         if (is_string($params)) {
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params;
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params;
         } elseif (empty($params['template']) && !empty($params['file'])) {
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params['file'];
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params['file'];
         } elseif (!empty($params['template']) && !empty($params['file'])) {
-            $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
+            $href = $this->app->templatesPath."/{$this->template->name}/{$type}/{$params['file']}";
         }
         return $href;
     }
@@ -235,16 +235,16 @@ 
 
         echo "<title>{$this->title}</title>\n";
 
-        if (!empty($this->template->config['favicon']) && file_exists($this->template->path . "/{$this->template->config['favicon']}")) {
+        if (!empty($this->template->config['favicon']) && file_exists($this->template->path."/{$this->template->config['favicon']}")) {
             echo "        <link rel='shortcut icon' href='/templates/{$this->template->name}/{$this->template->config['favicon']}' />";
-        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path . "/static/images/{$this->template->config['favicon']}")) {
+        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path."/static/images/{$this->template->config['favicon']}")) {
             echo "        <link rel='shortcut icon' href='/static/images/{$this->template->config['favicon']}' />";
-        } elseif (file_exists($this->app->path . '/static/images/favicon.ico')) {
+        } elseif (file_exists($this->app->path.'/static/images/favicon.ico')) {
             echo "        <link rel='shortcut icon' href='/static/images/favicon.ico' />";
         }
 
         foreach ($this->getMetaTags() as $meta) {
-            echo "\n        " . Html::el('meta', $meta, '', null);
+            echo "\n        ".Html::el('meta', $meta, '', null);
         }
 
         if (!empty(Inji::$config['assets']['js'])) {
@@ -255,7 +255,7 @@ 
 
         $this->checkNeedLibs();
         $this->parseCss();
-        echo "\n        <script src='" . Statics::file(($this->app->type != 'app' ? '/' . $this->app->name : '' ) . "/static/system/js/Inji.js") . "'></script>";
+        echo "\n        <script src='".Statics::file(($this->app->type != 'app' ? '/'.$this->app->name : '')."/static/system/js/Inji.js")."'></script>";
     }
 
     public function parseCss()
@@ -279,25 +279,25 @@ 
             if (file_exists($path)) {
                 $this->loadedCss[$href] = $href;
                 $urls[$href] = $path;
-                $timeStr.=filemtime($path);
+                $timeStr .= filemtime($path);
             } else {
                 echo "\n        <link href='{$href}' rel='stylesheet' type='text/css' />";
             }
         }
         $timeMd5 = md5($timeStr);
         $cacheDir = Cache::getDir('static');
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.css')) {
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.css')) {
             foreach ($urls as $primaryUrl => $url) {
                 $source = file_get_contents($url);
                 $rootPath = substr($primaryUrl, 0, strrpos($primaryUrl, '/'));
                 $levelUpPath = substr($rootPath, 0, strrpos($rootPath, '/'));
-                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1' . $levelUpPath, $source);
-                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1' . $rootPath, $source);
-                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1' . $rootPath . '/$2', $source);
-                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url(' . $rootPath . '/$1$2', $source);
+                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1'.$levelUpPath, $source);
+                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1'.$rootPath, $source);
+                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1'.$rootPath.'/$2', $source);
+                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url('.$rootPath.'/$1$2', $source);
                 $cssAll .= $source;
             }
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.css', $cssAll);
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.css', $cssAll);
         }
         echo "\n        <link href='/{$cacheDir}/all{$timeMd5}.css' rel='stylesheet' type='text/css' />";
     }
@@ -329,7 +329,7 @@ 
                     if (strpos($css, '//') !== false)
                         $href = $css;
                     else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -342,7 +342,7 @@ 
                     if (strpos($css, '://') !== false)
                         $href = $css;
                     else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                        $href = $this->app->templatesPath."/{$this->template->name}/css/{$css}";
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -355,7 +355,7 @@ 
                     if (strpos($css, '//') !== false)
                         $href = $css;
                     else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -375,9 +375,9 @@ 
         if (!empty($this->app->config['site']['metatags'])) {
             foreach ($this->app->config['site']['metatags'] as $meta) {
                 if (!empty($meta['name'])) {
-                    $metas['metaName:' . $meta['name']] = $meta;
+                    $metas['metaName:'.$meta['name']] = $meta;
                 } elseif (!empty($meta['property'])) {
-                    $metas['metaProperty:' . $meta['property']] = $meta;
+                    $metas['metaProperty:'.$meta['property']] = $meta;
                 }
             }
         }
@@ -390,9 +390,9 @@ 
     public function addMetaTag($meta)
     {
         if (!empty($meta['name'])) {
-            $this->dynMetas['metaName:' . $meta['name']] = $meta;
+            $this->dynMetas['metaName:'.$meta['name']] = $meta;
         } elseif (!empty($meta['property'])) {
-            $this->dynMetas['metaProperty:' . $meta['property']] = $meta;
+            $this->dynMetas['metaProperty:'.$meta['property']] = $meta;
         }
     }
 
@@ -416,7 +416,7 @@ 
                 if (file_exists($path)) {
                     $nativeUrl[$script] = $script;
                     $urls[$script] = $path;
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }
@@ -431,7 +431,7 @@ 
                     if (!empty($script['name'])) {
                         $onLoadModules[$script['name']] = $script['name'];
                     }
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }
@@ -440,20 +440,20 @@ 
 
         $timeMd5 = md5($timeStr);
         $cacheDir = Cache::getDir('static');
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.js')) {
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.js')) {
             foreach ($urls as $url) {
-                $scriptAll .= ';' . file_get_contents($url);
+                $scriptAll .= ';'.file_get_contents($url);
             }
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.js', $scriptAll);
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.js', $scriptAll);
         }
         $options = [
             'scripts' => array_values($noParsedScripts),
             'compresedScripts' => $nativeUrl,
             'styles' => [],
-            'appRoot' => $this->app->type == 'app' ? '/' : '/' . $this->app->name . '/',
+            'appRoot' => $this->app->type == 'app' ? '/' : '/'.$this->app->name.'/',
             'onLoadModules' => $onLoadModules
         ];
-        $options['scripts'][] = '/' . $cacheDir . '/all' . $timeMd5 . '.js';
+        $options['scripts'][] = '/'.$cacheDir.'/all'.$timeMd5.'.js';
         $this->widget('View\bodyEnd', compact('options'));
     }
 
@@ -500,7 +500,7 @@ 
                     if (strpos($js, '//') !== false)
                         $href = $js;
                     else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                        $href = $this->app->templatesPath."/{$this->template->name}/js/{$js}";
                     $resultArray[] = $href;
                 }
                 break;
@@ -536,7 +536,7 @@ 
     public function setTitle($title, $add = true)
     {
         if ($add && !empty($this->app->config['site']['name'])) {
-            $this->title = $title . ' - ' . $this->app->config['site']['name'];
+            $this->title = $title.' - '.$this->app->config['site']['name'];
         } else {
             $this->title = $title;
         }
@@ -562,7 +562,7 @@ 
                     }
                 }
                 if (!$paramArray)
-                    $lineParams = ':' . implode(':', $_params);
+                    $lineParams = ':'.implode(':', $_params);
             }
         }
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";
@@ -581,24 +581,24 @@ 
         if (strpos($widgetName, '\\')) {
             $widgetName = explode('\\', $widgetName);
 
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '.php';
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'/'.$widgetName[1].'.php';
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'.php';
             App::$cur->$widgetName[0];
             $modulePaths = Module::getModulePaths(ucfirst($widgetName[0]));
             foreach ($modulePaths as $pathName => $path) {
-                $paths[$pathName . '_widgetDir'] = $path . '/widgets/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
-                $paths[$pathName] = $path . '/widgets/' . $widgetName[1] . '.php';
+                $paths[$pathName.'_widgetDir'] = $path.'/widgets/'.$widgetName[1].'/'.$widgetName[1].'.php';
+                $paths[$pathName] = $path.'/widgets/'.$widgetName[1].'.php';
             }
             return $paths;
         } else {
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '.php';
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'.php';
 
-            $paths['curAppPath_widgetDir'] = $this->app->path . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
-            $paths['curAppPath'] = $this->app->path . '/widgets/' . $widgetName . '.php';
+            $paths['curAppPath_widgetDir'] = $this->app->path.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
+            $paths['curAppPath'] = $this->app->path.'/widgets/'.$widgetName.'.php';
 
-            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
-            $paths['systemPath'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '.php';
+            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
+            $paths['systemPath'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'.php';
         }
         return $paths;
     }

system/modules/View/appControllers/ViewController.php

Spacing +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
 {
     public function editorcssAction()
     {
-        if (file_exists($this->view->template->path . '/css/editor.css')) {
-            Tools::redirect('/static/templates/' . $this->view->template['name'] . '/css/editor.css');
+        if (file_exists($this->view->template->path.'/css/editor.css')) {
+            Tools::redirect('/static/templates/'.$this->view->template['name'].'/css/editor.css');
         } else {
             header("Content-type: text/css");
             exit();
@@ -26,8 +26,8 @@ 
         if ($args) {
             $moduleName = ucfirst($args[0]);
             $params = array_slice($args, 1);
-            if (file_exists($this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php')) {
-                include_once $this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php';
+            if (file_exists($this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php')) {
+                include_once $this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php';
                 $module = new $moduleName($this->module->app);
                 $cotroller = $module->findController();
                 $cotroller->params = $params;

system/modules/View/objects/Template.php

Spacing +22 added lines, -22 removed lines

@@ -94,7 +94,7 @@ 
     {
         $this->setParams($params);
         if (!$this->path) {
-            $this->path = $this->app->view->templatesPath . '/' . $this->name;
+            $this->path = $this->app->view->templatesPath.'/'.$this->name;
         }
         $this->loadConfig();
         $this->setPage();
@@ -110,7 +110,7 @@ 
     public function loadConfig($configPath = '')
     {
         if (!$configPath) {
-            $configPath = $this->path . '/config.php';
+            $configPath = $this->path.'/config.php';
         }
         $this->configPath = $configPath;
         $this->config = \Config::custom($this->configPath);
@@ -140,7 +140,7 @@ 
         }
         $this->page = $page;
         if (!$this->pagePath) {
-            $this->pagePath = $this->path . '/' . $this->page . '.html';
+            $this->pagePath = $this->path.'/'.$this->page.'.html';
         }
         $this->pagePath = \Tools::pathsResolve($this->getPagePaths(), $this->pagePath);
     }
@@ -157,8 +157,8 @@ 
             $page = $this->page;
         }
         return [
-            'template' => $this->path . '/' . $page . '.html',
-            'defaultPage' => \Module::getModulePath('View') . '/templatePages/' . $page . '.html'
+            'template' => $this->path.'/'.$page.'.html',
+            'defaultPage' => \Module::getModulePath('View').'/templatePages/'.$page.'.html'
         ];
     }
 
@@ -194,7 +194,7 @@ 
                 $this->content = \Controller::$cur->method;
             }
             if ((!$this->contentPath || $content) && \Module::$cur) {
-                $this->contentPath = \Module::$cur->path . '/' . \Module::$cur->app->type . "Controllers/content/{$this->content}.php";
+                $this->contentPath = \Module::$cur->path.'/'.\Module::$cur->app->type."Controllers/content/{$this->content}.php";
             }
             $this->contentPath = \Tools::pathsResolve($this->getContentPaths(), $this->contentPath);
         }
@@ -214,33 +214,33 @@ 
         $paths = [];
         if ($this->module) {
             if (\Controller::$cur) {
-                $paths['templateModuleController'] = $this->path . "/modules/{$this->module->moduleName}/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['templateModuleController'] = $this->path."/modules/{$this->module->moduleName}/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['templateModule'] = $this->path . "/modules/{$this->module->moduleName}/{$content}.php";
+            $paths['templateModule'] = $this->path."/modules/{$this->module->moduleName}/{$content}.php";
         }
         if (\Module::$cur) {
             if (\Controller::$cur) {
-                $paths['templateCurModuleController'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['templateCurModuleController'] = $this->path."/modules/".\Module::$cur->moduleName."/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['templateCurModule'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/{$content}.php";
+            $paths['templateCurModule'] = $this->path."/modules/".\Module::$cur->moduleName."/{$content}.php";
         }
         if (\Controller::$cur) {
-            $paths['appControllerContentController'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['appControllerContent'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
-            $paths['controllerContentController'] = \Controller::$cur->path . "/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['controllerContent'] = \Controller::$cur->path . "/content/{$content}.php";
-            $paths['moduleControllerContentController'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['moduleControllerContent'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
+            $paths['appControllerContentController'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['appControllerContent'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
+            $paths['controllerContentController'] = \Controller::$cur->path."/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['controllerContent'] = \Controller::$cur->path."/content/{$content}.php";
+            $paths['moduleControllerContentController'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['moduleControllerContent'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
         }
         if ($this->module) {
             if (\Controller::$cur) {
-                $paths['customModuleTemplateControllerContentController'] = $this->path . "/modules/" . $this->module->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['customModuleTemplateControllerContentController'] = $this->path."/modules/".$this->module->moduleName."/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['customModuleTemplateControllerContent'] = $this->path . "/modules/" . $this->module->moduleName . "/{$content}.php";
+            $paths['customModuleTemplateControllerContent'] = $this->path."/modules/".$this->module->moduleName."/{$content}.php";
         }
         if ($this->module && \Controller::$cur) {
-            $paths['customModuleControllerContentController'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['customModuleControllerContent'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
+            $paths['customModuleControllerContentController'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['customModuleControllerContent'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
         }
         return $paths;
     }
@@ -260,10 +260,10 @@ 
         if (!$templatesPath) {
             $templatesPath = $app->view->templatesPath;
         }
-        if (file_exists($templatesPath . '/' . $templateName)) {
+        if (file_exists($templatesPath.'/'.$templateName)) {
             return new Template([
                 'name' => $templateName,
-                'path' => $templatesPath . '/' . $templateName,
+                'path' => $templatesPath.'/'.$templateName,
                 'app' => $app
             ]);
         }

system/modules/View/objects/Adapter.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
     public function el($name, $option = [])
     {
-        $className = get_called_class() . '\\' . $name;
+        $className = get_called_class().'\\'.$name;
         if (class_exists($className)) {
             return new $className();
         }