injitools / cms-Inji

system/modules/Files/models/File.php

Doc Comments +3 added lines

@@ -40,6 +40,9 @@
     }
   }
 
+  /**
+   * @return string
+   */
   public function getRealPath() {
     $sitePath = \App::$primary->path;
     return "{$sitePath}{$this->path}";

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;
-      }
+        }
+    }
     }
-  }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
           '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()
+          'upload_code' => 'activeForm:'.$this->activeForm->modelName.':'.$this->activeForm->model->pk()
       ]);
 
       if ($file_id) {

system/modules/Ui/objects/ActiveForm.php

Indentation +156 added lines, -156 removed lines

@@ -13,118 +13,118 @@ 
 
 class ActiveForm extends \Object {
 
-  public $model = null;
-  public $modelName = '';
-  public $header = "";
-  public $action = "";
-  public $form = [];
-  public $inputs = [];
-  public $formName = 'noNameForm';
-  public $requestFormName = '';
-  public $requestFullFormName = '';
-  public $parent = null;
+    public $model = null;
+    public $modelName = '';
+    public $header = "";
+    public $action = "";
+    public $form = [];
+    public $inputs = [];
+    public $formName = 'noNameForm';
+    public $requestFormName = '';
+    public $requestFullFormName = '';
+    public $parent = null;
 
-  /**
-   * 
-   * @param array|\Model $model
-   * @param array|string $form
-   */
-  public function __construct($model, $form = '') {
+    /**
+     * 
+     * @param array|\Model $model
+     * @param array|string $form
+     */
+    public function __construct($model, $form = '') {
     if (is_array($model)) {
-      $this->form = $model;
-      if (is_string($form)) {
+        $this->form = $model;
+        if (is_string($form)) {
         $this->formName = $form;
-      }
+        }
     } else {
-      $this->model = $model;
-      $this->modelName = get_class($model);
-      if (is_array($form)) {
+        $this->model = $model;
+        $this->modelName = get_class($model);
+        if (is_array($form)) {
         if (empty($form)) {
-          throw new \Exception('empty form');
+            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)) {
-          throw new \Exception('empty form ' . $form);
+            throw new \Exception('empty form ' . $form);
         }
         $this->inputs = $this->getInputs();
-      }
+        }
     }
     $this->requestFormName = "ActiveForm_{$this->formName}";
     $modeName = $this->modelName;
 
     if (!empty($this->form['name'])) {
-      $this->header = $this->form['name'];
+        $this->header = $this->form['name'];
     } elseif (!empty($modeName::$objectName)) {
-      $this->header = $modeName::$objectName;
+        $this->header = $modeName::$objectName;
     } else {
-      $this->header = $this->modelName;
+        $this->header = $this->modelName;
+    }
     }
-  }
 
-  public function getInputs() {
+    public function getInputs() {
     $inputs = !empty($this->form['inputs']) ? $this->form['inputs'] : [];
     $modelName = $this->modelName;
     foreach ($this->form['map'] as $row) {
-      foreach ($row as $col) {
+        foreach ($row as $col) {
         if (!$col || !empty($inputs[$col])) {
-          continue;
+            continue;
         }
         if (strpos($col, 'form:') === 0) {
-          $colPath = explode(':', $col);
-          if ($this->model->{$colPath[1]}) {
+            $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;
+                $this->model->_params[$modelName::index()] = 0;
             }
             $relOptions['model']::fixPrefix($relOptions['col']);
             $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
-          }
-          $inputs[$col]->parent = $this;
+            }
+            $inputs[$col]->parent = $this;
         } elseif (!empty($modelName::$cols[$col])) {
-          $inputs[$col] = $modelName::$cols[$col];
+            $inputs[$col] = $modelName::$cols[$col];
+        }
         }
-      }
     }
     return $inputs;
-  }
+    }
 
-  public function checkRequest($params = [], $ajax = false) {
+    public function checkRequest($params = [], $ajax = false) {
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
+        return [];
     }
     $successId = 0;
     if (!empty($_POST[$this->requestFormName][$this->modelName]) || !empty($_FILES[$this->requestFormName]['tmp_name'][$this->modelName])) {
-      $request = !empty($_POST[$this->requestFormName][$this->modelName])?$_POST[$this->requestFormName][$this->modelName]:[];
-      if ($this->model) {
+        $request = !empty($_POST[$this->requestFormName][$this->modelName])?$_POST[$this->requestFormName][$this->modelName]:[];
+        if ($this->model) {
         if (!empty($this->form['handler'])) {
-          $modelName = $this->model;
-          $modelName::{$this->form['handler']}($request);
-          $text = 'Новый элемент был успешно добавлен';
-          \Msg::add($text, 'success');
-          \Msg::show();
+            $modelName = $this->model;
+            $modelName::{$this->form['handler']}($request);
+            $text = 'Новый элемент был успешно добавлен';
+            \Msg::add($text, 'success');
+            \Msg::show();
         } else {
-          $presets = !empty($this->form['preset']) ? $this->form['preset'] : [];
-          if (!empty($this->form['userGroupPreset'][\Users\User::$cur->group_id])) {
+            $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]);
-          }
-          $afterSave = [];
-          $error = false;
-          foreach ($this->inputs as $col => $param) {
+            }
+            $afterSave = [];
+            $error = false;
+            foreach ($this->inputs as $col => $param) {
             if (!empty($presets[$col])) {
-              continue;
+                continue;
             }
             if (is_object($param)) {
-              $afterSave[] = $param;
-              continue;
+                $afterSave[] = $param;
+                continue;
             }
             if (!empty($this->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($col, $this->form['userGroupReadonly'][\Users\User::$cur->group_id])) {
-              continue;
+                continue;
             }
             $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($param['type']);
             $input = new $inputClassName();
@@ -134,189 +134,189 @@ 
             $input->colName = $col;
             $input->colParams = $param;
             try {
-              $input->validate($request);
-              $input->parseRequest($request);
+                $input->validate($request);
+                $input->parseRequest($request);
             } catch (\Exception $exc) {
-              \Msg::add($exc->getMessage(), 'danger');
-              $error = true;
+                \Msg::add($exc->getMessage(), 'danger');
+                $error = true;
+            }
             }
-          }
-          if (!$error && empty($_GET['notSave'])) {
+            if (!$error && empty($_GET['notSave'])) {
             foreach ($presets as $col => $preset) {
-              if (!empty($preset['value'])) {
+                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;
+                    $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 {
-                  $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                    $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                }
                 }
-              }
             }
             if (!$this->parent) {
-              if (!empty($this->form['successText'])) {
+                if (!empty($this->form['successText'])) {
                 $text = $this->form['successText'];
-              } else {
+                } else {
                 $text = $this->model->pk() ? 'Изменения были успешно сохранены' : 'Новый элемент был успешно добавлен';
-              }
-              \Msg::add($text, 'success');
+                }
+                \Msg::add($text, 'success');
             }
 
             $this->model->save(!empty($params['dataManagerParams']) ? $params['dataManagerParams'] : []);
             foreach ($afterSave as $form) {
-              $form->checkRequest();
+                $form->checkRequest();
             }
             if ($ajax) {
-              \Msg::show();
+                \Msg::show();
             } elseif (!empty($_GET['redirectUrl'])) {
-              \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
+                \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
             }
             $successId = $this->model->pk();
-          }
+            }
+        }
         }
-      }
-      if (!is_array($params) && is_callable($params)) {
+        if (!is_array($params) && is_callable($params)) {
         $params($request);
-      }
+        }
     }
     return $successId;
-  }
+    }
 
-  public function draw($params = [], $ajax = false) {
+    public function draw($params = [], $ajax = false) {
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
+        return [];
     }
     $form = new Form(!empty($this->form['formOptions']) ? $this->form['formOptions'] : []);
     \App::$cur->view->widget('Ui\ActiveForm', ['form' => $form, 'activeForm' => $this, 'ajax' => $ajax, 'params' => $params]);
-  }
+    }
 
-  public function drawCol($colName, $options, $form, $params = []) {
+    public function drawCol($colName, $options, $form, $params = []) {
     if (is_object($options)) {
-      $options->draw();
+        $options->draw();
     } else {
-      $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
-      $input = new $inputClassName();
-      $input->form = $form;
-      $input->activeForm = $this;
-      $input->activeFormParams = $params;
-      $input->modelName = $this->modelName;
-      $input->colName = $colName;
-      $input->colParams = $options;
-      $input->options = !empty($options['options']) ? $options['options'] : [];
-      $input->draw();
+        $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
+        $input = new $inputClassName();
+        $input->form = $form;
+        $input->activeForm = $this;
+        $input->activeFormParams = $params;
+        $input->modelName = $this->modelName;
+        $input->colName = $colName;
+        $input->colParams = $options;
+        $input->options = !empty($options['options']) ? $options['options'] : [];
+        $input->draw();
     }
     return true;
-  }
+    }
 
-  public static function getOptionsList($inputParams, $params = [], $modelName = '', $aditionalInputNamePrefix = 'aditional', $options = []) {
+    public static function getOptionsList($inputParams, $params = [], $modelName = '', $aditionalInputNamePrefix = 'aditional', $options = []) {
     $values = [];
     switch ($inputParams['source']) {
-      case 'model':
+        case 'model':
         $values = $inputParams['model']::getList(['forSelect' => true]);
         break;
-      case 'array':
+        case 'array':
         $values = $inputParams['sourceArray'];
         break;
-      case 'method':
+        case 'method':
         if (!empty($inputParams['params'])) {
-          $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']);
+            $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']);
         } else {
-          $values = \App::$cur->$inputParams['module']->$inputParams['method']();
+            $values = \App::$cur->$inputParams['module']->$inputParams['method']();
         }
         break;
-      case 'relation':
+        case 'relation':
         if (!$modelName) {
-          return [];
+            return [];
         }
         $relation = $modelName::getRelation($inputParams['relation']);
         if (!empty($params['dataManagerParams']['appType'])) {
-          $options['appType'] = $params['dataManagerParams']['appType'];
+            $options['appType'] = $params['dataManagerParams']['appType'];
         }
         $items = [];
         if (class_exists($relation['model'])) {
-          $filters = $relation['model']::managerFilters();
-          if (!empty($filters['getRows']['where'])) {
+            $filters = $relation['model']::managerFilters();
+            if (!empty($filters['getRows']['where'])) {
             $options['where'][] = $filters['getRows']['where'];
-          }
-          if (!empty($relation['where'])) {
+            }
+            if (!empty($relation['where'])) {
             $options['where'][] = $relation['where'];
-          }
-          if (!empty($relation['order'])) {
+            }
+            if (!empty($relation['order'])) {
             $options['order'] = $relation['order'];
-          }
-          if (!empty($inputParams['itemName'])) {
+            }
+            if (!empty($inputParams['itemName'])) {
             $options['itemName'] = $inputParams['itemName'];
-          }
-          $items = $relation['model']::getList($options);
+            }
+            $items = $relation['model']::getList($options);
         }
         if (!empty($params['noEmptyValue'])) {
-          $values = [];
+            $values = [];
         } else {
-          $values = [0 => 'Не задано'];
+            $values = [0 => 'Не задано'];
         }
         foreach ($items as $key => $item) {
-          if (!empty($inputParams['showCol'])) {
+            if (!empty($inputParams['showCol'])) {
             if (is_array($inputParams['showCol'])) {
-              switch ($inputParams['showCol']['type']) {
+                switch ($inputParams['showCol']['type']) {
                 case 'staticMethod':
                   $values[$key] = $inputParams['showCol']['class']::{$inputParams['showCol']['method']}($item);
-                  break;
-              }
+                    break;
+                }
             } else {
-              $values[$key] = $item->$inputParams['showCol'];
+                $values[$key] = $item->$inputParams['showCol'];
             }
-          } else {
+            } else {
             $values[$key] = $item->name();
-          }
+            }
         }
         break;
     }
     foreach ($values as $key => $value) {
-      if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
+        if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
         $values[$key]['input']['name'] = $aditionalInputNamePrefix . "[{$value['input']['name']}]";
-      }
+        }
     }
     return $values;
-  }
+    }
 
-  /**
-   * Draw error message
-   * 
-   * @param string $errorText
-   */
-  public function drawError($errorText) {
+    /**
+     * Draw error message
+     * 
+     * @param string $errorText
+     */
+    public function drawError($errorText) {
     echo $errorText;
-  }
+    }
 
-  /**
-   * Check access cur user to form with name in param and $model
-   * 
-   * @return boolean
-   */
-  public function checkAccess() {
+    /**
+     * Check access cur user to form with name in param and $model
+     * 
+     * @return boolean
+     */
+    public function checkAccess() {
     if (empty($this->form)) {
-      $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
-      return false;
+        $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
+        return false;
     }
     if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {
-      return false;
+        return false;
     }
     if (!empty($this->form['options']['access']['apps']) && !in_array(\App::$cur->name, $this->form['options']['access']['apps'])) {
-      return false;
+        return false;
     }
     if (!empty($this->form['options']['access']['groups']) && in_array(\Users\User::$cur->group_id, $this->form['options']['access']['groups'])) {
-      return true;
+        return true;
     }
     if ($this->model && !empty($this->form['options']['access']['self']) && \Users\User::$cur->id == $this->model->user_id) {
-      return true;
+        return true;
     }
     if ($this->formName == 'manager' && !\Users\User::$cur->isAdmin()) {
-      return false;
+        return false;
     }
     return true;
-  }
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
         $this->formName = $form;
         $this->form = \App::$cur->ui->getModelForm($this->modelName, $form);
         if (empty($this->form)) {
-          throw new \Exception('empty form ' . $form);
+          throw new \Exception('empty form '.$form);
         }
         $this->inputs = $this->getInputs();
       }
@@ -82,7 +82,7 @@ 
               $this->model->_params[$modelName::index()] = 0;
             }
             $relOptions['model']::fixPrefix($relOptions['col']);
-            $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
+            $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])) {
@@ -95,12 +95,12 @@ 
 
   public function checkRequest($params = [], $ajax = false) {
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->formName.'"');
       return [];
     }
     $successId = 0;
     if (!empty($_POST[$this->requestFormName][$this->modelName]) || !empty($_FILES[$this->requestFormName]['tmp_name'][$this->modelName])) {
-      $request = !empty($_POST[$this->requestFormName][$this->modelName])?$_POST[$this->requestFormName][$this->modelName]:[];
+      $request = !empty($_POST[$this->requestFormName][$this->modelName]) ? $_POST[$this->requestFormName][$this->modelName] : [];
       if ($this->model) {
         if (!empty($this->form['handler'])) {
           $modelName = $this->model;
@@ -126,7 +126,7 @@ 
             if (!empty($this->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($col, $this->form['userGroupReadonly'][\Users\User::$cur->group_id])) {
               continue;
             }
-            $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($param['type']);
+            $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($param['type']);
             $input = new $inputClassName();
             $input->activeForm = $this;
             $input->activeFormParams = $params;
@@ -171,7 +171,7 @@ 
             if ($ajax) {
               \Msg::show();
             } elseif (!empty($_GET['redirectUrl'])) {
-              \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
+              \Tools::redirect($_GET['redirectUrl'].(!empty($_GET['dataManagerHash']) ? '#'.$_GET['dataManagerHash'] : ''));
             }
             $successId = $this->model->pk();
           }
@@ -186,7 +186,7 @@ 
 
   public function draw($params = [], $ajax = false) {
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" form with name: "'.$this->formName.'"');
       return [];
     }
     $form = new Form(!empty($this->form['formOptions']) ? $this->form['formOptions'] : []);
@@ -197,7 +197,7 @@ 
     if (is_object($options)) {
       $options->draw();
     } else {
-      $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
+      $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($options['type']);
       $input = new $inputClassName();
       $input->form = $form;
       $input->activeForm = $this;
@@ -276,7 +276,7 @@ 
     }
     foreach ($values as $key => $value) {
       if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
-        $values[$key]['input']['name'] = $aditionalInputNamePrefix . "[{$value['input']['name']}]";
+        $values[$key]['input']['name'] = $aditionalInputNamePrefix."[{$value['input']['name']}]";
       }
     }
     return $values;
@@ -298,7 +298,7 @@ 
    */
   public function checkAccess() {
     if (empty($this->form)) {
-      $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
+      $this->drawError('"'.$this->modelName.'" form with name: "'.$this->formName.'" not found');
       return false;
     }
     if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {

system/modules/Ui/objects/DataManager.php

Indentation +311 added lines, -311 removed lines

@@ -12,61 +12,61 @@ 
 
 class DataManager extends \Object {
 
-  public $modelName = '';
-  public $managerOptions = [];
-  public $managerName = 'customManager';
-  public $name = 'Менеджер данных';
-  public $limit = 30;
-  public $page = 1;
-  public $table = null;
-  public $joins = [];
-  public $predraw = false;
-  public $cols = [];
-  public $managerId = '';
-
-  /**
-   * Construct new data manager
-   * 
-   * @param string|array $modelNameOrOptions
-   * @param string $managerName
-   * @throws Exception
-   */
-  public function __construct($modelNameOrOptions, $managerName = 'manager') {
+    public $modelName = '';
+    public $managerOptions = [];
+    public $managerName = 'customManager';
+    public $name = 'Менеджер данных';
+    public $limit = 30;
+    public $page = 1;
+    public $table = null;
+    public $joins = [];
+    public $predraw = false;
+    public $cols = [];
+    public $managerId = '';
+
+    /**
+     * Construct new data manager
+     * 
+     * @param string|array $modelNameOrOptions
+     * @param string $managerName
+     * @throws Exception
+     */
+    public function __construct($modelNameOrOptions, $managerName = 'manager') {
     $this->managerName = $managerName;
 
     if (!is_array($modelNameOrOptions)) {
-      if (!class_exists($modelNameOrOptions)) {
+        if (!class_exists($modelNameOrOptions)) {
         throw new \Exception("model {$modelNameOrOptions} not exists");
-      }
-      $this->modelName = $modelNameOrOptions;
-      $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
-      if (isset($modelNameOrOptions::$objectName)) {
+        }
+        $this->modelName = $modelNameOrOptions;
+        $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
+        if (isset($modelNameOrOptions::$objectName)) {
         $this->name = $modelNameOrOptions::$objectName;
-      } else {
+        } else {
         $this->name = $modelNameOrOptions;
-      }
+        }
     } else {
-      $this->managerOptions = $modelNameOrOptions;
+        $this->managerOptions = $modelNameOrOptions;
     }
 
     if (!$this->managerOptions || !is_array($this->managerOptions)) {
-      throw new \Exception('empty DataManager');
+        throw new \Exception('empty DataManager');
     }
 
     if (!empty($this->managerOptions['name'])) {
-      $this->name = $this->managerOptions['name'];
+        $this->name = $this->managerOptions['name'];
     }
 
     $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
-  }
-
-  /**
-   * Get buttons for manager
-   * 
-   * @param string $params
-   * @param object $model
-   */
-  public function getButtons($params = [], $model = null) {
+    }
+
+    /**
+     * Get buttons for manager
+     * 
+     * @param string $params
+     * @param object $model
+     */
+    public function getButtons($params = [], $model = null) {
     $modelName = $this->modelName;
 
 
@@ -76,102 +76,102 @@ 
         'formName' => !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager'
     ];
     if ($model) {
-      $formModelName = get_class($model);
-      $relations = $formModelName::relations();
-      $type = !empty($relations[$params['relation']]['type']) ? $relations[$params['relation']]['type'] : 'to';
-      switch ($type) {
+        $formModelName = get_class($model);
+        $relations = $formModelName::relations();
+        $type = !empty($relations[$params['relation']]['type']) ? $relations[$params['relation']]['type'] : 'to';
+        switch ($type) {
         case 'relModel':
           $formParams['preset'] = [
-              $formModelName::index() => $model->pk()
-          ];
-          break;
+                $formModelName::index() => $model->pk()
+            ];
+            break;
         default:
           $formParams['preset'] = [
-              $relations[$params['relation']]['col'] => $model->pk()
-          ];
-      }
+                $relations[$params['relation']]['col'] => $model->pk()
+            ];
+        }
     }
 
     $buttons = [];
     if (!empty($this->managerOptions['sortMode'])) {
-      $buttons[] = [
-          'class' => 'modeBtn',
-          'data-mode' => 'sort',
-          'text' => 'Сортировать',
-      ];
+        $buttons[] = [
+            'class' => 'modeBtn',
+            'data-mode' => 'sort',
+            'text' => 'Сортировать',
+        ];
     }
     if (!empty($this->managerOptions['filters'])) {
-      $buttons[] = [
-          'text' => 'Фильтры',
-          'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+        $buttons[] = [
+            'text' => 'Фильтры',
+            'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
                 modal.modal("show");',
-      ];
+        ];
     }
     if (!empty($modelName::$forms['simpleItem'])) {
-      $formParams['formName'] = 'simpleItem';
-      $buttons[] = [
-          'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
-      ];
+        $formParams['formName'] = 'simpleItem';
+        $buttons[] = [
+            'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
+            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+        ];
     }
     $formParams['formName'] = !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager';
     $name = 'Элемент';
     if ($modelName::$objectName) {
-      $name = $modelName::$objectName;
+        $name = $modelName::$objectName;
     }
     if (!empty($modelName::$forms[$formParams['formName']])) {
-      $aform = new ActiveForm(new $modelName, $formParams['formName']);
-      if ($aform->checkAccess()) {
+        $aform = new ActiveForm(new $modelName, $formParams['formName']);
+        if ($aform->checkAccess()) {
         $buttons[] = [
             'text' => 'Создать ' . $name,
             'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
         ];
-      }
+        }
     }
 
     return $buttons;
-  }
+    }
 
-  function getActions($onlyGroupActions = false) {
+    function getActions($onlyGroupActions = false) {
     $actions = [
         'Open' => ['className' => 'Open'], 'Edit' => ['className' => 'Edit'], 'Delete' => ['className' => 'Delete']
     ];
     if (isset($this->managerOptions['actions'])) {
-      $actions = array_merge($actions, $this->managerOptions['actions']);
+        $actions = array_merge($actions, $this->managerOptions['actions']);
     }
     $return = [];
     foreach ($actions as $key => $action) {
-      if ($action === false) {
+        if ($action === false) {
         continue;
-      }
-      if (is_array($action)) {
+        }
+        if (is_array($action)) {
         if (!empty($action['access']['groups']) && !in_array(\Users\User::$cur->group_id, $action['access']['groups'])) {
-          continue;
+            continue;
         }
         if (empty($action['className'])) {
-          $action['className'] = $key;
+            $action['className'] = $key;
         }
         $return[$key] = $action;
-      } else {
+        } else {
         $key = $action;
         $return[$key] = [
             'className' => $action
         ];
-      }
-      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
-      if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
+        }
+        $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+        if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
         unset($return[$key]);
-      }
+        }
     }
     return $return;
-  }
-
-  /**
-   * Get cols for manager
-   * 
-   * @return string
-   */
-  public function getCols() {
+    }
+
+    /**
+     * Get cols for manager
+     * 
+     * @return string
+     */
+    public function getCols() {
     $actions = $this->getActions();
     ob_start();
     ?>
@@ -187,12 +187,12 @@ 
         <li><a href ='' onclick='inji.Ui.dataManagers.get(this).rowSelection("inverse");return false;'>Инвертировать</a></li>
         <li role="separator" class="divider"></li>
           <?php
-          foreach ($actions as $action => $actionParams) {
+            foreach ($actions as $action => $actionParams) {
             if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+                echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+            }
             }
-          }
-          ?>
+            ?>
       </ul>
     </div>
     <?php
@@ -205,284 +205,284 @@ 
 
     $modelName = $this->modelName;
     foreach ($this->managerOptions['cols'] as $key => $col) {
-      if (is_array($col)) {
+        if (is_array($col)) {
         $colName = $key;
         $colOptions = $col;
-      } else {
+        } else {
         $colName = $col;
         $colOptions = [];
-      }
-      $colInfo = [];
-      if ($modelName) {
+        }
+        $colInfo = [];
+        if ($modelName) {
         $colInfo = $modelName::getColInfo($colName);
-      }
-      if (empty($colOptions['label']) && !empty($colInfo['label'])) {
+        }
+        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;
+        }
+        $cols[$colName] = $colOptions;
     }
     return $cols;
-  }
-
-  /**
-   * Get rows for manager
-   * 
-   * @param array $params
-   * @param object $model
-   * @return type
-   */
-  public function getRows($params = [], $model = null) {
+    }
+
+    /**
+     * Get rows for manager
+     * 
+     * @param array $params
+     * @param object $model
+     * @return type
+     */
+    public function getRows($params = [], $model = null) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return [];
+        return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     $modelName = $this->modelName;
     $queryParams = [];
     if (empty($params['all'])) {
-      if (!empty($params['limit'])) {
+        if (!empty($params['limit'])) {
         $this->limit = (int) $params['limit'];
-      }
-      if (!empty($params['page'])) {
+        }
+        if (!empty($params['page'])) {
         $this->page = (int) $params['page'];
-      }
-      $queryParams['limit'] = $this->limit;
-      $queryParams['start'] = $this->page * $this->limit - $this->limit;
+        }
+        $queryParams['limit'] = $this->limit;
+        $queryParams['start'] = $this->page * $this->limit - $this->limit;
     }
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+        $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
     }
     if (!empty($params['appType'])) {
-      $queryParams['appType'] = $params['appType'];
+        $queryParams['appType'] = $params['appType'];
     }
     if ($this->joins) {
-      $queryParams['joins'] = $this->joins;
+        $queryParams['joins'] = $this->joins;
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
-      foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
+        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'])];
+            $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
         } elseif (isset($colOptions['value'])) {
-          if (is_array($colOptions['value'])) {
+            if (is_array($colOptions['value'])) {
             foreach ($colOptions['value'] as $key => $value) {
-              if ($key === 'userCol') {
+                if ($key === 'userCol') {
                 $colOptions['value'][$key] = \Model::getColValue(\Users\User::$cur, $value);
-              }
+                }
+            }
             }
-          }
-          $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+            $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+        }
         }
-      }
     }
     if (!empty($this->managerOptions['filters'])) {
-      foreach ($this->managerOptions['filters'] as $col) {
+        foreach ($this->managerOptions['filters'] as $col) {
         $colInfo = $modelName::getColInfo($col);
         switch ($colInfo['colParams']['type']) {
-          case 'select':
+            case 'select':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             if (is_array($params['filters'][$col]['value'])) {
-              foreach ($params['filters'][$col]['value'] as $key => $value) {
+                foreach ($params['filters'][$col]['value'] as $key => $value) {
                 if ($value === '') {
-                  unset($params['filters'][$col]['value'][$key]);
+                    unset($params['filters'][$col]['value'][$key]);
+                }
                 }
-              }
             }
             if (!$params['filters'][$col]['value']) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value'], is_array($params['filters'][$col]['value']) ? 'IN' : '='];
             break;
-          case 'bool':
+            case 'bool':
 
             if (!isset($params['filters'][$col]['value']) || $params['filters'][$col]['value'] === '') {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
             break;
-          case 'dateTime':
+            case 'dateTime':
           case 'date':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
+                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, '<='];
+                }
+                $queryParams['where'][] = [$col, $date, '<='];
             }
             break;
-          case 'number':
+            case 'number':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
             }
             break;
-          case 'email':
+            case 'email':
           case 'text':
           case 'textarea':
           case 'html':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             switch ($params['filters'][$col]['compareType']) {
-              case 'contains':
+                case 'contains':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'equals':
+                case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
-              case 'starts_with':
+                case 'starts_with':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'ends_with':
+                case 'ends_with':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
         }
-      }
+        }
     }
     if (!empty($params['mode']) && $params['mode'] == 'sort') {
-      $queryParams['order'] = ['weight', 'asc'];
+        $queryParams['order'] = ['weight', 'asc'];
     } elseif (!empty($params['sortered']) && !empty($this->managerOptions['sortable'])) {
-      foreach ($params['sortered'] as $colName => $sortType) {
+        foreach ($params['sortered'] as $colName => $sortType) {
         if ($colName && in_array($colName, $this->managerOptions['sortable'])) {
-          $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
-          $queryParams['order'][] = [$colName, $sortType];
+            $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
+            $queryParams['order'][] = [$colName, $sortType];
+        }
         }
-      }
     }
     if ($model && !empty($params['relation'])) {
-      $relation = $model::getRelation($params['relation']);
-      $items = $model->$params['relation']($queryParams);
+        $relation = $model::getRelation($params['relation']);
+        $items = $model->$params['relation']($queryParams);
     } else {
-      $relation = false;
-      $items = $modelName::getList($queryParams);
+        $relation = false;
+        $items = $modelName::getList($queryParams);
     }
     $rows = [];
     foreach ($items as $item) {
-      if ($relation && !empty($relation['relModel'])) {
+        if ($relation && !empty($relation['relModel'])) {
         $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
-      }
-      $row = [];
-      $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
-      $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '%5C', get_class($originalItem));
-      $row[] = "<a href ='/admin/" . $item->genViewLink() . "?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
-      foreach ($this->managerOptions['cols'] as $key => $colName) {
+        }
+        $row = [];
+        $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+        $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '%5C', get_class($originalItem));
+        $row[] = "<a href ='/admin/" . $item->genViewLink() . "?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
+        foreach ($this->managerOptions['cols'] as $key => $colName) {
         if (!empty($params['download'])) {
-          $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
+            $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
         } else {
-          $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
+            $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
+        }
         }
-      }
-      $row[] = $this->rowButtons($item, $params);
-      $rows[] = $row;
+        $row[] = $this->rowButtons($item, $params);
+        $rows[] = $row;
     }
     return $rows;
-  }
+    }
 
-  public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) {
+    public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) {
     $modelName = get_class($item);
     if (!class_exists($modelName)) {
-      return false;
+        return false;
     }
 
     if (!$originalCol) {
-      $originalCol = $colName;
+        $originalCol = $colName;
     }
     if (!$originalItem) {
-      $originalItem = $item;
+        $originalItem = $item;
     }
 
     $relations = $modelName::relations();
     if (strpos($colName, ':') !== false && !empty($relations[substr($colName, 0, strpos($colName, ':'))])) {
-      $rel = substr($colName, 0, strpos($colName, ':'));
-      $col = substr($colName, strpos($colName, ':') + 1);
-      if ($item->$rel) {
+        $rel = substr($colName, 0, strpos($colName, ':'));
+        $col = substr($colName, strpos($colName, ':') + 1);
+        if ($item->$rel) {
         return DataManager::drawCol($item->$rel, $col, $params, $dataManager, $originalCol, $originalItem);
-      } else {
+        } else {
         return 'Не указано';
-      }
+        }
     }
     if (!empty($modelName::$cols[$colName]['relation'])) {
-      $type = !empty($relations[$modelName::$cols[$colName]['relation']]['type']) ? $relations[$modelName::$cols[$colName]['relation']]['type'] : 'to';
-      switch ($type) {
+        $type = !empty($relations[$modelName::$cols[$colName]['relation']]['type']) ? $relations[$modelName::$cols[$colName]['relation']]['type'] : 'to';
+        switch ($type) {
         case 'relModel':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
-          $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-          $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+            $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
+            $count = $count ? $count : 'Нет';
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
         case 'many':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
-          $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-          $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+            $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
+            $count = $count ? $count : 'Нет';
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
         default :
           if ($item->{$modelName::$cols[$colName]['relation']}) {
             if (\App::$cur->name == 'admin') {
-              $href = "<a href ='/admin/" . $item->{$modelName::$cols[$colName]['relation']}->genViewLink() . "'>";
-              if (!empty($modelName::$cols[$colName]['showCol'])) {
+                $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;
+                }
+                $href .= '</a>';
+                return $href;
             } else {
-              return $item->{$modelName::$cols[$colName]['relation']}->name();
+                return $item->{$modelName::$cols[$colName]['relation']}->name();
             }
-          } else {
+            } else {
             return $item->$colName;
-          }
-      }
+            }
+        }
     } else {
-      if (!empty($modelName::$cols[$colName]['view']['type'])) {
+        if (!empty($modelName::$cols[$colName]['view']['type'])) {
         switch ($modelName::$cols[$colName]['view']['type']) {
-          case 'widget':
+            case 'widget':
             ob_start();
             \App::$cur->view->widget($modelName::$cols[$colName]['view']['widget'], ['item' => $item, 'colName' => $colName, 'colParams' => $modelName::$cols[$colName]]);
             $content = ob_get_contents();
             ob_end_clean();
             return $content;
-          case 'moduleMethod':
+            case 'moduleMethod':
             return \App::$cur->{$modelName::$cols[$colName]['view']['module']}->{$modelName::$cols[$colName]['view']['method']}($item, $colName, $modelName::$cols[$colName]);
-          case 'many':
+            case 'many':
             $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
             $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
             return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
-          default:
+            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>";
+            $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') {
-          $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>";
+            $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') {
-          $uid = \Tools::randomString();
-          $script = "<script>inji.onLoad(function(){
+            $uid = \Tools::randomString();
+            $script = "<script>inji.onLoad(function(){
             var el{$uid}=$('#{$uid}');
             var height{$uid} = el{$uid}.height();
             el{$uid}.css('maxHeight','none');
@@ -508,20 +508,20 @@ 
               el{$uid}.after('<a href=\"#\" onclick=\"el{$uid}Toggle();return false;\">Развернуть</a>');
             }
             })</script>";
-          return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
+            return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
         } else {
-          return \Model::resloveTypeValue($item, $colName);
+            return \Model::resloveTypeValue($item, $colName);
         }
-      } else {
+        } else {
         return $item->$colName;
-      }
+        }
+    }
     }
-  }
 
-  public function rowButtons($item, $params) {
+    public function rowButtons($item, $params) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return false;
+        return false;
     }
     ob_start();
     $widgetName = !empty($this->managerOptions['rowButtonsWidget']) ? $this->managerOptions['rowButtonsWidget'] : 'Ui\DataManager/rowButtons';
@@ -533,132 +533,132 @@ 
     $buttons = ob_get_contents();
     ob_end_clean();
     return $buttons;
-  }
+    }
 
-  public function getPages($params = [], $model = null) {
+    public function getPages($params = [], $model = null) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return [];
+        return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     if (!empty($params['limit'])) {
-      $this->limit = (int) $params['limit'];
+        $this->limit = (int) $params['limit'];
     }
     if (!empty($params['page'])) {
-      $this->page = (int) $params['page'];
+        $this->page = (int) $params['page'];
     }
     $queryParams = [
         'count' => true
     ];
     $modelName = $this->modelName;
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+        $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
-      foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
+        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'])];
+            $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
         } elseif (isset($colOptions['value'])) {
-          if (is_array($colOptions['value'])) {
+            if (is_array($colOptions['value'])) {
             foreach ($colOptions['value'] as $key => $value) {
-              if ($key === 'userCol') {
+                if ($key === 'userCol') {
                 $colOptions['value'][$key] = \Model::getColValue(\Users\User::$cur, $value);
-              }
+                }
             }
-          }
-          $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+            }
+            $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+        }
         }
-      }
     }
     $modelName = $this->modelName;
     if (!empty($this->managerOptions['filters'])) {
-      foreach ($this->managerOptions['filters'] as $col) {
+        foreach ($this->managerOptions['filters'] as $col) {
         $colInfo = $modelName::getColInfo($col);
         switch ($colInfo['colParams']['type']) {
-          case 'select':
+            case 'select':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             if (is_array($params['filters'][$col]['value'])) {
-              foreach ($params['filters'][$col]['value'] as $key => $value) {
+                foreach ($params['filters'][$col]['value'] as $key => $value) {
                 if ($value === '') {
-                  unset($params['filters'][$col]['value'][$key]);
+                    unset($params['filters'][$col]['value'][$key]);
+                }
                 }
-              }
             }
             if (!$params['filters'][$col]['value']) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value'], is_array($params['filters'][$col]['value']) ? 'IN' : '='];
             break;
-          case 'bool':
+            case 'bool':
 
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, '1'];
             break;
-          case 'dateTime':
+            case 'dateTime':
           case 'date':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
+                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, '<='];
+                }
+                $queryParams['where'][] = [$col, $date, '<='];
             }
             break;
-          case 'number':
+            case 'number':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
             }
             break;
-          case 'email':
+            case 'email':
           case 'text':
           case 'textarea':
           case 'html':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             switch ($params['filters'][$col]['compareType']) {
-              case 'contains':
+                case 'contains':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'equals':
+                case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
-              case 'starts_with':
+                case 'starts_with':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'ends_with':
+                case 'ends_with':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
         }
-      }
+        }
     }
     if ($model && !empty($params['relation'])) {
-      $count = $model->$params['relation']($queryParams);
+        $count = $model->$params['relation']($queryParams);
     } else {
-      $count = $modelName::getCount($queryParams);
+        $count = $modelName::getCount($queryParams);
     }
     $pages = new Pages([
         'limit' => $this->limit,
@@ -668,9 +668,9 @@ 
         'dataManager' => $this
     ]);
     return $pages;
-  }
+    }
 
-  public function preDraw($params = [], $model = null) {
+    public function preDraw($params = [], $model = null) {
     $this->predraw = true;
 
     $cols = $this->getCols();
@@ -678,19 +678,19 @@ 
     $this->table = new Table();
     $tableCols = [];
     foreach ($cols as $colName => $colOptions) {
-      $tableCols[] = [
-          'attributes' => ['class' => $this->managerId . '_colname_' . $colName, 'data-colname' => $colName],
-          'text' => !empty($colOptions['label']) ? $colOptions['label'] : $colName
-      ];
+        $tableCols[] = [
+            'attributes' => ['class' => $this->managerId . '_colname_' . $colName, 'data-colname' => $colName],
+            'text' => !empty($colOptions['label']) ? $colOptions['label'] : $colName
+        ];
     }
     $tableCols[] = '';
     $this->table->class .=' datamanagertable';
     $this->table->setCols($tableCols);
-  }
+    }
 
-  public function draw($params = [], $model = null) {
+    public function draw($params = [], $model = null) {
     if (!$this->predraw) {
-      $this->preDraw($params, $model);
+        $this->preDraw($params, $model);
     }
     \App::$cur->view->widget('Ui\DataManager/DataManager', [
         'dataManager' => $this,
@@ -698,58 +698,58 @@ 
         'table' => $this->table,
         'params' => $params
     ]);
-  }
+    }
 
-  public function drawCategorys() {
+    public function drawCategorys() {
     if (!class_exists($this->modelName)) {
-      return false;
+        return false;
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     $tree = new Tree();
     $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-      $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
-      $cleanClassName = str_replace('\\', '\\\\', get_class($category));
-      return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
+        $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+        $cleanClassName = str_replace('\\', '\\\\', get_class($category));
+        return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
                 
                     <a href = '#' class ='glyphicon glyphicon-edit'   onclick = 'inji.Ui.forms.popUp(\"{$cleanClassName}:{$category->pk()}\")'></a>&nbsp;
                     <a href = '#' class ='glyphicon glyphicon-remove' onclick = 'inji.Ui.dataManagers.get(this).delCategory({$category->pk()});return false;'></a>";
     });
     ?>
     <?php
-  }
-
-  /**
-   * Draw error message
-   * 
-   * @param string $errorText
-   */
-  public function drawError($errorText) {
+    }
+
+    /**
+     * Draw error message
+     * 
+     * @param string $errorText
+     */
+    public function drawError($errorText) {
     echo $errorText;
-  }
-
-  /**
-   * Check access cur user to manager with name in param
-   * 
-   * @return boolean
-   */
-  public function checkAccess() {
+    }
+
+    /**
+     * Check access cur user to manager with name in param
+     * 
+     * @return boolean
+     */
+    public function checkAccess() {
     if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {
-      return false;
+        return false;
     }
 
     if (!empty($this->managerOptions['options']['access']['apps']) && !in_array(\App::$cur->name, $this->managerOptions['options']['access']['apps'])) {
-      return false;
+        return false;
     }
     if (!empty($this->managerOptions['options']['access']['groups']) && in_array(\Users\User::$cur->group_id, $this->managerOptions['options']['access']['groups'])) {
-      return true;
+        return true;
     }
     if ($this->managerName == 'manager' && !\Users\User::$cur->isAdmin()) {
-      return false;
+        return false;
     }
     return true;
-  }
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -57,7 +57,7 @@ 
       $this->name = $this->managerOptions['name'];
     }
 
-    $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
+    $this->managerId = str_replace('\\', '_', 'dataManager_'.$this->modelName.'_'.$this->managerName.'_'.\Tools::randomString());
   }
 
   /**
@@ -103,7 +103,7 @@ 
     if (!empty($this->managerOptions['filters'])) {
       $buttons[] = [
           'text' => 'Фильтры',
-          'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+          'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
       ];
     }
@@ -111,7 +111,7 @@ 
       $formParams['formName'] = 'simpleItem';
       $buttons[] = [
           'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
       ];
     }
     $formParams['formName'] = !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager';
@@ -123,8 +123,8 @@ 
       $aform = new ActiveForm(new $modelName, $formParams['formName']);
       if ($aform->checkAccess()) {
         $buttons[] = [
-            'text' => 'Создать ' . $name,
-            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+            'text' => 'Создать '.$name,
+            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
         ];
       }
     }
@@ -158,7 +158,7 @@ 
             'className' => $action
         ];
       }
-      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\'.$return[$key]['className']) ? 'Ui\DataManager\Action\\'.$return[$key]['className'] : $return[$key]['className'];
       if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
         unset($return[$key]);
       }
@@ -189,7 +189,7 @@ 
           <?php
           foreach ($actions as $action => $actionParams) {
             if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"".str_replace('\\', '\\\\', $action)."\");return false;'>{$actionParams['className']::$name}</a></li>";
             }
           }
           ?>
@@ -239,7 +239,7 @@ 
       return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     $modelName = $this->modelName;
@@ -255,7 +255,7 @@ 
       $queryParams['start'] = $this->page * $this->limit - $this->limit;
     }
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+      $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
     }
     if (!empty($params['appType'])) {
       $queryParams['appType'] = $params['appType'];
@@ -317,7 +317,7 @@ 
             if (!empty($params['filters'][$col]['max'])) {
               if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                $date = $params['filters'][$col]['max'].' 23:59:59';
               } else {
                 $date = $params['filters'][$col]['max'];
               }
@@ -344,16 +344,16 @@ 
             }
             switch ($params['filters'][$col]['compareType']) {
               case 'contains':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
               case 'starts_with':
-                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'ends_with':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
@@ -383,9 +383,9 @@ 
         $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
       }
       $row = [];
-      $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
-      $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '%5C', get_class($originalItem));
-      $row[] = "<a href ='/admin/" . $item->genViewLink() . "?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
+      $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
+      $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '%5C', get_class($originalItem));
+      $row[] = "<a href ='/admin/".$item->genViewLink()."?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
       foreach ($this->managerOptions['cols'] as $key => $colName) {
         if (!empty($params['download'])) {
           $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
@@ -429,16 +429,16 @@ 
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
           $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
           $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
         case 'many':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
           $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
           $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
         default :
           if ($item->{$modelName::$cols[$colName]['relation']}) {
             if (\App::$cur->name == 'admin') {
-              $href = "<a href ='/admin/" . $item->{$modelName::$cols[$colName]['relation']}->genViewLink() . "'>";
+              $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 {
@@ -468,17 +468,17 @@ 
           case 'many':
             $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
             $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count} ".\Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов'])."</a>";
           default:
             return $item->$colName;
         }
       } elseif (!empty($modelName::$cols[$colName]['type'])) {
-        if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+        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));
+          $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') {
-          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
+          $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') {
           $uid = \Tools::randomString();
@@ -508,7 +508,7 @@ 
               el{$uid}.after('<a href=\"#\" onclick=\"el{$uid}Toggle();return false;\">Развернуть</a>');
             }
             })</script>";
-          return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
+          return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>".$script;
         } else {
           return \Model::resloveTypeValue($item, $colName);
         }
@@ -541,7 +541,7 @@ 
       return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     if (!empty($params['limit'])) {
@@ -555,7 +555,7 @@ 
     ];
     $modelName = $this->modelName;
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+      $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
       foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
@@ -612,7 +612,7 @@ 
             if (!empty($params['filters'][$col]['max'])) {
               if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                $date = $params['filters'][$col]['max'].' 23:59:59';
               } else {
                 $date = $params['filters'][$col]['max'];
               }
@@ -639,16 +639,16 @@ 
             }
             switch ($params['filters'][$col]['compareType']) {
               case 'contains':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
               case 'starts_with':
-                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'ends_with':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
@@ -679,12 +679,12 @@ 
     $tableCols = [];
     foreach ($cols as $colName => $colOptions) {
       $tableCols[] = [
-          'attributes' => ['class' => $this->managerId . '_colname_' . $colName, 'data-colname' => $colName],
+          'attributes' => ['class' => $this->managerId.'_colname_'.$colName, 'data-colname' => $colName],
           'text' => !empty($colOptions['label']) ? $colOptions['label'] : $colName
       ];
     }
     $tableCols[] = '';
-    $this->table->class .=' datamanagertable';
+    $this->table->class .= ' datamanagertable';
     $this->table->setCols($tableCols);
   }
 
@@ -705,12 +705,12 @@ 
       return false;
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     $tree = new Tree();
     $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-      $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+      $path = $category->tree_path.($category->pk() ? $category->pk()."/" : '');
       $cleanClassName = str_replace('\\', '\\\\', get_class($category));
       return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
                 

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

Indentation +3 added lines, -3 removed lines

@@ -7,13 +7,13 @@
     'class' => "form-control " . (!empty($options['class']) ? $options['class'] : '')
 ];
 if (!empty($options['required'])) {
-  $attributes['required'] = 'required';
+    $attributes['required'] = 'required';
 }
 if (!empty($options['disabled'])) {
-  $attributes['disabled'] = 'disabled';
+    $attributes['disabled'] = 'disabled';
 }
 if (!empty($options['attributes'])) {
-  $attributes = array_merge($attributes, $options['attributes']);
+    $attributes = array_merge($attributes, $options['attributes']);
 }
 echo Html::el('textarea', $attributes, !empty($options['value']) ? $options['value'] : (!empty($form->userDataTree[$name]) ? addcslashes($form->userDataTree[$name], "'") : ''));
 echo empty($options['noContainer']) ? '</div>' : '';

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 echo $label !== false ? "<label>{$label}</label>" : '';
 $attributes = [
     'name' => $name,
-    'class' => "form-control " . (!empty($options['class']) ? $options['class'] : '')
+    'class' => "form-control ".(!empty($options['class']) ? $options['class'] : '')
 ];
 if (!empty($options['required'])) {
   $attributes['required'] = 'required';

system/modules/Ui/widgets/Table/head.php

Indentation +3 added lines, -3 removed lines

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

system/modules/Ui/widgets/Table/foot.php

Indentation +3 added lines, -3 removed lines

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

system/Inji/Model.php

Indentation +1027 added lines, -1027 removed lines

@@ -10,262 +10,262 @@ 
  */
 class Model {
 
-  /**
-   * Object storage type
-   * 
-   * @var array 
-   */
-  public static $storage = ['type' => 'db'];
-
-  /**
-   * Object name
-   * 
-   * @var string 
-   */
-  public static $objectName = '';
-
-  /**
-   * App type for separate data storage
-   * 
-   * @var string
-   */
-  public $appType = 'app';
-
-  /**
-   * Object current params
-   * 
-   * @var array
-   */
-  public $_params = [];
-
-  /**
-   * List of changed params in current instance
-   * 
-   * @var array
-   */
-  public $_changedParams = [];
-
-  /**
-   * Loaded relations
-   * 
-   * @var array 
-   */
-  public $loadedRelations = [];
-
-  /**
-   * Model name where this model uses as category
-   * 
-   * @var string
-   */
-  public static $treeCategory = '';
-
-  /**
-   * Model name who uses as category in this model
-   * 
-   * @var string
-   */
-  public static $categoryModel = '';
-
-  /**
-   * Col labels
-   * 
-   * @var array
-   */
-  public static $labels = [];
-
-  /**
-   * Model forms
-   * 
-   * @var array
-   */
-  public static $forms = [];
-
-  /**
-   * Model cols
-   * 
-   * @var array
-   */
-  public static $cols = [];
-
-  /**
-   * Options group for display inforamtion from model
-   * 
-   * @var array
-   */
-  public static $view = [];
-
-  /**
-   * List of relations need loaded with item
-   * 
-   * @var array 
-   */
-  public static $needJoin = [];
-
-  /**
-   * List of joins who need to laod
-   * 
-   * @var array 
-   */
-  public static $relJoins = [];
-
-  /**
-   * Set params when model create
-   * 
-   * @param array $params
-   */
-  public function __construct($params = []) {
+    /**
+     * Object storage type
+     * 
+     * @var array 
+     */
+    public static $storage = ['type' => 'db'];
+
+    /**
+     * Object name
+     * 
+     * @var string 
+     */
+    public static $objectName = '';
+
+    /**
+     * App type for separate data storage
+     * 
+     * @var string
+     */
+    public $appType = 'app';
+
+    /**
+     * Object current params
+     * 
+     * @var array
+     */
+    public $_params = [];
+
+    /**
+     * List of changed params in current instance
+     * 
+     * @var array
+     */
+    public $_changedParams = [];
+
+    /**
+     * Loaded relations
+     * 
+     * @var array 
+     */
+    public $loadedRelations = [];
+
+    /**
+     * Model name where this model uses as category
+     * 
+     * @var string
+     */
+    public static $treeCategory = '';
+
+    /**
+     * Model name who uses as category in this model
+     * 
+     * @var string
+     */
+    public static $categoryModel = '';
+
+    /**
+     * Col labels
+     * 
+     * @var array
+     */
+    public static $labels = [];
+
+    /**
+     * Model forms
+     * 
+     * @var array
+     */
+    public static $forms = [];
+
+    /**
+     * Model cols
+     * 
+     * @var array
+     */
+    public static $cols = [];
+
+    /**
+     * Options group for display inforamtion from model
+     * 
+     * @var array
+     */
+    public static $view = [];
+
+    /**
+     * List of relations need loaded with item
+     * 
+     * @var array 
+     */
+    public static $needJoin = [];
+
+    /**
+     * List of joins who need to laod
+     * 
+     * @var array 
+     */
+    public static $relJoins = [];
+
+    /**
+     * Set params when model create
+     * 
+     * @param array $params
+     */
+    public function __construct($params = []) {
     $this->setParams($params);
-  }
-
-  /**
-   * return object name
-   * 
-   * @return string
-   */
-  public static function objectName() {
+    }
+
+    /**
+     * return object name
+     * 
+     * @return string
+     */
+    public static function objectName() {
     return static::$objectName;
-  }
-
-  /**
-   * Retrn col value with col params and relations path
-   * 
-   * @param Model $object
-   * @param string $valuePath
-   * @param boolean $convert
-   * @param boolean $manageHref
-   * @return string
-   */
-  public static function getColValue($object, $valuePath, $convert = false, $manageHref = false) {
+    }
+
+    /**
+     * Retrn col value with col params and relations path
+     * 
+     * @param Model $object
+     * @param string $valuePath
+     * @param boolean $convert
+     * @param boolean $manageHref
+     * @return string
+     */
+    public static function getColValue($object, $valuePath, $convert = false, $manageHref = false) {
     if (strpos($valuePath, ':')) {
-      $rel = substr($valuePath, 0, strpos($valuePath, ':'));
-      $param = substr($valuePath, strpos($valuePath, ':') + 1);
-      if (!$object->$rel) {
+        $rel = substr($valuePath, 0, strpos($valuePath, ':'));
+        $param = substr($valuePath, strpos($valuePath, ':') + 1);
+        if (!$object->$rel) {
         $modelName = get_class($object);
         $relations = $modelName::relations();
         if (empty($relations[$rel]['type']) || $relations[$rel]['type'] == 'one') {
-          return $object->{$relations[$rel]['col']};
+            return $object->{$relations[$rel]['col']};
         }
         return 0;
-      }
-      if (strpos($valuePath, ':')) {
+        }
+        if (strpos($valuePath, ':')) {
         return self::getColValue($object->$rel, $param, $convert, $manageHref);
-      } else {
+        } else {
         return $convert ? Model::resloveTypeValue($object->$rel, $param, $manageHref) : $object->$rel->$param;
-      }
+        }
     } else {
-      return $convert ? Model::resloveTypeValue($object, $valuePath, $manageHref) : $object->$valuePath;
-    }
-  }
-
-  /**
-   * Retrun value for view
-   * 
-   * @param Model $item
-   * @param string $colName
-   * @param boolean $manageHref
-   * @return string
-   */
-  public static function resloveTypeValue($item, $colName, $manageHref = false) {
+        return $convert ? Model::resloveTypeValue($object, $valuePath, $manageHref) : $object->$valuePath;
+    }
+    }
+
+    /**
+     * Retrun value for view
+     * 
+     * @param Model $item
+     * @param string $colName
+     * @param boolean $manageHref
+     * @return string
+     */
+    public static function resloveTypeValue($item, $colName, $manageHref = false) {
     $modelName = get_class($item);
     $colInfo = $modelName::getColInfo($colName);
     $type = !empty($colInfo['colParams']['type']) ? $colInfo['colParams']['type'] : 'string';
     $value = '';
     switch ($type) {
-      case 'select':
+        case 'select':
         switch ($colInfo['colParams']['source']) {
-          case 'model':
+            case 'model':
             $sourceValue = '';
             if ($item->$colName) {
-              $sourceValue = $colInfo['colParams']['model']::get($item->$colName);
+                $sourceValue = $colInfo['colParams']['model']::get($item->$colName);
             }
             $value = $sourceValue ? $sourceValue->name() : 'Не задано';
             break;
-          case 'array':
+            case 'array':
             $value = !empty($colInfo['colParams']['sourceArray'][$item->$colName]) ? $colInfo['colParams']['sourceArray'][$item->$colName] : 'Не задано';
             if (is_array($value) && $value['text']) {
-              $value = $value['text'];
+                $value = $value['text'];
             }
             break;
-          case 'bool':
+            case 'bool':
             return $item->$colName ? 'Да' : 'Нет';
-          case 'method':
+            case 'method':
             if (!empty($colInfo['colParams']['params'])) {
-              $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']);
+                $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']);
             } else {
-              $values = $colInfo['colParams']['module']->$colInfo['colParams']['method']();
+                $values = $colInfo['colParams']['module']->$colInfo['colParams']['method']();
             }
             $value = !empty($values[$item->$colName]) ? $values[$item->$colName] : 'Не задано';
             break;
-          case 'void':
+            case 'void':
             if (!empty($modelName::$cols[$colName]['value']['type']) && $modelName::$cols[$colName]['value']['type'] == 'moduleMethod') {
-              return \App::$cur->{$modelName::$cols[$colName]['value']['module']}->{$modelName::$cols[$colName]['value']['method']}($item, $colName, $modelName::$cols[$colName]);
+                return \App::$cur->{$modelName::$cols[$colName]['value']['module']}->{$modelName::$cols[$colName]['value']['method']}($item, $colName, $modelName::$cols[$colName]);
             }
             break;
-          case 'relation':
+            case 'relation':
             $relations = $colInfo['modelName']::relations();
             $relValue = $relations[$colInfo['colParams']['relation']]['model']::get($item->$colName);
             $relModel = $relations[$colInfo['colParams']['relation']]['model'];
             $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
             if ($manageHref) {
-              $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+                $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
             } else {
-              $value = $relValue ? $relValue->name() : 'Не задано';
+                $value = $relValue ? $relValue->name() : 'Не задано';
             }
             break;
         }
         break;
-      case 'image':
+        case 'image':
         $file = Files\File::get($item->$colName);
         if ($file) {
-          $value = '<img src="' . $file->path . '?resize=60x120" />';
+            $value = '<img src="' . $file->path . '?resize=60x120" />';
         } else {
-          $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
+            $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
         }
         break;
-      case 'file':
+        case 'file':
         $file = Files\File::get($item->$colName);
         if ($file) {
-          $value = '<a href="' . $file->path . '">' . $file->name . '.' . $file->type->ext . '</a>';
+            $value = '<a href="' . $file->path . '">' . $file->name . '.' . $file->type->ext . '</a>';
         } else {
-          $value = 'Файл не загружен';
+            $value = 'Файл не загружен';
         }
         break;
-      case 'bool':
+        case 'bool':
         $value = $item->$colName ? 'Да' : 'Нет';
         break;
-      case 'void':
+        case 'void':
         if (!empty($colInfo['colParams']['value']['type']) && $colInfo['colParams']['value']['type'] == 'moduleMethod') {
-          return \App::$cur->{$colInfo['colParams']['value']['module']}->{$colInfo['colParams']['value']['method']}($item, $colName, $colInfo['colParams']);
+            return \App::$cur->{$colInfo['colParams']['value']['module']}->{$colInfo['colParams']['value']['method']}($item, $colName, $colInfo['colParams']);
         }
         break;
-      case 'dynamicType':
+        case 'dynamicType':
         switch ($colInfo['colParams']['typeSource']) {
-          case'selfMethod':
+            case'selfMethod':
             $type = $item->{$colInfo['colParams']['selfMethod']}();
             if (is_array($type)) {
-              if (strpos($type['relation'], ':')) {
+                if (strpos($type['relation'], ':')) {
                 $relationPath = explode(':', $type['relation']);
                 $relationName = array_pop($relationPath);
                 $curItem = $item;
                 foreach ($relationPath as $path) {
-                  $curItem = $curItem->$path;
+                    $curItem = $curItem->$path;
                 }
                 $itemModel = get_class($curItem);
                 $relation = $itemModel::getRelation($relationName);
                 $sourceModel = $relation['model'];
-              } else {
+                } else {
                 $relation = static::getRelation($type['relation']);
                 $sourceModel = $relation['model'];
-              }
-              $inputType = 'select';
-              $value = $sourceModel::get($item->$colName);
-              if ($value) {
+                }
+                $inputType = 'select';
+                $value = $sourceModel::get($item->$colName);
+                if ($value) {
                 $value = $value->name();
-              } else {
+                } else {
                 $value = $item->$colName;
-              }
+                }
             } else {
-              switch ($type) {
+                switch ($type) {
                 case 'map':
                   if ($item->$colName && json_decode($item->$colName, true)) {
                     $addres = json_decode($item->$colName, true);
@@ -305,114 +305,114 @@ 
                     $onclick .= 'return false;';
                     $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                     $value .= $content;
-                  } else {
+                    } else {
                     $value = 'Местоположение не заданно';
-                  }
+                    }
 
-                  break;
+                    break;
                 default:
                   $value = $item->$colName;
-              }
+                }
             }
             break;
         }
         break;
-      default:
+        default:
         $value = $item->$colName;
         break;
     }
     return $value;
-  }
-
-  /**
-   * Fix col prefix
-   * 
-   * @param mixed $array
-   * @param string $searchtype
-   * @param string $rootModel
-   * @return null
-   */
-  public static function fixPrefix(&$array, $searchtype = 'key', $rootModel = '') {
+    }
+
+    /**
+     * Fix col prefix
+     * 
+     * @param mixed $array
+     * @param string $searchtype
+     * @param string $rootModel
+     * @return null
+     */
+    public static function fixPrefix(&$array, $searchtype = 'key', $rootModel = '') {
     if (!$rootModel) {
-      $rootModel = get_called_class();
+        $rootModel = get_called_class();
     }
     $cols = static::cols();
     if (!$array) {
-      return;
+        return;
     }
     if (!is_array($array)) {
-      if (!isset($cols[static::colPrefix() . $array]) && isset(static::$cols[$array])) {
+        if (!isset($cols[static::colPrefix() . $array]) && isset(static::$cols[$array])) {
         static::createCol($array);
         $cols = static::cols(true);
-      }
-      if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
+        }
+        if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
         $array = static::colPrefix() . $array;
-      } else {
+        } else {
         static::checkForJoin($array, $rootModel);
-      }
-      return;
+        }
+        return;
     }
     switch ($searchtype) {
-      case 'key':
+        case 'key':
         foreach ($array as $key => $item) {
-          if (!isset($cols[static::colPrefix() . $key]) && isset(static::$cols[$key])) {
+            if (!isset($cols[static::colPrefix() . $key]) && isset(static::$cols[$key])) {
             static::createCol($key);
             $cols = static::cols(true);
-          }
-          if (!isset($cols[$key]) && isset($cols[static::colPrefix() . $key])) {
+            }
+            if (!isset($cols[$key]) && isset($cols[static::colPrefix() . $key])) {
             $array[static::colPrefix() . $key] = $item;
             unset($array[$key]);
             $key = static::colPrefix() . $key;
-          }
-          if (is_array($array[$key])) {
+            }
+            if (is_array($array[$key])) {
             static::fixPrefix($array[$key], 'key', $rootModel);
-          } else {
+            } else {
             static::checkForJoin($key, $rootModel);
-          }
+            }
         }
         break;
-      case 'first':
+        case 'first':
         if (isset($array[0]) && is_string($array[0])) {
-          if (!isset($cols[static::colPrefix() . $array[0]]) && isset(static::$cols[$array[0]])) {
+            if (!isset($cols[static::colPrefix() . $array[0]]) && isset(static::$cols[$array[0]])) {
             static::createCol($array[0]);
             $cols = static::cols(true);
-          }
-          if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
+            }
+            if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
             $array[0] = static::colPrefix() . $array[0];
-          } else {
+            } else {
             static::checkForJoin($array[0], $rootModel);
-          }
+            }
         } elseif (isset($array[0]) && is_array($array[0])) {
-          foreach ($array as &$item) {
+            foreach ($array as &$item) {
             static::fixPrefix($item, 'first', $rootModel);
-          }
+            }
         }
         break;
     }
-  }
+    }
 
-  /**
-   * Check model relations path and load need relations
-   * 
-   * @param string $col
-   * @param string $rootModel
-   */
-  public static function checkForJoin(&$col, $rootModel) {
+    /**
+     * Check model relations path and load need relations
+     * 
+     * @param string $col
+     * @param string $rootModel
+     */
+    public static function checkForJoin(&$col, $rootModel) {
 
     if (strpos($col, ':') !== false) {
-      $relations = static::relations();
-      if (isset($relations[substr($col, 0, strpos($col, ':'))])) {
+        $relations = static::relations();
+        if (isset($relations[substr($col, 0, strpos($col, ':'))])) {
         $rel = substr($col, 0, strpos($col, ':'));
         $col = substr($col, strpos($col, ':') + 1);
 
         $type = empty($relations[$rel]['type']) ? 'to' : $relations[$rel]['type'];
         switch ($type) {
-          case 'to':
+            case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
             $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
             break;
-          case 'one':
+            case 'one':
           case 'many':
             $relCol = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($relCol);
@@ -420,44 +420,44 @@ 
             break;
         }
         $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel);
-      }
+        }
+    }
     }
-  }
 
-  /**
-   * Return full col information
-   * 
-   * @param string $col
-   * @return array
-   */
-  public static function getColInfo($col) {
+    /**
+     * Return full col information
+     * 
+     * @param string $col
+     * @return array
+     */
+    public static function getColInfo($col) {
     return static::parseColRecursion($col);
-  }
-
-  /**
-   * Information extractor for col relations path
-   * 
-   * @param string|array $info
-   * @return array
-   */
-  public static function parseColRecursion($info) {
+    }
+
+    /**
+     * Information extractor for col relations path
+     * 
+     * @param string|array $info
+     * @return array
+     */
+    public static function parseColRecursion($info) {
     if (is_string($info)) {
-      $info = ['col' => $info, 'rawCol' => $info, 'modelName' => '', 'label' => '', 'joins' => []];
+        $info = ['col' => $info, 'rawCol' => $info, 'modelName' => '', 'label' => '', 'joins' => []];
     }
     if (strpos($info['col'], ':') !== false) {
-      $relations = static::relations();
-      if (isset($relations[substr($info['col'], 0, strpos($info['col'], ':'))])) {
+        $relations = static::relations();
+        if (isset($relations[substr($info['col'], 0, strpos($info['col'], ':'))])) {
         $rel = substr($info['col'], 0, strpos($info['col'], ':'));
         $info['col'] = substr($info['col'], strpos($info['col'], ':') + 1);
         $type = empty($relations[$rel]['type']) ? 'to' : $relations[$rel]['type'];
         switch ($type) {
-          case 'to':
+            case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
             //$info['modelName'] = $relations[$rel]['model'];
             $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
             break;
-          case 'one':
+            case 'one':
             $relCol = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($relCol);
             //$info['modelName'] = $relations[$rel]['model'];
@@ -465,788 +465,788 @@ 
             break;
         }
         $info = $relations[$rel]['model']::parseColRecursion($info);
-      }
+        }
     } else {
-      $cols = static::cols();
-      if (!empty(static::$labels[$info['col']])) {
+        $cols = static::cols();
+        if (!empty(static::$labels[$info['col']])) {
         $info['label'] = static::$labels[$info['col']];
-      }
+        }
 
-      if (isset(static::$cols[$info['col']])) {
+        if (isset(static::$cols[$info['col']])) {
         $info['colParams'] = static::$cols[$info['col']];
-      } elseif (isset(static::$cols[str_replace(static::colPrefix(), '', $info['col'])])) {
+        } elseif (isset(static::$cols[str_replace(static::colPrefix(), '', $info['col'])])) {
         $info['colParams'] = static::$cols[str_replace(static::colPrefix(), '', $info['col'])];
-      } else {
+        } else {
         $info['colParams'] = [];
-      }
-      if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
+        }
+        if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
         $info['col'] = static::colPrefix() . $info['col'];
-      }
-      $info['modelName'] = get_called_class();
+        }
+        $info['modelName'] = get_called_class();
     }
     if (!empty(static::$labels[$info['rawCol']])) {
-      $info['label'] = static::$labels[$info['rawCol']];
+        $info['label'] = static::$labels[$info['rawCol']];
     }
     return $info;
-  }
-
-  /**
-   * Return actual cols from data base
-   * 
-   * @param boolean $refresh
-   * @return array
-   */
-  public static function cols($refresh = false) {
+    }
+
+    /**
+     * Return actual cols from data base
+     * 
+     * @param boolean $refresh
+     * @return array
+     */
+    public static function cols($refresh = false) {
     if (static::$storage['type'] == 'moduleConfig') {
-      return [];
+        return [];
     }
     if (empty(Model::$cols[static::table()]) || $refresh) {
-      Model::$cols[static::table()] = App::$cur->db->getTableCols(static::table());
+        Model::$cols[static::table()] = App::$cur->db->getTableCols(static::table());
     }
     if (!Model::$cols[static::table()]) {
-      static::createTable();
-      Model::$cols[static::table()] = App::$cur->db->getTableCols(static::table());
+        static::createTable();
+        Model::$cols[static::table()] = App::$cur->db->getTableCols(static::table());
     }
     return Model::$cols[static::table()];
-  }
-
-  /**
-   * Return cols indexes for create tables
-   * 
-   * @return array
-   */
-  public static function indexes() {
+    }
+
+    /**
+     * Return cols indexes for create tables
+     * 
+     * @return array
+     */
+    public static function indexes() {
     return [];
-  }
-
-  /**
-   * Generate params string for col by name
-   * 
-   * @param string $colName
-   * @return boolean|string
-   */
-  public static function genColParams($colName) {
+    }
+
+    /**
+     * Generate params string for col by name
+     * 
+     * @param string $colName
+     * @return boolean|string
+     */
+    public static function genColParams($colName) {
     if (empty(static::$cols[$colName]) || static::$storage['type'] == 'moduleConfig') {
-      return false;
+        return false;
     }
 
     $params = false;
     switch (static::$cols[$colName]['type']) {
-      case 'select':
+        case 'select':
         switch (static::$cols[$colName]['source']) {
-          case 'relation':
+            case 'relation':
             $params = 'int(11) UNSIGNED NOT NULL';
             break;
-          default:
+            default:
             $params = 'varchar(255) NOT NULL';
         }
         break;
-      case 'image':
+        case 'image':
       case 'file':
         $params = 'int(11) UNSIGNED NOT NULL';
         break;
-      case 'number':
+        case 'number':
         $params = 'int(11) NOT NULL';
         break;
-      case 'text':
+        case 'text':
       case 'email':
         $params = 'varchar(255) NOT NULL';
         break;
-      case 'html':
+        case 'html':
       case 'textarea':
       case 'json':
       case 'password':
       case 'dynamicType':
         $params = 'text NOT NULL';
         break;
-      case 'bool':
+        case 'bool':
         $params = 'tinyint(1) UNSIGNED NOT NULL';
         break;
-      case 'decimal':
+        case 'decimal':
         $params = 'decimal(8, 2) NOT NULL';
         break;
-      case 'date':
+        case 'date':
         $params = 'date NOT NULL DEFAULT 0';
         break;
-      case 'dateTime':
+        case 'dateTime':
         $params = 'timestamp NOT NULL DEFAULT 0';
         break;
     }
     return $params;
-  }
-
-  /**
-   * Create new col in data base
-   * 
-   * @param string $colName
-   * @return boolean|integer
-   */
-  public static function createCol($colName) {
+    }
+
+    /**
+     * Create new col in data base
+     * 
+     * @param string $colName
+     * @return boolean|integer
+     */
+    public static function createCol($colName) {
     $params = static::genColParams($colName);
     if ($params === false) {
-      return false;
+        return false;
     }
     return App::$cur->db->addCol(static::table(), static::colPrefix() . $colName, $params);
-  }
+    }
 
-  public static function createTable() {
+    public static function createTable() {
     if (static::$storage['type'] == 'moduleConfig') {
-      return true;
+        return true;
     }
     if (!App::$cur->db) {
-      return false;
+        return false;
     }
 
     $query = App::$cur->db->newQuery();
     if (!$query) {
-      return false;
+        return false;
     }
 
     if (!isset($this)) {
-      $tableName = static::table();
-      $colPrefix = static::colPrefix();
-      $indexes = static::indexes();
+        $tableName = static::table();
+        $colPrefix = static::colPrefix();
+        $indexes = static::indexes();
     } else {
-      $tableName = $this->table();
-      $colPrefix = $this->colPrefix();
-      $indexes = $this->indexes();
+        $tableName = $this->table();
+        $colPrefix = $this->colPrefix();
+        $indexes = $this->indexes();
     }
     if (App::$cur->db->tableExist($tableName)) {
-      return true;
+        return true;
     }
     $cols = [
         $colPrefix . 'id' => 'pk'
     ];
     $className = get_called_class();
     if (!empty($className::$cols)) {
-      foreach ($className::$cols as $colName => $colParams) {
+        foreach ($className::$cols as $colName => $colParams) {
         if ($colName == 'date_create') {
-          $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
-          continue;
+            $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+            continue;
         }
         $params = $className::genColParams($colName);
         if ($params) {
-          $cols[$colPrefix . $colName] = $params;
+            $cols[$colPrefix . $colName] = $params;
+        }
         }
-      }
     }
     if (empty($cols[$colPrefix . 'date_create'])) {
-      $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+        $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
     }
     $tableIndexes = [];
     if ($indexes) {
-      foreach ($indexes as $indexName => $index) {
+        foreach ($indexes as $indexName => $index) {
         $tableIndexes[] = $index['type'] . ' ' . App::$cur->db->table_prefix . $indexName . ' (' . implode(',', $index['cols']) . ')';
-      }
+        }
     }
 
     $query->createTable($tableName, $cols, $tableIndexes);
     return true;
-  }
-
-  /**
-   * Return table name
-   * 
-   * @return string
-   */
-  public static function table() {
+    }
+
+    /**
+     * Return table name
+     * 
+     * @return string
+     */
+    public static function table() {
     return strtolower(str_replace('\\', '_', get_called_class()));
-  }
+    }
 
-  /**
-   * Return table index col name
-   * 
-   * @return string
-   */
-  public static function index() {
+    /**
+     * Return table index col name
+     * 
+     * @return string
+     */
+    public static function index() {
 
     return static::colPrefix() . 'id';
-  }
-
-  /**
-   * Return col prefix
-   * 
-   * @return string
-   */
-  public static function colPrefix() {
+    }
+
+    /**
+     * Return col prefix
+     * 
+     * @return string
+     */
+    public static function colPrefix() {
     $classPath = explode('\\', get_called_class());
     $classPath = array_slice($classPath, 1);
     return strtolower(implode('_', $classPath)) . '_';
-  }
-
-  /**
-   * return relations list
-   * 
-   * @return array
-   */
-  public static function relations() {
+    }
+
+    /**
+     * return relations list
+     * 
+     * @return array
+     */
+    public static function relations() {
     return [];
-  }
-
-  /**
-   * views list
-   * 
-   * @return array
-   */
-  public static $views = [];
-
-  /**
-   * Return name of col with object name
-   * 
-   * @return string
-   */
-  public static function nameCol() {
+    }
+
+    /**
+     * views list
+     * 
+     * @return array
+     */
+    public static $views = [];
+
+    /**
+     * Return name of col with object name
+     * 
+     * @return string
+     */
+    public static function nameCol() {
     return 'name';
-  }
-
-  /**
-   * Return object name
-   * 
-   * @return string
-   */
-  public function name() {
+    }
+
+    /**
+     * Return object name
+     * 
+     * @return string
+     */
+    public function name() {
     return $this->{$this->nameCol()} ? $this->{$this->nameCol()} : '№' . $this->pk();
-  }
-
-  /**
-   * Get single object from data base
-   * 
-   * @param mixed $param
-   * @param string $col
-   * @param array $options
-   * @return boolean|\Model
-   */
-  public static function get($param, $col = null, $options = []) {
+    }
+
+    /**
+     * Get single object from data base
+     * 
+     * @param mixed $param
+     * @param string $col
+     * @param array $options
+     * @return boolean|\Model
+     */
+    public static function get($param, $col = null, $options = []) {
     if (static::$storage['type'] == 'moduleConfig') {
-      return static::getFromModuleStorage($param, $col, $options);
+        return static::getFromModuleStorage($param, $col, $options);
     }
     if (!empty($col)) {
-      static::fixPrefix($col);
+        static::fixPrefix($col);
     }
 
     if (is_array($param)) {
-      static::fixPrefix($param, 'first');
+        static::fixPrefix($param, 'first');
     }
     foreach (static::$relJoins as $join) {
-      App::$cur->db->join($join[0], $join[1]);
+        App::$cur->db->join($join[0], $join[1]);
     }
     static::$relJoins = [];
     foreach (static::$needJoin as $rel) {
-      $relations = static::relations();
-      if (isset($relations[$rel])) {
+        $relations = static::relations();
+        if (isset($relations[$rel])) {
         $type = empty($relations[$rel]['type']) ? 'to' : $relations[$rel]['type'];
         switch ($type) {
-          case 'to':
+            case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
             App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
             break;
-          case 'one':
+            case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
             App::$cur->db->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
             break;
         }
-      }
+        }
     }
     static::$needJoin = [];
     if (is_array($param)) {
-      App::$cur->db->where($param);
+        App::$cur->db->where($param);
     } else {
-      if ($col === null) {
+        if ($col === null) {
 
         $col = static::index();
-      }
-      if ($param !== null) {
+        }
+        if ($param !== null) {
         $cols = static::cols();
         if (!isset($cols[$col]) && isset($cols[static::colPrefix() . $col])) {
-          $col = static::colPrefix() . $col;
+            $col = static::colPrefix() . $col;
         }
         App::$cur->db->where($col, $param);
-      } else {
+        } else {
         return false;
-      }
+        }
     }
     if (!App::$cur->db->where) {
-      return false;
+        return false;
     }
     try {
-      $result = App::$cur->db->select(static::table());
+        $result = App::$cur->db->select(static::table());
     } catch (PDOException $exc) {
-      if ($exc->getCode() == '42S02') {
+        if ($exc->getCode() == '42S02') {
         static::createTable();
-      }
-      $result = App::$cur->db->select(static::table());
+        }
+        $result = App::$cur->db->select(static::table());
     }
     if (!$result) {
-      return false;
+        return false;
     }
     return $result->fetch(get_called_class());
-  }
-
-  /**
-   * Old method
-   * 
-   * @param type $options
-   * @return Array
-   */
-  public static function get_list($options = []) {
+    }
+
+    /**
+     * Old method
+     * 
+     * @param type $options
+     * @return Array
+     */
+    public static function get_list($options = []) {
     $query = App::$cur->db->newQuery();
     if (!$query) {
-      return [];
+        return [];
     }
     if (!empty($options['where']))
-      $query->where($options['where']);
+        $query->where($options['where']);
     if (!empty($options['cols']))
-      $query->cols = $options['cols'];
+        $query->cols = $options['cols'];
     if (!empty($options['group'])) {
-      $query->group($options['group']);
+        $query->group($options['group']);
     }
     if (!empty($options['having'])) {
-      $query->having($options['having']);
+        $query->having($options['having']);
     }
     if (!empty($options['order']))
-      $query->order($options['order']);
+        $query->order($options['order']);
     if (!empty($options['join']))
-      $query->join($options['join']);
+        $query->join($options['join']);
     if (!empty($options['distinct']))
-      $query->distinct = $options['distinct'];
+        $query->distinct = $options['distinct'];
 
     foreach (static::$relJoins as $join) {
-      $query->join($join[0], $join[1]);
+        $query->join($join[0], $join[1]);
     }
     static::$relJoins = [];
     foreach (static::$needJoin as $rel) {
-      $relations = static::relations();
-      if (isset($relations[$rel])) {
+        $relations = static::relations();
+        if (isset($relations[$rel])) {
         $type = empty($relations[$rel]['type']) ? 'to' : $relations[$rel]['type'];
         switch ($type) {
-          case 'to':
+            case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
             $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
             break;
-          case 'one':
+            case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
             $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
             break;
         }
-      }
+        }
     }
     static::$needJoin = [];
 
     if (!empty($options['limit']))
-      $limit = (int) $options['limit'];
+        $limit = (int) $options['limit'];
     else {
-      $limit = 0;
+        $limit = 0;
     }
     if (!empty($options['start']))
-      $start = (int) $options['start'];
+        $start = (int) $options['start'];
     else {
-      $start = 0;
+        $start = 0;
     }
     if ($limit || $start) {
-      $query->limit($start, $limit);
+        $query->limit($start, $limit);
     }
     if (isset($options['key'])) {
-      $key = $options['key'];
+        $key = $options['key'];
     } else {
-      $key = static::index();
+        $key = static::index();
     }
     try {
-      $query->operation = 'SELECT';
-      $query->table = static::table();
-      $queryArr = $query->buildQuery();
-      $result = $query->query($queryArr);
+        $query->operation = 'SELECT';
+        $query->table = static::table();
+        $queryArr = $query->buildQuery();
+        $result = $query->query($queryArr);
     } catch (PDOException $exc) {
-      if ($exc->getCode() == '42S02') {
+        if ($exc->getCode() == '42S02') {
         static::createTable();
         $result = $query->query($queryArr);
-      } else {
+        } else {
         throw $exc;
-      }
+        }
     }
 
     if (!empty($options['array'])) {
-      return $result->getArray($key);
+        return $result->getArray($key);
     }
     $list = $result->getObjects(get_called_class(), $key);
     if (!empty($options['forSelect'])) {
-      $return = [];
-      foreach ($list as $key => $item) {
+        $return = [];
+        foreach ($list as $key => $item) {
         $return[$key] = $item->name();
-      }
-      return $return;
+        }
+        return $return;
     }
     return $list;
-  }
-
-  /**
-   * Return list of objects from data base
-   * 
-   * @param type $options
-   * @return type
-   */
-  public static function getList($options = []) {
+    }
+
+    /**
+     * Return list of objects from data base
+     * 
+     * @param type $options
+     * @return type
+     */
+    public static function getList($options = []) {
     if (static::$storage['type'] != 'db') {
-      return static::getListFromModuleStorage($options);
+        return static::getListFromModuleStorage($options);
     }
     if (!empty($options['where'])) {
-      static::fixPrefix($options['where'], 'first');
+        static::fixPrefix($options['where'], 'first');
     }
     if (!empty($options['group'])) {
-      static::fixPrefix($options['group'], 'first');
+        static::fixPrefix($options['group'], 'first');
     }
     if (!empty($options['order'])) {
-      static::fixPrefix($options['order'], 'first');
+        static::fixPrefix($options['order'], 'first');
     }
     if (!empty($options['having'])) {
-      static::fixPrefix($options['having'], 'first');
+        static::fixPrefix($options['having'], 'first');
     }
     return static::get_list($options);
-  }
-
-  /**
-   * Get single item from module storage
-   * 
-   * @param array $param
-   * @param string $col
-   * @param array $options
-   * @return boolean|\Model
-   */
-  public static function getFromModuleStorage($param = null, $col = null, $options = []) {
+    }
+
+    /**
+     * Get single item from module storage
+     * 
+     * @param array $param
+     * @param string $col
+     * @param array $options
+     * @return boolean|\Model
+     */
+    public static function getFromModuleStorage($param = null, $col = null, $options = []) {
     if ($col === null) {
 
-      $col = static::index();
+        $col = static::index();
     }
     if ($param == null) {
-      return false;
+        return false;
     }
     $classPath = explode('\\', get_called_class());
     if (!empty(static::$storage['options']['share'])) {
-      $moduleConfig = Config::share($classPath[0]);
+        $moduleConfig = Config::share($classPath[0]);
     } else {
-      $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
+        $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
     }
     $appType = App::$cur->type;
     if (!empty($moduleConfig['storage']['appTypeSplit'])) {
-      if (!empty($options['appType'])) {
+        if (!empty($options['appType'])) {
         $appType = $options['appType'];
-      }
-      $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
+        }
+        $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
     } else {
-      $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
+        $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
     }
     if (!empty($storage[$classPath[1]])) {
-      $items = $storage[$classPath[1]];
-      $class = get_called_class();
-      $where = is_array($param) ? $param : [$col, $param];
-      foreach ($items as $key => $item) {
+        $items = $storage[$classPath[1]];
+        $class = get_called_class();
+        $where = is_array($param) ? $param : [$col, $param];
+        foreach ($items as $key => $item) {
         if (!Model::checkWhere($item, $where)) {
-          continue;
+            continue;
         }
         if (!empty($options['array'])) {
-          return $item;
+            return $item;
         }
         $item = new $class($item);
         $item->appType = $appType;
         return $item;
-      }
+        }
     }
     return false;
-  }
-
-  /**
-   * Return list items from module storage
-   * 
-   * @param array $options
-   * @return array
-   */
-  public static function getListFromModuleStorage($options = []) {
+    }
+
+    /**
+     * Return list items from module storage
+     * 
+     * @param array $options
+     * @return array
+     */
+    public static function getListFromModuleStorage($options = []) {
     $classPath = explode('\\', get_called_class());
     if (!empty(static::$storage['options']['share'])) {
-      $moduleConfig = Config::share($classPath[0]);
+        $moduleConfig = Config::share($classPath[0]);
     } else {
-      $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
+        $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
     }
     if (!empty($moduleConfig['storage']['appTypeSplit'])) {
-      if (empty($options['appType'])) {
+        if (empty($options['appType'])) {
         $appType = App::$cur->type;
-      } else {
+        } else {
         $appType = $options['appType'];
-      }
-      $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
+        }
+        $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
     } else {
-      $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
+        $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
     }
     if (!empty($storage[$classPath[1]])) {
-      $items = [];
-      $class = get_called_class();
-      if (isset($options['key'])) {
+        $items = [];
+        $class = get_called_class();
+        if (isset($options['key'])) {
         $arrayKey = $options['key'];
-      } else {
+        } else {
         $arrayKey = static::index();
-      }
-      foreach ($storage[$classPath[1]] as $key => $item) {
+        }
+        foreach ($storage[$classPath[1]] as $key => $item) {
         if (!empty($options['where']) && !Model::checkWhere($item, $options['where'])) {
-          continue;
+            continue;
         }
         $items[$item[$arrayKey]] = new $class($item);
-      }
-      if (!empty($options['order'])) {
+        }
+        if (!empty($options['order'])) {
         usort($items, function($a, $b) use($options) {
-          if ($a->{$options['order'][0]} > $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
+            if ($a->{$options['order'][0]} > $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
             return 1;
-          } elseif ($a->{$options['order'][0]} < $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
+            } elseif ($a->{$options['order'][0]} < $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
             return -1;
-          }
-          return 0;
+            }
+            return 0;
         });
-      }
-      if (!empty($options['forSelect'])) {
+        }
+        if (!empty($options['forSelect'])) {
         $return = [];
         foreach ($items as $key => $item) {
-          $return[$key] = $item->name();
+            $return[$key] = $item->name();
         }
         return $return;
-      }
-      return $items;
+        }
+        return $items;
     }
     return [];
-  }
+    }
 
-  /**
-   * Return count of records from module storage
-   * 
-   * @param array $options
-   * @return int
-   */
-  public static function getCountFromModuleStorage($options = []) {
+    /**
+     * Return count of records from module storage
+     * 
+     * @param array $options
+     * @return int
+     */
+    public static function getCountFromModuleStorage($options = []) {
 
     $classPath = explode('\\', get_called_class());
     $count = 0;
     if (empty($options['appType'])) {
-      $appType = App::$cur->type;
+        $appType = App::$cur->type;
     } else {
-      $appType = $options['appType'];
+        $appType = $options['appType'];
     }
     if (!empty(static::$storage['options']['share'])) {
-      $moduleConfig = Config::share($classPath[0]);
+        $moduleConfig = Config::share($classPath[0]);
     } else {
-      $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
+        $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
     }
     if (!empty($moduleConfig['storage'][$appType][$classPath[1]])) {
-      $items = $moduleConfig['storage'][$appType][$classPath[1]];
-      if (empty($options['where'])) {
+        $items = $moduleConfig['storage'][$appType][$classPath[1]];
+        if (empty($options['where'])) {
         return count($items);
-      }
-      foreach ($items as $key => $item) {
+        }
+        foreach ($items as $key => $item) {
         if (!empty($options['where'])) {
-          if (Model::checkWhere($item, $options['where'])) {
+            if (Model::checkWhere($item, $options['where'])) {
             $count++;
-          }
+            }
         } else {
-          $count++;
+            $count++;
+        }
         }
-      }
     }
     return $count;
-  }
-
-  /**
-   * Check where for module storage query
-   * 
-   * @param array $item
-   * @param array|string $where
-   * @param string $value
-   * @param string $operation
-   * @param string $concatenation
-   * @return boolean
-   */
-  public static function checkWhere($item = [], $where = '', $value = '', $operation = '=', $concatenation = 'AND') {
+    }
+
+    /**
+     * Check where for module storage query
+     * 
+     * @param array $item
+     * @param array|string $where
+     * @param string $value
+     * @param string $operation
+     * @param string $concatenation
+     * @return boolean
+     */
+    public static function checkWhere($item = [], $where = '', $value = '', $operation = '=', $concatenation = 'AND') {
 
     if (is_array($where)) {
-      if (is_array($where[0])) {
+        if (is_array($where[0])) {
         $result = true;
         foreach ($where as $key => $whereItem) {
-          $concatenation = empty($whereItem[3]) ? 'AND' : strtoupper($whereItem[3]);
-          switch ($concatenation) {
+            $concatenation = empty($whereItem[3]) ? 'AND' : strtoupper($whereItem[3]);
+            switch ($concatenation) {
             case 'AND':
               $result = $result && forward_static_call_array(['Model', 'checkWhere'], [$item, $whereItem]);
-              break;
+                break;
             case 'OR':
               $result = $result || forward_static_call_array(['Model', 'checkWhere'], [$item, $whereItem]);
-              break;
-          }
+                break;
+            }
         }
 
         return $result;
-      } else {
+        } else {
         return forward_static_call_array(['Model', 'checkWhere'], array_merge([$item], $where));
-      }
+        }
     }
     if (!isset($item[$where]) && !$value) {
-      return true;
+        return true;
     }
     if (!isset($item[$where]) && $value) {
-      return false;
+        return false;
     }
     if ($item[$where] == $value) {
-      return true;
+        return true;
     }
     return false;
-  }
-
-  /**
-   * Return count of records from data base
-   * 
-   * @param array $options
-   * @return array|int
-   */
-  public static function getCount($options = []) {
+    }
+
+    /**
+     * Return count of records from data base
+     * 
+     * @param array $options
+     * @return array|int
+     */
+    public static function getCount($options = []) {
     if (static::$storage['type'] == 'moduleConfig') {
-      return static::getCountFromModuleStorage($options);
+        return static::getCountFromModuleStorage($options);
     }
     $query = App::$cur->db->newQuery();
     if (!$query) {
-      return 0;
+        return 0;
     }
     if (!empty($options['where'])) {
-      static::fixPrefix($options['where'], 'first');
+        static::fixPrefix($options['where'], 'first');
     }
     if (!empty($options['group'])) {
-      static::fixPrefix($options['group'], 'first');
+        static::fixPrefix($options['group'], 'first');
     }
     if (!empty($options['where']))
-      $query->where($options['where']);
+        $query->where($options['where']);
     if (!empty($options['join']))
-      $query->join($options['join']);
+        $query->join($options['join']);
     if (!empty($options['order'])) {
-      $query->order($options['order']);
+        $query->order($options['order']);
     }
     if (!empty($options['limit']))
-      $limit = (int) $options['limit'];
+        $limit = (int) $options['limit'];
     else {
-      $limit = 0;
+        $limit = 0;
     }
     if (!empty($options['start']))
-      $start = (int) $options['start'];
+        $start = (int) $options['start'];
     else {
-      $start = 0;
+        $start = 0;
     }
     if ($limit || $start) {
-      $query->limit($start, $limit);
+        $query->limit($start, $limit);
     }
 
     foreach (static::$relJoins as $join) {
-      $query->join($join[0], $join[1]);
+        $query->join($join[0], $join[1]);
     }
     static::$relJoins = [];
     foreach (static::$needJoin as $rel) {
-      $relations = static::relations();
-      if (isset($relations[$rel])) {
+        $relations = static::relations();
+        if (isset($relations[$rel])) {
         $type = empty($relations[$rel]['type']) ? 'to' : $relations[$rel]['type'];
         switch ($type) {
-          case 'to':
+            case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
             $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
             break;
-          case 'one':
+            case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
             $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
             break;
         }
-      }
+        }
     }
     static::$needJoin = [];
     $cols = 'COUNT(';
 
     if (!empty($options['distinct'])) {
-      if (is_bool($options['distinct'])) {
+        if (is_bool($options['distinct'])) {
         $cols .= 'DISTINCT *';
-      } else {
+        } else {
         $cols .= "DISTINCT {$options['distinct']}";
-      }
+        }
     } else {
-      $cols .= '*';
+        $cols .= '*';
     }
     $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
     $query->cols = $cols;
     if (!empty($options['group'])) {
-      $query->group($options['group']);
+        $query->group($options['group']);
     }
     try {
-      $result = $query->select(static::table());
+        $result = $query->select(static::table());
     } catch (PDOException $exc) {
-      if ($exc->getCode() == '42S02') {
+        if ($exc->getCode() == '42S02') {
         static::createTable();
-      }
-      $result = $query->select(static::table());
+        }
+        $result = $query->select(static::table());
     }
     if (!empty($options['group'])) {
-      $count = $result->getArray();
-      return $count;
+        $count = $result->getArray();
+        return $count;
     } else {
-      $count = $result->fetch();
-      return $count['count'];
-    }
-  }
-
-  /**
-   * Update records in data base
-   * 
-   * @param array $params
-   * @param array $where
-   * @return boolean
-   */
-  public static function update($params, $where = []) {
+        $count = $result->fetch();
+        return $count['count'];
+    }
+    }
+
+    /**
+     * Update records in data base
+     * 
+     * @param array $params
+     * @param array $where
+     * @return boolean
+     */
+    public static function update($params, $where = []) {
     static::fixPrefix($params);
 
     $cols = self::cols();
 
     $values = [];
     foreach ($cols as $col => $param) {
-      if (isset($params[$col]))
+        if (isset($params[$col]))
         $values[$col] = $params[$col];
     }
     if (empty($values)) {
-      return false;
+        return false;
     }
 
     if (!empty($where)) {
-      static::fixPrefix($where, 'first');
+        static::fixPrefix($where, 'first');
 
-      App::$cur->db->where($where);
+        App::$cur->db->where($where);
     }
     App::$cur->db->update(static::table(), $values);
-  }
-
-  /**
-   * Return primary key of object
-   * 
-   * @return mixed
-   */
-  public function pk() {
+    }
+
+    /**
+     * Return primary key of object
+     * 
+     * @return mixed
+     */
+    public function pk() {
     return $this->{$this->index()};
-  }
+    }
 
-  /**
-   * Before save trigger
-   */
-  public function beforeSave() {
+    /**
+     * Before save trigger
+     */
+    public function beforeSave() {
     
-  }
+    }
 
-  /**
-   * Save object to module storage
-   * 
-   * @param array $options
-   * @return boolean
-   */
-  public function saveModuleStorage($options) {
+    /**
+     * Save object to module storage
+     * 
+     * @param array $options
+     * @return boolean
+     */
+    public function saveModuleStorage($options) {
 
     $col = static::index();
     $id = $this->pk();
@@ -1254,54 +1254,54 @@ 
     $classPath = explode('\\', get_called_class());
 
     if (!empty(static::$storage['options']['share'])) {
-      $moduleConfig = Config::share($classPath[0]);
+        $moduleConfig = Config::share($classPath[0]);
     } else {
-      $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
+        $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
     }
 
     if (!empty($moduleConfig['storage']['appTypeSplit'])) {
-      if (empty($options['appType'])) {
+        if (empty($options['appType'])) {
         $appType = App::$cur->type;
-      } else {
+        } else {
         $appType = $options['appType'];
-      }
-      $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
+        }
+        $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
     } else {
-      $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
+        $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
     }
     if (empty($storage[$classPath[1]])) {
-      $storage[$classPath[1]] = [];
+        $storage[$classPath[1]] = [];
     }
     if ($id) {
-      foreach ($storage[$classPath[1]] as $key => $item) {
+        foreach ($storage[$classPath[1]] as $key => $item) {
         if ($item[$col] == $id) {
-          $storage[$classPath[1]][$key] = $this->_params;
-          break;
+            $storage[$classPath[1]][$key] = $this->_params;
+            break;
+        }
         }
-      }
     } else {
-      $id = !empty($storage['scheme'][$classPath[1]]['ai']) ? $storage['scheme'][$classPath[1]]['ai'] : 1;
-      $this->$col = $id;
-      $storage['scheme'][$classPath[1]]['ai'] = $id + 1;
-      $storage[$classPath[1]][] = $this->_params;
+        $id = !empty($storage['scheme'][$classPath[1]]['ai']) ? $storage['scheme'][$classPath[1]]['ai'] : 1;
+        $this->$col = $id;
+        $storage['scheme'][$classPath[1]]['ai'] = $id + 1;
+        $storage[$classPath[1]][] = $this->_params;
     }
     if (!empty($moduleConfig['storage']['appTypeSplit'])) {
-      $moduleConfig['storage'][$appType] = $storage;
+        $moduleConfig['storage'][$appType] = $storage;
     } else {
-      $moduleConfig['storage'] = $storage;
+        $moduleConfig['storage'] = $storage;
     }
     if (empty(static::$storage['options']['share'])) {
-      Config::save('module', $moduleConfig, $classPath[0]);
+        Config::save('module', $moduleConfig, $classPath[0]);
     } else {
-      Config::save('share', $moduleConfig, $classPath[0]);
+        Config::save('share', $moduleConfig, $classPath[0]);
     }
     return true;
-  }
+    }
 
-  /**
-   * Update tree path category
-   */
-  public function changeCategoryTree() {
+    /**
+     * Update tree path category
+     */
+    public function changeCategoryTree() {
     $class = get_class($this);
     $itemModel = $class::$treeCategory;
     $oldPath = $this->tree_path;
@@ -1312,572 +1312,572 @@ 
     $categoryTreeCol = $this->colPrefix() . 'tree_path';
     $categoryTable = \App::$cur->db->table_prefix . $this->table();
     if ($oldPath) {
-      \App::$cur->db->query('UPDATE
+        \App::$cur->db->query('UPDATE
                 ' . $categoryTable . ' 
                     SET 
                         ' . $categoryTreeCol . ' = REPLACE(' . $categoryTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
                     WHERE ' . $categoryTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
 
-      \App::$cur->db->query('UPDATE
+        \App::$cur->db->query('UPDATE
                 ' . $itemsTable . '
                     SET 
                         ' . $itemTreeCol . ' = REPLACE(' . $itemTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
                     WHERE ' . $itemTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
     }
     $itemModel::update([$itemTreeCol => $this->tree_path . $this->id . '/'], [$itemModel::colPrefix() . $this->index(), $this->id]);
-  }
-
-  /**
-   * Return tree path
-   * 
-   * @param \Model $catalog
-   * @return string
-   */
-  public function getCatalogTree($catalog) {
+    }
+
+    /**
+     * Return tree path
+     * 
+     * @param \Model $catalog
+     * @return string
+     */
+    public function getCatalogTree($catalog) {
     $catalogClass = get_class($catalog);
     $catalogParent = $catalogClass::get($catalog->parent_id);
     if ($catalog && $catalogParent) {
-      if ($catalogParent->tree_path) {
+        if ($catalogParent->tree_path) {
         return $catalogParent->tree_path . $catalogParent->id . '/';
-      } else {
+        } else {
         return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
-      }
+        }
     }
     return '/';
-  }
+    }
 
-  /**
-   * Update tree path item
-   */
-  public function changeItemTree() {
+    /**
+     * Update tree path item
+     */
+    public function changeItemTree() {
     $class = get_class($this);
     $categoryModel = $class::$categoryModel;
     $category = $categoryModel::get($this->{$categoryModel::index()});
     if ($category) {
-      $this->tree_path = $category->tree_path . $category->pk() . '/';
+        $this->tree_path = $category->tree_path . $category->pk() . '/';
     } else {
-      $this->tree_path = '/';
+        $this->tree_path = '/';
+    }
     }
-  }
 
-  /**
-   * Save object to data base
-   * 
-   * @param array $options
-   * @return boolean|int
-   */
-  public function save($options = []) {
+    /**
+     * Save object to data base
+     * 
+     * @param array $options
+     * @return boolean|int
+     */
+    public function save($options = []) {
 
     if (static::$storage['type'] == 'moduleConfig') {
-      return static::saveModuleStorage($options);
+        return static::saveModuleStorage($options);
     }
     $class = get_class($this);
     if ($class::$categoryModel) {
-      $this->changeItemTree();
+        $this->changeItemTree();
     }
     if ($class::$treeCategory) {
-      $this->changeCategoryTree();
+        $this->changeCategoryTree();
     }
     if (!empty($this->_changedParams) && $this->pk()) {
-      Inji::$inst->event('modelItemParamsChanged-' . get_called_class(), $this);
+        Inji::$inst->event('modelItemParamsChanged-' . get_called_class(), $this);
     }
     $this->beforeSave();
 
     $values = [];
 
     foreach ($this->cols() as $col => $param) {
-      if (isset($this->_params[$col])) {
+        if (isset($this->_params[$col])) {
         $values[$col] = $this->_params[$col];
-      }
+        }
     }
     foreach ($class::$cols as $colName => $params) {
-      $class::fixPrefix($colName);
-      if (isset($params['default']) && !isset($values[$colName])) {
+        $class::fixPrefix($colName);
+        if (isset($params['default']) && !isset($values[$colName])) {
         $this->_params[$colName] = $values[$colName] = $params['default'];
-      }
+        }
     }
     if (empty($values) && empty($options['empty'])) {
-      return false;
+        return false;
     }
 
     if ($this->pk()) {
-      $new = false;
-      if ($this->get($this->_params[$this->index()])) {
+        $new = false;
+        if ($this->get($this->_params[$this->index()])) {
         App::$cur->db->where($this->index(), $this->_params[$this->index()]);
         App::$cur->db->update($this->table(), $values);
-      } else {
+        } else {
 
         $this->_params[$this->index()] = App::$cur->db->insert($this->table(), $values);
-      }
+        }
     } else {
-      $new = true;
-      $this->_params[$this->index()] = App::$cur->db->insert($this->table(), $values);
+        $new = true;
+        $this->_params[$this->index()] = App::$cur->db->insert($this->table(), $values);
     }
     App::$cur->db->where($this->index(), $this->_params[$this->index()]);
     try {
-      $result = App::$cur->db->select($this->table());
+        $result = App::$cur->db->select($this->table());
     } catch (PDOException $exc) {
-      if ($exc->getCode() == '42S02') {
+        if ($exc->getCode() == '42S02') {
         $this->createTable();
-      }
-      $result = App::$cur->db->select($this->table());
+        }
+        $result = App::$cur->db->select($this->table());
     }
     $this->_params = $result->fetch();
     if ($new) {
-      Inji::$inst->event('modelCreatedItem-' . get_called_class(), $this);
+        Inji::$inst->event('modelCreatedItem-' . get_called_class(), $this);
     }
     $this->afterSave();
     return $this->{$this->index()};
-  }
+    }
 
-  /**
-   * After save trigger
-   */
-  public function afterSave() {
+    /**
+     * After save trigger
+     */
+    public function afterSave() {
     
-  }
+    }
 
-  /**
-   * Before delete trigger
-   */
-  public function beforeDelete() {
+    /**
+     * Before delete trigger
+     */
+    public function beforeDelete() {
     
-  }
+    }
 
-  /**
-   * Delete item from module storage
-   * 
-   * @param array $options
-   * @return boolean
-   */
-  public function deleteFromModuleStorage($options) {
+    /**
+     * Delete item from module storage
+     * 
+     * @param array $options
+     * @return boolean
+     */
+    public function deleteFromModuleStorage($options) {
 
     $col = static::index();
     $id = $this->pk();
     $appType = '';
     $classPath = explode('\\', get_called_class());
     if (!empty(static::$storage['options']['share'])) {
-      $moduleConfig = Config::share($classPath[0]);
+        $moduleConfig = Config::share($classPath[0]);
     } else {
-      $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
+        $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
     }
 
     if (!empty($moduleConfig['storage']['appTypeSplit'])) {
-      if (empty($options['appType'])) {
+        if (empty($options['appType'])) {
         $appType = App::$cur->type;
-      } else {
+        } else {
         $appType = $options['appType'];
-      }
-      $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
+        }
+        $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
     } else {
-      $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
+        $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
     }
     if (empty($storage[$classPath[1]])) {
-      $storage[$classPath[1]] = [];
+        $storage[$classPath[1]] = [];
     }
     foreach ($storage[$classPath[1]] as $key => $item) {
 
-      if ($item[$col] == $id) {
+        if ($item[$col] == $id) {
         unset($storage[$classPath[1]][$key]);
         break;
-      }
+        }
     }
     if (!empty($moduleConfig['storage']['appTypeSplit'])) {
-      $moduleConfig['storage'][$appType] = $storage;
+        $moduleConfig['storage'][$appType] = $storage;
     } else {
-      $moduleConfig['storage'] = $storage;
+        $moduleConfig['storage'] = $storage;
     }
     if (empty(static::$storage['options']['share'])) {
-      Config::save('module', $moduleConfig, $classPath[0]);
+        Config::save('module', $moduleConfig, $classPath[0]);
     } else {
-      Config::save('share', $moduleConfig, $classPath[0]);
+        Config::save('share', $moduleConfig, $classPath[0]);
     }
     return true;
-  }
-
-  /**
-   * Delete item from data base
-   * 
-   * @param array $options
-   * @return boolean
-   */
-  public function delete($options = []) {
+    }
+
+    /**
+     * Delete item from data base
+     * 
+     * @param array $options
+     * @return boolean
+     */
+    public function delete($options = []) {
     $this->beforeDelete();
 
     if (static::$storage['type'] == 'moduleConfig') {
-      return static::deleteFromModuleStorage($options);
+        return static::deleteFromModuleStorage($options);
     }
     if (!empty($this->_params[$this->index()])) {
-      App::$cur->db->where($this->index(), $this->_params[$this->index()]);
-      $result = App::$cur->db->delete($this->table());
-      if ($result) {
+        App::$cur->db->where($this->index(), $this->_params[$this->index()]);
+        $result = App::$cur->db->delete($this->table());
+        if ($result) {
         $this->afterDelete();
         return $result;
-      }
+        }
     }
     return false;
-  }
-
-  /**
-   * Delete items from data base
-   * 
-   * @param array $where
-   */
-  public static function deleteList($where) {
+    }
+
+    /**
+     * Delete items from data base
+     * 
+     * @param array $where
+     */
+    public static function deleteList($where) {
     if (!empty($where)) {
-      static::fixPrefix($where, 'first');
-      App::$cur->db->where($where);
+        static::fixPrefix($where, 'first');
+        App::$cur->db->where($where);
     }
     App::$cur->db->delete(static::table());
-  }
+    }
 
-  /**
-   * After delete trigger
-   */
-  public function afterDelete() {
+    /**
+     * After delete trigger
+     */
+    public function afterDelete() {
     
-  }
+    }
 
-  /**
-   * find relation for col name
-   * 
-   * @param string $col
-   * @return array|null
-   */
-  public static function findRelation($col) {
+    /**
+     * find relation for col name
+     * 
+     * @param string $col
+     * @return array|null
+     */
+    public static function findRelation($col) {
 
     foreach (static::relations() as $relName => $rel) {
-      if ($rel['col'] == $col)
+        if ($rel['col'] == $col)
         return $relName;
     }
     return NULL;
-  }
-
-  /**
-   * Set params for model
-   * 
-   * @param array $params
-   */
-  public function setParams($params) {
+    }
+
+    /**
+     * Set params for model
+     * 
+     * @param array $params
+     */
+    public function setParams($params) {
     static::fixPrefix($params);
     $className = get_called_class();
     foreach ($params as $paramName => $value) {
-      $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $paramName);
-      if (!empty($className::$cols[$shortName])) {
+        $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $paramName);
+        if (!empty($className::$cols[$shortName])) {
         switch ($className::$cols[$shortName]['type']) {
-          case 'decimal':
+            case 'decimal':
             $params[$paramName] = (float) $value;
             break;
-          case 'number':
+            case 'number':
             $params[$paramName] = (int) $value;
             break;
-          case 'bool':
+            case 'bool':
             $params[$paramName] = (bool) $value;
             break;
         }
-      }
+        }
     }
     $this->_params = array_merge($this->_params, $params);
-  }
-
-  /**
-   * Return relation
-   * 
-   * @param string $relName
-   * @return array|boolean
-   */
-  public static function getRelation($relName) {
+    }
+
+    /**
+     * Return relation
+     * 
+     * @param string $relName
+     * @return array|boolean
+     */
+    public static function getRelation($relName) {
     $relations = static::relations();
     return !empty($relations[$relName]) ? $relations[$relName] : false;
-  }
-
-  /**
-   * Load relation
-   * 
-   * @param string $name
-   * @param array $params
-   * @return null|array|integer|\Model
-   */
-  public function loadRelation($name, $params = []) {
+    }
+
+    /**
+     * Load relation
+     * 
+     * @param string $name
+     * @param array $params
+     * @return null|array|integer|\Model
+     */
+    public function loadRelation($name, $params = []) {
     $relation = static::getRelation($name);
     if ($relation) {
-      if (!isset($relation['type'])) {
+        if (!isset($relation['type'])) {
         $type = 'to';
-      } else {
+        } else {
         $type = $relation['type'];
-      }
-      $getCol = null;
-      $getParams = [];
-      switch ($type) {
+        }
+        $getCol = null;
+        $getParams = [];
+        switch ($type) {
         case 'relModel':
           if (!$this->pk()) {
             return [];
-          }
-          $fixedCol = $relation['model']::index();
-          $relation['relModel']::fixPrefix($fixedCol);
-          $ids = array_keys($relation['relModel']::getList(['where' => [$this->index(), $this->pk()], 'array' => true, 'key' => $fixedCol]));
-          if (empty($ids)) {
+            }
+            $fixedCol = $relation['model']::index();
+            $relation['relModel']::fixPrefix($fixedCol);
+            $ids = array_keys($relation['relModel']::getList(['where' => [$this->index(), $this->pk()], 'array' => true, 'key' => $fixedCol]));
+            if (empty($ids)) {
             if (empty($params['count'])) {
-              return [];
+                return [];
             } else {
-              return 0;
+                return 0;
             }
-          }
-          $getType = 'getList';
-          $options = [
-              'where' => [$relation['model']::index(), implode(',', $ids), 'IN'],
-              'array' => (!empty($params['array'])) ? true : false,
-              'key' => (isset($params['key'])) ? $params['key'] : ((isset($relation['resultKey'])) ? $relation['resultKey'] : null),
-              'start' => (isset($params['start'])) ? $params['start'] : ((isset($relation['start'])) ? $relation['start'] : null),
-              'order' => (isset($params['order'])) ? $params['order'] : ((isset($relation['order'])) ? $relation['order'] : null),
-              'limit' => (isset($params['limit'])) ? $params['limit'] : ((isset($relation['limit'])) ? $relation['limit'] : null),
-          ];
-          break;
+            }
+            $getType = 'getList';
+            $options = [
+                'where' => [$relation['model']::index(), implode(',', $ids), 'IN'],
+                'array' => (!empty($params['array'])) ? true : false,
+                'key' => (isset($params['key'])) ? $params['key'] : ((isset($relation['resultKey'])) ? $relation['resultKey'] : null),
+                'start' => (isset($params['start'])) ? $params['start'] : ((isset($relation['start'])) ? $relation['start'] : null),
+                'order' => (isset($params['order'])) ? $params['order'] : ((isset($relation['order'])) ? $relation['order'] : null),
+                'limit' => (isset($params['limit'])) ? $params['limit'] : ((isset($relation['limit'])) ? $relation['limit'] : null),
+            ];
+            break;
         case 'many':
           if (!$this->{$this->index()}) {
             return [];
-          }
-          $getType = 'getList';
-          $options = [
-              'join' => (isset($relation['join'])) ? $relation['join'] : null,
-              'key' => (isset($params['key'])) ? $params['key'] : ((isset($relation['resultKey'])) ? $relation['resultKey'] : null),
-              'array' => (!empty($params['array'])) ? true : false,
-              'forSelect' => (!empty($params['forSelect'])) ? true : false,
-              'order' => (isset($params['order'])) ? $params['order'] : ((isset($relation['order'])) ? $relation['order'] : null),
-              'start' => (isset($params['start'])) ? $params['start'] : ((isset($relation['start'])) ? $relation['start'] : null),
-              'limit' => (isset($params['limit'])) ? $params['limit'] : ((isset($relation['limit'])) ? $relation['limit'] : null),
-              'appType' => (isset($params['appType'])) ? $params['appType'] : ((isset($relation['appType'])) ? $relation['appType'] : null),
-              'where' => []
-          ];
-          $options['where'][] = [$relation['col'], $this->{$this->index()}];
-          if (!empty($relation['where'])) {
+            }
+            $getType = 'getList';
+            $options = [
+                'join' => (isset($relation['join'])) ? $relation['join'] : null,
+                'key' => (isset($params['key'])) ? $params['key'] : ((isset($relation['resultKey'])) ? $relation['resultKey'] : null),
+                'array' => (!empty($params['array'])) ? true : false,
+                'forSelect' => (!empty($params['forSelect'])) ? true : false,
+                'order' => (isset($params['order'])) ? $params['order'] : ((isset($relation['order'])) ? $relation['order'] : null),
+                'start' => (isset($params['start'])) ? $params['start'] : ((isset($relation['start'])) ? $relation['start'] : null),
+                'limit' => (isset($params['limit'])) ? $params['limit'] : ((isset($relation['limit'])) ? $relation['limit'] : null),
+                'appType' => (isset($params['appType'])) ? $params['appType'] : ((isset($relation['appType'])) ? $relation['appType'] : null),
+                'where' => []
+            ];
+            $options['where'][] = [$relation['col'], $this->{$this->index()}];
+            if (!empty($relation['where'])) {
             $options['where'] = array_merge($options['where'], [$relation['where']]);
-          }
-          if (!empty($params['where'])) {
+            }
+            if (!empty($params['where'])) {
             $options['where'] = array_merge($options['where'], [$params['where']]);
-          }
-          break;
+            }
+            break;
         case 'one':
           $getType = 'get';
-          $options = [$relation['col'], $this->pk()];
-          break;
+            $options = [$relation['col'], $this->pk()];
+            break;
         default:
           if ($this->$relation['col'] === NULL) {
             return null;
-          }
-          $getType = 'get';
-          $options = $this->$relation['col'];
-          $getParams['appType'] = $this->appType;
-      }
-      if (!empty($params['count'])) {
+            }
+            $getType = 'get';
+            $options = $this->$relation['col'];
+            $getParams['appType'] = $this->appType;
+        }
+        if (!empty($params['count'])) {
         if (class_exists($relation['model'])) {
-          return $relation['model']::getCount($options);
+            return $relation['model']::getCount($options);
         }
         return 0;
-      } else {
+        } else {
         if (class_exists($relation['model'])) {
-          $this->loadedRelations[$name][json_encode($params)] = $relation['model']::$getType($options, $getCol, $getParams);
+            $this->loadedRelations[$name][json_encode($params)] = $relation['model']::$getType($options, $getCol, $getParams);
         } else {
-          $this->loadedRelations[$name][json_encode($params)] = [];
+            $this->loadedRelations[$name][json_encode($params)] = [];
+        }
         }
-      }
-      return $this->loadedRelations[$name][json_encode($params)];
+        return $this->loadedRelations[$name][json_encode($params)];
     }
     return NULL;
-  }
-
-  /**
-   * Add relation item
-   * 
-   * @param string $relName
-   * @param \Model $objectId
-   * @return \Model|boolean
-   */
-  public function addRelation($relName, $objectId) {
+    }
+
+    /**
+     * Add relation item
+     * 
+     * @param string $relName
+     * @param \Model $objectId
+     * @return \Model|boolean
+     */
+    public function addRelation($relName, $objectId) {
     $relation = $this->getRelation($relName);
     if ($relation) {
-      $rel = $relation['relModel']::get([[$relation['model']::index(), $objectId], [$this->index(), $this->pk()]]);
-      if (!$rel) {
+        $rel = $relation['relModel']::get([[$relation['model']::index(), $objectId], [$this->index(), $this->pk()]]);
+        if (!$rel) {
         $rel = new $relation['relModel']([
             $relation['model']::index() => $objectId,
             $this->index() => $this->pk()
         ]);
         $rel->save();
-      }
-      return $rel;
+        }
+        return $rel;
     }
     return false;
-  }
-
-  /**
-   * Check user access for form
-   * 
-   * @param string $formName
-   * @return boolean
-   */
-  public function checkFormAccess($formName) {
+    }
+
+    /**
+     * Check user access for form
+     * 
+     * @param string $formName
+     * @return boolean
+     */
+    public function checkFormAccess($formName) {
     if ($formName == 'manage' && !Users\User::$cur->isAdmin()) {
-      return false;
+        return false;
     }
     return true;
-  }
-
-  /**
-   * Check access for model
-   * 
-   * @param string $mode
-   * @param \Users\User $user
-   * @return boolean
-   */
-  public function checkAccess($mode = 'write', $user = null) {
+    }
+
+    /**
+     * Check access for model
+     * 
+     * @param string $mode
+     * @param \Users\User $user
+     * @return boolean
+     */
+    public function checkAccess($mode = 'write', $user = null) {
     if (!$user) {
-      $user = \Users\User::$cur;
+        $user = \Users\User::$cur;
     }
     return $user->isAdmin();
-  }
-
-  /**
-   * Param and relation with params getter
-   * 
-   * @param string $name
-   * @param array $params
-   * @return \Value|mixed
-   */
-  public function __call($name, $params) {
+    }
+
+    /**
+     * Param and relation with params getter
+     * 
+     * @param string $name
+     * @param array $params
+     * @return \Value|mixed
+     */
+    public function __call($name, $params) {
     $fixedName = $name;
     static::fixPrefix($fixedName);
     if (isset($this->_params[$fixedName])) {
-      return new Value($this, $fixedName);
+        return new Value($this, $fixedName);
     } elseif (isset($this->_params[$name])) {
-      return new Value($this, $name);
+        return new Value($this, $name);
     }
     return call_user_func_array([$this, 'loadRelation'], array_merge([$name], $params));
-  }
-
-  /**
-   * Param and relation getter
-   * 
-   * @param string $name
-   * @return mixed
-   */
-  public function __get($name) {
+    }
+
+    /**
+     * Param and relation getter
+     * 
+     * @param string $name
+     * @return mixed
+     */
+    public function __get($name) {
     $fixedName = $name;
     static::fixPrefix($fixedName);
     if (isset($this->_params[$fixedName])) {
-      return $this->_params[$fixedName];
+        return $this->_params[$fixedName];
     }
     if (isset($this->loadedRelations[$name][json_encode([])])) {
-      return $this->loadedRelations[$name][json_encode([])];
+        return $this->loadedRelations[$name][json_encode([])];
     }
     return $this->loadRelation($name);
-  }
-
-  /**
-   * Return model value in object
-   * 
-   * @param string $name
-   * @return \Value|null
-   */
-  public function value($name) {
+    }
+
+    /**
+     * Return model value in object
+     * 
+     * @param string $name
+     * @return \Value|null
+     */
+    public function value($name) {
     $fixedName = $name;
     static::fixPrefix($fixedName);
     if (isset($this->_params[$fixedName])) {
-      return new Value($this, $fixedName);
+        return new Value($this, $fixedName);
     } elseif ($this->_params[$name]) {
-      return new Value($this, $name);
+        return new Value($this, $name);
     }
     return null;
-  }
-
-  /**
-   * Return manager filters
-   * 
-   * @return array
-   */
-  public static function managerFilters() {
+    }
+
+    /**
+     * Return manager filters
+     * 
+     * @return array
+     */
+    public static function managerFilters() {
     return [];
-  }
-
-  /**
-   * Return validators for cols
-   * 
-   * @return array
-   */
-  public static function validators() {
+    }
+
+    /**
+     * Return validators for cols
+     * 
+     * @return array
+     */
+    public static function validators() {
     return [];
-  }
-
-  /**
-   * Return validator by name
-   * 
-   * @param string $name
-   * @return array
-   */
-  public static function validator($name) {
+    }
+
+    /**
+     * Return validator by name
+     * 
+     * @param string $name
+     * @return array
+     */
+    public static function validator($name) {
     $validators = static::validators();
     if (!empty($validators[$name])) {
-      return $validators[$name];
+        return $validators[$name];
     }
     return [];
-  }
+    }
 
-  function genViewLink() {
+    function genViewLink() {
     $className = get_class($this);
     $link = substr($className, 0, strpos($className, '\\'));
     $link .= '/view/';
     $link .= str_replace('\\', '%5C', substr($className, strpos($className, '\\') + 1));
     $link .= "/{$this->id}";
     return $link;
-  }
-
-  /**
-   * Set handler for model params
-   * 
-   * @param string $name
-   * @param mixed $value
-   */
-  public function __set($name, $value) {
+    }
+
+    /**
+     * Set handler for model params
+     * 
+     * @param string $name
+     * @param mixed $value
+     */
+    public function __set($name, $value) {
     static::fixPrefix($name);
     $className = get_called_class();
     $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $name);
     if (!empty($className::$cols[$shortName])) {
-      switch ($className::$cols[$shortName]['type']) {
+        switch ($className::$cols[$shortName]['type']) {
         case 'decimal':
           $value = (float) $value;
-          break;
+            break;
         case 'number':
           $value = (int) $value;
-          break;
+            break;
         case 'bool':
           $value = (bool) $value;
-          break;
-      }
+            break;
+        }
     }
     if ((isset($this->_params[$name]) && $this->_params[$name] != $value) && !isset($this->_changedParams[$name])) {
-      $this->_changedParams[$name] = $this->_params[$name];
+        $this->_changedParams[$name] = $this->_params[$name];
     }
 
     $this->_params[$name] = $value;
-  }
-
-  /**
-   * Isset handler for model params
-   * 
-   * @param string $name
-   * @return boolean
-   */
-  public function __isset($name) {
+    }
+
+    /**
+     * Isset handler for model params
+     * 
+     * @param string $name
+     * @return boolean
+     */
+    public function __isset($name) {
     static::fixPrefix($name);
     return isset($this->_params[$name]);
-  }
-
-  /**
-   * Convert object to string
-   * 
-   * @return string
-   */
-  public function __toString() {
+    }
+
+    /**
+     * Convert object to string
+     * 
+     * @return string
+     */
+    public function __toString() {
     return $this->name();
-  }
+    }
 
 }

Spacing +58 added lines, -58 removed lines

@@ -207,7 +207,7 @@ 
             $relModel = $relations[$colInfo['colParams']['relation']]['model'];
             $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
             if ($manageHref) {
-              $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+              $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relModel)."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано';
             } else {
               $value = $relValue ? $relValue->name() : 'Не задано';
             }
@@ -217,7 +217,7 @@ 
       case 'image':
         $file = Files\File::get($item->$colName);
         if ($file) {
-          $value = '<img src="' . $file->path . '?resize=60x120" />';
+          $value = '<img src="'.$file->path.'?resize=60x120" />';
         } else {
           $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
         }
@@ -225,7 +225,7 @@ 
       case 'file':
         $file = Files\File::get($item->$colName);
         if ($file) {
-          $value = '<a href="' . $file->path . '">' . $file->name . '.' . $file->type->ext . '</a>';
+          $value = '<a href="'.$file->path.'">'.$file->name.'.'.$file->type->ext.'</a>';
         } else {
           $value = 'Файл не загружен';
         }
@@ -269,7 +269,7 @@ 
                 case 'map':
                   if ($item->$colName && json_decode($item->$colName, true)) {
                     $addres = json_decode($item->$colName, true);
-                    $name = $addres['address'] ? $addres['address'] : 'lat:' . $addres['lat'] . ': lng:' . $addres['lng'];
+                    $name = $addres['address'] ? $addres['address'] : 'lat:'.$addres['lat'].': lng:'.$addres['lng'];
                     \App::$cur->libs->loadLib('yandexMap');
                     ob_start();
                     $uid = Tools::randomString();
@@ -301,7 +301,7 @@ 
                     <?php
                     $content = ob_get_contents();
                     ob_end_clean();
-                    $onclick = 'inji.Ui.modals.show("' . addcslashes($addres['address'], '"') . '", $("#map' . $uid . '_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal' . $uid . '","modal-lg");';
+                    $onclick = 'inji.Ui.modals.show("'.addcslashes($addres['address'], '"').'", $("#map'.$uid.'_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal'.$uid.'","modal-lg");';
                     $onclick .= 'return false;';
                     $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                     $value .= $content;
@@ -341,12 +341,12 @@ 
       return;
     }
     if (!is_array($array)) {
-      if (!isset($cols[static::colPrefix() . $array]) && isset(static::$cols[$array])) {
+      if (!isset($cols[static::colPrefix().$array]) && isset(static::$cols[$array])) {
         static::createCol($array);
         $cols = static::cols(true);
       }
-      if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
-        $array = static::colPrefix() . $array;
+      if (!isset($cols[$array]) && isset($cols[static::colPrefix().$array])) {
+        $array = static::colPrefix().$array;
       } else {
         static::checkForJoin($array, $rootModel);
       }
@@ -355,14 +355,14 @@ 
     switch ($searchtype) {
       case 'key':
         foreach ($array as $key => $item) {
-          if (!isset($cols[static::colPrefix() . $key]) && isset(static::$cols[$key])) {
+          if (!isset($cols[static::colPrefix().$key]) && isset(static::$cols[$key])) {
             static::createCol($key);
             $cols = static::cols(true);
           }
-          if (!isset($cols[$key]) && isset($cols[static::colPrefix() . $key])) {
-            $array[static::colPrefix() . $key] = $item;
+          if (!isset($cols[$key]) && isset($cols[static::colPrefix().$key])) {
+            $array[static::colPrefix().$key] = $item;
             unset($array[$key]);
-            $key = static::colPrefix() . $key;
+            $key = static::colPrefix().$key;
           }
           if (is_array($array[$key])) {
             static::fixPrefix($array[$key], 'key', $rootModel);
@@ -373,12 +373,12 @@ 
         break;
       case 'first':
         if (isset($array[0]) && is_string($array[0])) {
-          if (!isset($cols[static::colPrefix() . $array[0]]) && isset(static::$cols[$array[0]])) {
+          if (!isset($cols[static::colPrefix().$array[0]]) && isset(static::$cols[$array[0]])) {
             static::createCol($array[0]);
             $cols = static::cols(true);
           }
-          if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
-            $array[0] = static::colPrefix() . $array[0];
+          if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix().$array[0]])) {
+            $array[0] = static::colPrefix().$array[0];
           } else {
             static::checkForJoin($array[0], $rootModel);
           }
@@ -410,13 +410,13 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+            $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
             break;
           case 'one':
           case 'many':
             $relCol = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($relCol);
-            $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+            $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
             break;
         }
         $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel);
@@ -455,13 +455,13 @@ 
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
             //$info['modelName'] = $relations[$rel]['model'];
-            $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+            $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
             break;
           case 'one':
             $relCol = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($relCol);
             //$info['modelName'] = $relations[$rel]['model'];
-            $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+            $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
             break;
         }
         $info = $relations[$rel]['model']::parseColRecursion($info);
@@ -479,8 +479,8 @@ 
       } else {
         $info['colParams'] = [];
       }
-      if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
-        $info['col'] = static::colPrefix() . $info['col'];
+      if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix().$info['col']])) {
+        $info['col'] = static::colPrefix().$info['col'];
       }
       $info['modelName'] = get_called_class();
     }
@@ -586,7 +586,7 @@ 
     if ($params === false) {
       return false;
     }
-    return App::$cur->db->addCol(static::table(), static::colPrefix() . $colName, $params);
+    return App::$cur->db->addCol(static::table(), static::colPrefix().$colName, $params);
   }
 
   public static function createTable() {
@@ -615,28 +615,28 @@ 
       return true;
     }
     $cols = [
-        $colPrefix . 'id' => 'pk'
+        $colPrefix.'id' => 'pk'
     ];
     $className = get_called_class();
     if (!empty($className::$cols)) {
       foreach ($className::$cols as $colName => $colParams) {
         if ($colName == 'date_create') {
-          $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+          $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
           continue;
         }
         $params = $className::genColParams($colName);
         if ($params) {
-          $cols[$colPrefix . $colName] = $params;
+          $cols[$colPrefix.$colName] = $params;
         }
       }
     }
-    if (empty($cols[$colPrefix . 'date_create'])) {
-      $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+    if (empty($cols[$colPrefix.'date_create'])) {
+      $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
     }
     $tableIndexes = [];
     if ($indexes) {
       foreach ($indexes as $indexName => $index) {
-        $tableIndexes[] = $index['type'] . ' ' . App::$cur->db->table_prefix . $indexName . ' (' . implode(',', $index['cols']) . ')';
+        $tableIndexes[] = $index['type'].' '.App::$cur->db->table_prefix.$indexName.' ('.implode(',', $index['cols']).')';
       }
     }
 
@@ -660,7 +660,7 @@ 
    */
   public static function index() {
 
-    return static::colPrefix() . 'id';
+    return static::colPrefix().'id';
   }
 
   /**
@@ -671,7 +671,7 @@ 
   public static function colPrefix() {
     $classPath = explode('\\', get_called_class());
     $classPath = array_slice($classPath, 1);
-    return strtolower(implode('_', $classPath)) . '_';
+    return strtolower(implode('_', $classPath)).'_';
   }
 
   /**
@@ -705,7 +705,7 @@ 
    * @return string
    */
   public function name() {
-    return $this->{$this->nameCol()} ? $this->{$this->nameCol()} : '№' . $this->pk();
+    return $this->{$this->nameCol()} ? $this->{$this->nameCol()} : '№'.$this->pk();
   }
 
   /**
@@ -739,12 +739,12 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+            App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
             break;
           case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
-            App::$cur->db->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+            App::$cur->db->join($relations[$rel]['model']::table(), static::index().' = '.$col);
             break;
         }
       }
@@ -759,8 +759,8 @@ 
       }
       if ($param !== null) {
         $cols = static::cols();
-        if (!isset($cols[$col]) && isset($cols[static::colPrefix() . $col])) {
-          $col = static::colPrefix() . $col;
+        if (!isset($cols[$col]) && isset($cols[static::colPrefix().$col])) {
+          $col = static::colPrefix().$col;
         }
         App::$cur->db->where($col, $param);
       } else {
@@ -824,12 +824,12 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
             break;
           case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
-            $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+            $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
             break;
         }
       }
@@ -1151,12 +1151,12 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
             break;
           case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
-            $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+            $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
             break;
         }
       }
@@ -1173,7 +1173,7 @@ 
     } else {
       $cols .= '*';
     }
-    $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
+    $cols .= ') as `count`'.(!empty($options['cols']) ? ','.$options['cols'] : '');
     $query->cols = $cols;
     if (!empty($options['group'])) {
       $query->group($options['group']);
@@ -1306,25 +1306,25 @@ 
     $itemModel = $class::$treeCategory;
     $oldPath = $this->tree_path;
     $this->tree_path = $this->getCatalogTree($this);
-    $itemsTable = \App::$cur->db->table_prefix . $itemModel::table();
-    $itemTreeCol = $itemModel::colPrefix() . 'tree_path';
+    $itemsTable = \App::$cur->db->table_prefix.$itemModel::table();
+    $itemTreeCol = $itemModel::colPrefix().'tree_path';
 
-    $categoryTreeCol = $this->colPrefix() . 'tree_path';
-    $categoryTable = \App::$cur->db->table_prefix . $this->table();
+    $categoryTreeCol = $this->colPrefix().'tree_path';
+    $categoryTable = \App::$cur->db->table_prefix.$this->table();
     if ($oldPath) {
       \App::$cur->db->query('UPDATE
-                ' . $categoryTable . ' 
+                ' . $categoryTable.' 
                     SET 
-                        ' . $categoryTreeCol . ' = REPLACE(' . $categoryTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $categoryTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $categoryTreeCol.' = REPLACE('.$categoryTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $categoryTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
 
       \App::$cur->db->query('UPDATE
-                ' . $itemsTable . '
+                ' . $itemsTable.'
                     SET 
-                        ' . $itemTreeCol . ' = REPLACE(' . $itemTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $itemTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $itemTreeCol.' = REPLACE('.$itemTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $itemTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
     }
-    $itemModel::update([$itemTreeCol => $this->tree_path . $this->id . '/'], [$itemModel::colPrefix() . $this->index(), $this->id]);
+    $itemModel::update([$itemTreeCol => $this->tree_path.$this->id.'/'], [$itemModel::colPrefix().$this->index(), $this->id]);
   }
 
   /**
@@ -1338,9 +1338,9 @@ 
     $catalogParent = $catalogClass::get($catalog->parent_id);
     if ($catalog && $catalogParent) {
       if ($catalogParent->tree_path) {
-        return $catalogParent->tree_path . $catalogParent->id . '/';
+        return $catalogParent->tree_path.$catalogParent->id.'/';
       } else {
-        return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
+        return $this->getCatalogTree($catalogParent).$catalogParent->id.'/';
       }
     }
     return '/';
@@ -1354,7 +1354,7 @@ 
     $categoryModel = $class::$categoryModel;
     $category = $categoryModel::get($this->{$categoryModel::index()});
     if ($category) {
-      $this->tree_path = $category->tree_path . $category->pk() . '/';
+      $this->tree_path = $category->tree_path.$category->pk().'/';
     } else {
       $this->tree_path = '/';
     }
@@ -1379,7 +1379,7 @@ 
       $this->changeCategoryTree();
     }
     if (!empty($this->_changedParams) && $this->pk()) {
-      Inji::$inst->event('modelItemParamsChanged-' . get_called_class(), $this);
+      Inji::$inst->event('modelItemParamsChanged-'.get_called_class(), $this);
     }
     $this->beforeSave();
 
@@ -1424,7 +1424,7 @@ 
     }
     $this->_params = $result->fetch();
     if ($new) {
-      Inji::$inst->event('modelCreatedItem-' . get_called_class(), $this);
+      Inji::$inst->event('modelCreatedItem-'.get_called_class(), $this);
     }
     $this->afterSave();
     return $this->{$this->index()};
@@ -1562,7 +1562,7 @@ 
     static::fixPrefix($params);
     $className = get_called_class();
     foreach ($params as $paramName => $value) {
-      $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $paramName);
+      $shortName = preg_replace('!'.$this->colPrefix().'!', '', $paramName);
       if (!empty($className::$cols[$shortName])) {
         switch ($className::$cols[$shortName]['type']) {
           case 'decimal':
@@ -1839,7 +1839,7 @@ 
   public function __set($name, $value) {
     static::fixPrefix($name);
     $className = get_called_class();
-    $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $name);
+    $shortName = preg_replace('!'.$this->colPrefix().'!', '', $name);
     if (!empty($className::$cols[$shortName])) {
       switch ($className::$cols[$shortName]['type']) {
         case 'decimal':