injitools / cms-Inji

system/modules/Menu/models/Menu.php

Indentation +48 added lines, -48 removed lines

@@ -13,52 +13,52 @@ 
 
 class Menu extends \Model {
 
-  public static $objectName = 'Меню';
-  public static $labels = [
-      'name' => 'Название',
-      'code' => 'Алиас',
-      'item' => 'Пункты меню',
-      'group_id' => 'Группа пользователей',
-  ];
-  public static $storage = ['type' => 'moduleConfig'];
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'code' => ['type' => 'text'],
-      'item' => ['type' => 'dataManager', 'relation' => 'items'],
-      'group_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'group']
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'options' => [
-              'access' => [
-                  'groups' => [
-                      3
-                  ]
-              ]
-          ],
-          'cols' => [
-              'name', 'code', 'item', 'group_id'
-          ]
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'options' => [
-              'access' => [
-                  'groups' => [
-                      3
-                  ]
-              ]
-          ],
-          'map' => [
-              ['name', 'code'],
-              ['group_id'],
-              ['item']
-          ]
-      ]
-  ];
+    public static $objectName = 'Меню';
+    public static $labels = [
+        'name' => 'Название',
+        'code' => 'Алиас',
+        'item' => 'Пункты меню',
+        'group_id' => 'Группа пользователей',
+    ];
+    public static $storage = ['type' => 'moduleConfig'];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'code' => ['type' => 'text'],
+        'item' => ['type' => 'dataManager', 'relation' => 'items'],
+        'group_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'group']
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'options' => [
+                'access' => [
+                    'groups' => [
+                        3
+                    ]
+                ]
+            ],
+            'cols' => [
+                'name', 'code', 'item', 'group_id'
+            ]
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'options' => [
+                'access' => [
+                    'groups' => [
+                        3
+                    ]
+                ]
+            ],
+            'map' => [
+                ['name', 'code'],
+                ['group_id'],
+                ['item']
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'items' => [
             'type' => 'many',
@@ -70,10 +70,10 @@ 
             'model' => 'Users\Group'
         ]
     ];
-  }
+    }
 
-  public static function index() {
+    public static function index() {
     return 'id';
-  }
+    }
 
 }

system/modules/Ui/appAdminControllers/content/dataManager/view.php

Indentation +23 added lines, -23 removed lines

@@ -5,33 +5,33 @@ 
 $formParams = ['formName' => 'manager'];
 $aform = new \Ui\ActiveForm($item, $formParams['formName']);
 if ($aform->checkAccess()) {
-  $table->addButton([
-      'text' => 'Редактировать',
-      'onclick' => 'inji.Ui.forms.popUp("' . addcslashes($modelName, '\\') . ':' . $item->pk() . '",' . json_encode($formParams) . ');',
-  ]);
+    $table->addButton([
+        'text' => 'Редактировать',
+        'onclick' => 'inji.Ui.forms.popUp("' . addcslashes($modelName, '\\') . ':' . $item->pk() . '",' . json_encode($formParams) . ');',
+    ]);
 }
 $row = [];
 $cols = !empty($modelName::$views['manager']['cols']) ? $modelName::$views['manager']['cols'] : array_keys($modelName::$cols);
 foreach ($cols as $colName) {
-  $modelName = get_class($item);
-  $colInfo = $modelName::getColInfo($colName);
-  $type = !empty($colInfo['colParams']['type']) ? $colInfo['colParams']['type'] : 'string';
-  if ($type != 'dataManager') {
+    $modelName = get_class($item);
+    $colInfo = $modelName::getColInfo($colName);
+    $type = !empty($colInfo['colParams']['type']) ? $colInfo['colParams']['type'] : 'string';
+    if ($type != 'dataManager') {
     $table->addRow([
         !empty($modelName::$labels[$colName]) ? $modelName::$labels[$colName] : $colName,
         \Model::resloveTypeValue($item, $colName, true)
     ]);
-  }
+    }
 }
 $table->draw();
 $form = new \Ui\Form();
 $relations = $modelName::relations();
 foreach ($cols as $colName) {
-  $colInfo = $modelName::getColInfo($colName);
-  if ($colInfo['colParams']['type'] == 'dataManager') {
+    $colInfo = $modelName::getColInfo($colName);
+    if ($colInfo['colParams']['type'] == 'dataManager') {
     $dataManager = new \Ui\DataManager($relations[$colInfo['colParams']['relation']]['model']);
     $dataManager->draw(['relation' => $colInfo['colParams']['relation']], $item);
-  }
+    }
 }
 ?>
 <div>
@@ -42,10 +42,10 @@ 
     ]]);
     ?>)</h3>
   <?php
-  foreach (\Dashboard\Comment::getList([ 'where' => [
-          ['item_id', $item->id],
-          ['model', $modelName],
-      ], 'order' => ['date_create', 'desc']]) as $comment) {
+    foreach (\Dashboard\Comment::getList([ 'where' => [
+            ['item_id', $item->id],
+            ['model', $modelName],
+        ], 'order' => ['date_create', 'desc']]) as $comment) {
     ?>
     <div class="row">
       <div class="col-sm-3" style="max-width: 300px;">
@@ -57,14 +57,14 @@ 
       </div>
     </div>
     <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 <div>
   <?php
-  $form = new \Ui\Form();
-  $form->begin();
-  $form->input('textarea', 'comment', 'Комментарий');
-  $form->end();
-  ?>
+    $form = new \Ui\Form();
+    $form->begin();
+    $form->input('textarea', 'comment', 'Комментарий');
+    $form->end();
+    ?>
 </div>

system/modules/Ui/Controllers/DataManagerController.php

Indentation +80 added lines, -80 removed lines

@@ -10,31 +10,31 @@ 
  */
 class DataManagerController extends Controller {
 
-  public function parseRequest() {
+    public function parseRequest() {
     $return = [];
     $return['params'] = UserRequest::get('params', 'array', []);
 
     $item = UserRequest::get('modelName', 'string', '');
     if (!$item) {
-      $item = UserRequest::get('item', 'string', '');
+        $item = UserRequest::get('item', 'string', '');
     }
 
     if (strpos($item, ':')) {
-      $raw = explode(':', $item);
-      $return['modelName'] = $raw[0];
-      $return['model'] = $return['modelName']::get($raw[1], $return['modelName']::index(), $return['params']);
+        $raw = explode(':', $item);
+        $return['modelName'] = $raw[0];
+        $return['model'] = $return['modelName']::get($raw[1], $return['modelName']::index(), $return['params']);
     } else {
-      $return['modelName'] = $item;
-      $return['model'] = null;
+        $return['modelName'] = $item;
+        $return['model'] = null;
     }
 
     if (!empty($return['params']['relation'])) {
-      $relation = $return['modelName']::getRelation($return['params']['relation']);
-      if (!empty($relation['type']) && $relation['type'] == 'relModel') {
+        $relation = $return['modelName']::getRelation($return['params']['relation']);
+        if (!empty($relation['type']) && $relation['type'] == 'relModel') {
         $return['modelName'] = $relation['relModel'];
-      } else {
+        } else {
         $return['modelName'] = $relation['model'];
-      }
+        }
     }
     $return['params']['filters'] = UserRequest::get('filters', 'array', []);
     $return['params']['sortered'] = UserRequest::get('sortered', 'array', []);
@@ -54,13 +54,13 @@ 
 
     $return['managerName'] = UserRequest::get('managerName', 'string', 'manager');
     if (!$return['managerName']) {
-      $return['managerName'] = 'manager';
+        $return['managerName'] = 'manager';
     }
 
     return $return;
-  }
+    }
 
-  public function indexAction() {
+    public function indexAction() {
     $result = new Server\Result();
 
     ob_start();
@@ -75,9 +75,9 @@ 
     ob_end_clean();
 
     $result->send();
-  }
+    }
 
-  public function loadRowsAction() {
+    public function loadRowsAction() {
     $result = new Server\Result();
     $result->content = [];
 
@@ -88,55 +88,55 @@ 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
     if ($request['download']) {
 
-      ini_set('memory_limit', '2000M');
-      set_time_limit(0);
+        ini_set('memory_limit', '2000M');
+        set_time_limit(0);
 
-      $request['params']['all'] = true;
-      $request['params']['download'] = true;
-      ob_end_clean();
-      header('Content-Encoding: UTF-8');
-      header("Content-Type: text/csv");
-      header("Content-Disposition: attachment; filename=" . $request['modelName']::$objectName . '.csv');
-      echo "\xEF\xBB\xBF"; // UTF-8 BOM
+        $request['params']['all'] = true;
+        $request['params']['download'] = true;
+        ob_end_clean();
+        header('Content-Encoding: UTF-8');
+        header("Content-Type: text/csv");
+        header("Content-Disposition: attachment; filename=" . $request['modelName']::$objectName . '.csv');
+        echo "\xEF\xBB\xBF"; // UTF-8 BOM
 
 
-      $cols = $dataManager->getCols();
-      $cols = array_slice($cols, 1);
-      $endRow = true;
-      foreach ($cols as $colName => $options) {
+        $cols = $dataManager->getCols();
+        $cols = array_slice($cols, 1);
+        $endRow = true;
+        foreach ($cols as $colName => $options) {
         if (!$endRow) {
-          echo ";";
+            echo ";";
         }
         $endRow = false;
         echo '"' . $options['label'] . '"';
-      }
-      echo "\n";
-      $endRow = true;
+        }
+        echo "\n";
+        $endRow = true;
     }
     if (!$request['params']['all']) {
-      $pages = $dataManager->getPages($request['params'], $request['model']);
-      $request['params']['page'] = !empty($pages->params['page']) ? $pages->params['page'] : $dataManager->page;
-      $request['params']['limit'] = !empty($pages->params['limit']) ? $pages->params['limit'] : $dataManager->limit;
+        $pages = $dataManager->getPages($request['params'], $request['model']);
+        $request['params']['page'] = !empty($pages->params['page']) ? $pages->params['page'] : $dataManager->page;
+        $request['params']['limit'] = !empty($pages->params['limit']) ? $pages->params['limit'] : $dataManager->limit;
     }
     $rows = $dataManager->getRows($request['params'], $request['model']);
     foreach ($rows as $row) {
-      if ($request['download']) {
+        if ($request['download']) {
         $row = array_slice($row, 1, -1);
         foreach ($row as $col) {
-          if (!$endRow) {
+            if (!$endRow) {
             echo ";";
-          }
-          $endRow = false;
-          echo '"' . str_replace(["\n", '"'], ['“'], $col) . '"';
+            }
+            $endRow = false;
+            echo '"' . str_replace(["\n", '"'], ['“'], $col) . '"';
         }
         echo "\n";
         $endRow = true;
-      } else {
+        } else {
         Ui\Table::drawRow($row);
-      }
+        }
     }
     if ($request['download']) {
-      exit();
+        exit();
     }
 
     $result->content['rows'] = ob_get_contents();
@@ -145,17 +145,17 @@ 
     $result->content['pages'] = '';
 
     if (isset($pages) && $pages) {
-      if ($pages) {
+        if ($pages) {
         $pages->draw();
         echo '<div style="background:#fff;">записей: <b>' . $pages->options['count'] . '</b>. страница <b>' . $pages->params['page'] . '</b> из <b>' . $pages->params['pages'] . '</b></div>';
-      }
-      $result->content['pages'] = ob_get_contents();
-      ob_end_clean();
+        }
+        $result->content['pages'] = ob_get_contents();
+        ob_end_clean();
     }
     $result->send();
-  }
+    }
 
-  public function loadCategorysAction() {
+    public function loadCategorysAction() {
     $result = new Server\Result();
 
     ob_start();
@@ -169,88 +169,88 @@ 
     ob_end_clean();
 
     $result->send();
-  }
+    }
 
-  public function delRowAction() {
+    public function delRowAction() {
 
     $request = $this->parseRequest();
 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
 
     if ($dataManager->checkAccess()) {
-      $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
-      if ($model) {
+        $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
+        if ($model) {
         $model->delete($request['params']);
-      }
+        }
     }
     $result = new Server\Result();
     $result->successMsg = empty($request['silence']) ? 'Запись удалена' : '';
     $result->send();
-  }
+    }
 
-  public function updateRowAction() {
+    public function updateRowAction() {
 
     $request = $this->parseRequest();
 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
 
     if ($dataManager->checkAccess()) {
-      $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
-      if ($model) {
+        $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
+        if ($model) {
         $model->{$request['col']} = $request['col_value'];
         $model->save($request['params']);
-      }
+        }
     }
     $result = new Server\Result();
     $result->successMsg = empty($request['silence']) ? 'Запись Обновлена' : '';
     $result->send();
-  }
+    }
 
-  public function groupActionAction() {
+    public function groupActionAction() {
     $request = $this->parseRequest();
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
     $result = new Server\Result();
     $result->success = false;
     $result->content = 'Не удалось выполнить операцию';
     if ($dataManager->checkAccess()) {
-      $ids = trim($request['ids'], ' ,');
-      if ($request['action'] && $ids) {
+        $ids = trim($request['ids'], ' ,');
+        if ($request['action'] && $ids) {
         $actions = $dataManager->getActions();
         if (!empty($actions[$request['action']])) {
-          $actionParams = $actions[$request['action']];
-          if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
+            $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;
+                $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
+                $result->success = true;
             } catch (\Exception $e) {
-              $result->content = $e->getMessage();
+                $result->content = $e->getMessage();
             }
-          }
+            }
+        }
         }
-      }
     } else {
-      $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
+        $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
     }
     $result->send();
-  }
+    }
 
-  public function delCategoryAction() {
+    public function delCategoryAction() {
 
     $request = $this->parseRequest();
 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
 
     if ($dataManager->checkAccess() && !empty($dataManager->managerOptions['categorys'])) {
-      $categoryModel = $dataManager->managerOptions['categorys']['model'];
-      $model = $categoryModel::get($request['key'], $categoryModel::index(), $request['params']);
-      if ($model) {
+        $categoryModel = $dataManager->managerOptions['categorys']['model'];
+        $model = $categoryModel::get($request['key'], $categoryModel::index(), $request['params']);
+        if ($model) {
         $model->delete($request['params']);
-      }
+        }
     }
     $result = new Server\Result();
     $result->send();
-  }
+    }
 
 }

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

Indentation +4 added lines, -4 removed lines

@@ -9,16 +9,16 @@
     'value' => !empty($options['value']) ? addcslashes($options['value'], "'") : (!empty($form->userDataTree[$name]) ? addcslashes($form->userDataTree[$name], "'") : '')
 ];
 if (!empty($options['disabled'])) {
-  $attributes['disabled'] = 'disabled';
+    $attributes['disabled'] = 'disabled';
 }
 if (!empty($options['placeholder'])) {
-  $attributes['placeholder'] = $options['placeholder'];
+    $attributes['placeholder'] = $options['placeholder'];
 }
 if (!empty($options['checked'])) {
-  $attributes['checked'] = 'checked';
+    $attributes['checked'] = 'checked';
 }
 if (!empty($options['attributes'])) {
-  $attributes = array_merge($attributes, $options['attributes']);
+    $attributes = array_merge($attributes, $options['attributes']);
 }
 echo Html::el('input', $attributes, '', null);
 echo!empty($options['helpText']) ? "<div class='help-block'>{$options['helpText']}</div>" : '';

system/program/admin/templates/default/widgets/sidebar.php

Indentation +12 added lines, -12 removed lines

@@ -7,8 +7,8 @@ 
     </li>
     <?php
     if (class_exists('Users\User')) {
-      App::$cur->ui;
-      ?>
+        App::$cur->ui;
+        ?>
       <hr />
       <div class="row userWidget">
         <div class="col-xs-4">
@@ -29,23 +29,23 @@ 
         <a href = "/admin">Панель управления</a>
       </li>
       <?php
-      $where[] = ['group_id', Users\User::$cur->group_id];
-      if (Users\User::$cur->group_id == 3) {
+        $where[] = ['group_id', Users\User::$cur->group_id];
+        if (Users\User::$cur->group_id == 3) {
         $where[] = ['group_id', 0, '=', 'OR'];
-      }
-      $menu = Menu\Menu::get([['code', 'sidebarMenu'], $where]);
-      foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
+        }
+        $menu = Menu\Menu::get([['code', 'sidebarMenu'], $where]);
+        foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
         echo "<li><a href = '{$item->href}'>{$item->name}</a>";
         $childItems = Menu\Item::getList(['where' => ['parent_id', $item->id]]);
         if ($childItems) {
-          echo "<ul>";
-          foreach ($childItems as $item) {
+            echo "<ul>";
+            foreach ($childItems as $item) {
             echo "<li><a href = '{$item->href}'>{$item->name}</a>";
-          }
-          echo "</ul>";
+            }
+            echo "</ul>";
         }
         echo "</li>";
-      }
+        }
     }
     ?>
     <li>

system/program/admin/objects/adminController.php

Indentation +23 added lines, -23 removed lines

@@ -10,55 +10,55 @@
  */
 class adminController extends Controller {
 
-  public function indexAction() {
+    public function indexAction() {
     $args = func_get_args();
     call_user_func_array([$this, 'dataManagerAction'], $args);
-  }
+    }
 
-  public function dataManagerAction($model = '', $dataManager = 'manager') {
+    public function dataManagerAction($model = '', $dataManager = 'manager') {
     if (!$model) {
-      $modulePath = Module::getModulePath($this->module->moduleName);
-      $path = $modulePath . '/models';
-      if (file_exists($path)) {
+        $modulePath = Module::getModulePath($this->module->moduleName);
+        $path = $modulePath . '/models';
+        if (file_exists($path)) {
         $files = array_slice(scandir($path), 2);
         foreach ($files as $file) {
-          if (is_dir($path . '/' . $file)) {
+            if (is_dir($path . '/' . $file)) {
             continue;
-          }
-          $model = pathinfo($file, PATHINFO_FILENAME);
-          break;
+            }
+            $model = pathinfo($file, PATHINFO_FILENAME);
+            break;
+        }
         }
-      }
     }
     $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
     $dataManager = new Ui\DataManager($fullModelName, $dataManager);
     $title = !empty($dataManager->managerOptions['name']) ? $dataManager->managerOptions['name'] : $fullModelName::objectName();
     $this->view->setTitle($title);
     $this->view->page(['module' => 'Ui', 'content' => 'dataManager/manager', 'data' => compact('dataManager')]);
-  }
+    }
 
-  public function viewAction($model, $pk) {
+    public function viewAction($model, $pk) {
     $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
     if (Users\User::$cur->group_id != 3 && (empty($fullModelName::$views['manager']['access']) || !in_array(Users\User::$cur->group_id, $fullModelName::$views['manager']['access']['groups']))) {
-      Tools::redirect('/admin', 'У вас нет прав доступа для просмотра этого объекта', 'danger');
+        Tools::redirect('/admin', 'У вас нет прав доступа для просмотра этого объекта', 'danger');
     }
     $item = $fullModelName::get($pk);
     $this->view->setTitle(($fullModelName::$objectName ? $fullModelName::$objectName : $fullModelName) . ($item ? ( ' - ' . $item->name()) : ''));
     if (!empty($_POST['comment'])) {
-      $comment = new Dashboard\Comment();
-      $comment->text = $_POST['comment'];
-      $comment->user_id = \Users\User::$cur->id;
-      $comment->model = $fullModelName;
-      $comment->item_id = $item->pk();
-      $comment->save();
-      Tools::redirect($_SERVER['REQUEST_URI']);
+        $comment = new Dashboard\Comment();
+        $comment->text = $_POST['comment'];
+        $comment->user_id = \Users\User::$cur->id;
+        $comment->model = $fullModelName;
+        $comment->item_id = $item->pk();
+        $comment->save();
+        Tools::redirect($_SERVER['REQUEST_URI']);
     }
     $moduleName = $this->module->moduleName;
     $pageParam = ['module' => 'Ui', 'content' => 'dataManager/view', 'data' => compact('item', 'moduleName')];
     if (isset($_GET['print'])) {
-      $pageParam['page'] = 'print';
+        $pageParam['page'] = 'print';
     }
     $this->view->page($pageParam);
-  }
+    }
 
 }

system/modules/Files/models/File.php

Indentation +23 added lines, -23 removed lines

@@ -13,39 +13,39 @@ 
 
 class File extends \Model {
 
-  public static $cols = [
-      'code' => ['type' => 'text'],
-      'type_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'type'],
-      'folder_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'foler'],
-      'upload_code' => ['type' => 'text'],
-      'path' => ['type' => 'textarea'],
-      'name' => ['type' => 'text'],
-      'about' => ['type' => 'html'],
-      'original_name' => ['type' => 'text'],
-      'md5' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
-
-  public function beforeSave() {
+    public static $cols = [
+        'code' => ['type' => 'text'],
+        'type_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'type'],
+        'folder_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'foler'],
+        'upload_code' => ['type' => 'text'],
+        'path' => ['type' => 'textarea'],
+        'name' => ['type' => 'text'],
+        'about' => ['type' => 'html'],
+        'original_name' => ['type' => 'text'],
+        'md5' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
+
+    public function beforeSave() {
     $path = $this->getRealPath();
     if (!$this->md5 && $this->path && file_exists($path)) {
-      $this->md5 = md5_file($path);
+        $this->md5 = md5_file($path);
+    }
     }
-  }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     $path = $this->getRealPath();
     if (file_exists($path)) {
-      unlink($path);
+        unlink($path);
+    }
     }
-  }
 
-  public function getRealPath() {
+    public function getRealPath() {
     $sitePath = \App::$primary->path;
     return "{$sitePath}{$this->path}";
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'type' => [
             'model' => 'Files\Type',
@@ -56,6 +56,6 @@ 
             'col' => 'folder_id'
         ],
     ];
-  }
+    }
 
 }

system/modules/Files/install_script.php

Indentation +61 added lines, -61 removed lines

@@ -1,67 +1,67 @@
 <?php
 
 return function($step = NULL, $params = []) {
-  $options = ['max_height' => 1200, 'max_width' => 1200];
-  $types = [
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'png',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpeg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'gif',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'xls',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'pdf',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'docx',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'xlsx',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-  ];
-  foreach ($types as $type) {
+    $options = ['max_height' => 1200, 'max_width' => 1200];
+    $types = [
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'png',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpeg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'gif',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'xls',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'pdf',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'docx',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'xlsx',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+    ];
+    foreach ($types as $type) {
     $typeObject = new \Files\Type($type);
     $typeObject->save();
-  }
+    }
 };

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

Indentation +13 added lines, -13 removed lines

@@ -13,22 +13,22 @@
 
 class File extends \Ui\ActiveForm\Input {
 
-  public function parseRequest($request) {
+    public function parseRequest($request) {
     if (!empty($_FILES[$this->activeForm->requestFormName]['tmp_name'][$this->modelName][$this->colName])) {
-      $file_id = \App::$primary->files->upload([
-          'tmp_name' => $_FILES[$this->activeForm->requestFormName]['tmp_name'][$this->modelName][$this->colName],
-          'name' => $_FILES[$this->activeForm->requestFormName]['name'][$this->modelName][$this->colName],
-          'type' => $_FILES[$this->activeForm->requestFormName]['type'][$this->modelName][$this->colName],
-          'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName],
-          'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName],
-              ], [
-          'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk()
-      ]);
+        $file_id = \App::$primary->files->upload([
+            'tmp_name' => $_FILES[$this->activeForm->requestFormName]['tmp_name'][$this->modelName][$this->colName],
+            'name' => $_FILES[$this->activeForm->requestFormName]['name'][$this->modelName][$this->colName],
+            'type' => $_FILES[$this->activeForm->requestFormName]['type'][$this->modelName][$this->colName],
+            'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName],
+            'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName],
+                ], [
+            'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk()
+        ]);
 
-      if ($file_id) {
+        if ($file_id) {
         $this->activeForm->model->{$this->colName} = $file_id;
-      }
+        }
+    }
     }
-  }
 
 }