injitools / cms-Inji

system/modules/Users/appControllers/UsersController.php

Braces +10 added lines, -5 removed lines

@@ -22,7 +22,8 @@ 
             $this->view->setTitle($sections[$activeSection]['name'] . ' - Личный кабинет');
             $bread[] = ['text' => 'Личный кабинет', 'href' => '/users/cabinet'];
             $bread[] = ['text' => $sections[$activeSection]['name']];
-        } else {
+        }
+        else {
             $this->view->setTitle('Личный кабинет');
             $bread[] = ['text' => 'Личный кабинет'];
         }
@@ -57,7 +58,8 @@ 
                         Msg::add('Вы не прошли проверку на робота', 'danger');
                         $error = true;
                     }
-                } else {
+                }
+                else {
                     Msg::add('Произошла ошибка, попробуйте ещё раз');
                     $error = true;
                 }
@@ -93,11 +95,13 @@ 
             $user_mail = trim($_POST['mail']);
             if (!filter_var($user_mail, FILTER_VALIDATE_EMAIL)) {
                 Msg::add('Вы ввели не корректный E-mail', 'danger');
-            } else {
+            }
+            else {
                 $user = Users\User::get($user_mail, 'mail');
                 if ($user && $user->id != Users\User::$cur->id) {
                     Msg::add('Данный E-mail уже привязан к другому аккаунту', 'danger');
-                } else {
+                }
+                else {
                     Users\User::$cur->mail = $user_mail;
                     if (!empty($this->module->config['needActivation'])) {
                         Users\User::$cur->activation = Tools::randomString();
@@ -107,7 +111,8 @@ 
                         $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '</a>';
                         Tools::sendMail($from, $to, $subject, $text);
                         Msg::add('На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
-                    } else {
+                    }
+                    else {
                         Msg::add('Вы успешно привязали E-Mail к своему аккаунту', 'success');
                     }
                     Users\User::$cur->save();

system/modules/Users/appControllers/content/cabinet.php

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
                                 <?php
                             }
                         }
-                    } else {
+                    }
+                    else {
                         $this->widget($sections[$activeSection]['fullWidget']);
                     }
                     ?>

system/modules/Access/Access.php

Braces +10 added lines, -6 removed lines

@@ -20,8 +20,9 @@ 
         if (!$app) {
             $app = $this->app->type;
         }
-        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl']))
-            return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) {
+                    return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        }
 
         return '/';
     }
@@ -46,8 +47,9 @@ 
             return true;
         }
 
-        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access)))
-            return false;
+        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) {
+                    return false;
+        }
 
         return true;
     }
@@ -66,9 +68,11 @@ 
     public function pathWalker($array, $path) {
         if ($path && isset($array[$path[0]])) {
             return $this->pathWalker($array[$path[0]], array_slice($path, 1));
-        } elseif (!$path) {
+        }
+        elseif (!$path) {
             return $array;
-        } else {
+        }
+        else {
             return NULL;
         }
     }

system/modules/Ui/objects/FastEdit.php

Braces +2 added lines, -1 removed lines

@@ -23,7 +23,8 @@
         $value = $value !== null ? $value : ($object ? $object->$col : '');
         if ($parse) {
             \App::$cur->view->parseSource($value);
-        } else {
+        }
+        else {
             $str .= $value;
         }
 

system/modules/Ui/objects/ActiveForm/Input/DynamicList.php

Braces +4 added lines, -2 removed lines

@@ -46,7 +46,8 @@ 
                             foreach ($relModels as $model) {
                                 if (empty($rels[$model->{$relation['model']::index()}])) {
                                     $model->delete();
-                                } else {
+                                }
+                                else {
                                     unset($rels[$model->{$relation['model']::index()}]);
                                 }
                             }
@@ -78,7 +79,8 @@ 
                             foreach ($relModels as $model) {
                                 if (empty($rels[$model->pk()])) {
                                     $model->delete();
-                                } else {
+                                }
+                                else {
                                     $model->setParams($rels[$model->pk()]);
                                     $model->save();
                                 }

system/modules/Ui/objects/ActiveForm/Input/Map.php

Braces +2 added lines, -1 removed lines

@@ -17,7 +17,8 @@
         $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
         if (isset($request[$this->colName])) {
             $this->activeForm->model->{$colName} = json_encode($request[$this->colName]);
-        } else {
+        }
+        else {
             $this->activeForm->model->{$colName} = 0;
             $this->activeForm->model->{$colName} = '';
         }

system/modules/Ui/objects/ActiveForm/Input/DynamicType.php

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
                         }
 
                         $inputOptions['values'] = $item->{$relationName}(['forSelect' => true]);
-                    } else {
+                    }
+                    else {
                         $inputOptions['values'] = $this->activeForm->model->{$type['relation']}(['forSelect' => true]);
                     }
                 }

system/modules/Ui/objects/ActiveForm/Input.php

Braces +4 added lines, -2 removed lines

@@ -45,7 +45,8 @@ 
         $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
         if (isset($request[$this->colName])) {
             $this->activeForm->model->{$colName} = $request[$this->colName];
-        } else {
+        }
+        else {
             $this->activeForm->model->{$colName} = 0;
             $this->activeForm->model->{$colName} = '';
         }
@@ -70,7 +71,8 @@ 
             $value = '';
             if (!empty($preset['value'])) {
                 $value = $preset['value'];
-            } elseif (!empty($preset['userCol'])) {
+            }
+            elseif (!empty($preset['userCol'])) {
                 if (strpos($preset['userCol'], ':')) {
                     $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
                     $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);

system/modules/Ui/objects/ActiveForm.php

Braces +32 added lines, -16 removed lines

@@ -35,7 +35,8 @@ 
             if (is_string($form)) {
                 $this->formName = $form;
             }
-        } else {
+        }
+        else {
             $this->model = $model;
             $this->modelName = get_class($model);
             if (is_array($form)) {
@@ -43,7 +44,8 @@ 
                     throw new \Exception('empty form');
                 }
                 $this->form = $form;
-            } else {
+            }
+            else {
                 $this->formName = $form;
                 $this->form = \App::$cur->ui->getModelForm($this->modelName, $form);
                 if (empty($this->form)) {
@@ -57,9 +59,11 @@ 
 
         if (!empty($this->form['name'])) {
             $this->header = $this->form['name'];
-        } elseif (!empty($modeName::$objectName)) {
+        }
+        elseif (!empty($modeName::$objectName)) {
             $this->header = $modeName::$objectName;
-        } else {
+        }
+        else {
             $this->header = $this->modelName;
         }
     }
@@ -76,7 +80,8 @@ 
                     $colPath = explode(':', $col);
                     if ($this->model->{$colPath[1]}) {
                         $inputs[$col] = new ActiveForm($this->model->{$colPath[1]}, $colPath[2]);
-                    } else {
+                    }
+                    else {
                         $relOptions = $modelName::getRelation($colPath[1]);
                         if (!isset($this->model->_params[$modelName::index()])) {
                             $this->model->_params[$modelName::index()] = 0;
@@ -85,7 +90,8 @@ 
                         $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
-                } elseif (!empty($modelName::$cols[$col])) {
+                }
+                elseif (!empty($modelName::$cols[$col])) {
                     $inputs[$col] = $modelName::$cols[$col];
                 }
             }
@@ -108,7 +114,8 @@ 
                     $text = 'Новый элемент был успешно добавлен';
                     \Msg::add($text, 'success');
                     \Msg::show();
-                } else {
+                }
+                else {
                     $presets = !empty($this->form['preset']) ? $this->form['preset'] : [];
                     if (!empty($this->form['userGroupPreset'][\Users\User::$cur->group_id])) {
                         $presets = array_merge($presets, $this->form['userGroupPreset'][\Users\User::$cur->group_id]);
@@ -145,12 +152,14 @@ 
                         foreach ($presets as $col => $preset) {
                             if (!empty($preset['value'])) {
                                 $this->model->$col = $preset['value'];
-                            } elseif (!empty($preset['userCol'])) {
+                            }
+                            elseif (!empty($preset['userCol'])) {
                                 if (strpos($preset['userCol'], ':')) {
                                     $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
                                     $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
                                     $this->model->$col = \Users\User::$cur->$rel->$param;
-                                } else {
+                                }
+                                else {
                                     $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                                 }
                             }
@@ -158,7 +167,8 @@ 
                         if (!$this->parent) {
                             if (!empty($this->form['successText'])) {
                                 $text = $this->form['successText'];
-                            } else {
+                            }
+                            else {
                                 $text = $this->model->pk() ? 'Изменения были успешно сохранены' : 'Новый элемент был успешно добавлен';
                             }
                             \Msg::add($text, 'success');
@@ -170,7 +180,8 @@ 
                         }
                         if ($ajax) {
                             \Msg::show();
-                        } elseif (!empty($_GET['redirectUrl'])) {
+                        }
+                        elseif (!empty($_GET['redirectUrl'])) {
                             \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
                         }
                         $successId = $this->model->pk();
@@ -196,7 +207,8 @@ 
     public function drawCol($colName, $options, $form, $params = []) {
         if (is_object($options)) {
             $options->draw();
-        } else {
+        }
+        else {
             $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
             $input = new $inputClassName();
             $input->form = $form;
@@ -223,7 +235,8 @@ 
             case 'method':
                 if (!empty($inputParams['params'])) {
                     $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']);
-                } else {
+                }
+                else {
                     $values = \App::$cur->$inputParams['module']->$inputParams['method']();
                 }
                 break;
@@ -254,7 +267,8 @@ 
                 }
                 if (!empty($params['noEmptyValue'])) {
                     $values = [];
-                } else {
+                }
+                else {
                     $values = [0 => 'Не задано'];
                 }
                 foreach ($items as $key => $item) {
@@ -265,10 +279,12 @@ 
                                     $values[$key] = $inputParams['showCol']['class']::{$inputParams['showCol']['method']}($item);
                                     break;
                             }
-                        } else {
+                        }
+                        else {
                             $values[$key] = $item->$inputParams['showCol'];
                         }
-                    } else {
+                    }
+                    else {
                         $values[$key] = $item->name();
                     }
                 }