injitools / cms-Inji

system/modules/Materials/models/Material.php

Indentation +110 added lines, -110 removed lines

@@ -13,99 +13,99 @@ 
 
 class Material extends \Model {
 
-  public static $objectName = 'Материал';
-  public static $categoryModel = 'Materials\Category';
-  public static $labels = [
-      'name' => 'Заголовок',
-      'category_id' => 'Раздел',
-      'preview' => 'Краткое превью',
-      'text' => 'Текст страницы',
-      'alias' => 'Алиас страницы',
-      'template' => 'Шаблон сайта',
-      'viewer' => 'Тип страницы',
-      'image_file_id' => 'Фото материала',
-      'description' => 'Описание для поисковиков',
-      'keywords' => 'Ключевые слова',
-      'user_id' => 'Создатель',
-      'date_create' => 'Дата создания',
-      'tag_list' => 'Теги'
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'name',
-              'alias',
-              'category_id',
-              'date_create',
-              'tag_list'
-          ],
-          'sortable' => [
-              'name',
-              'alias',
-              'category_id',
-              'date_create'
-          ],
-          'filters' => [
-              'name',
-              'preview',
-              'text',
-              'alias',
-              'template',
-              'viewer',
-              'description',
-              'keywords',
-              'user_id',
-              'date_create'
-          ],
-          'categorys' => [
-              'model' => 'Materials\Category',
-          ],
-          'sortMode' => true
-      ]
-  ];
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'alias' => ['type' => 'text'],
-      'preview' => ['type' => 'html'],
-      'text' => ['type' => 'html'],
-      'keywords' => ['type' => 'text'],
-      'description' => ['type' => 'text'],
-      'category_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'category'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesList', 'module' => 'Materials'],
-      'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsList', 'module' => 'Materials'],
-      'default' => ['type' => 'bool'],
-      'hidden' => ['type' => 'bool'],
-      'image_file_id' => ['type' => 'image'],
-      'link' => ['type' => 'dataManager', 'relation' => 'links'],
-      'tree_path' => ['type' => 'text'],
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-      'tag_list' => ['type' => 'text'],
-  ];
-  public static $forms = [
-      'manager' => [
-          'options' => [
-              'access' => [
-                  'groups' => [
-                      3
-                  ]
-              ]
-          ],
-          'map' => [
-              ['name', 'category_id'],
-              ['alias', 'image_file_id'],
-              ['template', 'viewer'],
-              ['keywords', 'description'],
-              ['tag_list'],
-              ['preview'],
-              ['text'],
-              ['link'],
-          ]
-      ]
-  ];
+    public static $objectName = 'Материал';
+    public static $categoryModel = 'Materials\Category';
+    public static $labels = [
+        'name' => 'Заголовок',
+        'category_id' => 'Раздел',
+        'preview' => 'Краткое превью',
+        'text' => 'Текст страницы',
+        'alias' => 'Алиас страницы',
+        'template' => 'Шаблон сайта',
+        'viewer' => 'Тип страницы',
+        'image_file_id' => 'Фото материала',
+        'description' => 'Описание для поисковиков',
+        'keywords' => 'Ключевые слова',
+        'user_id' => 'Создатель',
+        'date_create' => 'Дата создания',
+        'tag_list' => 'Теги'
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'name',
+                'alias',
+                'category_id',
+                'date_create',
+                'tag_list'
+            ],
+            'sortable' => [
+                'name',
+                'alias',
+                'category_id',
+                'date_create'
+            ],
+            'filters' => [
+                'name',
+                'preview',
+                'text',
+                'alias',
+                'template',
+                'viewer',
+                'description',
+                'keywords',
+                'user_id',
+                'date_create'
+            ],
+            'categorys' => [
+                'model' => 'Materials\Category',
+            ],
+            'sortMode' => true
+        ]
+    ];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'alias' => ['type' => 'text'],
+        'preview' => ['type' => 'html'],
+        'text' => ['type' => 'html'],
+        'keywords' => ['type' => 'text'],
+        'description' => ['type' => 'text'],
+        'category_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'category'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesList', 'module' => 'Materials'],
+        'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsList', 'module' => 'Materials'],
+        'default' => ['type' => 'bool'],
+        'hidden' => ['type' => 'bool'],
+        'image_file_id' => ['type' => 'image'],
+        'link' => ['type' => 'dataManager', 'relation' => 'links'],
+        'tree_path' => ['type' => 'text'],
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+        'tag_list' => ['type' => 'text'],
+    ];
+    public static $forms = [
+        'manager' => [
+            'options' => [
+                'access' => [
+                    'groups' => [
+                        3
+                    ]
+                ]
+            ],
+            'map' => [
+                ['name', 'category_id'],
+                ['alias', 'image_file_id'],
+                ['template', 'viewer'],
+                ['keywords', 'description'],
+                ['tag_list'],
+                ['preview'],
+                ['text'],
+                ['link'],
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'category' => [
             'model' => '\Materials\Category',
@@ -125,43 +125,43 @@ 
             'col' => 'material_id'
         ]
     ];
-  }
+    }
 
-  public function getHref() {
+    public function getHref() {
     $href = !empty(\App::$primary->config['defaultModule']) && \App::$primary->config['defaultModule'] == 'Materials' ? '' : '/materials';
     $treePath = array_filter(explode('/', $this->tree_path));
     if ($treePath) {
-      $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
-      foreach ($categorys as $category) {
+        $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
+        foreach ($categorys as $category) {
         if ($category->alias) {
-          $href .="/{$category->alias}";
+            $href .="/{$category->alias}";
+        }
         }
-      }
     }
     if ((!$href || $href == '/materials') && !$this->alias) {
-      return ($href ? $href : '/materials') . '/view/' . $this->pk();
+        return ($href ? $href : '/materials') . '/view/' . $this->pk();
     }
     return $href . "/" . ($this->alias ? $this->alias : $this->pk());
-  }
+    }
 
-  public function resolveTemplate() {
+    public function resolveTemplate() {
     if ($this->template !== 'inherit') {
-      return $this->template;
+        return $this->template;
     } elseif ($this->template == 'inherit' && $this->category) {
-      return $this->category->resolveTemplate(true);
+        return $this->category->resolveTemplate(true);
     } else {
-      return 'current';
+        return 'current';
+    }
     }
-  }
 
-  public function resolveViewer() {
+    public function resolveViewer() {
     if ($this->viewer !== 'inherit') {
-      return $this->viewer;
+        return $this->viewer;
     } elseif ($this->viewer == 'inherit' && $this->category) {
-      return $this->category->resolveViewer(true);
+        return $this->category->resolveViewer(true);
     } else {
-      return 'default';
+        return 'default';
+    }
     }
-  }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -134,14 +134,14 @@
       $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
       foreach ($categorys as $category) {
         if ($category->alias) {
-          $href .="/{$category->alias}";
+          $href .= "/{$category->alias}";
         }
       }
     }
     if ((!$href || $href == '/materials') && !$this->alias) {
-      return ($href ? $href : '/materials') . '/view/' . $this->pk();
+      return ($href ? $href : '/materials').'/view/'.$this->pk();
     }
-    return $href . "/" . ($this->alias ? $this->alias : $this->pk());
+    return $href."/".($this->alias ? $this->alias : $this->pk());
   }
 
   public function resolveTemplate() {

system/Inji/Model.php

Doc Comments +4 added lines, -4 removed lines

@@ -382,7 +382,7 @@ 
   /**
    * Information extractor for col relations path
    * 
-   * @param string|array $info
+   * @param string $info
    * @return array
    */
   public static function parseColRecursion($info) {
@@ -465,7 +465,7 @@ 
    * Generate params string for col by name
    * 
    * @param string $colName
-   * @return boolean|string
+   * @return false|string
    */
   public static function genColParams($colName) {
     if (empty(static::$cols[$colName]) || static::$storage['type'] == 'moduleConfig') {
@@ -619,7 +619,7 @@ 
   /**
    * return relations list
    * 
-   * @return array
+   * @return string
    */
   public static function relations() {
     return [];
@@ -1127,7 +1127,7 @@ 
    * 
    * @param array $params
    * @param array $where
-   * @return boolean
+   * @return false|null
    */
   public static function update($params, $where = []) {
     static::fixPrefix($params);

Indentation +1010 added lines, -1010 removed lines

@@ -10,354 +10,354 @@ 
  */
 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 '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 {
-              $value = $item->$colName;
+                $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);
@@ -365,44 +365,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'];
@@ -410,770 +410,770 @@ 
             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();
     }
     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 [];
-  }
-
-  /**
-   * Return name of col with object name
-   * 
-   * @return string
-   */
-  public static function nameCol() {
+    }
+
+    /**
+     * 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();
-      foreach ($items as $key => $item) {
+        $items = $storage[$classPath[1]];
+        $class = get_called_class();
+        foreach ($items as $key => $item) {
         if ($item[$col] == $param) {
-          if (!empty($options['array'])) {
+            if (!empty($options['array'])) {
             return $item;
-          }
-          $item = new $class($item);
-          $item->appType = $appType;
-          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])) {
         foreach ($where as $whereItem) {
-          $result = forward_static_call_array(['Model', 'checkWhere'], array_merge([$item], $whereItem));
-          if (!$result) {
+            $result = forward_static_call_array(['Model', 'checkWhere'], array_merge([$item], $whereItem));
+            if (!$result) {
             return false;
-          }
+            }
         }
         return true;
-      } 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();
@@ -1181,54 +1181,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;
@@ -1239,563 +1239,563 @@ 
     $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 [];
-  }
-
-  /**
-   * 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 +54 added lines, -54 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" />';
         }
@@ -286,12 +286,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);
       }
@@ -300,14 +300,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);
@@ -318,12 +318,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);
           }
@@ -355,13 +355,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);
@@ -400,13 +400,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);
@@ -424,8 +424,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();
     }
@@ -528,7 +528,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() {
@@ -557,28 +557,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']).')';
       }
     }
 
@@ -602,7 +602,7 @@ 
    */
   public static function index() {
 
-    return static::colPrefix() . 'id';
+    return static::colPrefix().'id';
   }
 
   /**
@@ -613,7 +613,7 @@ 
   public static function colPrefix() {
     $classPath = explode('\\', get_called_class());
     $classPath = array_slice($classPath, 1);
-    return strtolower(implode('_', $classPath)) . '_';
+    return strtolower(implode('_', $classPath)).'_';
   }
 
   /**
@@ -674,12 +674,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;
         }
       }
@@ -694,8 +694,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 {
@@ -759,12 +759,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;
         }
       }
@@ -1078,12 +1078,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;
         }
       }
@@ -1100,7 +1100,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']);
@@ -1233,25 +1233,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]);
   }
 
   /**
@@ -1265,9 +1265,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 '/';
@@ -1281,7 +1281,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 = '/';
     }
@@ -1306,7 +1306,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();
 
@@ -1351,7 +1351,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()};
@@ -1489,7 +1489,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':
@@ -1757,7 +1757,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':

Braces +39 added lines, -30 removed lines

@@ -730,22 +730,27 @@ 
     if (!$query) {
       return [];
     }
-    if (!empty($options['where']))
-      $query->where($options['where']);
-    if (!empty($options['cols']))
-      $query->cols = $options['cols'];
+    if (!empty($options['where'])) {
+          $query->where($options['where']);
+    }
+    if (!empty($options['cols'])) {
+          $query->cols = $options['cols'];
+    }
     if (!empty($options['group'])) {
       $query->group($options['group']);
     }
     if (!empty($options['having'])) {
       $query->having($options['having']);
     }
-    if (!empty($options['order']))
-      $query->order($options['order']);
-    if (!empty($options['join']))
-      $query->join($options['join']);
-    if (!empty($options['distinct']))
-      $query->distinct = $options['distinct'];
+    if (!empty($options['order'])) {
+          $query->order($options['order']);
+    }
+    if (!empty($options['join'])) {
+          $query->join($options['join']);
+    }
+    if (!empty($options['distinct'])) {
+          $query->distinct = $options['distinct'];
+    }
 
     foreach (static::$relJoins as $join) {
       $query->join($join[0], $join[1]);
@@ -771,14 +776,14 @@ 
     }
     static::$needJoin = [];
 
-    if (!empty($options['limit']))
-      $limit = (int) $options['limit'];
-    else {
+    if (!empty($options['limit'])) {
+          $limit = (int) $options['limit'];
+    } else {
       $limit = 0;
     }
-    if (!empty($options['start']))
-      $start = (int) $options['start'];
-    else {
+    if (!empty($options['start'])) {
+          $start = (int) $options['start'];
+    } else {
       $start = 0;
     }
     if ($limit || $start) {
@@ -1045,21 +1050,23 @@ 
     if (!empty($options['group'])) {
       static::fixPrefix($options['group'], 'first');
     }
-    if (!empty($options['where']))
-      $query->where($options['where']);
-    if (!empty($options['join']))
-      $query->join($options['join']);
+    if (!empty($options['where'])) {
+          $query->where($options['where']);
+    }
+    if (!empty($options['join'])) {
+          $query->join($options['join']);
+    }
     if (!empty($options['order'])) {
       $query->order($options['order']);
     }
-    if (!empty($options['limit']))
-      $limit = (int) $options['limit'];
-    else {
+    if (!empty($options['limit'])) {
+          $limit = (int) $options['limit'];
+    } else {
       $limit = 0;
     }
-    if (!empty($options['start']))
-      $start = (int) $options['start'];
-    else {
+    if (!empty($options['start'])) {
+          $start = (int) $options['start'];
+    } else {
       $start = 0;
     }
     if ($limit || $start) {
@@ -1136,8 +1143,9 @@ 
 
     $values = [];
     foreach ($cols as $col => $param) {
-      if (isset($params[$col]))
-        $values[$col] = $params[$col];
+      if (isset($params[$col])) {
+              $values[$col] = $params[$col];
+      }
     }
     if (empty($values)) {
       return false;
@@ -1474,8 +1482,9 @@ 
   public static function findRelation($col) {
 
     foreach (static::relations() as $relName => $rel) {
-      if ($rel['col'] == $col)
-        return $relName;
+      if ($rel['col'] == $col) {
+              return $relName;
+      }
     }
     return NULL;
   }

system/modules/Db/objects/Mysql/Query.php

Doc Comments +6 added lines

@@ -31,6 +31,9 @@ 
   public $params = [];
   public $distinct = false;
 
+  /**
+   * @param  $instance
+   */
   public function __construct($instance = null) {
     if (!$instance) {
       $this->curInstance = \App::$cur->db->connection;
@@ -47,6 +50,9 @@ 
     return $this->curInstance->pdo->lastInsertId();
   }
 
+  /**
+   * @param string $table
+   */
   public function select($table) {
     $this->operation = 'SELECT';
     $this->table = $table;

Indentation +195 added lines, -195 removed lines

@@ -13,413 +13,413 @@ 
 
 class Query extends \Object {
 
-  public $curInstance = null;
-  public $where = [];
-  public $whereString = '';
-  public $having = [];
-  public $havingString = '';
-  public $cols = [];
-  public $order = NULL;
-  public $join = [];
-  public $group = [];
-  public $limit = '';
-  public $error = '';
-  public $query = '';
-  public $table = '';
-  public $operation = '';
-  public $indexes = [];
-  public $params = [];
-  public $distinct = false;
-
-  public function __construct($instance = null) {
+    public $curInstance = null;
+    public $where = [];
+    public $whereString = '';
+    public $having = [];
+    public $havingString = '';
+    public $cols = [];
+    public $order = NULL;
+    public $join = [];
+    public $group = [];
+    public $limit = '';
+    public $error = '';
+    public $query = '';
+    public $table = '';
+    public $operation = '';
+    public $indexes = [];
+    public $params = [];
+    public $distinct = false;
+
+    public function __construct($instance = null) {
     if (!$instance) {
-      $this->curInstance = \App::$cur->db->connection;
+        $this->curInstance = \App::$cur->db->connection;
     } else {
-      $this->curInstance = $instance;
+        $this->curInstance = $instance;
+    }
     }
-  }
 
-  public function insert($table, $data) {
+    public function insert($table, $data) {
     $this->operation = 'INSERT';
     $this->table = $table;
     $this->cols = $data;
     $this->query();
     return $this->curInstance->pdo->lastInsertId();
-  }
+    }
 
-  public function select($table) {
+    public function select($table) {
     $this->operation = 'SELECT';
     $this->table = $table;
     return $this->query();
-  }
+    }
 
-  public function update($table, $data) {
+    public function update($table, $data) {
     $this->operation = 'UPDATE';
     $this->table = $table;
     $this->cols = $data;
     $result = $this->query();
     return $result->pdoResult->rowCount();
-  }
+    }
 
-  public function delete($table) {
+    public function delete($table) {
     $this->operation = 'DELETE';
     $this->table = $table;
     $result = $this->query();
     return $result->pdoResult->rowCount();
-  }
+    }
 
-  public function createTable($table_name, $cols, $indexes = []) {
+    public function createTable($table_name, $cols, $indexes = []) {
     $this->operation = 'CREATE TABLE';
     $this->table = $table_name;
     $this->cols = $cols;
     $this->indexes = $indexes;
     return $this->query();
-  }
+    }
 
-  public function cols($cols) {
+    public function cols($cols) {
     if (is_array($cols)) {
-      $this->cols = array_merge($this->cols, array_values($cols));
+        $this->cols = array_merge($this->cols, array_values($cols));
     } else {
-      $this->cols[] = $cols;
+        $this->cols[] = $cols;
+    }
     }
-  }
 
-  public function join($table, $where = false, $type = 'LEFT', $alias = '') {
+    public function join($table, $where = false, $type = 'LEFT', $alias = '') {
     if (is_array($table)) {
-      foreach ($table as $item) {
+        foreach ($table as $item) {
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'join'), $table);
-          break;
+            call_user_func_array(array($this, 'join'), $table);
+            break;
         } else {
-          $this->join($item);
+            $this->join($item);
+        }
         }
-      }
     } else {
-      $this->join[] = [$table, $where, $type, $alias];
+        $this->join[] = [$table, $where, $type, $alias];
+    }
     }
-  }
 
-  public function where($where = '', $value = '', $operation = false, $concatenation = 'AND') {
+    public function where($where = '', $value = '', $operation = false, $concatenation = 'AND') {
     if (!is_array($where)) {
-      $this->where[] = [$where, $value, $operation, $concatenation];
+        $this->where[] = [$where, $value, $operation, $concatenation];
     } else {
-      $this->where[] = $where;
+        $this->where[] = $where;
+    }
     }
-  }
 
-  public function having($where = '', $value = '', $operation = false, $concatenation = 'AND') {
+    public function having($where = '', $value = '', $operation = false, $concatenation = 'AND') {
     if (!is_array($where)) {
-      $this->having[] = [$where, $value, $operation, $concatenation];
+        $this->having[] = [$where, $value, $operation, $concatenation];
     } else {
-      $this->having[] = $where;
+        $this->having[] = $where;
+    }
     }
-  }
 
-  public function group($colname) {
+    public function group($colname) {
     $this->group[] = $colname;
-  }
+    }
 
-  public function order($order, $type = 'ASC') {
+    public function order($order, $type = 'ASC') {
 
 
     if (!is_array($order)) {
-      $this->order[] = "{$order} {$type}";
+        $this->order[] = "{$order} {$type}";
     } else {
-      foreach ($order as $item)
+        foreach ($order as $item)
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'order'), $order);
-          break;
+            call_user_func_array(array($this, 'order'), $order);
+            break;
         } else
-          $this->order($item);
+            $this->order($item);
+    }
     }
-  }
 
-  public function limit($start = 0, $len = 0) {
+    public function limit($start = 0, $len = 0) {
     $start = intval($start);
     $len = intval($len);
     $this->limit = "LIMIT {$start}";
     if ($len !== 0)
-      $this->limit .= ",{$len}";
-  }
+        $this->limit .= ",{$len}";
+    }
 
-  public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
+    public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
     $join = '';
     if (is_array($table)) {
-      $joins = func_get_args();
-      foreach ($joins as $joinAr) {
+        $joins = func_get_args();
+        foreach ($joins as $joinAr) {
         $join .= call_user_func_array([$this, 'buildJoin'], $joinAr);
-      }
+        }
     } else {
-      $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-      if ($alias)
+        $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
+        if ($alias)
         $join .= " AS `{$alias}`";
-      if ($where)
+        if ($where)
         $join .= " ON {$where}";
     }
     return $join;
-  }
-
-  /**
-   * Build where string
-   * 
-   * @param string|array $where
-   * @param mixed $value
-   * @param string $operation
-   * @param string $concatenation
-   */
-  public function buildWhere($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
+    }
+
+    /**
+     * Build where string
+     * 
+     * @param string|array $where
+     * @param mixed $value
+     * @param string $operation
+     * @param string $concatenation
+     */
+    public function buildWhere($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
     if (!is_array($where)) {
-      if (empty($operation)) {
+        if (empty($operation)) {
         $operation = '=';
-      }
+        }
 
-      if ($concatenation === false)
+        if ($concatenation === false)
         $concatenation = 'AND';
-      elseif ($concatenation === true)
+        elseif ($concatenation === true)
         $concatenation = '';
 
-      if ($this->whereString == NULL)
+        if ($this->whereString == NULL)
         $this->whereString = ' WHERE ';
 
-      if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
+        if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
         if (is_array($value)) {
-          $newValue = '';
-          foreach ($value as $item) {
+            $newValue = '';
+            foreach ($value as $item) {
             if ($newValue) {
-              $newValue.=',';
+                $newValue.=',';
             }
             if (is_string($item)) {
-              $newValue .='"' . $item . '"';
+                $newValue .='"' . $item . '"';
             } else {
-              $newValue .=$item;
+                $newValue .=$item;
+            }
             }
-          }
-          $value = '(' . $newValue . ')';
+            $value = '(' . $newValue . ')';
         } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "({$value})";
+            $value = "({$value})";
         } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "\"{$value}\"";
+            $value = "\"{$value}\"";
         }
-      } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+        } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
         $this->params[] = $value;
         $value = "?";
-      }
+        }
 
-      if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
+        if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
         $this->whereString .= " {$where} {$operation} {$value} ";
-      else
+        else
         $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
     }
     else {
-      $i = -1;
-      while (isset($where[++$i])) {
+        $i = -1;
+        while (isset($where[++$i])) {
         $item = $where[$i];
         if (isset($where[$i + 1]) && !isset($where[$i - 1]) && is_array($where[$i])) {
-          if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
+            if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
             if (!isset($item[3])) {
-              $concatenation = 'AND';
+                $concatenation = 'AND';
             } else {
-              $concatenation = $item[3];
+                $concatenation = $item[3];
             }
 
             $this->whereString .= "{$concatenation} ";
-          }
+            }
 
-          if ($this->whereString != NULL)
+            if ($this->whereString != NULL)
             $this->whereString .= '(';
-          else
+            else
             $this->whereString = 'WHERE (';
         }
 
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'buildWhere'), $where);
-          break;
+            call_user_func_array(array($this, 'buildWhere'), $where);
+            break;
         } else {
-          $this->buildWhere($item);
+            $this->buildWhere($item);
         }
         if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
-          $this->whereString .= ') ';
+            $this->whereString .= ') ';
+        }
         }
-      }
-    }
-  }
-
-  /**
-   * Build having string
-   * 
-   * @param string|array $where
-   * @param mixed $value
-   * @param string $operation
-   * @param string $concatenation
-   */
-  public function buildHaving($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
+    }
+    }
+
+    /**
+     * Build having string
+     * 
+     * @param string|array $where
+     * @param mixed $value
+     * @param string $operation
+     * @param string $concatenation
+     */
+    public function buildHaving($where = '', $value = '', $operation = '=', $concatenation = 'AND') {
     if (!is_array($where)) {
-      if (empty($operation)) {
+        if (empty($operation)) {
         $operation = '=';
-      }
-      if ($concatenation === false)
+        }
+        if ($concatenation === false)
         $concatenation = 'AND';
-      elseif ($concatenation === true)
+        elseif ($concatenation === true)
         $concatenation = '';
 
-      if ($this->havingString == NULL)
+        if ($this->havingString == NULL)
         $this->havingString = ' HAVING ';
 
-      if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
+        if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
         if (is_array($value)) {
-          $newValue = '';
-          foreach ($value as $item) {
+            $newValue = '';
+            foreach ($value as $item) {
             if ($newValue) {
-              $newValue.=',';
+                $newValue.=',';
             }
             if (is_string($item)) {
-              $newValue .='"' . $item . '"';
+                $newValue .='"' . $item . '"';
             } else {
-              $newValue .=$item;
+                $newValue .=$item;
+            }
             }
-          }
-          $value = '(' . $newValue . ')';
+            $value = '(' . $newValue . ')';
         } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "({$value})";
+            $value = "({$value})";
         } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
-          $value = "\"{$value}\"";
+            $value = "\"{$value}\"";
         }
-      } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+        } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
         $this->params[] = $value;
         $value = "?";
-      }
+        }
 
-      if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
+        if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
         $this->havingString .= " {$where} {$operation} {$value} ";
-      else
+        else
         $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
     }
     else {
-      $i = -1;
-      while (isset($where[++$i])) {
+        $i = -1;
+        while (isset($where[++$i])) {
         $item = $where[$i];
         if (isset($where[$i + 1]) && !isset($where[$i - 1]) && is_array($where[$i])) {
-          if ($this->havingString != NULL && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
+            if ($this->havingString != NULL && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
             if (!isset($item[3])) {
-              $concatenation = 'AND';
+                $concatenation = 'AND';
             } else {
-              $concatenation = $item[3];
+                $concatenation = $item[3];
             }
 
             $this->havingString .= "{$concatenation} ";
-          }
+            }
 
-          if ($this->havingString != NULL)
+            if ($this->havingString != NULL)
             $this->havingString .= '(';
-          else
+            else
             $this->havingString = 'HAVING (';
         }
 
         if (!is_array($item)) {
-          call_user_func_array(array($this, 'buildHaving'), $where);
-          break;
+            call_user_func_array(array($this, 'buildHaving'), $where);
+            break;
         } else {
-          $this->buildHaving($item);
+            $this->buildHaving($item);
         }
         if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
-          $this->havingString .= ') ';
+            $this->havingString .= ') ';
         }
-      }
+        }
+    }
     }
-  }
 
-  public function buildQuery() {
+    public function buildQuery() {
     $query = $this->operation;
     $this->operation = strtoupper($this->operation);
 
     switch ($this->operation) {
-      case 'SELECT':
+        case 'SELECT':
         $query .= ' ' . ($this->distinct ? 'DISTINCT' : '');
         $query .= ' ' . (!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
-      case 'DELETE':
+        case 'DELETE':
         $query .= ' FROM';
         break;
-      case 'INSERT':
+        case 'INSERT':
         $query .= ' INTO';
         break;
     }
     $query .= " `{$this->curInstance->db_name}`.`{$this->curInstance->table_prefix}{$this->table}`";
     if ($this->join) {
-      $query .= $this->buildJoin($this->join);
+        $query .= $this->buildJoin($this->join);
     }
     switch ($this->operation) {
-      case 'INSERT':
+        case 'INSERT':
         $this->params = array_merge($this->params, array_values($this->cols));
         $colsStr = '';
         if ($this->cols) {
-          $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
+            $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
         }
         $query .= ' (' . $colsStr . ') VALUES (' . rtrim(str_repeat('?,', count($this->cols)), ',') . ')';
         break;
-      case 'CREATE TABLE':
+        case 'CREATE TABLE':
         $query .= " (";
         foreach ($this->cols as $col_name => $param) {
-          if ($param == 'pk') {
+            if ($param == 'pk') {
             $param = "int(11) UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$col_name}`)";
-          }
-          $query .= " `{$col_name}` {$param},";
+            }
+            $query .= " `{$col_name}` {$param},";
         }
         $query = rtrim($query, ',');
         if ($this->indexes) {
-          $query .= ', ' . implode(',', $this->indexes);
+            $query .= ', ' . implode(',', $this->indexes);
         }
         $query .= ") ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci";
         break;
-      case 'UPDATE':
+        case 'UPDATE':
         $updates = [];
         foreach ($this->cols as $key => $item) {
-          if (!in_array($item, array('CURRENT_TIMESTAMP'))) {
+            if (!in_array($item, array('CURRENT_TIMESTAMP'))) {
             $this->params[] = $item;
             $updates[] = "`{$key}` = ?";
-          } else {
+            } else {
             $updates[] = "`{$key}` = {$item}";
-          }
+            }
         }
         $update = implode(',', $updates);
         $query .=" SET {$update}";
-      case 'SELECT':
+        case 'SELECT':
       case 'DELETE':
         $this->buildWhere($this->where);
         if ($this->whereString) {
-          $query .= ' ' . $this->whereString;
+            $query .= ' ' . $this->whereString;
         }
         break;
     }
     if ($this->group) {
-      $query .= ' GROUP BY ' . implode(',', $this->group);
+        $query .= ' GROUP BY ' . implode(',', $this->group);
     }
     $this->buildHaving($this->having);
     if ($this->havingString) {
-      $query .= ' ' . $this->havingString;
+        $query .= ' ' . $this->havingString;
     }
     if ($this->order) {
-      $query .= ' ORDER BY ' . implode(',', $this->order);
+        $query .= ' ORDER BY ' . implode(',', $this->order);
     }
     if ($this->limit) {
-      $query .= ' ' . $this->limit;
+        $query .= ' ' . $this->limit;
     }
     return ['query' => $query, 'params' => $this->params];
-  }
-
-  /**
-   * Execute query
-   * 
-   * @param string|array $query
-   * @return \Db\Mysql\Result
-   */
-  public function query($query = []) {
+    }
+
+    /**
+     * Execute query
+     * 
+     * @param string|array $query
+     * @return \Db\Mysql\Result
+     */
+    public function query($query = []) {
     if (!$query) {
-      $this->params = [];
-      $query = $this->buildQuery();
+        $this->params = [];
+        $query = $this->buildQuery();
     }
 
     if (is_string($query)) {
-      $query = ['query' => $query, 'params' => $this->params];
+        $query = ['query' => $query, 'params' => $this->params];
     }
 
     $prepare = $this->curInstance->pdo->prepare($query['query']);
@@ -429,10 +429,10 @@ 
     $result = new Result();
     $result->pdoResult = $prepare;
     if ($this->curInstance->dbInstance && $this->curInstance->dbInstance->curQuery && $this->curInstance->dbInstance->curQuery === $this) {
-      $this->curInstance->dbInstance->curQuery = null;
+        $this->curInstance->dbInstance->curQuery = null;
     }
 
     return $result;
-  }
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -186,15 +186,15 @@ 
           $newValue = '';
           foreach ($value as $item) {
             if ($newValue) {
-              $newValue.=',';
+              $newValue .= ',';
             }
             if (is_string($item)) {
-              $newValue .='"' . $item . '"';
+              $newValue .= '"'.$item.'"';
             } else {
-              $newValue .=$item;
+              $newValue .= $item;
             }
           }
-          $value = '(' . $newValue . ')';
+          $value = '('.$newValue.')';
         } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
           $value = "({$value})";
         } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
@@ -270,15 +270,15 @@ 
           $newValue = '';
           foreach ($value as $item) {
             if ($newValue) {
-              $newValue.=',';
+              $newValue .= ',';
             }
             if (is_string($item)) {
-              $newValue .='"' . $item . '"';
+              $newValue .= '"'.$item.'"';
             } else {
-              $newValue .=$item;
+              $newValue .= $item;
             }
           }
-          $value = '(' . $newValue . ')';
+          $value = '('.$newValue.')';
         } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
           $value = "({$value})";
         } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
@@ -334,8 +334,8 @@ 
 
     switch ($this->operation) {
       case 'SELECT':
-        $query .= ' ' . ($this->distinct ? 'DISTINCT' : '');
-        $query .= ' ' . (!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
+        $query .= ' '.($this->distinct ? 'DISTINCT' : '');
+        $query .= ' '.(!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
       case 'DELETE':
         $query .= ' FROM';
         break;
@@ -352,9 +352,9 @@ 
         $this->params = array_merge($this->params, array_values($this->cols));
         $colsStr = '';
         if ($this->cols) {
-          $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
+          $colsStr = '`'.implode('`,`', array_keys($this->cols)).'`';
         }
-        $query .= ' (' . $colsStr . ') VALUES (' . rtrim(str_repeat('?,', count($this->cols)), ',') . ')';
+        $query .= ' ('.$colsStr.') VALUES ('.rtrim(str_repeat('?,', count($this->cols)), ',').')';
         break;
       case 'CREATE TABLE':
         $query .= " (";
@@ -366,7 +366,7 @@ 
         }
         $query = rtrim($query, ',');
         if ($this->indexes) {
-          $query .= ', ' . implode(',', $this->indexes);
+          $query .= ', '.implode(',', $this->indexes);
         }
         $query .= ") ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci";
         break;
@@ -381,27 +381,27 @@ 
           }
         }
         $update = implode(',', $updates);
-        $query .=" SET {$update}";
+        $query .= " SET {$update}";
       case 'SELECT':
       case 'DELETE':
         $this->buildWhere($this->where);
         if ($this->whereString) {
-          $query .= ' ' . $this->whereString;
+          $query .= ' '.$this->whereString;
         }
         break;
     }
     if ($this->group) {
-      $query .= ' GROUP BY ' . implode(',', $this->group);
+      $query .= ' GROUP BY '.implode(',', $this->group);
     }
     $this->buildHaving($this->having);
     if ($this->havingString) {
-      $query .= ' ' . $this->havingString;
+      $query .= ' '.$this->havingString;
     }
     if ($this->order) {
-      $query .= ' ORDER BY ' . implode(',', $this->order);
+      $query .= ' ORDER BY '.implode(',', $this->order);
     }
     if ($this->limit) {
-      $query .= ' ' . $this->limit;
+      $query .= ' '.$this->limit;
     }
     return ['query' => $query, 'params' => $this->params];
   }

Braces +53 added lines, -42 removed lines

@@ -125,12 +125,14 @@ 
     if (!is_array($order)) {
       $this->order[] = "{$order} {$type}";
     } else {
-      foreach ($order as $item)
-        if (!is_array($item)) {
+      foreach ($order as $item) {
+              if (!is_array($item)) {
           call_user_func_array(array($this, 'order'), $order);
+      }
           break;
-        } else
-          $this->order($item);
+        } else {
+                  $this->order($item);
+        }
     }
   }
 
@@ -138,8 +140,9 @@ 
     $start = intval($start);
     $len = intval($len);
     $this->limit = "LIMIT {$start}";
-    if ($len !== 0)
-      $this->limit .= ",{$len}";
+    if ($len !== 0) {
+          $this->limit .= ",{$len}";
+    }
   }
 
   public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
@@ -151,10 +154,12 @@ 
       }
     } else {
       $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-      if ($alias)
-        $join .= " AS `{$alias}`";
-      if ($where)
-        $join .= " ON {$where}";
+      if ($alias) {
+              $join .= " AS `{$alias}`";
+      }
+      if ($where) {
+              $join .= " ON {$where}";
+      }
     }
     return $join;
   }
@@ -173,13 +178,15 @@ 
         $operation = '=';
       }
 
-      if ($concatenation === false)
-        $concatenation = 'AND';
-      elseif ($concatenation === true)
-        $concatenation = '';
+      if ($concatenation === false) {
+              $concatenation = 'AND';
+      } elseif ($concatenation === true) {
+              $concatenation = '';
+      }
 
-      if ($this->whereString == NULL)
-        $this->whereString = ' WHERE ';
+      if ($this->whereString == NULL) {
+              $this->whereString = ' WHERE ';
+      }
 
       if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
         if (is_array($value)) {
@@ -205,12 +212,12 @@ 
         $value = "?";
       }
 
-      if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
-        $this->whereString .= " {$where} {$operation} {$value} ";
-      else
-        $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
-    }
-    else {
+      if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') {
+              $this->whereString .= " {$where} {$operation} {$value} ";
+      } else {
+              $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+      }
+    } else {
       $i = -1;
       while (isset($where[++$i])) {
         $item = $where[$i];
@@ -225,10 +232,11 @@ 
             $this->whereString .= "{$concatenation} ";
           }
 
-          if ($this->whereString != NULL)
-            $this->whereString .= '(';
-          else
-            $this->whereString = 'WHERE (';
+          if ($this->whereString != NULL) {
+                      $this->whereString .= '(';
+          } else {
+                      $this->whereString = 'WHERE (';
+          }
         }
 
         if (!is_array($item)) {
@@ -257,13 +265,15 @@ 
       if (empty($operation)) {
         $operation = '=';
       }
-      if ($concatenation === false)
-        $concatenation = 'AND';
-      elseif ($concatenation === true)
-        $concatenation = '';
+      if ($concatenation === false) {
+              $concatenation = 'AND';
+      } elseif ($concatenation === true) {
+              $concatenation = '';
+      }
 
-      if ($this->havingString == NULL)
-        $this->havingString = ' HAVING ';
+      if ($this->havingString == NULL) {
+              $this->havingString = ' HAVING ';
+      }
 
       if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
         if (is_array($value)) {
@@ -289,12 +299,12 @@ 
         $value = "?";
       }
 
-      if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
-        $this->havingString .= " {$where} {$operation} {$value} ";
-      else
-        $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
-    }
-    else {
+      if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ') {
+              $this->havingString .= " {$where} {$operation} {$value} ";
+      } else {
+              $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
+      }
+    } else {
       $i = -1;
       while (isset($where[++$i])) {
         $item = $where[$i];
@@ -309,10 +319,11 @@ 
             $this->havingString .= "{$concatenation} ";
           }
 
-          if ($this->havingString != NULL)
-            $this->havingString .= '(';
-          else
-            $this->havingString = 'HAVING (';
+          if ($this->havingString != NULL) {
+                      $this->havingString .= '(';
+          } else {
+                      $this->havingString = 'HAVING (';
+          }
         }
 
         if (!is_array($item)) {

system/modules/Users/Users.php

Doc Comments +6 added lines

@@ -116,6 +116,9 @@ 
     }
   }
 
+  /**
+   * @param string $user_mail
+   */
   public function passre($user_mail) {
     $user = $this->get($user_mail, 'mail');
     if (!$user) {
@@ -400,6 +403,9 @@ 
     return $return;
   }
 
+  /**
+   * @param integer $cat_id
+   */
   public function addUserActivity($user_id, $cat_id, $text = '') {
     $ua = new Users\Activity([
         'user_id' => $user_id,

Spacing +34 added lines, -34 removed lines

@@ -37,8 +37,8 @@ 
     }
      * 
      */
-    if (filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_session_hash') && filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_id')) {
-      return $this->cuntinueSession(filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_session_hash'), filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_id'));
+    if (filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_session_hash') && filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_id')) {
+      return $this->cuntinueSession(filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_session_hash'), filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_id'));
     }
     if (isset($_POST['autorization']) && trim(filter_input(INPUT_POST, 'user_login')) && trim(filter_input(INPUT_POST, 'user_pass'))) {
       unset($_POST['autorization']);
@@ -53,18 +53,18 @@ 
   }
 
   public function logOut($redirect = true) {
-    if (!empty($_COOKIE[$this->cookiePrefix . "_user_session_hash"]) && !empty($_COOKIE[$this->cookiePrefix . "_user_id"])) {
+    if (!empty($_COOKIE[$this->cookiePrefix."_user_session_hash"]) && !empty($_COOKIE[$this->cookiePrefix."_user_id"])) {
       $session = Users\Session::get([
-                  ['user_id', $_COOKIE[$this->cookiePrefix . "_user_id"]],
-                  ['hash', $_COOKIE[$this->cookiePrefix . "_user_session_hash"]]
+                  ['user_id', $_COOKIE[$this->cookiePrefix."_user_id"]],
+                  ['hash', $_COOKIE[$this->cookiePrefix."_user_session_hash"]]
       ]);
       if ($session) {
         $session->delete();
       }
     }
     if (!headers_sent()) {
-      setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
-      setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
+      setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");
+      setcookie($this->cookiePrefix."_user_id", '', 0, "/");
     }
     if ($redirect) {
       if (!empty($this->config['logoutUrl'][$this->app->type])) {
@@ -81,25 +81,25 @@ 
     ]);
     if ($session && $session->user && $session->user->blocked) {
       if (!headers_sent()) {
-        setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
-        setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
+        setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");
+        setcookie($this->cookiePrefix."_user_id", '', 0, "/");
       }
       Msg::add('Ваш аккаунт заблокирован', 'info');
       return;
     }
     if ($session && $session->user && !$session->user->blocked) {
       if (!headers_sent()) {
-        setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");
-        setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");
+        setcookie($this->cookiePrefix."_user_session_hash", $session->hash, time() + 360000, "/");
+        setcookie($this->cookiePrefix."_user_id", $session->user_id, time() + 360000, "/");
       }
       if (!empty($this->config['needActivation']) && $session->user->activation) {
         if (!headers_sent()) {
-          setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
-          setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
+          setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");
+          setcookie($this->cookiePrefix."_user_id", '', 0, "/");
         }
-        Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');
+        Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$session->user->id.'"><b>повторно выслать ссылку активации</b></a>');
       } elseif ($session->user->activation) {
-        Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');
+        Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$session->user->id.'"><b>повторно выслать ссылку активации</b></a>');
       }
       if (!$session->user->mail && !empty($this->config['noMailNotify'])) {
         Msg::add($this->config['noMailNotify']);
@@ -109,8 +109,8 @@ 
       Users\User::$cur->save();
     } else {
       if (!headers_sent()) {
-        setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
-        setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
+        setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");
+        setcookie($this->cookiePrefix."_user_id", '', 0, "/");
       }
       Msg::add('Ваша сессия устарела или более недействительна, вам необходимо пройти <a href = "/users/login">авторизацию</a> заново', 'info');
     }
@@ -119,7 +119,7 @@ 
   public function passre($user_mail) {
     $user = $this->get($user_mail, 'mail');
     if (!$user) {
-      Msg::add('Пользователь ' . $user_mail . ' не найден, проверьте првильность ввода e-mail или зарегистрируйтесь', 'danger');
+      Msg::add('Пользователь '.$user_mail.' не найден, проверьте првильность ввода e-mail или зарегистрируйтесь', 'danger');
       return false;
     }
     $passre = Users\Passre::get([['user_id', $user->id], ['status', 1]]);
@@ -127,10 +127,10 @@ 
       $passre->status = 2;
       $passre->save();
     }
-    $hash = $user->id . '_' . Tools::randomString(50);
+    $hash = $user->id.'_'.Tools::randomString(50);
     $passre = new Users\Passre(['user_id' => $user->id, 'status' => 1, 'hash' => $hash]);
     $passre->save();
-    Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $user_mail, 'Восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для продолжения восстановления пароля перейдите по ссылке: <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/?passrecont=1&hash=' . $hash . '">' . idn_to_utf8(INJI_DOMAIN_NAME) . '/?passrecont=1&hash=' . $hash . '</a>');
+    Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, $user_mail, 'Восстановление пароля на сайте '.idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />для продолжения восстановления пароля перейдите по ссылке: <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/?passrecont=1&hash='.$hash.'">'.idn_to_utf8(INJI_DOMAIN_NAME).'/?passrecont=1&hash='.$hash.'</a>');
     Tools::redirect('/', 'На указанный почтовый ящик была выслана инструкция по восстановлению пароля', 'success');
   }
 
@@ -147,7 +147,7 @@ 
       $user->pass = $this->hashpass($pass);
       $user->save();
       $this->autorization($user->mail, $user->pass, 'mail');
-      Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $user->mail, 'Новый пароль на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />Ваш новый пароль: ' . $pass);
+      Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, $user->mail, 'Новый пароль на сайте '.idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />Ваш новый пароль: '.$pass);
       Tools::redirect('/', 'На указанный почтовый ящик был выслан новый пароль', 'success');
     }
   }
@@ -159,9 +159,9 @@ 
     $user = $this->get($login, $ltype);
     if ($user && $this->verifypass($pass, $user->pass) && !$user->blocked) {
       if (!empty($this->config['needActivation']) && $user->activation) {
-        Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $user->id . '"><b>повторно выслать ссылку активации</b></a>');
+        Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$user->id.'"><b>повторно выслать ссылку активации</b></a>');
       } elseif ($user->activation) {
-        Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $user->id . '"><b>повторно выслать ссылку активации</b></a>');
+        Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$user->id.'"><b>повторно выслать ссылку активации</b></a>');
       }
       if (!$user->mail && !empty($this->config['noMailNotify'])) {
         Msg::add($this->config['noMailNotify']);
@@ -180,7 +180,7 @@ 
       if ($user && $user->blocked) {
         Msg::add('Вы заблокированы', 'danger');
       } elseif ($user) {
-        Msg::add('Вы ошиблись при наборе пароля или логина, попробуйте ещё раз или воспользуйтесь <a href = "?passre=1&user_mail=' . $user->mail . '">Восстановлением пароля</a>', 'danger');
+        Msg::add('Вы ошиблись при наборе пароля или логина, попробуйте ещё раз или воспользуйтесь <a href = "?passre=1&user_mail='.$user->mail.'">Восстановлением пароля</a>', 'danger');
       } else {
         Msg::add('Данный почтовый ящик не зарегистрирован в системе', 'danger');
       }
@@ -202,8 +202,8 @@ 
     $session->save();
 
     if (!headers_sent()) {
-      setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");
-      setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");
+      setcookie($this->cookiePrefix."_user_session_hash", $session->hash, time() + 360000, "/");
+      setcookie($this->cookiePrefix."_user_id", $session->user_id, time() + 360000, "/");
     } else {
       Msg::add('Не удалось провести авторизацию. Попробуйте позже', 'info');
     }
@@ -346,20 +346,20 @@ 
       $this->autorization($data['user_mail'], $pass, 'mail');
     }
     if (!empty($this->config['needActivation'])) {
-      $from = 'noreply@' . INJI_DOMAIN_NAME;
+      $from = 'noreply@'.INJI_DOMAIN_NAME;
       $to = $data['user_mail'];
-      $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-      $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
-      $text .='<br />';
+      $subject = 'Регистрация на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+      $text = 'Вы были зарегистрированы на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: '.$pass;
       $text .= '<br />';
-      $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';
+      $text .= '<br />';
+      $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://'.INJI_DOMAIN_NAME.'/users/activation/'.$user->id.'/'.$user->activation.'">http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/users/activation/'.$user->id.'/'.$user->activation.'</a>';
       Tools::sendMail($from, $to, $subject, $text);
       Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль и ссылка для активации', 'success');
     } else {
-      $from = 'noreply@' . INJI_DOMAIN_NAME;
+      $from = 'noreply@'.INJI_DOMAIN_NAME;
       $to = $data['user_mail'];
-      $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-      $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
+      $subject = 'Регистрация на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+      $text = 'Вы были зарегистрированы на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: '.$pass;
       Tools::sendMail($from, $to, $subject, $text);
       Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль', 'success');
     }

Braces +13 added lines, -10 removed lines

@@ -217,17 +217,20 @@
    * @return boolean|\User\User
    */
   public function get($idn, $ltype = 'id') {
-    if (!$idn)
-      return false;
+    if (!$idn) {
+          return false;
+    }
 
-    if (is_numeric($idn) && $ltype != 'login')
-      $user = Users\User::get($idn, 'id');
-    elseif ($ltype == 'login')
-      $user = Users\User::get($idn, 'login');
-    else
-      $user = Users\User::get($idn, 'mail');
-    if (!$user)
-      return [];
+    if (is_numeric($idn) && $ltype != 'login') {
+          $user = Users\User::get($idn, 'id');
+    } elseif ($ltype == 'login') {
+          $user = Users\User::get($idn, 'login');
+    } else {
+          $user = Users\User::get($idn, 'mail');
+    }
+    if (!$user) {
+          return [];
+    }
 
     return $user;
   }

Indentation +173 added lines, -173 removed lines

@@ -10,18 +10,18 @@ 
  */
 class Users extends Module {
 
-  public $cookiePrefix = '';
+    public $cookiePrefix = '';
 
-  public function init() {
+    public function init() {
     if (!empty($this->config['cookieSplit'])) {
-      $this->cookiePrefix = \App::$cur->type;
+        $this->cookiePrefix = \App::$cur->type;
     }
     \Users\User::$cur = new Users\User(array('group_id' => 1, 'role_id' => 1));
     if (!App::$cur->db->connect) {
-      return;
+        return;
     }
     if (isset($_GET['logout'])) {
-      return $this->logOut();
+        return $this->logOut();
     }
     /*
       $activeSocials = Users\Social::getList(['where' => ['active', 1]]);
@@ -38,158 +38,158 @@ 
      * 
      */
     if (isset($_GET['passre']) && filter_input(INPUT_GET, 'user_mail')) {
-      $this->passre(trim(filter_input(INPUT_GET, 'user_mail')));
+        $this->passre(trim(filter_input(INPUT_GET, 'user_mail')));
     }
     if (!empty($_GET['passrecont']) && filter_input(INPUT_GET, 'hash')) {
-      $this->passrecont(filter_input(INPUT_GET, 'hash'));
+        $this->passrecont(filter_input(INPUT_GET, 'hash'));
     }
     if (filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_session_hash') && filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_id')) {
-      return $this->cuntinueSession(filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_session_hash'), filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_id'));
+        return $this->cuntinueSession(filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_session_hash'), filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_id'));
     }
     if (isset($_POST['autorization']) && trim(filter_input(INPUT_POST, 'user_login')) && trim(filter_input(INPUT_POST, 'user_pass'))) {
-      unset($_POST['autorization']);
-      return $this->autorization(trim(filter_input(INPUT_POST, 'user_login')), trim(filter_input(INPUT_POST, 'user_pass')), strpos(filter_input(INPUT_POST, 'user_login'), '@') ? 'mail' : 'login', false);
+        unset($_POST['autorization']);
+        return $this->autorization(trim(filter_input(INPUT_POST, 'user_login')), trim(filter_input(INPUT_POST, 'user_pass')), strpos(filter_input(INPUT_POST, 'user_login'), '@') ? 'mail' : 'login', false);
+    }
     }
-  }
 
-  public function logOut($redirect = true) {
+    public function logOut($redirect = true) {
     if (!empty($_COOKIE[$this->cookiePrefix . "_user_session_hash"]) && !empty($_COOKIE[$this->cookiePrefix . "_user_id"])) {
-      $session = Users\Session::get([
-                  ['user_id', $_COOKIE[$this->cookiePrefix . "_user_id"]],
-                  ['hash', $_COOKIE[$this->cookiePrefix . "_user_session_hash"]]
-      ]);
-      if ($session) {
+        $session = Users\Session::get([
+                    ['user_id', $_COOKIE[$this->cookiePrefix . "_user_id"]],
+                    ['hash', $_COOKIE[$this->cookiePrefix . "_user_session_hash"]]
+        ]);
+        if ($session) {
         $session->delete();
-      }
+        }
     }
     if (!headers_sent()) {
-      setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
-      setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
+        setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
+        setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
     }
     if ($redirect) {
-      if (!empty($this->config['logoutUrl'][$this->app->type])) {
+        if (!empty($this->config['logoutUrl'][$this->app->type])) {
         Tools::redirect($this->config['logoutUrl'][$this->app->type]);
-      }
-      Tools::redirect('/', 'Вы вышли из своего профиля', 'success');
+        }
+        Tools::redirect('/', 'Вы вышли из своего профиля', 'success');
+    }
     }
-  }
 
-  public function cuntinueSession($hash, $userId) {
+    public function cuntinueSession($hash, $userId) {
     $session = Users\Session::get([
                 ['user_id', $userId],
                 ['hash', $hash]
     ]);
     if ($session && $session->user && $session->user->blocked) {
-      if (!headers_sent()) {
+        if (!headers_sent()) {
         setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
         setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
-      }
-      Msg::add('Ваш аккаунт заблокирован', 'info');
-      return;
+        }
+        Msg::add('Ваш аккаунт заблокирован', 'info');
+        return;
     }
     if ($session && $session->user && !$session->user->blocked) {
-      if (!headers_sent()) {
+        if (!headers_sent()) {
         setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");
         setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");
-      }
-      if (!empty($this->config['needActivation']) && $session->user->activation) {
+        }
+        if (!empty($this->config['needActivation']) && $session->user->activation) {
         if (!headers_sent()) {
-          setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
-          setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
+            setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
+            setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
         }
         Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');
-      } elseif ($session->user->activation) {
+        } elseif ($session->user->activation) {
         Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');
-      }
-      if (!$session->user->mail && !empty($this->config['noMailNotify'])) {
+        }
+        if (!$session->user->mail && !empty($this->config['noMailNotify'])) {
         Msg::add($this->config['noMailNotify']);
-      }
-      Users\User::$cur = $session->user;
-      Users\User::$cur->date_last_active = 'CURRENT_TIMESTAMP';
-      Users\User::$cur->save();
+        }
+        Users\User::$cur = $session->user;
+        Users\User::$cur->date_last_active = 'CURRENT_TIMESTAMP';
+        Users\User::$cur->save();
     } else {
-      if (!headers_sent()) {
+        if (!headers_sent()) {
         setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");
         setcookie($this->cookiePrefix . "_user_id", '', 0, "/");
-      }
-      Msg::add('Ваша сессия устарела или более недействительна, вам необходимо пройти <a href = "/users/login">авторизацию</a> заново', 'info');
+        }
+        Msg::add('Ваша сессия устарела или более недействительна, вам необходимо пройти <a href = "/users/login">авторизацию</a> заново', 'info');
+    }
     }
-  }
 
-  public function passre($user_mail) {
+    public function passre($user_mail) {
     $user = $this->get($user_mail, 'mail');
     if (!$user) {
-      Msg::add('Пользователь ' . $user_mail . ' не найден, проверьте првильность ввода e-mail или зарегистрируйтесь', 'danger');
-      return false;
+        Msg::add('Пользователь ' . $user_mail . ' не найден, проверьте првильность ввода e-mail или зарегистрируйтесь', 'danger');
+        return false;
     }
     $passre = Users\Passre::get([['user_id', $user->id], ['status', 1]]);
     if ($passre) {
-      $passre->status = 2;
-      $passre->save();
+        $passre->status = 2;
+        $passre->save();
     }
     $hash = $user->id . '_' . Tools::randomString(50);
     $passre = new Users\Passre(['user_id' => $user->id, 'status' => 1, 'hash' => $hash]);
     $passre->save();
     Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $user_mail, 'Восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для продолжения восстановления пароля перейдите по ссылке: <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/?passrecont=1&hash=' . $hash . '">' . idn_to_utf8(INJI_DOMAIN_NAME) . '/?passrecont=1&hash=' . $hash . '</a>');
     Tools::redirect('/', 'На указанный почтовый ящик была выслана инструкция по восстановлению пароля', 'success');
-  }
+    }
 
-  public function passrecont($hash) {
+    public function passrecont($hash) {
     $passre = Users\Passre::get([['hash', $hash]]);
     if ($passre) {
-      if ($passre->status != 1) {
+        if ($passre->status != 1) {
         Tools::redirect('/', 'Этот код восстановление более недействителен', 'danger');
-      }
-      $passre->status = 3;
-      $passre->save();
-      $pass = Tools::randomString(10);
-      $user = Users\User::get($passre->user_id);
-      $user->pass = $this->hashpass($pass);
-      $user->save();
-      $this->autorization($user->mail, $user->pass, 'mail');
-      Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $user->mail, 'Новый пароль на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />Ваш новый пароль: ' . $pass);
-      Tools::redirect('/', 'На указанный почтовый ящик был выслан новый пароль', 'success');
-    }
-  }
+        }
+        $passre->status = 3;
+        $passre->save();
+        $pass = Tools::randomString(10);
+        $user = Users\User::get($passre->user_id);
+        $user->pass = $this->hashpass($pass);
+        $user->save();
+        $this->autorization($user->mail, $user->pass, 'mail');
+        Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $user->mail, 'Новый пароль на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />Ваш новый пароль: ' . $pass);
+        Tools::redirect('/', 'На указанный почтовый ящик был выслан новый пароль', 'success');
+    }
+    }
 
-  public function autorization($login, $pass, $ltype = 'login', $noMsg = true) {
+    public function autorization($login, $pass, $ltype = 'login', $noMsg = true) {
 
     sleep(3); //simple anti brute
 
     $user = $this->get($login, $ltype);
     if ($user && $this->verifypass($pass, $user->pass) && !$user->blocked) {
-      if (!empty($this->config['needActivation']) && $user->activation) {
+        if (!empty($this->config['needActivation']) && $user->activation) {
         Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $user->id . '"><b>повторно выслать ссылку активации</b></a>');
-      } elseif ($user->activation) {
+        } elseif ($user->activation) {
         Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $user->id . '"><b>повторно выслать ссылку активации</b></a>');
-      }
-      if (!$user->mail && !empty($this->config['noMailNotify'])) {
+        }
+        if (!$user->mail && !empty($this->config['noMailNotify'])) {
         Msg::add($this->config['noMailNotify']);
-      }
-      $this->newSession($user);
+        }
+        $this->newSession($user);
 
-      Users\User::$cur = $user;
-      Users\User::$cur->date_last_active = 'CURRENT_TIMESTAMP';
-      Users\User::$cur->save();
-      if (!$noMsg && !empty($this->config['loginUrl'][$this->app->type])) {
+        Users\User::$cur = $user;
+        Users\User::$cur->date_last_active = 'CURRENT_TIMESTAMP';
+        Users\User::$cur->save();
+        if (!$noMsg && !empty($this->config['loginUrl'][$this->app->type])) {
         Tools::redirect($this->config['loginUrl'][$this->app->type]);
-      }
-      return true;
+        }
+        return true;
     }
     if (!$noMsg) {
-      if ($user && $user->blocked) {
+        if ($user && $user->blocked) {
         Msg::add('Вы заблокированы', 'danger');
-      } elseif ($user) {
+        } elseif ($user) {
         Msg::add('Вы ошиблись при наборе пароля или логина, попробуйте ещё раз или воспользуйтесь <a href = "?passre=1&user_mail=' . $user->mail . '">Восстановлением пароля</a>', 'danger');
-      } else {
+        } else {
         Msg::add('Данный почтовый ящик не зарегистрирован в системе', 'danger');
-      }
+        }
     }
 
     return false;
-  }
+    }
 
-  public function newSession($user) {
+    public function newSession($user) {
     $hash = Tools::randomString(255);
 
     $session = new Users\Session([
@@ -202,115 +202,115 @@ 
     $session->save();
 
     if (!headers_sent()) {
-      setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");
-      setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");
+        setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");
+        setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");
     } else {
-      Msg::add('Не удалось провести авторизацию. Попробуйте позже', 'info');
+        Msg::add('Не удалось провести авторизацию. Попробуйте позже', 'info');
+    }
     }
-  }
 
-  /**
-   * Return user
-   * 
-   * @param integer|string $idn
-   * @param type $ltype
-   * @return boolean|\User\User
-   */
-  public function get($idn, $ltype = 'id') {
+    /**
+     * Return user
+     * 
+     * @param integer|string $idn
+     * @param type $ltype
+     * @return boolean|\User\User
+     */
+    public function get($idn, $ltype = 'id') {
     if (!$idn)
-      return false;
+        return false;
 
     if (is_numeric($idn) && $ltype != 'login')
-      $user = Users\User::get($idn, 'id');
+        $user = Users\User::get($idn, 'id');
     elseif ($ltype == 'login')
-      $user = Users\User::get($idn, 'login');
+        $user = Users\User::get($idn, 'login');
     else
-      $user = Users\User::get($idn, 'mail');
+        $user = Users\User::get($idn, 'mail');
     if (!$user)
-      return [];
+        return [];
 
     return $user;
-  }
+    }
 
-  public function registration($data, $autorization = false) {
+    public function registration($data, $autorization = false) {
 
     if (empty($data['user_mail'])) {
-      Msg::add('Вы не ввели E-mail', 'danger');
-      return false;
+        Msg::add('Вы не ввели E-mail', 'danger');
+        return false;
     }
     $data['user_mail'] = trim($data['user_mail']);
     if (!filter_var($data['user_mail'], FILTER_VALIDATE_EMAIL)) {
-      Msg::add('Вы ввели не корректный E-mail', 'danger');
-      return false;
+        Msg::add('Вы ввели не корректный E-mail', 'danger');
+        return false;
     }
 
     $user = $this->get($data['user_mail'], 'mail');
     if ($user) {
-      Msg::add('Введенный вами E-mail зарегистрирован в нашей системе, войдите или введите другой E-mail', 'danger');
-      return false;
+        Msg::add('Введенный вами E-mail зарегистрирован в нашей системе, войдите или введите другой E-mail', 'danger');
+        return false;
     }
     if (empty($data['user_login'])) {
-      $data['user_login'] = $data['user_mail'];
+        $data['user_login'] = $data['user_mail'];
     }
     $data['user_login'] = trim($data['user_login']);
     $user = $this->get($data['user_login'], 'login');
     if ($user) {
-      Msg::add('Введенный вами логин зарегистрирован в нашей системе, войдите или введите другой логин', 'danger');
-      return false;
+        Msg::add('Введенный вами логин зарегистрирован в нашей системе, войдите или введите другой логин', 'danger');
+        return false;
     }
     if (empty($data['first_name'])) {
-      $data['first_name'] = '';
+        $data['first_name'] = '';
     }
     if (empty($data['last_name'])) {
-      $data['last_name'] = '';
+        $data['last_name'] = '';
     }
     if (!empty($user_name)) {
-      $data['first_name'] = '';
+        $data['first_name'] = '';
     }
     if (empty($data['user_city'])) {
-      $data['user_city'] = '';
+        $data['user_city'] = '';
     }
     if (empty($data['user_birthday'])) {
-      $data['user_birthday'] = '';
+        $data['user_birthday'] = '';
     }
     if (empty($data['user_phone'])) {
-      $data['user_phone'] = '';
+        $data['user_phone'] = '';
     }
     $invite_code = (!empty($data['invite_code']) ? $data['invite_code'] : (!empty($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))));
     if (!empty($invite_code)) {
-      $invite = Users\User\Invite::get($invite_code, 'code');
-      if (!$invite) {
+        $invite = Users\User\Invite::get($invite_code, 'code');
+        if (!$invite) {
         Msg::add('Такой код приглашения не найден', 'danger');
         return false;
-      }
-      if ($invite->limit && !($invite->limit - $invite->count)) {
+        }
+        if ($invite->limit && !($invite->limit - $invite->count)) {
         Msg::add('Лимит приглашений для данного кода исчерпан', 'danger');
         return false;
-      }
-      $data['parent_id'] = $invite->user_id;
-      $inviter = $data['parent_id'];
-      $invite->count++;
-      $invite->save();
+        }
+        $data['parent_id'] = $invite->user_id;
+        $inviter = $data['parent_id'];
+        $invite->count++;
+        $invite->save();
     }
     if (empty($data['parent_id']) && !empty($this->config['defaultPartner'])) {
-      $data['parent_id'] = $this->config['defaultPartner'];
+        $data['parent_id'] = $this->config['defaultPartner'];
     }
     if (!empty($data['user_pass'])) {
-      if (empty($data['user_pass'][0])) {
+        if (empty($data['user_pass'][0])) {
         Msg::add('Введите пароль', 'danger');
         return false;
-      }
-      if (empty($data['user_pass'][1])) {
+        }
+        if (empty($data['user_pass'][1])) {
         Msg::add('Повторите ввод пароля', 'danger');
         return false;
-      }
-      if ($data['user_pass'][0] != $data['user_pass'][1]) {
+        }
+        if ($data['user_pass'][0] != $data['user_pass'][1]) {
         Msg::add('Введенные пароли несовпадают', 'danger');
         return false;
-      }
-      $pass = $data['user_pass'][0];
+        }
+        $pass = $data['user_pass'][0];
     } else {
-      $pass = Tools::randomString(10);
+        $pass = Tools::randomString(10);
     }
 
     $user = new Users\User([
@@ -322,12 +322,12 @@ 
         'parent_id' => !empty($data['parent_id']) ? $data['parent_id'] : 0
     ]);
     if (!empty($this->config['needActivation'])) {
-      $user->activation = Tools::randomString();
+        $user->activation = Tools::randomString();
     }
     $user->save();
     if (!$user->id) {
-      Msg::add('Не удалось зарегистрировать', 'danger');
-      return false;
+        Msg::add('Не удалось зарегистрировать', 'danger');
+        return false;
     }
     $info = new \Users\User\Info([
         'user_id' => $user->id,
@@ -340,41 +340,41 @@ 
     ]);
     $info->save();
     if (isset($inviter)) {
-      $this->AddUserActivity($inviter, 2, "У вас зарегистрировался новый партнер, {$info->first_name} {$info->last_name} (id: {$user->id}, email: {$user->mail})");
+        $this->AddUserActivity($inviter, 2, "У вас зарегистрировался новый партнер, {$info->first_name} {$info->last_name} (id: {$user->id}, email: {$user->mail})");
     }
     if ($autorization) {
-      $this->autorization($data['user_mail'], $pass, 'mail');
+        $this->autorization($data['user_mail'], $pass, 'mail');
     }
     if (!empty($this->config['needActivation'])) {
-      $from = 'noreply@' . INJI_DOMAIN_NAME;
-      $to = $data['user_mail'];
-      $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-      $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
-      $text .='<br />';
-      $text .= '<br />';
-      $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';
-      Tools::sendMail($from, $to, $subject, $text);
-      Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль и ссылка для активации', 'success');
+        $from = 'noreply@' . INJI_DOMAIN_NAME;
+        $to = $data['user_mail'];
+        $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+        $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
+        $text .='<br />';
+        $text .= '<br />';
+        $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';
+        Tools::sendMail($from, $to, $subject, $text);
+        Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль и ссылка для активации', 'success');
     } else {
-      $from = 'noreply@' . INJI_DOMAIN_NAME;
-      $to = $data['user_mail'];
-      $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-      $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
-      Tools::sendMail($from, $to, $subject, $text);
-      Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль', 'success');
+        $from = 'noreply@' . INJI_DOMAIN_NAME;
+        $to = $data['user_mail'];
+        $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+        $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
+        Tools::sendMail($from, $to, $subject, $text);
+        Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль', 'success');
     }
     return $user->id;
-  }
+    }
 
-  public function hashpass($pass) {
+    public function hashpass($pass) {
     return password_hash($pass, PASSWORD_DEFAULT);
-  }
+    }
 
-  public function verifypass($pass, $hash) {
+    public function verifypass($pass, $hash) {
     return password_verify($pass, $hash);
-  }
+    }
 
-  public function getUserPartners($user, $levels = 0) {
+    public function getUserPartners($user, $levels = 0) {
     $return = [
         'users' => [],
         'levels' => [],
@@ -384,29 +384,29 @@ 
     $levels = [];
     $userIds = $user->user_id;
     for ($i = 1; $i <= $levels || !$levels; $i++) {
-      if (!$userIds && $levels) {
+        if (!$userIds && $levels) {
         $levels[$i] = [];
         continue;
-      } elseif (!$userIds && !$levels) {
+        } elseif (!$userIds && !$levels) {
         break;
-      }
-      $usersLevel = \Users\User::getList(['where' => [['parent_id', $userIds, 'IN']]]);
-      $return['users'] += $usersLevel;
-      $return['levels'][$i] = array_keys($usersLevel);
-      $userIds = implode(',', $return['levels'][$i]);
-      $return['lastLevel'] = $i;
+        }
+        $usersLevel = \Users\User::getList(['where' => [['parent_id', $userIds, 'IN']]]);
+        $return['users'] += $usersLevel;
+        $return['levels'][$i] = array_keys($usersLevel);
+        $userIds = implode(',', $return['levels'][$i]);
+        $return['lastLevel'] = $i;
     }
     $return['count'] = count($return['users']);
     return $return;
-  }
+    }
 
-  public function addUserActivity($user_id, $cat_id, $text = '') {
+    public function addUserActivity($user_id, $cat_id, $text = '') {
     $ua = new Users\Activity([
         'user_id' => $user_id,
         'category_id' => $cat_id,
         'text' => $text,
     ]);
     $ua->save();
-  }
+    }
 
 }

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

Indentation +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@
   <?php
 
-  echo empty($options['noContainer']) ? '<div class="form-group">' : '';
-  echo $label !== false ? "<label>{$label}</label>" : '';
-  $attributes = [
-      'name' => $name,
-      'class' => "form-control " . (!empty($options['class']) ? $options['class'] : '')
-  ];
-  if (!empty($options['required'])) {
+    echo empty($options['noContainer']) ? '<div class="form-group">' : '';
+    echo $label !== false ? "<label>{$label}</label>" : '';
+    $attributes = [
+        'name' => $name,
+        'class' => "form-control " . (!empty($options['class']) ? $options['class'] : '')
+    ];
+    if (!empty($options['required'])) {
     $attributes['required'] = 'required';
-  }
-  if (!empty($options['attributes'])) {
+    }
+    if (!empty($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>' : '';
-  
\ No newline at end of file
+    }
+    echo Html::el('textarea', $attributes, !empty($options['value']) ? $options['value'] : (!empty($form->userDataTree[$name]) ? addcslashes($form->userDataTree[$name], "'") : ''));
+    echo empty($options['noContainer']) ? '</div>' : '';
+    
\ No newline at end of file

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/Form/text.php

Indentation +4 added lines, -4 removed lines

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

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

Indentation +31 added lines, -31 removed lines

@@ -6,10 +6,10 @@ 
     <?= $label; ?>
   </h3>
   <?php
-  if ($options['source'] == 'relation' && empty($options['modelPk'])) {
+    if ($options['source'] == 'relation' && empty($options['modelPk'])) {
     echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>';
     echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>';
-  } else {
+    } else {
     ?>
     <div class="table-responsive">
       <table class ='table table-striped'>
@@ -17,18 +17,18 @@ 
           <tr>
             <?php
             foreach ($options['cols'] as $colName => $col) {
-              if (!empty($col['hidden'])) {
+                if (!empty($col['hidden'])) {
                 continue;
-              }
-              echo "<th>";
-              echo $col['col']['label'];
-              if (!empty($col['col']['model'])) {
+                }
+                echo "<th>";
+                echo $col['col']['label'];
+                if (!empty($col['col']['model'])) {
                 $modelName = $col['col']['model'];
                 $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
                         . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
                 echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
-              }
-              echo "</th>";
+                }
+                echo "</th>";
             }
             ?>
             <td>&nbsp;</td>
@@ -36,14 +36,14 @@ 
         </thead>
         <tbody class="listBody">
           <?php
-          $i = 0;
-          if (!empty($options['values'])) {
+            $i = 0;
+            if (!empty($options['values'])) {
             foreach ($options['values'] as $row) {
-              echo '<tr>';
-              foreach ($options['cols'] as $colName => $col) {
+                echo '<tr>';
+                foreach ($options['cols'] as $colName => $col) {
                 $input = clone $col['input'];
                 if (empty($col['hidden'])) {
-                  echo '<td>';
+                    echo '<td>';
                 }
                 $input->options['noContainer'] = true;
                 $input->colParams['label'] = false;
@@ -51,24 +51,24 @@ 
                 $input->colName .= '[' . $colName . '][' . ($i) . ']';
                 $input->draw();
                 if (empty($col['hidden'])) {
-                  echo '</td>';
+                    echo '</td>';
+                }
                 }
-              }
-              $i++;
-              echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';
-              echo '</tr>';
+                $i++;
+                echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';
+                echo '</tr>';
             }
-          }
-          ?>
+            }
+            ?>
         </tbody>
         <tfoot>
           <tr>
             <?php
             foreach ($options['cols'] as $colName => $col) {
-              if (!empty($col['hidden'])) {
+                if (!empty($col['hidden'])) {
                 continue;
-              }
-              echo "<th>{$col['col']['label']}</th>";
+                }
+                echo "<th>{$col['col']['label']}</th>";
             }
             ?>
             <td>&nbsp;</td>
@@ -81,26 +81,26 @@ 
       <script>/*
        <tr>
   <?php
-  foreach ($options['cols'] as $colName => $col) {
+    foreach ($options['cols'] as $colName => $col) {
     if (empty($col['hidden'])) {
-      echo '<td>';
+        echo '<td>';
     }
     $col['input']->options['noContainer'] = true;
     $col['input']->colParams['label'] = false;
     $col['input']->colName.="[{$colName}][]";
     $col['input']->draw();
     if (empty($col['hidden'])) {
-      echo '</td>';
+        echo '</td>';
+    }
     }
-  }
-  ?>
+    ?>
        <td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>
        </tr>
        */</script>
     </div>
     <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 <?php
 //exit();

Spacing +4 added lines, -4 removed lines

@@ -24,9 +24,9 @@ 
               echo $col['col']['label'];
               if (!empty($col['col']['model'])) {
                 $modelName = $col['col']['model'];
-                $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+                $onclick = 'inji.Ui.forms.popUp(\''.addslashes($modelName).'\',{},function(elem){'
                         . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
-                echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
+                echo ' (<a href="" onclick="'.$onclick.';this.disabled=true;return false;">Создать</a>)';
               }
               echo "</th>";
             }
@@ -48,7 +48,7 @@ 
                 $input->options['noContainer'] = true;
                 $input->colParams['label'] = false;
                 $input->colParams['value'] = $row[$colName];
-                $input->colName .= '[' . $colName . '][' . ($i) . ']';
+                $input->colName .= '['.$colName.']['.($i).']';
                 $input->draw();
                 if (empty($col['hidden'])) {
                   echo '</td>';
@@ -87,7 +87,7 @@ 
     }
     $col['input']->options['noContainer'] = true;
     $col['input']->colParams['label'] = false;
-    $col['input']->colName.="[{$colName}][]";
+    $col['input']->colName .= "[{$colName}][]";
     $col['input']->draw();
     if (empty($col['hidden'])) {
       echo '</td>';

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

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
 <?php
 if (!empty($options['value']['lat']) && !empty($options['value']['lng'])) {
-  /*
+    /*
     ?>
     myPlacemark = new ymaps.Placemark([<?= $options['value']['lat']; ?>,<?= $options['value']['lng']; ?>], {
     // Чтобы балун и хинт открывались на метке, необходимо задать ей определенные свойства.

system/modules/Ui/objects/FastEdit.php

Indentation +5 added lines, -5 removed lines

@@ -13,22 +13,22 @@
 
 class FastEdit extends \Object {
 
-  public static function block($object, $col, $value = null, $parse = false) {
+    public static function block($object, $col, $value = null, $parse = false) {
 
     $str = "<div class = 'fastEdit' ";
     if ($object) {
-      $str .= "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
+        $str .= "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
     }
     $str .= ">";
     $value = $value !== null ? $value : ($object ? $object->$col : '');
     if ($parse) {
-      \App::$cur->view->parseSource($value);
+        \App::$cur->view->parseSource($value);
     } else {
-      $str .= $value;
+        $str .= $value;
     }
 
     $str .= "</div>";
     return $str;
-  }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     $str = "<div class = 'fastEdit' ";
     if ($object) {
-      $str .= "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
+      $str .= "data-model='".get_class($object)."' data-col='{$col}' data-key='".$object->pk()."'";
     }
     $str .= ">";
     $value = $value !== null ? $value : ($object ? $object->$col : '');