injitools / cms-Inji

system/modules/Ui/objects/Tree.php

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
             <?php
             if (is_string($objectRoot)) {
                 $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
-            } else {
+            }
+            else {
                 $class = get_class($objectRoot);
                 $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()], 'order' => $order]);
             }
@@ -66,7 +67,8 @@ 
         }
         if ($isset) {
             echo '</ul></li>';
-        } else {
+        }
+        else {
             echo \Html::el('li', $attributes, $item);
         }
         return $count;

system/modules/Ui/objects/Pages.php

Braces +8 added lines, -5 removed lines

@@ -30,15 +30,18 @@
             $this->params['page'] = 0;
             $this->params['pages'] = 0;
             $this->params['start'] = 0;
-        } else {
+        }
+        else {
             $this->params['pages'] = ceil($this->options['count'] / $this->params['limit']);
             $this->params['page'] = 1;
             if (!empty($this->data['page'])) {
                 $this->params['page'] = (int) $this->data['page'];
-                if ($this->params['page'] <= 0)
-                    $this->params['page'] = 1;
-                elseif ($this->params['page'] > ceil($this->options['count'] / $this->params['limit']))
-                    $this->params['page'] = ceil($this->options['count'] / $this->params['limit']);
+                if ($this->params['page'] <= 0) {
+                                    $this->params['page'] = 1;
+                }
+                elseif ($this->params['page'] > ceil($this->options['count'] / $this->params['limit'])) {
+                                    $this->params['page'] = ceil($this->options['count'] / $this->params['limit']);
+                }
             }
 
             $this->params['start'] = $this->params['page'] * $this->params['limit'] - $this->params['limit'];

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/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/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/Table/foot.php

Braces +2 added lines, -1 removed lines

@@ -4,7 +4,8 @@
       foreach ($table->cols as $col) {
           if (is_string($col)) {
               echo "<th>{$col}</th>";
-          } else {
+          }
+          else {
               echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']);
           }
       }

system/modules/Ui/widgets/DataManager/filters.php

Braces +24 added lines, -12 removed lines

@@ -15,7 +15,8 @@ 
           if ($dataManager->modelName) {
               $modelName = $dataManager->modelName;
               $colInfo = $modelName::getColInfo($col);
-          } else {
+          }
+          else {
               $colInfo = $dataManager->managerOptions['cols'][$col];
           }
           $values = [];
@@ -28,10 +29,12 @@ 
                       $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
                       $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                  } else {
+                  }
+                  else {
                       $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                   }
-              } elseif (!empty($colOptions['value'])) {
+              }
+              elseif (!empty($colOptions['value'])) {
                   $inputOptions['value'] = $colOptions['value'];
               }
               if (is_array($inputOptions['value'])) {
@@ -40,7 +43,8 @@ 
                       $inputOptions['value'] = $value;
                       $form->input('hidden', "datamanagerFilters[{$col}][value][{$key}]", '', $inputOptions);
                   }
-              } else {
+              }
+              else {
                   $form->input('hidden', "datamanagerFilters[{$col}][value]", '', $inputOptions);
               }
               continue;
@@ -59,7 +63,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 = ['' => 'Не важно'] + App::$cur->$colInfo['colParams']['module']->$colInfo['colParams']['method']();
                               }
                               break;
@@ -81,7 +86,8 @@ 
                               foreach ($items as $key => $item) {
                                   if (!empty($inputParams['showCol'])) {
                                       $values[$key] = $item->$inputParams['showCol'];
-                                  } else {
+                                  }
+                                  else {
                                       $values[$key] = $item->name();
                                   }
                               }
@@ -100,10 +106,12 @@ 
                                   $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
                                   $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                              } else {
+                              }
+                              else {
                                   $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                               }
-                          } elseif (!empty($colOptions['value'])) {
+                          }
+                          elseif (!empty($colOptions['value'])) {
 
                               $inputOptions['value'] = $colOptions['value'];
                           }
@@ -141,9 +149,11 @@ 
                           <?php
                           if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
                               $value = 1;
-                          } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
+                          }
+                          elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
                               $value = 0;
-                          } else {
+                          }
+                          else {
                               $value = '';
                           }
                           $inputOptions = ['value' => $value, 'values' => [
@@ -162,10 +172,12 @@ 
                                       $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
                                       $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                                  } else {
+                                  }
+                                  else {
                                       $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                                   }
-                              } elseif (!empty($colOptions['value'])) {
+                              }
+                              elseif (!empty($colOptions['value'])) {
 
                                   $inputOptions['value'] = $colOptions['value'];
                               }

system/modules/Materials/models/Material.php

Braces +8 added lines, -4 removed lines

@@ -147,9 +147,11 @@ 
     public function resolveTemplate() {
         if ($this->template !== 'inherit') {
             return $this->template;
-        } elseif ($this->template == 'inherit' && $this->category) {
+        }
+        elseif ($this->template == 'inherit' && $this->category) {
             return $this->category->resolveTemplate(true);
-        } else {
+        }
+        else {
             return 'current';
         }
     }
@@ -157,9 +159,11 @@ 
     public function resolveViewer() {
         if ($this->viewer !== 'inherit') {
             return $this->viewer;
-        } elseif ($this->viewer == 'inherit' && $this->category) {
+        }
+        elseif ($this->viewer == 'inherit' && $this->category) {
             return $this->category->resolveViewer(true);
-        } else {
+        }
+        else {
             return 'default';
         }
     }

system/modules/Materials/models/Category.php

Braces +8 added lines, -4 removed lines

@@ -136,9 +136,11 @@ 
         $param = $material ? 'material_template' : 'template';
         if ($this->$param !== 'inherit') {
             return $this->$param;
-        } elseif ($this->$param == 'inherit' && $this->parent) {
+        }
+        elseif ($this->$param == 'inherit' && $this->parent) {
             return $this->parent->resolveTemplate($material);
-        } else {
+        }
+        else {
             return 'current';
         }
     }
@@ -147,9 +149,11 @@ 
         $param = $material ? 'material_viewer' : 'viewer';
         if ($this->$param !== 'inherit') {
             return $this->$param;
-        } elseif ($this->$param == 'inherit' && $this->parent) {
+        }
+        elseif ($this->$param == 'inherit' && $this->parent) {
             return $this->parent->resolveViewer($material);
-        } else {
+        }
+        else {
             return $material ? 'default' : 'category';
         }
     }