Completed
Push — master ( 308a3c...ebb499 )
by Alexey
08:08
created
system/modules/Access/Access.php 1 patch
Braces   +10 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,8 +20,9 @@  discard block
 block discarded – undo
20 20
         if (!$app) {
21 21
             $app = $this->app->type;
22 22
         }
23
-        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl']))
24
-            return $this->config['access']['accessTree'][$app]['deniedUrl'];
23
+        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) {
24
+                    return $this->config['access']['accessTree'][$app]['deniedUrl'];
25
+        }
25 26
 
26 27
         return '/';
27 28
     }
@@ -46,8 +47,9 @@  discard block
 block discarded – undo
46 47
             return true;
47 48
         }
48 49
 
49
-        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access)))
50
-            return false;
50
+        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) {
51
+                    return false;
52
+        }
51 53
 
52 54
         return true;
53 55
     }
@@ -66,9 +68,11 @@  discard block
 block discarded – undo
66 68
     public function pathWalker($array, $path) {
67 69
         if ($path && isset($array[$path[0]])) {
68 70
             return $this->pathWalker($array[$path[0]], array_slice($path, 1));
69
-        } elseif (!$path) {
71
+        }
72
+        elseif (!$path) {
70 73
             return $array;
71
-        } else {
74
+        }
75
+        else {
72 76
             return NULL;
73 77
         }
74 78
     }
Please login to merge, or discard this patch.
system/modules/Ui/objects/FastEdit.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@
 block discarded – undo
23 23
         $value = $value !== null ? $value : ($object ? $object->$col : '');
24 24
         if ($parse) {
25 25
             \App::$cur->view->parseSource($value);
26
-        } else {
26
+        }
27
+        else {
27 28
             $str .= $value;
28 29
         }
29 30
 
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input/DynamicList.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,7 +46,8 @@  discard block
 block discarded – undo
46 46
                             foreach ($relModels as $model) {
47 47
                                 if (empty($rels[$model->{$relation['model']::index()}])) {
48 48
                                     $model->delete();
49
-                                } else {
49
+                                }
50
+                                else {
50 51
                                     unset($rels[$model->{$relation['model']::index()}]);
51 52
                                 }
52 53
                             }
@@ -78,7 +79,8 @@  discard block
 block discarded – undo
78 79
                             foreach ($relModels as $model) {
79 80
                                 if (empty($rels[$model->pk()])) {
80 81
                                     $model->delete();
81
-                                } else {
82
+                                }
83
+                                else {
82 84
                                     $model->setParams($rels[$model->pk()]);
83 85
                                     $model->save();
84 86
                                 }
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input/Map.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,8 @@
 block discarded – undo
17 17
         $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
18 18
         if (isset($request[$this->colName])) {
19 19
             $this->activeForm->model->{$colName} = json_encode($request[$this->colName]);
20
-        } else {
20
+        }
21
+        else {
21 22
             $this->activeForm->model->{$colName} = 0;
22 23
             $this->activeForm->model->{$colName} = '';
23 24
         }
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input/DynamicType.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,8 @@
 block discarded – undo
43 43
                         }
44 44
 
45 45
                         $inputOptions['values'] = $item->{$relationName}(['forSelect' => true]);
46
-                    } else {
46
+                    }
47
+                    else {
47 48
                         $inputOptions['values'] = $this->activeForm->model->{$type['relation']}(['forSelect' => true]);
48 49
                     }
49 50
                 }
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,8 @@  discard block
 block discarded – undo
45 45
         $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
46 46
         if (isset($request[$this->colName])) {
47 47
             $this->activeForm->model->{$colName} = $request[$this->colName];
48
-        } else {
48
+        }
49
+        else {
49 50
             $this->activeForm->model->{$colName} = 0;
50 51
             $this->activeForm->model->{$colName} = '';
51 52
         }
@@ -70,7 +71,8 @@  discard block
 block discarded – undo
70 71
             $value = '';
71 72
             if (!empty($preset['value'])) {
72 73
                 $value = $preset['value'];
73
-            } elseif (!empty($preset['userCol'])) {
74
+            }
75
+            elseif (!empty($preset['userCol'])) {
74 76
                 if (strpos($preset['userCol'], ':')) {
75 77
                     $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
76 78
                     $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm.php 1 patch
Braces   +32 added lines, -16 removed lines patch added patch discarded remove patch
@@ -35,7 +35,8 @@  discard block
 block discarded – undo
35 35
             if (is_string($form)) {
36 36
                 $this->formName = $form;
37 37
             }
38
-        } else {
38
+        }
39
+        else {
39 40
             $this->model = $model;
40 41
             $this->modelName = get_class($model);
41 42
             if (is_array($form)) {
@@ -43,7 +44,8 @@  discard block
 block discarded – undo
43 44
                     throw new \Exception('empty form');
44 45
                 }
45 46
                 $this->form = $form;
46
-            } else {
47
+            }
48
+            else {
47 49
                 $this->formName = $form;
48 50
                 $this->form = \App::$cur->ui->getModelForm($this->modelName, $form);
49 51
                 if (empty($this->form)) {
@@ -57,9 +59,11 @@  discard block
 block discarded – undo
57 59
 
58 60
         if (!empty($this->form['name'])) {
59 61
             $this->header = $this->form['name'];
60
-        } elseif (!empty($modeName::$objectName)) {
62
+        }
63
+        elseif (!empty($modeName::$objectName)) {
61 64
             $this->header = $modeName::$objectName;
62
-        } else {
65
+        }
66
+        else {
63 67
             $this->header = $this->modelName;
64 68
         }
65 69
     }
@@ -76,7 +80,8 @@  discard block
 block discarded – undo
76 80
                     $colPath = explode(':', $col);
77 81
                     if ($this->model->{$colPath[1]}) {
78 82
                         $inputs[$col] = new ActiveForm($this->model->{$colPath[1]}, $colPath[2]);
79
-                    } else {
83
+                    }
84
+                    else {
80 85
                         $relOptions = $modelName::getRelation($colPath[1]);
81 86
                         if (!isset($this->model->_params[$modelName::index()])) {
82 87
                             $this->model->_params[$modelName::index()] = 0;
@@ -85,7 +90,8 @@  discard block
 block discarded – undo
85 90
                         $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
86 91
                     }
87 92
                     $inputs[$col]->parent = $this;
88
-                } elseif (!empty($modelName::$cols[$col])) {
93
+                }
94
+                elseif (!empty($modelName::$cols[$col])) {
89 95
                     $inputs[$col] = $modelName::$cols[$col];
90 96
                 }
91 97
             }
@@ -108,7 +114,8 @@  discard block
 block discarded – undo
108 114
                     $text = 'Новый элемент был успешно добавлен';
109 115
                     \Msg::add($text, 'success');
110 116
                     \Msg::show();
111
-                } else {
117
+                }
118
+                else {
112 119
                     $presets = !empty($this->form['preset']) ? $this->form['preset'] : [];
113 120
                     if (!empty($this->form['userGroupPreset'][\Users\User::$cur->group_id])) {
114 121
                         $presets = array_merge($presets, $this->form['userGroupPreset'][\Users\User::$cur->group_id]);
@@ -145,12 +152,14 @@  discard block
 block discarded – undo
145 152
                         foreach ($presets as $col => $preset) {
146 153
                             if (!empty($preset['value'])) {
147 154
                                 $this->model->$col = $preset['value'];
148
-                            } elseif (!empty($preset['userCol'])) {
155
+                            }
156
+                            elseif (!empty($preset['userCol'])) {
149 157
                                 if (strpos($preset['userCol'], ':')) {
150 158
                                     $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
151 159
                                     $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
152 160
                                     $this->model->$col = \Users\User::$cur->$rel->$param;
153
-                                } else {
161
+                                }
162
+                                else {
154 163
                                     $this->model->$col = \Users\User::$cur->{$preset['userCol']};
155 164
                                 }
156 165
                             }
@@ -158,7 +167,8 @@  discard block
 block discarded – undo
158 167
                         if (!$this->parent) {
159 168
                             if (!empty($this->form['successText'])) {
160 169
                                 $text = $this->form['successText'];
161
-                            } else {
170
+                            }
171
+                            else {
162 172
                                 $text = $this->model->pk() ? 'Изменения были успешно сохранены' : 'Новый элемент был успешно добавлен';
163 173
                             }
164 174
                             \Msg::add($text, 'success');
@@ -170,7 +180,8 @@  discard block
 block discarded – undo
170 180
                         }
171 181
                         if ($ajax) {
172 182
                             \Msg::show();
173
-                        } elseif (!empty($_GET['redirectUrl'])) {
183
+                        }
184
+                        elseif (!empty($_GET['redirectUrl'])) {
174 185
                             \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
175 186
                         }
176 187
                         $successId = $this->model->pk();
@@ -196,7 +207,8 @@  discard block
 block discarded – undo
196 207
     public function drawCol($colName, $options, $form, $params = []) {
197 208
         if (is_object($options)) {
198 209
             $options->draw();
199
-        } else {
210
+        }
211
+        else {
200 212
             $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
201 213
             $input = new $inputClassName();
202 214
             $input->form = $form;
@@ -223,7 +235,8 @@  discard block
 block discarded – undo
223 235
             case 'method':
224 236
                 if (!empty($inputParams['params'])) {
225 237
                     $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']);
226
-                } else {
238
+                }
239
+                else {
227 240
                     $values = \App::$cur->$inputParams['module']->$inputParams['method']();
228 241
                 }
229 242
                 break;
@@ -254,7 +267,8 @@  discard block
 block discarded – undo
254 267
                 }
255 268
                 if (!empty($params['noEmptyValue'])) {
256 269
                     $values = [];
257
-                } else {
270
+                }
271
+                else {
258 272
                     $values = [0 => 'Не задано'];
259 273
                 }
260 274
                 foreach ($items as $key => $item) {
@@ -265,10 +279,12 @@  discard block
 block discarded – undo
265 279
                                     $values[$key] = $inputParams['showCol']['class']::{$inputParams['showCol']['method']}($item);
266 280
                                     break;
267 281
                             }
268
-                        } else {
282
+                        }
283
+                        else {
269 284
                             $values[$key] = $item->$inputParams['showCol'];
270 285
                         }
271
-                    } else {
286
+                    }
287
+                    else {
272 288
                         $values[$key] = $item->name();
273 289
                     }
274 290
                 }
Please login to merge, or discard this patch.
system/modules/Ui/objects/Tree.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,8 @@  discard block
 block discarded – undo
24 24
             <?php
25 25
             if (is_string($objectRoot)) {
26 26
                 $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
27
-            } else {
27
+            }
28
+            else {
28 29
                 $class = get_class($objectRoot);
29 30
                 $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()], 'order' => $order]);
30 31
             }
@@ -66,7 +67,8 @@  discard block
 block discarded – undo
66 67
         }
67 68
         if ($isset) {
68 69
             echo '</ul></li>';
69
-        } else {
70
+        }
71
+        else {
70 72
             echo \Html::el('li', $attributes, $item);
71 73
         }
72 74
         return $count;
Please login to merge, or discard this patch.
system/modules/Ui/objects/Form.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,8 @@  discard block
 block discarded – undo
30 30
         foreach ($data as $key => $item) {
31 31
             if (is_array($item)) {
32 32
                 $this->genUserDataTree($item, $treeKey ? $treeKey . "[{$key}]" : $key);
33
-            } else {
33
+            }
34
+            else {
34 35
                 $this->userDataTree[$treeKey ? $treeKey . "[{$key}]" : $key] = $item;
35 36
             }
36 37
         }
@@ -58,7 +59,8 @@  discard block
 block discarded – undo
58 59
                 $params['form'] = $this;
59 60
                 if (empty($params['options']['class'])) {
60 61
                     $params['options']['class'] = 'htmleditor';
61
-                } else {
62
+                }
63
+                else {
62 64
                     $params['options']['class'] .= ' htmleditor';
63 65
                 }
64 66
                 \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/textarea', $params);
Please login to merge, or discard this patch.