injitools / cms-Inji

system/Inji/Tools.php

Doc Comments +1 added lines

@@ -216,6 +216,7 @@
      * @param  $number Integer Число на основе которого нужно сформировать окончание
      * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
      *         например array('яблоко', 'яблока', 'яблок')
+     * @param string[] $endingArray
      * @return String
      */
     static function getNumEnding($number, $endingArray)

Braces +27 added lines, -15 removed lines

@@ -41,7 +41,8 @@ 
         foreach ($params as $key => $param) {
             if ($param != '') {
                 $params[$key] = urldecode($param);
-            } else {
+            }
+            else {
                 unset($params[$key]);
             }
         }
@@ -55,8 +56,9 @@ 
      * @return boolean
      */
     public static function createDir($path) {
-        if (file_exists($path))
-            return true;
+        if (file_exists($path)) {
+                    return true;
+        }
 
         $path = explode('/', $path);
         $cur = '';
@@ -100,10 +102,12 @@ 
             return false;
         }
 
-        if ($img_width / $max_width > $img_height / $max_height)
-            $separator = $img_width / $max_width;
-        else
-            $separator = $img_height / $max_height;
+        if ($img_width / $max_width > $img_height / $max_height) {
+                    $separator = $img_width / $max_width;
+        }
+        else {
+                    $separator = $img_height / $max_height;
+        }
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {
@@ -112,7 +116,8 @@ 
                 $img_width = $img_height;
                 $new_width = $max_width;
                 $new_height = $max_height;
-            } else {
+            }
+            else {
                 $imgX = 0;
                 $imgY = floor(( $img_height - $img_width ) / 2);
                 $img_height = $img_width;
@@ -122,7 +127,8 @@ 
             if ($pos == 'top') {
                 $imgY = 0;
             }
-        } elseif ($crop == 'c') {
+        }
+        elseif ($crop == 'c') {
 //Вычисляем некий коэффициент масштабирования
             $k1 = $img_width / $max_width;
             $k2 = $img_height / $max_height;
@@ -138,10 +144,12 @@ 
             $imgX = (int) (($ow / 2) - ($img_width / 2) );
             if ($pos == 'center') {
                 $imgY = (int) (($oh / 2) - ($img_height / 2));
-            } else {
+            }
+            else {
                 $imgY = 0;
             }
-        } else {
+        }
+        else {
             $imgX = 0;
             $imgY = 0;
             $new_width = floor($img_width / $separator);
@@ -156,7 +164,8 @@ 
         if ($img_type == 'jpeg') {
             imageinterlace($new_res, 1); // чересстрочное формирование изображение
             imagejpeg($new_res, $img_path, 85);
-        } else {
+        }
+        else {
             $imageX = "image{$img_type}";
             $imageX($new_res, $img_path);
         }
@@ -207,7 +216,8 @@ 
         }
         if (!headers_sent()) {
             header("Location: {$href}");
-        } else {
+        }
+        else {
             echo '\'"><script>window.location="' . $href . '";</script>';
         }
         exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
@@ -224,7 +234,8 @@ 
         $number = $number % 100;
         if ($number >= 11 && $number <= 19) {
             $ending = $endingArray[2];
-        } else {
+        }
+        else {
             $i = $number % 10;
             switch ($i) {
                 case (1): $ending = $endingArray[0];
@@ -366,7 +377,8 @@ 
             }
             if (is_dir($from . '/' . $file)) {
                 self::copyFiles($from . '/' . $file, $to . '/' . $file);
-            } else {
+            }
+            else {
                 copy($from . '/' . $file, $to . '/' . $file);
             }
         }

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

Doc Comments +6 added lines

@@ -29,6 +29,9 @@ 
     public $params = [];
     public $distinct = false;
 
+    /**
+     * @param  $instance
+     */
     function __construct($instance = null)
     {
         if (!$instance) {
@@ -47,6 +50,9 @@ 
         return $this->curInstance->pdo->lastInsertId();
     }
 
+    /**
+     * @param string $table
+     */
     public function select($table)
     {
         $this->operation = 'SELECT';

Braces +100 added lines, -59 removed lines

@@ -34,7 +34,8 @@ 
     public function __construct($instance = null) {
         if (!$instance) {
             $this->curInstance = \App::$cur->db->connection;
-        } else {
+        }
+        else {
             $this->curInstance = $instance;
         }
     }
@@ -79,7 +80,8 @@ 
     public function cols($cols) {
         if (is_array($cols)) {
             $this->cols = array_merge($this->cols, array_values($cols));
-        } else {
+        }
+        else {
             $this->cols[] = $cols;
         }
     }
@@ -90,11 +92,13 @@ 
                 if (!is_array($item)) {
                     call_user_func_array(array($this, 'join'), $table);
                     break;
-                } else {
+                }
+                else {
                     $this->join($item);
                 }
             }
-        } else {
+        }
+        else {
             $this->join[] = [$table, $where, $type, $alias];
         }
     }
@@ -102,7 +106,8 @@ 
     public function where($where = '', $value = '', $operation = false, $concatenation = 'AND') {
         if (!is_array($where)) {
             $this->where[] = [$where, $value, $operation, $concatenation];
-        } else {
+        }
+        else {
             $this->where[] = $where;
         }
     }
@@ -110,7 +115,8 @@ 
     public function having($where = '', $value = '', $operation = false, $concatenation = 'AND') {
         if (!is_array($where)) {
             $this->having[] = [$where, $value, $operation, $concatenation];
-        } else {
+        }
+        else {
             $this->having[] = $where;
         }
     }
@@ -124,13 +130,17 @@ 
 
         if (!is_array($order)) {
             $this->order[] = "{$order} {$type}";
-        } else {
-            foreach ($order as $item)
-                if (!is_array($item)) {
+        }
+        else {
+            foreach ($order as $item) {
+                            if (!is_array($item)) {
                     call_user_func_array(array($this, 'order'), $order);
+            }
                     break;
-                } else
-                    $this->order($item);
+                }
+                else {
+                                    $this->order($item);
+                }
         }
     }
 
@@ -138,8 +148,9 @@ 
         $start = intval($start);
         $len = intval($len);
         $this->limit = "LIMIT {$start}";
-        if ($len !== 0)
-            $this->limit .= ",{$len}";
+        if ($len !== 0) {
+                    $this->limit .= ",{$len}";
+        }
     }
 
     public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
@@ -149,12 +160,15 @@ 
             foreach ($joins as $joinAr) {
                 $join .= call_user_func_array([$this, 'buildJoin'], $joinAr);
             }
-        } else {
+        }
+        else {
             $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-            if ($alias)
-                $join .= " AS `{$alias}`";
-            if ($where)
-                $join .= " ON {$where}";
+            if ($alias) {
+                            $join .= " AS `{$alias}`";
+            }
+            if ($where) {
+                            $join .= " ON {$where}";
+            }
         }
         return $join;
     }
@@ -173,13 +187,16 @@ 
                 $operation = '=';
             }
 
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            }
+            elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->whereString == NULL)
-                $this->whereString = ' WHERE ';
+            if ($this->whereString == NULL) {
+                            $this->whereString = ' WHERE ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
                 if (is_array($value)) {
@@ -190,25 +207,31 @@ 
                         }
                         if (is_string($item)) {
                             $newValue .='"' . $item . '"';
-                        } else {
+                        }
+                        else {
                             $newValue .=$item;
                         }
                     }
                     $value = '(' . $newValue . ')';
-                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "({$value})";
-                } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "\"{$value}\"";
                 }
-            } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+            }
+            elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
                 $this->params[] = $value;
                 $value = "?";
             }
 
-            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
-                $this->whereString .= " {$where} {$operation} {$value} ";
-            else
-                $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') {
+                            $this->whereString .= " {$where} {$operation} {$value} ";
+            }
+            else {
+                            $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
         }
         else {
             $i = -1;
@@ -218,23 +241,27 @@ 
                     if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
                         if (!isset($item[3])) {
                             $concatenation = 'AND';
-                        } else {
+                        }
+                        else {
                             $concatenation = $item[3];
                         }
 
                         $this->whereString .= "{$concatenation} ";
                     }
 
-                    if ($this->whereString != NULL)
-                        $this->whereString .= '(';
-                    else
-                        $this->whereString = 'WHERE (';
+                    if ($this->whereString != NULL) {
+                                            $this->whereString .= '(';
+                    }
+                    else {
+                                            $this->whereString = 'WHERE (';
+                    }
                 }
 
                 if (!is_array($item)) {
                     call_user_func_array(array($this, 'buildWhere'), $where);
                     break;
-                } else {
+                }
+                else {
                     $this->buildWhere($item);
                 }
                 if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
@@ -257,13 +284,16 @@ 
             if (empty($operation)) {
                 $operation = '=';
             }
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            }
+            elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->havingString == NULL)
-                $this->havingString = ' HAVING ';
+            if ($this->havingString == NULL) {
+                            $this->havingString = ' HAVING ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
                 if (is_array($value)) {
@@ -274,25 +304,31 @@ 
                         }
                         if (is_string($item)) {
                             $newValue .='"' . $item . '"';
-                        } else {
+                        }
+                        else {
                             $newValue .=$item;
                         }
                     }
                     $value = '(' . $newValue . ')';
-                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "({$value})";
-                } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "\"{$value}\"";
                 }
-            } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+            }
+            elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
                 $this->params[] = $value;
                 $value = "?";
             }
 
-            if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
-                $this->havingString .= " {$where} {$operation} {$value} ";
-            else
-                $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
+            if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ') {
+                            $this->havingString .= " {$where} {$operation} {$value} ";
+            }
+            else {
+                            $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
         }
         else {
             $i = -1;
@@ -302,23 +338,27 @@ 
                     if ($this->havingString != NULL && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
                         if (!isset($item[3])) {
                             $concatenation = 'AND';
-                        } else {
+                        }
+                        else {
                             $concatenation = $item[3];
                         }
 
                         $this->havingString .= "{$concatenation} ";
                     }
 
-                    if ($this->havingString != NULL)
-                        $this->havingString .= '(';
-                    else
-                        $this->havingString = 'HAVING (';
+                    if ($this->havingString != NULL) {
+                                            $this->havingString .= '(';
+                    }
+                    else {
+                                            $this->havingString = 'HAVING (';
+                    }
                 }
 
                 if (!is_array($item)) {
                     call_user_func_array(array($this, 'buildHaving'), $where);
                     break;
-                } else {
+                }
+                else {
                     $this->buildHaving($item);
                 }
                 if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
@@ -376,7 +416,8 @@ 
                     if (!in_array($item, array('CURRENT_TIMESTAMP'))) {
                         $this->params[] = $item;
                         $updates[] = "`{$key}` = ?";
-                    } else {
+                    }
+                    else {
                         $updates[] = "`{$key}` = {$item}";
                     }
                 }

system/modules/Files/models/File.php

Doc Comments +3 added lines

@@ -83,6 +83,9 @@
         return null;
     }
 
+    /**
+     * @return string
+     */
     function colName()
     {
         return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}][{$this->colName}]";

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

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/Inji/Model.php

Doc Comments +7 added lines, -4 removed lines

@@ -437,6 +437,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $new
+     */
     public function logChanges($new) {
         if (!App::$cur->db->connect || !App::$cur->dashboard) {
             return false;
@@ -539,7 +542,7 @@ 
     /**
      * Information extractor for col relations path
      * 
-     * @param string|array $info
+     * @param string $info
      * @return array
      */
     public static function parseColRecursion($info) {
@@ -625,7 +628,7 @@ 
      * Generate params string for col by name
      * 
      * @param string $colName
-     * @return boolean|string
+     * @return false|string
      */
     public static function genColParams($colName) {
         if (empty(static::$cols[$colName]) || static::$storage['type'] == 'moduleConfig') {
@@ -780,7 +783,7 @@ 
     /**
      * return relations list
      * 
-     * @return array
+     * @return string
      */
     public static function relations() {
         return [];
@@ -1303,7 +1306,7 @@ 
      * 
      * @param array $params
      * @param array $where
-     * @return boolean
+     * @return false|null
      */
     public static function update($params, $where = []) {
         static::fixPrefix($params);

Braces +159 added lines, -86 removed lines

@@ -151,10 +151,12 @@ 
             }
             if (strpos($valuePath, ':')) {
                 return self::getColValue($object->$rel, $param, $convert, $manageHref);
-            } else {
+            }
+            else {
                 return $convert ? Model::resloveTypeValue($object->$rel, $param, $manageHref) : $object->$rel->$param;
             }
-        } else {
+        }
+        else {
             return $convert ? Model::resloveTypeValue($object, $valuePath, $manageHref) : $object->$valuePath;
         }
     }
@@ -193,7 +195,8 @@ 
                     case 'method':
                         if (!empty($colInfo['colParams']['params'])) {
                             $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']);
-                        } else {
+                        }
+                        else {
                             $values = $colInfo['colParams']['module']->$colInfo['colParams']['method']();
                         }
                         $value = !empty($values[$item->$colName]) ? $values[$item->$colName] : 'Не задано';
@@ -210,7 +213,8 @@ 
                         $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
                         if ($manageHref) {
                             $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
-                        } else {
+                        }
+                        else {
                             $value = $relValue ? $relValue->name() : 'Не задано';
                         }
                         break;
@@ -220,7 +224,8 @@ 
                 $file = Files\File::get($item->$colName);
                 if ($file) {
                     $value = '<img src="' . $file->path . '?resize=60x120" />';
-                } else {
+                }
+                else {
                     $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
                 }
                 break;
@@ -228,7 +233,8 @@ 
                 $file = Files\File::get($item->$colName);
                 if ($file) {
                     $value = '<a href="' . $file->path . '">' . $file->name . '.' . $file->type->ext . '</a>';
-                } else {
+                }
+                else {
                     $value = 'Файл не загружен';
                 }
                 break;
@@ -279,7 +285,8 @@ 
                     $onclick .= 'return false;';
                     $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                     $value .= $content;
-                } else {
+                }
+                else {
                     $value = 'Местоположение не заданно';
                 }
 
@@ -299,7 +306,8 @@ 
                                 $itemModel = get_class($curItem);
                                 $relation = $itemModel::getRelation($relationName);
                                 $sourceModel = $relation['model'];
-                            } else {
+                            }
+                            else {
                                 $relation = static::getRelation($type['relation']);
                                 $sourceModel = $relation['model'];
                             }
@@ -307,10 +315,12 @@ 
                             $value = $sourceModel::get($item->$colName);
                             if ($value) {
                                 $value = $value->name();
-                            } else {
+                            }
+                            else {
                                 $value = $item->$colName;
                             }
-                        } else {
+                        }
+                        else {
                             switch ($type) {
                                 case 'map':
                                     if ($item->$colName && json_decode($item->$colName, true)) {
@@ -351,7 +361,8 @@ 
                                         $onclick .= 'return false;';
                                         $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                                         $value .= $content;
-                                    } else {
+                                    }
+                                    else {
                                         $value = 'Местоположение не заданно';
                                     }
 
@@ -393,7 +404,8 @@ 
             }
             if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
                 $array = static::colPrefix() . $array;
-            } else {
+            }
+            else {
                 static::checkForJoin($array, $rootModel);
             }
             return;
@@ -412,7 +424,8 @@ 
                     }
                     if (is_array($array[$key])) {
                         static::fixPrefix($array[$key], 'key', $rootModel);
-                    } else {
+                    }
+                    else {
                         static::checkForJoin($key, $rootModel);
                     }
                 }
@@ -425,10 +438,12 @@ 
                     }
                     if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
                         $array[0] = static::colPrefix() . $array[0];
-                    } else {
+                    }
+                    else {
                         static::checkForJoin($array[0], $rootModel);
                     }
-                } elseif (isset($array[0]) && is_array($array[0])) {
+                }
+                elseif (isset($array[0]) && is_array($array[0])) {
                     foreach ($array as &$item) {
                         static::fixPrefix($item, 'first', $rootModel);
                     }
@@ -461,7 +476,8 @@ 
                 }
                 if (strlen($oldValue) + strlen($this->_params[$fullColName]) < 200) {
                     $changes_text[] = (!empty($class::$labels[$colName]) ? $class::$labels[$colName] : $colName) . ": \"{$oldValue}\" => \"{$this->$colName}\"";
-                } else {
+                }
+                else {
                     $changes_text[] = !empty($class::$labels[$colName]) ? $class::$labels[$colName] : $colName;
                 }
             }
@@ -480,7 +496,8 @@ 
                 ]);
                 $change->save();
             }
-        } elseif ($new) {
+        }
+        elseif ($new) {
             $activity = new Dashboard\Activity([
                 'user_id' => \Users\User::$cur->id,
                 'module' => substr($class, 0, strpos($class, '\\')),
@@ -568,7 +585,8 @@ 
                 }
                 $info = $relations[$rel]['model']::parseColRecursion($info);
             }
-        } else {
+        }
+        else {
             $cols = static::cols();
             if (!empty(static::$labels[$info['col']])) {
                 $info['label'] = static::$labels[$info['col']];
@@ -576,9 +594,11 @@ 
 
             if (isset(static::$cols[$info['col']])) {
                 $info['colParams'] = static::$cols[$info['col']];
-            } elseif (isset(static::$cols[str_replace(static::colPrefix(), '', $info['col'])])) {
+            }
+            elseif (isset(static::$cols[str_replace(static::colPrefix(), '', $info['col'])])) {
                 $info['colParams'] = static::$cols[str_replace(static::colPrefix(), '', $info['col'])];
-            } else {
+            }
+            else {
                 $info['colParams'] = [];
             }
             if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
@@ -709,7 +729,8 @@ 
             $tableName = static::table();
             $colPrefix = static::colPrefix();
             $indexes = static::indexes();
-        } else {
+        }
+        else {
             $tableName = $this->table();
             $colPrefix = $this->colPrefix();
             $indexes = $this->indexes();
@@ -855,7 +876,8 @@ 
         static::$needJoin = [];
         if (is_array($param)) {
             App::$cur->db->where($param);
-        } else {
+        }
+        else {
             if ($col === null) {
 
                 $col = static::index();
@@ -866,7 +888,8 @@ 
                     $col = static::colPrefix() . $col;
                 }
                 App::$cur->db->where($col, $param);
-            } else {
+            }
+            else {
                 return false;
             }
         }
@@ -898,22 +921,27 @@ 
         if (!$query) {
             return [];
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
-        if (!empty($options['cols']))
-            $query->cols = $options['cols'];
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
+        if (!empty($options['cols'])) {
+                    $query->cols = $options['cols'];
+        }
         if (!empty($options['group'])) {
             $query->group($options['group']);
         }
         if (!empty($options['having'])) {
             $query->having($options['having']);
         }
-        if (!empty($options['order']))
-            $query->order($options['order']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
-        if (!empty($options['distinct']))
-            $query->distinct = $options['distinct'];
+        if (!empty($options['order'])) {
+                    $query->order($options['order']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
+        if (!empty($options['distinct'])) {
+                    $query->distinct = $options['distinct'];
+        }
 
         foreach (static::$relJoins as $join) {
             $query->join($join[0], $join[1]);
@@ -939,13 +967,15 @@ 
         }
         static::$needJoin = [];
 
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        }
         else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        }
         else {
             $start = 0;
         }
@@ -954,7 +984,8 @@ 
         }
         if (isset($options['key'])) {
             $key = $options['key'];
-        } else {
+        }
+        else {
             $key = static::index();
         }
         try {
@@ -966,7 +997,8 @@ 
             if ($exc->getCode() == '42S02') {
                 static::createTable();
                 $result = $query->query($queryArr);
-            } else {
+            }
+            else {
                 throw $exc;
             }
         }
@@ -1029,7 +1061,8 @@ 
         $classPath = explode('\\', get_called_class());
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
         $appType = App::$cur->type;
@@ -1038,7 +1071,8 @@ 
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (!empty($storage[$classPath[1]])) {
@@ -1070,17 +1104,20 @@ 
         $classPath = explode('\\', get_called_class());
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             if (empty($options['appType'])) {
                 $appType = App::$cur->type;
-            } else {
+            }
+            else {
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (!empty($storage[$classPath[1]])) {
@@ -1088,7 +1125,8 @@ 
             $class = get_called_class();
             if (isset($options['key'])) {
                 $arrayKey = $options['key'];
-            } else {
+            }
+            else {
                 $arrayKey = static::index();
             }
             foreach ($storage[$classPath[1]] as $key => $item) {
@@ -1101,7 +1139,8 @@ 
                 usort($items, function($a, $b) use($options) {
                     if ($a->{$options['order'][0]} > $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
                         return 1;
-                    } elseif ($a->{$options['order'][0]} < $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
+                    }
+                    elseif ($a->{$options['order'][0]} < $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
                         return -1;
                     }
                     return 0;
@@ -1131,12 +1170,14 @@ 
         $count = 0;
         if (empty($options['appType'])) {
             $appType = App::$cur->type;
-        } else {
+        }
+        else {
             $appType = $options['appType'];
         }
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
         if (!empty($moduleConfig['storage'][$appType][$classPath[1]])) {
@@ -1149,7 +1190,8 @@ 
                     if (Model::checkWhere($item, $options['where'])) {
                         $count++;
                     }
-                } else {
+                }
+                else {
                     $count++;
                 }
             }
@@ -1185,7 +1227,8 @@ 
                 }
 
                 return $result;
-            } else {
+            }
+            else {
                 return forward_static_call_array(['Model', 'checkWhere'], array_merge([$item], $where));
             }
         }
@@ -1221,20 +1264,24 @@ 
         if (!empty($options['group'])) {
             static::fixPrefix($options['group'], 'first');
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
         if (!empty($options['order'])) {
             $query->order($options['order']);
         }
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        }
         else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        }
         else {
             $start = 0;
         }
@@ -1270,10 +1317,12 @@ 
         if (!empty($options['distinct'])) {
             if (is_bool($options['distinct'])) {
                 $cols .= 'DISTINCT *';
-            } else {
+            }
+            else {
                 $cols .= "DISTINCT {$options['distinct']}";
             }
-        } else {
+        }
+        else {
             $cols .= '*';
         }
         $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
@@ -1292,7 +1341,8 @@ 
         if (!empty($options['group'])) {
             $count = $result->getArray();
             return $count;
-        } else {
+        }
+        else {
             $count = $result->fetch();
             return $count['count'];
         }
@@ -1312,8 +1362,9 @@ 
 
         $values = [];
         foreach ($cols as $col => $param) {
-            if (isset($params[$col]))
-                $values[$col] = $params[$col];
+            if (isset($params[$col])) {
+                            $values[$col] = $params[$col];
+            }
         }
         if (empty($values)) {
             return false;
@@ -1358,18 +1409,21 @@ 
 
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
 
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             if (empty($options['appType'])) {
                 $appType = App::$cur->type;
-            } else {
+            }
+            else {
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (empty($storage[$classPath[1]])) {
@@ -1382,7 +1436,8 @@ 
                     break;
                 }
             }
-        } else {
+        }
+        else {
             $id = !empty($storage['scheme'][$classPath[1]]['ai']) ? $storage['scheme'][$classPath[1]]['ai'] : 1;
             $this->$col = $id;
             $storage['scheme'][$classPath[1]]['ai'] = $id + 1;
@@ -1390,12 +1445,14 @@ 
         }
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             $moduleConfig['storage'][$appType] = $storage;
-        } else {
+        }
+        else {
             $moduleConfig['storage'] = $storage;
         }
         if (empty(static::$storage['options']['share'])) {
             Config::save('module', $moduleConfig, $classPath[0]);
-        } else {
+        }
+        else {
             Config::save('share', $moduleConfig, $classPath[0]);
         }
         return true;
@@ -1442,7 +1499,8 @@ 
         if ($catalog && $catalogParent) {
             if ($catalogParent->tree_path) {
                 return $catalogParent->tree_path . $catalogParent->id . '/';
-            } else {
+            }
+            else {
                 return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
             }
         }
@@ -1458,7 +1516,8 @@ 
         $category = $categoryModel::get($this->{$categoryModel::index()});
         if ($category) {
             $this->tree_path = $category->tree_path . $category->pk() . '/';
-        } else {
+        }
+        else {
             $this->tree_path = '/';
         }
     }
@@ -1507,11 +1566,13 @@ 
             if ($this->get($this->_params[$this->index()])) {
                 App::$cur->db->where($this->index(), $this->_params[$this->index()]);
                 App::$cur->db->update($this->table(), $values);
-            } else {
+            }
+            else {
 
                 $this->_params[$this->index()] = App::$cur->db->insert($this->table(), $values);
             }
-        } else {
+        }
+        else {
             $new = true;
             $this->_params[$this->index()] = App::$cur->db->insert($this->table(), $values);
         }
@@ -1561,18 +1622,21 @@ 
         $classPath = explode('\\', get_called_class());
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
 
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             if (empty($options['appType'])) {
                 $appType = App::$cur->type;
-            } else {
+            }
+            else {
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (empty($storage[$classPath[1]])) {
@@ -1587,12 +1651,14 @@ 
         }
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             $moduleConfig['storage'][$appType] = $storage;
-        } else {
+        }
+        else {
             $moduleConfig['storage'] = $storage;
         }
         if (empty(static::$storage['options']['share'])) {
             Config::save('module', $moduleConfig, $classPath[0]);
-        } else {
+        }
+        else {
             Config::save('share', $moduleConfig, $classPath[0]);
         }
         return true;
@@ -1650,8 +1716,9 @@ 
     public static function findRelation($col) {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }
@@ -1706,7 +1773,8 @@ 
         if ($relation) {
             if (!isset($relation['type'])) {
                 $type = 'to';
-            } else {
+            }
+            else {
                 $type = $relation['type'];
             }
             $getCol = null;
@@ -1722,7 +1790,8 @@ 
                     if (empty($ids)) {
                         if (empty($params['count'])) {
                             return [];
-                        } else {
+                        }
+                        else {
                             return 0;
                         }
                     }
@@ -1777,10 +1846,12 @@ 
                     return $relation['model']::getCount($options);
                 }
                 return 0;
-            } else {
+            }
+            else {
                 if (class_exists($relation['model'])) {
                     $this->loadedRelations[$name][json_encode($params)] = $relation['model']::$getType($options, $getCol, $getParams);
-                } else {
+                }
+                else {
                     $this->loadedRelations[$name][json_encode($params)] = [];
                 }
             }
@@ -1851,7 +1922,8 @@ 
         static::fixPrefix($fixedName);
         if (isset($this->_params[$fixedName])) {
             return new Value($this, $fixedName);
-        } elseif (isset($this->_params[$name])) {
+        }
+        elseif (isset($this->_params[$name])) {
             return new Value($this, $name);
         }
         return call_user_func_array([$this, 'loadRelation'], array_merge([$name], $params));
@@ -1886,7 +1958,8 @@ 
         static::fixPrefix($fixedName);
         if (isset($this->_params[$fixedName])) {
             return new Value($this, $fixedName);
-        } elseif ($this->_params[$name]) {
+        }
+        elseif ($this->_params[$name]) {
             return new Value($this, $name);
         }
         return null;

system/modules/Users/Users.php

Doc Comments +6 added lines

@@ -116,6 +116,9 @@ 
         }
     }
 
+    /**
+     * @param string $user_mail
+     */
     public function passre($user_mail) {
         $user = $this->get($user_mail, 'mail');
         if (!$user) {
@@ -400,6 +403,9 @@ 
         return $return;
     }
 
+    /**
+     * @param integer $cat_id
+     */
     public function addUserActivity($user_id, $cat_id, $text = '') {
         $ua = new Users\Activity([
             'user_id' => $user_id,

Braces +33 added lines, -19 removed lines

@@ -98,7 +98,8 @@ 
                     setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
                 }
                 Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');
-            } elseif ($session->user->activation) {
+            }
+            elseif ($session->user->activation) {
                 Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');
             }
             if (!$session->user->mail && !empty($this->config['noMailNotify'])) {
@@ -107,7 +108,8 @@ 
             Users\User::$cur = $session->user;
             Users\User::$cur->date_last_active = 'CURRENT_TIMESTAMP';
             Users\User::$cur->save();
-        } else {
+        }
+        else {
             if (!headers_sent()) {
                 setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
                 setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
@@ -160,7 +162,8 @@ 
         if ($user && $this->verifypass($pass, $user->pass) && !$user->blocked) {
             if (!empty($this->config['needActivation']) && $user->activation) {
                 Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $user->id . '"><b>повторно выслать ссылку активации</b></a>');
-            } elseif ($user->activation) {
+            }
+            elseif ($user->activation) {
                 Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $user->id . '"><b>повторно выслать ссылку активации</b></a>');
             }
             if (!$user->mail && !empty($this->config['noMailNotify'])) {
@@ -179,9 +182,11 @@ 
         if (!$noMsg) {
             if ($user && $user->blocked) {
                 Msg::add('Вы заблокированы', 'danger');
-            } elseif ($user) {
+            }
+            elseif ($user) {
                 Msg::add('Вы ошиблись при наборе пароля или логина, попробуйте ещё раз или воспользуйтесь <a href = "?passre=1&user_mail=' . $user->mail . '">Восстановлением пароля</a>', 'danger');
-            } else {
+            }
+            else {
                 Msg::add('Данный почтовый ящик не зарегистрирован в системе', 'danger');
             }
         }
@@ -204,7 +209,8 @@ 
         if (!headers_sent()) {
             setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");
             setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");
-        } else {
+        }
+        else {
             Msg::add('Не удалось провести авторизацию. Попробуйте позже', 'info');
         }
     }
@@ -217,17 +223,22 @@ 
      * @return boolean|\User\User
      */
     public function get($idn, $ltype = 'id') {
-        if (!$idn)
-            return false;
+        if (!$idn) {
+                    return false;
+        }
 
-        if (is_numeric($idn) && $ltype != 'login')
-            $user = Users\User::get($idn, 'id');
-        elseif ($ltype == 'login')
-            $user = Users\User::get($idn, 'login');
-        else
-            $user = Users\User::get($idn, 'mail');
-        if (!$user)
-            return [];
+        if (is_numeric($idn) && $ltype != 'login') {
+                    $user = Users\User::get($idn, 'id');
+        }
+        elseif ($ltype == 'login') {
+                    $user = Users\User::get($idn, 'login');
+        }
+        else {
+                    $user = Users\User::get($idn, 'mail');
+        }
+        if (!$user) {
+                    return [];
+        }
 
         return $user;
     }
@@ -309,7 +320,8 @@ 
                 return false;
             }
             $pass = $data['user_pass'][0];
-        } else {
+        }
+        else {
             $pass = Tools::randomString(10);
         }
 
@@ -355,7 +367,8 @@ 
             $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';
             Tools::sendMail($from, $to, $subject, $text);
             Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль и ссылка для активации', 'success');
-        } else {
+        }
+        else {
             $from = 'noreply@' . INJI_DOMAIN_NAME;
             $to = $data['user_mail'];
             $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
@@ -387,7 +400,8 @@ 
             if (!$userIds && $levels) {
                 $levels[$i] = [];
                 continue;
-            } elseif (!$userIds && !$levels) {
+            }
+            elseif (!$userIds && !$levels) {
                 break;
             }
             $usersLevel = \Users\User::getList(['where' => [['parent_id', $userIds, 'IN']]]);

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

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

system/modules/Files/appAdminControllers/content/managerForEditor.php

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
                   <?php
                   if ($file->type->group == 'image') {
                       echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />";
-                  } else {
+                  }
+                  else {
                       echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />";
                   }
                   ?>