injitools / cms-Inji

system/modules/Ecommerce/models/Item/Offer.php

Spacing +11 added lines, -11 removed lines

@@ -78,12 +78,12 @@ 
     {
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
         if ($warehouse) {
-            $warehouse->count +=(float) $count;
+            $warehouse->count += (float) $count;
             $warehouse->save();
         } else {
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
             if ($warehouse) {
-                $warehouse->count +=(float) $count;
+                $warehouse->count += (float) $count;
                 $warehouse->save();
             }
         }
@@ -101,21 +101,21 @@ 
             }
         }
         if ($warehouseIds) {
-            \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Warehouse::index(), $warehouseIds, 'IN');
+            \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Warehouse::index(), $warehouseIds, 'IN');
         }
-        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count),0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Item\Offer\Warehouse::colPrefix().'count),0) as `sum` ';
         $warehouse = \App::$cur->db->select(\Ecommerce\Item\Offer\Warehouse::table())->fetch();
 
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0) as `sum` ';
-        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Warehouse\Block::colPrefix().'count) ,0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
         if ($cart_id) {
-            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index(), (int) $cart_id, '!=');
+            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index(), (int) $cart_id, '!=');
         }
         $on = '
-            ' . \Ecommerce\Cart::index() . ' = ' . \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() . 'cart_status_id` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+            ' . \Ecommerce\Cart::index().' = '.\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().'cart_status_id` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
         ';
         \App::$cur->db->join(\Ecommerce\Cart::table(), $on, 'inner');

system/modules/Migrations/objects/Parser/Object/Value.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
                 $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
                 if ($this->model->{$this->param->value}) {
                     $file = \Files\File::get($this->model->{$this->param->value});
-                    if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
+                    if ($file && $value && file_exists($dir.'/'.$value) && file_exists(\App::$primary->path.$file->path) && md5_file($dir.'/'.$value) == md5_file(\App::$primary->path.$file->path)) {
                         $notEq = false;
                     }
                     if ($file && $notEq) {
@@ -81,7 +81,7 @@ 
                     }
                 }
                 if ($notEq) {
-                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir.'/'.$value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
                 }
                 break;
             default:

system/modules/Migrations/objects/Parser/Object.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
                         if ($param->type == 'custom') {
                             $parserName = $param->value;
                         } else {
-                            $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
+                            $parserName = '\Migrations\Parser\Object\\'.ucfirst($param->type);
                         }
                         $parser = new $parserName;
                         $parser->data = &$data[$param->code];

system/modules/Ui/objects/Tree.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
           }
           $count += count($items);
           foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
           }
           ?>
         </ul>
@@ -52,7 +52,7 @@ 
             $item = $item['text'];
         }
         if (!isset($attributes['id'])) {
-            $attributes['id'] = str_replace('\\', '_', get_class($object)) . "-{$object->pk()}";
+            $attributes['id'] = str_replace('\\', '_', get_class($object))."-{$object->pk()}";
         }
         if (!$maxDeep || $deep < $maxDeep) {
             $items = $class::getList(['where' => ['parent_id', $object->pk()], 'order' => $order]);
@@ -63,7 +63,7 @@ 
                     echo \Html::el('li', $attributes, $item, true);
                     echo '<ul>';
                 }
-                $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
             }
         }
         if ($isset) {

system/modules/Money/models/Wallet.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         'manager' => [

             'cols' => ['user:id', 'user_id', 'currency_id', 'amount'],

             'sortable' => ['user:id', 'user_id', 'currency_id', 'amount'],

-            'filters' => [ 'currency_id'],

+            'filters' => ['currency_id'],

         ]

     ];

 

@@ -66,7 +66,7 @@ 
     {

         $amount = (float) $amount;

         $query = \App::$cur->db->newQuery();

-        $string = 'UPDATE ' . \App::$cur->db->table_prefix . $this->table() . ' SET `' . $this->colPrefix() . 'amount`=`' . $this->colPrefix() . 'amount`+' . $amount . ' where `' . $this->index() . '` = ' . $this->id;

+        $string = 'UPDATE '.\App::$cur->db->table_prefix.$this->table().' SET `'.$this->colPrefix().'amount`=`'.$this->colPrefix().'amount`+'.$amount.' where `'.$this->index().'` = '.$this->id;

         $query->query($string);

         $history = new Wallet\History();

         $history->wallet_id = $this->pk();

@@ -86,7 +86,7 @@ 
     {

         switch ($this->currency->round_type) {

             case 'floor':

-                $dif = (float) ('1' . str_repeat('0', $this->currency->round_precision));

+                $dif = (float) ('1'.str_repeat('0', $this->currency->round_precision));

                 return floor($this->amount * $dif) / $dif;

             default :

                 return $this->amount;

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');

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

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <div class="dashboard-widgets">

-  <h4 class ='dashboard-widgets-welcome'>Добро Пожаловать в панель управления<?= class_exists('\Users\User') ? ', ' . \Users\User::$cur->name() : ''; ?></h4>

+  <h4 class ='dashboard-widgets-welcome'>Добро Пожаловать в панель управления<?= class_exists('\Users\User') ? ', '.\Users\User::$cur->name() : ''; ?></h4>

   <div class = "row">

     <?php

     $rowSum = 0;

@@ -9,7 +9,7 @@ 
         }

 

         $widgetSize = !empty($section['size']) ? $section['size'] : 1;

-        $rowSum+=$widgetSize;

+        $rowSum += $widgetSize;

         ?>

         <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div>

         <?php

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/template/editFile/' . $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/template/editFile/'.$template.'">Файлы</a> <a href = "/admin/view/editTemplate/'.$template.'">Редактировать</a>'
         ]);
     }
 $table->draw();
\ No newline at end of file

system/modules/View/appAdminControllers/content/template/chooseFile.php

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 <hr/>
 <?php
 foreach ($template->config['css'] as $file) {
-    if (file_exists($template->path . '/css/' . $file)) {
+    if (file_exists($template->path.'/css/'.$file)) {
         ?>
-        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/' . $file; ?>'><?= $file; ?></a>
+        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/'.$file; ?>'><?= $file; ?></a>
         <?php
     }
 }