injitools / cms-Inji

system/modules/Exchange1c/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function ($step = null, $params = []) {
     \App::$cur->db->createTable('exchange1c_exchange', [
         'exchange_id' => 'pk',
         'exchange_type' => 'varchar(255) NOT NULL',

system/modules/Materials/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function ($step = null, $params = []) {
     $material = new Materials\Material([
         'name' => 'Главная',
         'text' => '<p>Главная страница сайта</p>',

system/modules/Sliders/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function ($step = null, $params = []) {
     
 };

system/modules/TextBlocks/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function ($step = null, $params = []) {
     App::$cur->db->createTable('textblocks_block', [
         'block_id' => 'pk',
         'block_code' => 'varchar(255) NOT NULL',

system/modules/UserForms/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function ($step = null, $params = []) {
     
 };

system/modules/Users/models/User/Inventory.php

Spacing +3 added lines, -3 removed lines

@@ -97,13 +97,13 @@
         if ($this->first_name . $this->last_name . $this->middle_name) {
             $name = '';
             if ($this->first_name) {
-                $name.=$this->first_name;
+                $name .= $this->first_name;
             }
             if ($this->middle_name) {
-                $name.=($name ? ' ' : '') . $this->middle_name;
+                $name .= ($name ? ' ' : '') . $this->middle_name;
             }
             if ($this->last_name) {
-                $name.=($name ? ' ' : '') . $this->last_name;
+                $name .= ($name ? ' ' : '') . $this->last_name;
             }
             return $name;
         } else {

Braces +2 added lines, -1 removed lines

@@ -56,7 +56,8 @@
                 $name.=($name ? ' ' : '') . $this->last_name;
             }
             return $name;
-        } else {
+        }
+        else {
             return $this->user_id;
         }
     }

system/modules/Ui/objects/DataManager.php

Doc Comments +3 added lines

@@ -329,6 +329,9 @@
         return $rows;
     }
 
+    /**
+     * @param DataManager $dataManager
+     */
     public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null)
     {
         $modelName = get_class($item);

Spacing +2 added lines, -2 removed lines

@@ -473,7 +473,7 @@ 
                         return $item->$colName;
                 }
             } elseif (!empty($modelName::$cols[$colName]['type'])) {
-                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
                     $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
                     return "<a href ='/admin/{$originalItem->genViewLink()}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
@@ -684,7 +684,7 @@ 
             ];
         }
         $tableCols[] = '';
-        $this->table->class .=' datamanagertable';
+        $this->table->class .= ' datamanagertable';
         $this->table->setCols($tableCols);
     }
 

Braces +46 added lines, -23 removed lines

@@ -42,10 +42,12 @@ 
             $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
             if (isset($modelNameOrOptions::$objectName)) {
                 $this->name = $modelNameOrOptions::$objectName;
-            } else {
+            }
+            else {
                 $this->name = $modelNameOrOptions;
             }
-        } else {
+        }
+        else {
             $this->managerOptions = $modelNameOrOptions;
         }
 
@@ -152,7 +154,8 @@ 
                     $action['className'] = $key;
                 }
                 $return[$key] = $action;
-            } else {
+            }
+            else {
                 $key = $action;
                 $return[$key] = [
                     'className' => $action
@@ -208,7 +211,8 @@ 
             if (is_array($col)) {
                 $colName = $key;
                 $colOptions = $col;
-            } else {
+            }
+            else {
                 $colName = $col;
                 $colOptions = [];
             }
@@ -218,7 +222,8 @@ 
             }
             if (empty($colOptions['label']) && !empty($colInfo['label'])) {
                 $colOptions['label'] = $colInfo['label'];
-            } elseif (empty($colOptions['label'])) {
+            }
+            elseif (empty($colOptions['label'])) {
                 $colOptions['label'] = $colName;
             }
             $cols[$colName] = $colOptions;
@@ -267,7 +272,8 @@ 
             foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
                 if (!empty($colOptions['userCol'])) {
                     $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
-                } elseif (isset($colOptions['value'])) {
+                }
+                elseif (isset($colOptions['value'])) {
                     if (is_array($colOptions['value'])) {
                         foreach ($colOptions['value'] as $key => $value) {
                             if ($key === 'userCol') {
@@ -318,7 +324,8 @@ 
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-                            } else {
+                            }
+                            else {
                                 $date = $params['filters'][$col]['max'];
                             }
                             $queryParams['where'][] = [$col, $date, '<='];
@@ -362,7 +369,8 @@ 
         }
         if (!empty($params['mode']) && $params['mode'] == 'sort') {
             $queryParams['order'] = ['weight', 'asc'];
-        } elseif (!empty($params['sortered']) && !empty($this->managerOptions['sortable'])) {
+        }
+        elseif (!empty($params['sortered']) && !empty($this->managerOptions['sortable'])) {
             foreach ($params['sortered'] as $colName => $sortType) {
                 if ($colName && in_array($colName, $this->managerOptions['sortable'])) {
                     $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
@@ -373,7 +381,8 @@ 
         if ($model && !empty($params['relation'])) {
             $relation = $model::getRelation($params['relation']);
             $items = $model->$params['relation']($queryParams);
-        } else {
+        }
+        else {
             $relation = false;
             $items = $modelName::getList($queryParams);
         }
@@ -389,7 +398,8 @@ 
             foreach ($this->managerOptions['cols'] as $key => $colName) {
                 if (!empty($params['download'])) {
                     $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
-                } else {
+                }
+                else {
                     $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
                 }
             }
@@ -418,7 +428,8 @@ 
             $col = substr($colName, strpos($colName, ':') + 1);
             if ($item->$rel) {
                 return DataManager::drawCol($item->$rel, $col, $params, $dataManager, $originalCol, $originalItem);
-            } else {
+            }
+            else {
                 return 'Не указано';
             }
         }
@@ -441,20 +452,24 @@ 
                             $href = "<a href ='/admin/" . $item->{$modelName::$cols[$colName]['relation']}->genViewLink() . "'>";
                             if (!empty($modelName::$cols[$colName]['showCol'])) {
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
-                            } else {
+                            }
+                            else {
 
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->name();
                             }
                             $href .= '</a>';
                             return $href;
-                        } else {
+                        }
+                        else {
                             return $item->{$modelName::$cols[$colName]['relation']}->name();
                         }
-                    } else {
+                    }
+                    else {
                         return $item->$colName;
                     }
             }
-        } else {
+        }
+        else {
             if (!empty($modelName::$cols[$colName]['view']['type'])) {
                 switch ($modelName::$cols[$colName]['view']['type']) {
                     case 'widget':
@@ -472,15 +487,18 @@ 
                     default:
                         return $item->$colName;
                 }
-            } elseif (!empty($modelName::$cols[$colName]['type'])) {
+            }
+            elseif (!empty($modelName::$cols[$colName]['type'])) {
                 if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
                     $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
                     return "<a href ='/admin/{$originalItem->genViewLink()}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
-                } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
+                }
+                elseif (\App::$cur->name == 'admin' && $colName == 'name') {
                     $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
                     return "<a href ='/admin/{$item->genViewLink()}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
-                } elseif ($modelName::$cols[$colName]['type'] == 'html') {
+                }
+                elseif ($modelName::$cols[$colName]['type'] == 'html') {
                     $uid = \Tools::randomString();
                     $script = "<script>inji.onLoad(function(){
             var el{$uid}=$('#{$uid}');
@@ -509,10 +527,12 @@ 
             }
             })</script>";
                     return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
-                } else {
+                }
+                else {
                     return \Model::resloveTypeValue($item, $colName);
                 }
-            } else {
+            }
+            else {
                 return $item->$colName;
             }
         }
@@ -561,7 +581,8 @@ 
             foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
                 if (!empty($colOptions['userCol'])) {
                     $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
-                } elseif (isset($colOptions['value'])) {
+                }
+                elseif (isset($colOptions['value'])) {
                     if (is_array($colOptions['value'])) {
                         foreach ($colOptions['value'] as $key => $value) {
                             if ($key === 'userCol') {
@@ -613,7 +634,8 @@ 
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-                            } else {
+                            }
+                            else {
                                 $date = $params['filters'][$col]['max'];
                             }
                             $queryParams['where'][] = [$col, $date, '<='];
@@ -657,7 +679,8 @@ 
         }
         if ($model && !empty($params['relation'])) {
             $count = $model->$params['relation']($queryParams);
-        } else {
+        }
+        else {
             $count = $modelName::getCount($queryParams);
         }
         $pages = new Pages([

system/modules/Ecommerce/models/UserAdds/Field.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             'map' => [
                 ['name', 'type'],
                 ['required', 'save'],
-                [ 'userfield']
+                ['userfield']
             ]
         ]
     ];

system/modules/Ecommerce/models/Delivery/Field.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             'map' => [
                 ['name', 'type'],
                 ['required', 'save'],
-                [ 'userfield']
+                ['userfield']
             ]
         ]
     ];