@@ -35,7 +35,7 @@ |
||
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | -require_once( INJI_SYSTEM_DIR . '/init.php' ); |
|
| 38 | +require_once(INJI_SYSTEM_DIR . '/init.php'); |
|
| 39 | 39 | /** |
| 40 | 40 | * System error messages |
| 41 | 41 | */ |
@@ -1035,7 +1035,7 @@ |
||
| 1035 | 1035 | } else { |
| 1036 | 1036 | $cols .= '*'; |
| 1037 | 1037 | } |
| 1038 | - $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
| 1038 | + $cols .= ') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
| 1039 | 1039 | App::$cur->db->cols = $cols; |
| 1040 | 1040 | if (!empty($options['group'])) { |
| 1041 | 1041 | App::$cur->db->group($options['group']); |
@@ -52,8 +52,9 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | static function get($clean = false) |
| 54 | 54 | { |
| 55 | - if (empty($_SESSION['_INJI_MSG'])) |
|
| 56 | - return []; |
|
| 55 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
| 56 | + return []; |
|
| 57 | + } |
|
| 57 | 58 | $msgs = $_SESSION['_INJI_MSG']; |
| 58 | 59 | if ($clean) { |
| 59 | 60 | $_SESSION['_INJI_MSG'] = []; |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | function parseColsForModel($cols = []) |
| 27 | 27 | { |
| 28 | - $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []]; |
|
| 28 | + $modelCols = ['labels' => [], 'cols' => [], 'relations' => []]; |
|
| 29 | 29 | foreach ($cols as $col) { |
| 30 | 30 | $modelCols['labels'][$col['code']] = $col['label']; |
| 31 | 31 | $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type']; |
@@ -6,8 +6,9 @@ |
||
| 6 | 6 | $systemModules = array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2); |
| 7 | 7 | foreach ($systemModules as $module) { |
| 8 | 8 | $info = Module::getInfo($module); |
| 9 | - if (!$info || isset($modules[$module])) |
|
| 10 | - continue; |
|
| 9 | + if (!$info || isset($modules[$module])) { |
|
| 10 | + continue; |
|
| 11 | + } |
|
| 11 | 12 | ?> |
| 12 | 13 | <div class ="form-group"> |
| 13 | 14 | <div class="checkbox"> |
@@ -16,8 +16,9 @@ |
||
| 16 | 16 | if (!empty($_POST['UserForms'])) { |
| 17 | 17 | foreach ($_POST['UserForms'] as $form_id => $inputs) { |
| 18 | 18 | $form = \UserForms\Form::get((int) $form_id); |
| 19 | - if (!$form) |
|
| 20 | - continue; |
|
| 19 | + if (!$form) { |
|
| 20 | + continue; |
|
| 21 | + } |
|
| 21 | 22 | $formRecive = new \UserForms\Recive(); |
| 22 | 23 | $formRecive->user_id = (int) \Users\User::$cur->id; |
| 23 | 24 | $formRecive->form_id = (int) $form_id; |
@@ -42,10 +42,11 @@ |
||
| 42 | 42 | <select class="form-control" name = 'user_role_id'> |
| 43 | 43 | <?php |
| 44 | 44 | foreach ($roles as $role) { |
| 45 | - if ($role['role_id'] == $user->user_role_id) |
|
| 46 | - $selected = 'selected = "selected"'; |
|
| 47 | - else |
|
| 48 | - $selected = ''; |
|
| 45 | + if ($role['role_id'] == $user->user_role_id) { |
|
| 46 | + $selected = 'selected = "selected"'; |
|
| 47 | + } else { |
|
| 48 | + $selected = ''; |
|
| 49 | + } |
|
| 49 | 50 | echo "<option {$selected} value = '{$role['role_id']}'>{$role['role_name']}</option>"; |
| 50 | 51 | } |
| 51 | 52 | ?> |
@@ -13,20 +13,22 @@ |
||
| 13 | 13 | static function genArray($data, $level = 0) |
| 14 | 14 | { |
| 15 | 15 | $return = ''; |
| 16 | - if ($level == 0) |
|
| 17 | - $return = "["; |
|
| 16 | + if ($level == 0) { |
|
| 17 | + $return = "["; |
|
| 18 | + } |
|
| 18 | 19 | foreach ($data as $key => $item) { |
| 19 | 20 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => "; |
| 20 | - if (!is_array($item)) |
|
| 21 | - $return .= "'{$item}',"; |
|
| 22 | - else { |
|
| 21 | + if (!is_array($item)) { |
|
| 22 | + $return .= "'{$item}',"; |
|
| 23 | + } else { |
|
| 23 | 24 | $return .= "["; |
| 24 | 25 | $return .= rtrim(self::genArray($item, $level + 1), ','); |
| 25 | 26 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],"; |
| 26 | 27 | } |
| 27 | 28 | } |
| 28 | - if ($level == 0) |
|
| 29 | - $return = rtrim($return, ',') . "\n];"; |
|
| 29 | + if ($level == 0) { |
|
| 30 | + $return = rtrim($return, ',') . "\n];"; |
|
| 31 | + } |
|
| 30 | 32 | |
| 31 | 33 | return $return; |
| 32 | 34 | } |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return function ($step = NULL, $params = []) { |
|
| 3 | +return function($step = NULL, $params = []) { |
|
| 4 | 4 | |
| 5 | 5 | $groups = [ |
| 6 | 6 | [ |