injitools / cms-Inji

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/TemplateController.php

Spacing +3 added lines, -3 removed lines

@@ -22,15 +22,15 @@
     function editFileAction($templateName)
     {
         $template = \View\Template::get($templateName, \App::$primary);
-        if (!empty($_GET['path']) && file_exists($template->path . '/' . Tools::parsePath($_GET['path']))) {
+        if (!empty($_GET['path']) && file_exists($template->path.'/'.Tools::parsePath($_GET['path']))) {
             $code = file_get_contents("php://input");
             if (!empty($code)) {
                 $result = new Server\Result();
                 $result->successMsg = 'Файл сохранен';
-                $content = file_put_contents($template->path . '/' . Tools::parsePath($_GET['path']), $code);
+                $content = file_put_contents($template->path.'/'.Tools::parsePath($_GET['path']), $code);
                 $result->send();
             }
-            $content = file_get_contents($template->path . '/' . Tools::parsePath($_GET['path']));
+            $content = file_get_contents($template->path.'/'.Tools::parsePath($_GET['path']));
             $this->libs->loadLib('Ace');
             $this->view->page(['content' => 'template/edit', 'data' => compact('template', 'content')]);
         } else {

system/Inji/Module.php

Spacing +33 added lines, -33 removed lines

@@ -72,7 +72,7 @@ 
         $this->info = $this->getInfo();
         $this->config = Config::module($this->moduleName, !empty($this->info['systemConfig']));
         $that = $this;
-        Inji::$inst->listen('Config-change-module-' . $this->app->name . '-' . $this->moduleName, $this->app->name . '-' . $this->moduleName . 'config', function($event) use ($that) {
+        Inji::$inst->listen('Config-change-module-'.$this->app->name.'-'.$this->moduleName, $this->app->name.'-'.$this->moduleName.'config', function($event) use ($that) {
             $that->config = $event['eventObject'];
         });
     }
@@ -88,10 +88,10 @@ 
         $moduleName = ucfirst($moduleName);
         $paths = [];
         if (App::$cur !== App::$primary) {
-            $paths['primaryAppPath'] = App::$primary->path . '/modules/' . $moduleName;
+            $paths['primaryAppPath'] = App::$primary->path.'/modules/'.$moduleName;
         }
-        $paths['curAppPath'] = App::$cur->path . '/modules/' . $moduleName;
-        $paths['systemPath'] = INJI_SYSTEM_DIR . '/modules/' . $moduleName;
+        $paths['curAppPath'] = App::$cur->path.'/modules/'.$moduleName;
+        $paths['systemPath'] = INJI_SYSTEM_DIR.'/modules/'.$moduleName;
         return $paths;
     }
 
@@ -106,7 +106,7 @@ 
         $moduleName = ucfirst($moduleName);
         $paths = Module::getModulePaths($moduleName);
         foreach ($paths as $path) {
-            if (file_exists($path . '/' . $moduleName . '.php')) {
+            if (file_exists($path.'/'.$moduleName.'.php')) {
                 return $path;
             }
         }
@@ -159,12 +159,12 @@ 
         foreach ($moduleDirs as $moduleDir) {
             if (is_dir($moduleDir)) {
                 foreach (scandir($moduleDir) as $dir) {
-                    if (preg_match('!Controllers$!', $dir) && is_dir($moduleDir . '/' . $dir)) {
-                        $path = $moduleDir . '/' . $dir;
+                    if (preg_match('!Controllers$!', $dir) && is_dir($moduleDir.'/'.$dir)) {
+                        $path = $moduleDir.'/'.$dir;
                         foreach (scandir($path) as $file) {
-                            if (preg_match('!Controller\.php$!', $file) && is_file($path . '/' . $file)) {
+                            if (preg_match('!Controller\.php$!', $file) && is_file($path.'/'.$file)) {
                                 $controllerName = preg_replace('!Controller\.php$!', '', $file);
-                                $controllers[preg_replace('!Controllers$!', '', $dir)][$controllerName] = $path . '/' . $file;
+                                $controllers[preg_replace('!Controllers$!', '', $dir)][$controllerName] = $path.'/'.$file;
                             }
                         }
                     }
@@ -211,31 +211,31 @@ 
         $paths = [];
         if (App::$cur != App::$primary) {
             if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-                $paths['primaryAppAppTypePath_slice'] = App::$primary->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+                $paths['primaryAppAppTypePath_slice'] = App::$primary->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
                 if (App::$primary->{$this->moduleName}) {
-                    $paths['primaryAppAppTypePath_slice'] = App::$primary->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+                    $paths['primaryAppAppTypePath_slice'] = App::$primary->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
                 }
             }
-            $paths['primaryAppAppAppTypePath'] = App::$primary->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+            $paths['primaryAppAppAppTypePath'] = App::$primary->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
             if (App::$primary->{$this->moduleName}) {
-                $paths['primaryAppAppTypePath'] = App::$primary->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+                $paths['primaryAppAppTypePath'] = App::$primary->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
             }
-            $paths['curAppAppTypePath'] = $this->app->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+            $paths['curAppAppTypePath'] = $this->app->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
         }
 
         if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-            $paths['appAppTypePath_slice'] = $this->app->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
-            $paths['appTypePath_slice'] = $this->path . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+            $paths['appAppTypePath_slice'] = $this->app->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
+            $paths['appTypePath_slice'] = $this->path.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
         }
-        $paths['appAppTypePath'] = $this->app->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
-        $paths['appTypePath'] = $this->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+        $paths['appAppTypePath'] = $this->app->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
+        $paths['appTypePath'] = $this->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
 
         if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-            $paths['appUniversalPath_slice'] = $this->app->path . '/modules/' . $this->moduleName . '/Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
-            $paths['universalPath_slice'] = $this->path . '/Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+            $paths['appUniversalPath_slice'] = $this->app->path.'/modules/'.$this->moduleName.'/Controllers/'.ucfirst($this->params[0]).'Controller.php';
+            $paths['universalPath_slice'] = $this->path.'/Controllers/'.ucfirst($this->params[0]).'Controller.php';
         }
-        $paths['appUniversalPath'] = $this->app->path . '/modules/' . $this->moduleName . '/Controllers/' . $this->moduleName . 'Controller.php';
-        $paths['universalPath'] = $this->path . '/Controllers/' . $this->moduleName . 'Controller.php';
+        $paths['appUniversalPath'] = $this->app->path.'/modules/'.$this->moduleName.'/Controllers/'.$this->moduleName.'Controller.php';
+        $paths['universalPath'] = $this->path.'/Controllers/'.$this->moduleName.'Controller.php';
 
         return $paths;
     }
@@ -258,7 +258,7 @@ 
                     $controllerName = $this->moduleName;
                     $params = $this->params;
                 }
-                $fullControllerName = $controllerName . 'Controller';
+                $fullControllerName = $controllerName.'Controller';
                 $controller = new $fullControllerName();
                 $controller->params = $params;
                 $controller->module = $this;
@@ -284,8 +284,8 @@ 
         }
         $paths = Module::getModulePaths($moduleName);
         foreach ($paths as $path) {
-            if (file_exists($path . '/info.php')) {
-                return include $path . '/info.php';
+            if (file_exists($path.'/info.php')) {
+                return include $path.'/info.php';
             }
         }
         return [];
@@ -304,16 +304,16 @@ 
     {
         $moduleName = $moduleName ? $moduleName : $this->moduleName;
         $modulePaths = Module::getModulePaths($moduleName);
-        $modulePaths['templatePath'] = App::$cur->view->template->path . '/modules/' . ucfirst($moduleName);
+        $modulePaths['templatePath'] = App::$cur->view->template->path.'/modules/'.ucfirst($moduleName);
         $snippets = [];
         foreach ($modulePaths as $path) {
-            if (file_exists($path . $dir . '/' . $snippetsPath)) {
-                $snippetsPaths = array_slice(scandir($path . $dir . '/' . $snippetsPath), 2);
+            if (file_exists($path.$dir.'/'.$snippetsPath)) {
+                $snippetsPaths = array_slice(scandir($path.$dir.'/'.$snippetsPath), 2);
                 foreach ($snippetsPaths as $snippetPath) {
-                    if (is_dir($path . $dir . '/' . $snippetsPath . '/' . $snippetPath)) {
-                        $snippets[$snippetPath] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath . '/info.php';
+                    if (is_dir($path.$dir.'/'.$snippetsPath.'/'.$snippetPath)) {
+                        $snippets[$snippetPath] = include $path.$dir.'/'.$snippetsPath.'/'.$snippetPath.'/info.php';
                     } else {
-                        $snippets[pathinfo($snippetPath, PATHINFO_FILENAME)] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath;
+                        $snippets[pathinfo($snippetPath, PATHINFO_FILENAME)] = include $path.$dir.'/'.$snippetsPath.'/'.$snippetPath;
                     }
                 }
             }
@@ -335,9 +335,9 @@ 
     {
         $extensions = [];
         $modules = Module::getInstalled(App::$cur);
-        $method = 'get' . ucfirst($extensionType);
+        $method = 'get'.ucfirst($extensionType);
         foreach ($modules as $module) {
-            $extensions = array_merge($extensions, $this->{$method}($request, false, "/extensions/{$this->moduleName}/" . $extensionType, $module));
+            $extensions = array_merge($extensions, $this->{$method}($request, false, "/extensions/{$this->moduleName}/".$extensionType, $module));
         }
         return $extensions;
     }

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

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     public function realType()
     {
-        if ($this->option && $this->option->type)  {
+        if ($this->option && $this->option->type) {
             $type = $this->option->type;
 
             if ($type == 'select') {

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

Spacing +12 added lines, -12 removed lines

@@ -76,7 +76,7 @@ 
                 'col' => 'item_offer_id',
                 //'resultKey' => 'code',
                 'resultKey' => 'item_offer_option_id',
-                'join' => [Offer\Option::table(), Offer\Option::index() . ' = ' . Offer\Param::colPrefix() . Offer\Option::index()]
+                'join' => [Offer\Option::table(), Offer\Option::index().' = '.Offer\Param::colPrefix().Offer\Option::index()]
             ],
             'item' => [
                 'model' => 'Ecommerce\Item',
@@ -89,12 +89,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();
             }
         }
@@ -112,21 +112,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/Ui/Controllers/UiController.php

Spacing +5 added lines, -5 removed lines

@@ -38,25 +38,25 @@
             $return = new Server\Result();
             ob_start();
             $form->checkRequest($params, true);
-            $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
             $get = $_GET;
             if (isset($get['notSave'])) {
                 unset($get['notSave']);
             }
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($get);
+            $form->action = (App::$cur->system ? '/'.App::$cur->name : '').'/ui/formPopUp/?'.http_build_query($get);
             $form->draw($params, true);
             $return->content = ob_get_contents();
             ob_end_clean();
             $return->send();
         } else {
             $form->checkRequest($params);
-            $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
             $get = $_GET;
             if (isset($get['notSave'])) {
                 unset($get['notSave']);
             }
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($get);
-            $this->view->setTitle(($model && $model->pk() ? 'Изменить ' : 'Создать ') . $form->header);
+            $form->action = (App::$cur->system ? '/'.App::$cur->name : '').'/ui/formPopUp/?'.http_build_query($get);
+            $this->view->setTitle(($model && $model->pk() ? 'Изменить ' : 'Создать ').$form->header);
             $this->view->page(['content' => 'form', 'data' => compact('form', 'params')]);
         }
     }