injitools / cms-Inji

system/modules/Ui/objects/DataManager.php

Braces +46 added lines, -23 removed lines

@@ -42,10 +42,12 @@ 
             $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
             if (isset($modelNameOrOptions::$objectName)) {
                 $this->name = $modelNameOrOptions::$objectName;
-            } else {
+            }
+            else {
                 $this->name = $modelNameOrOptions;
             }
-        } else {
+        }
+        else {
             $this->managerOptions = $modelNameOrOptions;
         }
 
@@ -152,7 +154,8 @@ 
                     $action['className'] = $key;
                 }
                 $return[$key] = $action;
-            } else {
+            }
+            else {
                 $key = $action;
                 $return[$key] = [
                     'className' => $action
@@ -208,7 +211,8 @@ 
             if (is_array($col)) {
                 $colName = $key;
                 $colOptions = $col;
-            } else {
+            }
+            else {
                 $colName = $col;
                 $colOptions = [];
             }
@@ -218,7 +222,8 @@ 
             }
             if (empty($colOptions['label']) && !empty($colInfo['label'])) {
                 $colOptions['label'] = $colInfo['label'];
-            } elseif (empty($colOptions['label'])) {
+            }
+            elseif (empty($colOptions['label'])) {
                 $colOptions['label'] = $colName;
             }
             $cols[$colName] = $colOptions;
@@ -267,7 +272,8 @@ 
             foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
                 if (!empty($colOptions['userCol'])) {
                     $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
-                } elseif (isset($colOptions['value'])) {
+                }
+                elseif (isset($colOptions['value'])) {
                     if (is_array($colOptions['value'])) {
                         foreach ($colOptions['value'] as $key => $value) {
                             if ($key === 'userCol') {
@@ -318,7 +324,8 @@ 
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-                            } else {
+                            }
+                            else {
                                 $date = $params['filters'][$col]['max'];
                             }
                             $queryParams['where'][] = [$col, $date, '<='];
@@ -362,7 +369,8 @@ 
         }
         if (!empty($params['mode']) && $params['mode'] == 'sort') {
             $queryParams['order'] = ['weight', 'asc'];
-        } elseif (!empty($params['sortered']) && !empty($this->managerOptions['sortable'])) {
+        }
+        elseif (!empty($params['sortered']) && !empty($this->managerOptions['sortable'])) {
             foreach ($params['sortered'] as $colName => $sortType) {
                 if ($colName && in_array($colName, $this->managerOptions['sortable'])) {
                     $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
@@ -373,7 +381,8 @@ 
         if ($model && !empty($params['relation'])) {
             $relation = $model::getRelation($params['relation']);
             $items = $model->$params['relation']($queryParams);
-        } else {
+        }
+        else {
             $relation = false;
             $items = $modelName::getList($queryParams);
         }
@@ -389,7 +398,8 @@ 
             foreach ($this->managerOptions['cols'] as $key => $colName) {
                 if (!empty($params['download'])) {
                     $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
-                } else {
+                }
+                else {
                     $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
                 }
             }
@@ -418,7 +428,8 @@ 
             $col = substr($colName, strpos($colName, ':') + 1);
             if ($item->$rel) {
                 return DataManager::drawCol($item->$rel, $col, $params, $dataManager, $originalCol, $originalItem);
-            } else {
+            }
+            else {
                 return 'Не указано';
             }
         }
@@ -441,20 +452,24 @@ 
                             $href = "<a href ='/admin/" . $item->{$modelName::$cols[$colName]['relation']}->genViewLink() . "'>";
                             if (!empty($modelName::$cols[$colName]['showCol'])) {
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
-                            } else {
+                            }
+                            else {
 
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->name();
                             }
                             $href .= '</a>';
                             return $href;
-                        } else {
+                        }
+                        else {
                             return $item->{$modelName::$cols[$colName]['relation']}->name();
                         }
-                    } else {
+                    }
+                    else {
                         return $item->$colName;
                     }
             }
-        } else {
+        }
+        else {
             if (!empty($modelName::$cols[$colName]['view']['type'])) {
                 switch ($modelName::$cols[$colName]['view']['type']) {
                     case 'widget':
@@ -472,15 +487,18 @@ 
                     default:
                         return $item->$colName;
                 }
-            } elseif (!empty($modelName::$cols[$colName]['type'])) {
+            }
+            elseif (!empty($modelName::$cols[$colName]['type'])) {
                 if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
                     $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
                     return "<a href ='/admin/{$originalItem->genViewLink()}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
-                } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
+                }
+                elseif (\App::$cur->name == 'admin' && $colName == 'name') {
                     $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
                     return "<a href ='/admin/{$item->genViewLink()}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
-                } elseif ($modelName::$cols[$colName]['type'] == 'html') {
+                }
+                elseif ($modelName::$cols[$colName]['type'] == 'html') {
                     $uid = \Tools::randomString();
                     $script = "<script>inji.onLoad(function(){
             var el{$uid}=$('#{$uid}');
@@ -509,10 +527,12 @@ 
             }
             })</script>";
                     return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
-                } else {
+                }
+                else {
                     return \Model::resloveTypeValue($item, $colName);
                 }
-            } else {
+            }
+            else {
                 return $item->$colName;
             }
         }
@@ -561,7 +581,8 @@ 
             foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
                 if (!empty($colOptions['userCol'])) {
                     $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
-                } elseif (isset($colOptions['value'])) {
+                }
+                elseif (isset($colOptions['value'])) {
                     if (is_array($colOptions['value'])) {
                         foreach ($colOptions['value'] as $key => $value) {
                             if ($key === 'userCol') {
@@ -613,7 +634,8 @@ 
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-                            } else {
+                            }
+                            else {
                                 $date = $params['filters'][$col]['max'];
                             }
                             $queryParams['where'][] = [$col, $date, '<='];
@@ -657,7 +679,8 @@ 
         }
         if ($model && !empty($params['relation'])) {
             $count = $model->$params['relation']($queryParams);
-        } else {
+        }
+        else {
             $count = $modelName::getCount($queryParams);
         }
         $pages = new Pages([

system/modules/Ui/Controllers/UiController.php

Braces +4 added lines, -2 removed lines

@@ -16,7 +16,8 @@ 
             $modelName = $raw[0];
             $id = $raw[1];
             $model = $modelName::get($id, $modelName::index(), !empty($_GET['params']['dataManagerParams']) ? $_GET['params']['dataManagerParams'] : []);
-        } else {
+        }
+        else {
             $modelName = $_GET['item'];
             $model = new $modelName();
         }
@@ -47,7 +48,8 @@ 
             $return->content = ob_get_contents();
             ob_end_clean();
             $return->send();
-        } else {
+        }
+        else {
             $form->checkRequest($params);
             $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
             $get = $_GET;

system/modules/Ui/Controllers/ActiveFormController.php

Braces +2 added lines, -1 removed lines

@@ -67,7 +67,8 @@
         }
         if ($searchArr) {
             $options['where'][] = $searchArr;
-        } else {
+        }
+        else {
             $result->content = [];
             $result->send();
         }

system/modules/Ui/Controllers/DataManagerController.php

Braces +10 added lines, -5 removed lines

@@ -23,7 +23,8 @@ 
             $raw = explode(':', $item);
             $return['modelName'] = $raw[0];
             $return['model'] = $return['modelName']::get($raw[1], $return['modelName']::index(), $return['params']);
-        } else {
+        }
+        else {
             $return['modelName'] = $item;
             $return['model'] = null;
         }
@@ -32,7 +33,8 @@ 
             $relation = $return['modelName']::getRelation($return['params']['relation']);
             if (!empty($relation['type']) && $relation['type'] == 'relModel') {
                 $return['modelName'] = $relation['relModel'];
-            } else {
+            }
+            else {
                 $return['modelName'] = $relation['model'];
             }
         }
@@ -131,7 +133,8 @@ 
                 }
                 echo "\n";
                 $endRow = true;
-            } else {
+            }
+            else {
                 Ui\Table::drawRow($row);
             }
         }
@@ -220,7 +223,8 @@ 
                     $actionParams = $actions[$request['action']];
                     if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
                         $result->content = 'У вас нет прав доступа к операции ' . (!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
-                    } else {
+                    }
+                    else {
                         try {
                             $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
                             $result->success = true;
@@ -230,7 +234,8 @@ 
                     }
                 }
             }
-        } else {
+        }
+        else {
             $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
         }
         $result->send();

system/modules/Ui/widgets/ActiveForm/ActiveForm.php

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
             }
             echo '</div>';
         }
-    } else {
+    }
+    else {
         foreach ($activeForm->form['map'] as $row) {
             foreach ($row as $col) {
                 if ($col) {

system/modules/Ui/widgets/Pages/pages.php

Braces +5 added lines, -3 removed lines

@@ -7,8 +7,9 @@ 
   for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
       if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
           echo '<li ';
-          if ($pagesInstance->params['page'] == $i)
-              echo 'class = "active"';
+          if ($pagesInstance->params['page'] == $i) {
+                        echo 'class = "active"';
+          }
           echo ">";
           $getArr['page'] = $i;
           echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
@@ -16,7 +17,8 @@ 
       elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
           $getArr['page'] = round($pagesInstance->params['page'] / 2);
           echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
-      } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
+      }
+      elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
           $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
           echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
       }

system/modules/Ui/widgets/Form/select.php

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
             $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
         }
         $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
-    } else {
+    }
+    else {
         $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
     }
 }
@@ -47,7 +48,8 @@ 
     if ($key !== $showedInput) {
         $input['options']['disabled'] = true;
         $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
-    } else {
+    }
+    else {
         $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
     }
     if ($input['type'] == 'select') {

system/modules/Ui/widgets/Form/dynamicList.php

Braces +2 added lines, -1 removed lines

@@ -9,7 +9,8 @@
     if ($options['source'] == 'relation' && empty($options['modelPk'])) {
         echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>';
         echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>';
-    } else {
+    }
+    else {
         ?>
         <div class="table-responsive">
             <table class ='table table-striped'>

system/modules/Ui/widgets/Form/search.php

Braces +4 added lines, -2 removed lines

@@ -12,10 +12,12 @@
                     $displayValue = $calssName::{$options['inputObject']->colParams['showCol']['method']}($options['values'][$value]);
                     break;
             }
-        } else {
+        }
+        else {
             $displayValue = $options['values'][$value]->$options['inputObject']->colParams['showCol'];
         }
-    } else {
+    }
+    else {
         $displayValue = $options['values'][$value]->name();
     }
 }