injitools / cms-Inji

system/modules/Materials/models/Category.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
         if ($treePath) {
             $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
             foreach ($categorys as $category) {
-                $href .="/{$category->alias}";
+                $href .= "/{$category->alias}";
             }
         }
         return $href . "/" . ($this->alias ? $this->alias : $this->pk());

Braces +8 added lines, -4 removed lines

@@ -136,9 +136,11 @@ 
         $param = $material ? 'material_template' : 'template';
         if ($this->$param !== 'inherit') {
             return $this->$param;
-        } elseif ($this->$param == 'inherit' && $this->parent) {
+        }
+        elseif ($this->$param == 'inherit' && $this->parent) {
             return $this->parent->resolveTemplate($material);
-        } else {
+        }
+        else {
             return 'current';
         }
     }
@@ -147,9 +149,11 @@ 
         $param = $material ? 'material_viewer' : 'viewer';
         if ($this->$param !== 'inherit') {
             return $this->$param;
-        } elseif ($this->$param == 'inherit' && $this->parent) {
+        }
+        elseif ($this->$param == 'inherit' && $this->parent) {
             return $this->parent->resolveViewer($material);
-        } else {
+        }
+        else {
             return $material ? 'default' : 'category';
         }
     }

system/modules/Db/objects/Mysql/Mysql.php

Spacing +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
 
 class Mysql extends \Object
 {
-    public $config = [];       // настройки подключения выбраной базы
-    public $connect = FALSE;        // ярлык соединения с MySQL
-    public $encoding = 'utf-8';        // установленная кодировка
-    public $db_name = 'test';         // выбраная в данный момент база
-    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $config = []; // настройки подключения выбраной базы
+    public $connect = FALSE; // ярлык соединения с MySQL
+    public $encoding = 'utf-8'; // установленная кодировка
+    public $db_name = 'test'; // выбраная в данный момент база
+    public $table_prefix = 'inji_'; // префикс названий таблиц
     public $pdo = NULL;
     public $lastQuery = '';
     public $last_error = '';

Braces +16 added lines, -10 removed lines

@@ -29,14 +29,18 @@ 
      */
     public function init($connect_options) {
         extract($connect_options);
-        if (isset($db_name))
-            $this->db_name = $db_name;
-        if (isset($encoding))
-            $this->encoding = $encoding;
-        if (isset($table_prefix))
-            $this->table_prefix = $table_prefix;
-        if (isset($noConnectAbort))
-            $this->noConnectAbort = $noConnectAbort;
+        if (isset($db_name)) {
+                    $this->db_name = $db_name;
+        }
+        if (isset($encoding)) {
+                    $this->encoding = $encoding;
+        }
+        if (isset($table_prefix)) {
+                    $this->table_prefix = $table_prefix;
+        }
+        if (isset($noConnectAbort)) {
+                    $this->noConnectAbort = $noConnectAbort;
+        }
 
         $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
         $dt = new \DateTime();
@@ -52,10 +56,12 @@ 
         if ((int) $error[0]) {
             if ($this->noConnectAbort) {
                 return false;
-            } else {
+            }
+            else {
                 INJI_SYSTEM_ERROR($error[2], true);
             }
-        } else {
+        }
+        else {
             $this->connect = true;
             $query = new Mysql\Query($this);
             $query->query("SET SQL_BIG_SELECTS=1");

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

@@ -14,11 +14,11 @@
 class Mysql extends \Object {
 
     public $config = [];       // настройки подключения выбраной базы
-    public $connect = FALSE;        // ярлык соединения с MySQL
+    public $connect = false;        // ярлык соединения с MySQL
     public $encoding = 'utf-8';        // установленная кодировка
     public $db_name = 'test';         // выбраная в данный момент база
     public $table_prefix = 'inji_';   // префикс названий таблиц
-    public $pdo = NULL;
+    public $pdo = null;
     public $lastQuery = '';
     public $last_error = '';
     public $noConnectAbort = false;

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

@@ -24,7 +24,8 @@
         $code .= '$' . $this->name . ' = ';
         if (is_array($this->value)) {
             $code .= \CodeGenerator::genArray($this->value);
-        } else {
+        }
+        else {
             $code .= '"' . str_replace('"', '\"', $this->value) . '";';
         }
         return $code;

system/modules/View/View.php

Spacing +9 added lines, -9 removed lines

@@ -187,16 +187,16 @@ 
     {
         $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']}";
         }
@@ -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,7 +279,7 @@ 
             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' />";
             }
@@ -330,7 +330,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;
@@ -356,7 +356,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;
@@ -417,7 +417,7 @@ 
                 if (file_exists($path)) {
                     $nativeUrl[$script] = $script;
                     $urls[$script] = $path;
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }
@@ -432,7 +432,7 @@ 
                     if (!empty($script['name'])) {
                         $onLoadModules[$script['name']] = $script['name'];
                     }
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }

Braces +86 added lines, -51 removed lines

@@ -59,7 +59,8 @@ 
                 $source = str_replace('</body>', '{BODYEND}</body>', $source);
             }
             $this->parseSource($source);
-        } else {
+        }
+        else {
             $this->content();
         }
     }
@@ -80,7 +81,8 @@ 
         //set content
         if (!empty($params['content'])) {
             $this->template->setContent($params['content']);
-        } elseif (!$this->template->contentPath) {
+        }
+        elseif (!$this->template->contentPath) {
             $this->template->setContent();
         }
         //set data
@@ -98,7 +100,8 @@ 
         }
         if (!file_exists($this->template->contentPath)) {
             echo 'Content not found';
-        } else {
+        }
+        else {
             extract($this->contentData);
             include $this->template->contentPath;
         }
@@ -126,15 +129,17 @@ 
         }
         if (!$data) {
             echo 'Content not found';
-        } else {
+        }
+        else {
             extract($this->contentData);
             include $data['contentPath'];
         }
     }
 
     private function parseRaw($source) {
-        if (!$source)
-            return [];
+        if (!$source) {
+                    return [];
+        }
 
         preg_match_all("|{([^}]+)}|", $source, $result);
         return $result[1];
@@ -185,9 +190,11 @@ 
         $href = '';
         if (is_string($params)) {
             $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params;
-        } elseif (empty($params['template']) && !empty($params['file'])) {
+        }
+        elseif (empty($params['template']) && !empty($params['file'])) {
             $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params['file'];
-        } elseif (!empty($params['template']) && !empty($params['file'])) {
+        }
+        elseif (!empty($params['template']) && !empty($params['file'])) {
             $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
         }
         return $href;
@@ -225,9 +232,11 @@ 
 
         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' />";
         }
 
@@ -267,7 +276,8 @@ 
                 $this->loadedCss[$href] = $href;
                 $urls[$href] = $path;
                 $timeStr.=filemtime($path);
-            } else {
+            }
+            else {
                 echo "\n        <link href='{$href}' rel='stylesheet' type='text/css' />";
             }
         }
@@ -311,10 +321,12 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '//') !== false)
-                        $href = $css;
-                    else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    if (strpos($css, '//') !== false) {
+                                            $href = $css;
+                    }
+                    else {
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -324,10 +336,12 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '://') !== false)
-                        $href = $css;
-                    else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                    if (strpos($css, '://') !== false) {
+                                            $href = $css;
+                    }
+                    else {
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -337,10 +351,12 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '//') !== false)
-                        $href = $css;
-                    else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    if (strpos($css, '//') !== false) {
+                                            $href = $css;
+                    }
+                    else {
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -360,7 +376,8 @@ 
             foreach ($this->app->config['site']['metatags'] as $meta) {
                 if (!empty($meta['name'])) {
                     $metas['metaName:' . $meta['name']] = $meta;
-                } elseif (!empty($meta['property'])) {
+                }
+                elseif (!empty($meta['property'])) {
                     $metas['metaProperty:' . $meta['property']] = $meta;
                 }
             }
@@ -374,7 +391,8 @@ 
     public function addMetaTag($meta) {
         if (!empty($meta['name'])) {
             $this->dynMetas['metaName:' . $meta['name']] = $meta;
-        } elseif (!empty($meta['property'])) {
+        }
+        elseif (!empty($meta['property'])) {
             $this->dynMetas['metaProperty:' . $meta['property']] = $meta;
         }
     }
@@ -391,20 +409,24 @@ 
         $noParsedScripts = [];
         foreach ($scripts as $script) {
             if (is_string($script)) {
-                if (!empty($urls[$script]))
-                    continue;
+                if (!empty($urls[$script])) {
+                                    continue;
+                }
 
                 $path = $this->app->staticLoader->parsePath($script);
                 if (file_exists($path)) {
                     $nativeUrl[$script] = $script;
                     $urls[$script] = $path;
                     $timeStr.=filemtime($path);
-                } else {
+                }
+                else {
                     $noParsedScripts[$script] = $script;
                 }
-            } elseif (!empty($script['file'])) {
-                if (!empty($urls[$script['file']]))
-                    continue;
+            }
+            elseif (!empty($script['file'])) {
+                if (!empty($urls[$script['file']])) {
+                                    continue;
+                }
 
                 $path = $this->app->staticLoader->parsePath($script['file']);
                 if (file_exists($path)) {
@@ -414,7 +436,8 @@ 
                         $onLoadModules[$script['name']] = $script['name'];
                     }
                     $timeStr.=filemtime($path);
-                } else {
+                }
+                else {
                     $noParsedScripts[$script] = $script;
                 }
             }
@@ -461,12 +484,15 @@ 
                         $this->genScriptArray($js, $type, $resultArray);
                         continue;
                     }
-                    if (strpos($js, '//') !== false)
-                        $href = $js;
-                    else
-                        $href = $this->getHref('js', $js);
-                    if (!$href)
-                        continue;
+                    if (strpos($js, '//') !== false) {
+                                            $href = $js;
+                    }
+                    else {
+                                            $href = $this->getHref('js', $js);
+                    }
+                    if (!$href) {
+                                            continue;
+                    }
 
                     $resultArray[] = $href;
                 }
@@ -477,10 +503,12 @@ 
                         $this->genScriptArray($js, $type, $resultArray);
                         continue;
                     }
-                    if (strpos($js, '//') !== false)
-                        $href = $js;
-                    else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                    if (strpos($js, '//') !== false) {
+                                            $href = $js;
+                    }
+                    else {
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                    }
                     $resultArray[] = $href;
                 }
                 break;
@@ -492,12 +520,14 @@ 
                             continue;
                         }
                         $asset = $js;
-                    } else {
+                    }
+                    else {
                         $asset = [];
                     }
                     $asset['file'] = $this->getHref('js', $js);
-                    if (!$asset['file'])
-                        continue;
+                    if (!$asset['file']) {
+                                            continue;
+                    }
                     $resultArray[] = $asset;
                 }
                 break;
@@ -507,7 +537,8 @@ 
     public function customAsset($type, $asset, $lib = false) {
         if (!$lib) {
             $this->dynAssets[$type][] = $asset;
-        } else {
+        }
+        else {
             $this->libAssets[$type][$lib][] = $asset;
         }
     }
@@ -516,10 +547,12 @@ 
         if ($add && !empty($this->app->config['site']['name'])) {
             if ($title) {
                 $this->title = $title . ' - ' . $this->app->config['site']['name'];
-            } else {
+            }
+            else {
                 $this->title = $this->app->config['site']['name'];
             }
-        } else {
+        }
+        else {
             $this->title = $title;
         }
     }
@@ -542,8 +575,9 @@ 
                         $paramArray = true;
                     }
                 }
-                if (!$paramArray)
-                    $lineParams = ':' . implode(':', $_params);
+                if (!$paramArray) {
+                                    $lineParams = ':' . implode(':', $_params);
+                }
             }
         }
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";
@@ -570,7 +604,8 @@ 
                 $paths[$pathName] = $path . '/widgets/' . $widgetName[1] . '.php';
             }
             return $paths;
-        } else {
+        }
+        else {
             $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
             $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '.php';
 

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

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
             if (empty($blocks[$block->wallet->currency_id])) {
                 $blocks[$block->wallet->currency_id] = $block->amount;
             } else {
-                $blocks[$block->wallet->currency_id]+= $block->amount;
+                $blocks[$block->wallet->currency_id] += $block->amount;
             }
         }
         return $blocks;
@@ -168,7 +168,7 @@ 
         $rootUser = $rootUser ? $rootUser : \Users\User::$cur;
         $reward = \Money\Reward::get($reward_id);
         $reward->checkBlocked();
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]);
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
         if ($reward_count >= $reward->quantity && $reward->quantity)
             return false;
         $types = $this->getSnippets('rewardType');
@@ -189,7 +189,7 @@ 
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
                 $amount = 0;
                 foreach ($recives as $recive) {
-                    $amount+=$recive->amount;
+                    $amount += $recive->amount;
                 }
                 if ($amount >= $reward->peruser) {
                     continue;

Braces +6 added lines, -3 removed lines

@@ -49,7 +49,8 @@ 
     public function reciver($data, $system, $status, $mr) {
         if ($system) {
             $merchant = \Money\Merchant::get($system, 'object_name');
-        } else {
+        }
+        else {
             $merchant = false;
         }
         if ($merchant) {
@@ -96,7 +97,8 @@ 
         foreach ($blocked as $block) {
             if (empty($blocks[$block->wallet->currency_id])) {
                 $blocks[$block->wallet->currency_id] = $block->amount;
-            } else {
+            }
+            else {
                 $blocks[$block->wallet->currency_id]+= $block->amount;
             }
         }
@@ -123,7 +125,8 @@ 
                 $wallet->currency_id = $currency->id;
                 $wallet->save();
                 $result[$walletIdasKey ? $wallet->id : $currency->id] = $forSelect ? $wallet->name() : $wallet;
-            } else {
+            }
+            else {
                 $result[$walletIdasKey ? $wallets[$currency->id]->id : $currency->id] = $forSelect ? $wallets[$currency->id]->name() : $wallets[$currency->id];
             }
         }

system/modules/Money/objects/Sums.php

Spacing +7 added lines, -7 removed lines

@@ -61,21 +61,21 @@
             if ($first) {
                 $first = false;
             } else {
-                $string.= '<br />';
+                $string .= '<br />';
             }
-            $string.= '<span style="white-space:nowrap;">';
-            $string.= number_format($sum, 2, '.', ' ');
+            $string .= '<span style="white-space:nowrap;">';
+            $string .= number_format($sum, 2, '.', ' ');
             if (\App::$cur->money) {
                 $currency = \Money\Currency::get($currency_id);
                 if ($currency) {
-                    $string.= ' ' . $currency->acronym();
+                    $string .= ' ' . $currency->acronym();
                 } else {
-                    $string.= ' руб.';
+                    $string .= ' руб.';
                 }
             } else {
-                $string.= ' руб.';
+                $string .= ' руб.';
             }
-            $string.= '</span>';
+            $string .= '</span>';
         }
         return $string;
     }

Braces +6 added lines, -3 removed lines

@@ -54,7 +54,8 @@ 
         foreach ($this->sums as $currency_id => $sum) {
             if ($first) {
                 $first = false;
-            } else {
+            }
+            else {
                 $string.= '<br />';
             }
             $string.= '<span style="white-space:nowrap;">';
@@ -63,10 +64,12 @@ 
                 $currency = \Money\Currency::get($currency_id);
                 if ($currency) {
                     $string.= ' ' . $currency->acronym();
-                } else {
+                }
+                else {
                     $string.= ' руб.';
                 }
-            } else {
+            }
+            else {
                 $string.= ' руб.';
             }
             $string.= '</span>';

system/modules/YandexExport/appControllers/YandexExportController.php

Doc Comments +4 added lines

@@ -11,6 +11,10 @@
 
     function indexAction() {
 
+        /**
+         * @param DOMDocument $xml
+         * @param string $nodeName
+         */
         function addToXml($xml, $parent, $nodeName, $text) {
             $node = $parent->appendChild($xml->createElement($nodeName));
             $node->appendChild($xml->createTextNode($text));

system/modules/Files/Files.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 
         if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
             $typeOptions = json_decode($type->options, true);
-            list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+            list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath . $fileObject->path);
             if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
                 Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
             }
@@ -120,7 +120,7 @@ 
 
         if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
             $typeOptions = json_decode($type->options, true);
-            list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+            list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath . $fileObject->path);
             if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
                 Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
             }

Braces +21 added lines, -14 removed lines

@@ -22,16 +22,19 @@ 
 
         $sitePath = App::$primary->path;
 
-        if (!is_uploaded_file($file['tmp_name']))
-            return 0;
+        if (!is_uploaded_file($file['tmp_name'])) {
+                    return 0;
+        }
 
         $fileinfo = pathinfo($file['name']);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -47,8 +50,9 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
@@ -84,12 +88,14 @@ 
         $sitePath = App::$primary->path;
 
         $fileinfo = pathinfo($url);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -105,8 +111,9 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');