injitools / cms-Inji

system/Inji/Model.php

Doc Comments +7 added lines, -4 removed lines

@@ -437,6 +437,9 @@ 
     }
   }
 
+  /**
+   * @param boolean $new
+   */
   public function logChanges($new) {
     if (!App::$cur->db->connect || !App::$cur->dashboard) {
       return false;
@@ -539,7 +542,7 @@ 
   /**
    * Information extractor for col relations path
    * 
-   * @param string|array $info
+   * @param string $info
    * @return array
    */
   public static function parseColRecursion($info) {
@@ -625,7 +628,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') {
@@ -780,7 +783,7 @@ 
   /**
    * return relations list
    * 
-   * @return array
+   * @return string
    */
   public static function relations() {
     return [];
@@ -1303,7 +1306,7 @@ 
    * 
    * @param array $params
    * @param array $where
-   * @return boolean
+   * @return false|null
    */
   public static function update($params, $where = []) {
     static::fixPrefix($params);

Indentation +1072 added lines, -1072 removed lines

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

Spacing +62 added lines, -62 removed lines

@@ -209,7 +209,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() : 'Не задано';
             }
@@ -219,7 +219,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" />';
         }
@@ -227,7 +227,7 @@ 
       case 'file':
         $file = Files\File::get($item->$colName);
         if ($file) {
-          $value = '<a href="' . $file->path . '">' . $file->name . '.' . $file->type->ext . '</a>';
+          $value = '<a href="'.$file->path.'">'.$file->name.'.'.$file->type->ext.'</a>';
         } else {
           $value = 'Файл не загружен';
         }
@@ -243,7 +243,7 @@ 
       case 'map':
         if ($item->$colName && json_decode($item->$colName, true)) {
           $addres = json_decode($item->$colName, true);
-          $name = $addres['address'] ? $addres['address'] : 'lat:' . $addres['lat'] . ': lng:' . $addres['lng'];
+          $name = $addres['address'] ? $addres['address'] : 'lat:'.$addres['lat'].': lng:'.$addres['lng'];
           \App::$cur->libs->loadLib('yandexMap');
           ob_start();
           $uid = Tools::randomString();
@@ -275,7 +275,7 @@ 
           <?php
           $content = ob_get_contents();
           ob_end_clean();
-          $onclick = 'inji.Ui.modals.show("' . addcslashes($addres['address'], '"') . '", $("#map' . $uid . '_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal' . $uid . '","modal-lg");';
+          $onclick = 'inji.Ui.modals.show("'.addcslashes($addres['address'], '"').'", $("#map'.$uid.'_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal'.$uid.'","modal-lg");';
           $onclick .= 'return false;';
           $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
           $value .= $content;
@@ -315,7 +315,7 @@ 
                 case 'map':
                   if ($item->$colName && json_decode($item->$colName, true)) {
                     $addres = json_decode($item->$colName, true);
-                    $name = $addres['address'] ? $addres['address'] : 'lat:' . $addres['lat'] . ': lng:' . $addres['lng'];
+                    $name = $addres['address'] ? $addres['address'] : 'lat:'.$addres['lat'].': lng:'.$addres['lng'];
                     \App::$cur->libs->loadLib('yandexMap');
                     ob_start();
                     $uid = Tools::randomString();
@@ -347,7 +347,7 @@ 
                     <?php
                     $content = ob_get_contents();
                     ob_end_clean();
-                    $onclick = 'inji.Ui.modals.show("' . addcslashes($addres['address'], '"') . '", $("#map' . $uid . '_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal' . $uid . '","modal-lg");';
+                    $onclick = 'inji.Ui.modals.show("'.addcslashes($addres['address'], '"').'", $("#map'.$uid.'_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal'.$uid.'","modal-lg");';
                     $onclick .= 'return false;';
                     $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                     $value .= $content;
@@ -387,12 +387,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);
       }
@@ -401,14 +401,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);
@@ -419,12 +419,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);
           }
@@ -456,11 +456,11 @@ 
       $changes_text = [];
       foreach ($this->_changedParams as $fullColName => $oldValue) {
         $colName = substr($fullColName, strlen($class::colPrefix()));
-        if(isset($class::$cols[$colName]['logging']) && !$class::$cols[$colName]['logging']){
+        if (isset($class::$cols[$colName]['logging']) && !$class::$cols[$colName]['logging']) {
           continue;
         }
         if (strlen($oldValue) + strlen($this->_params[$fullColName]) < 200) {
-          $changes_text[] = (!empty($class::$labels[$colName]) ? $class::$labels[$colName] : $colName) . ": \"{$oldValue}\" => \"{$this->$colName}\"";
+          $changes_text[] = (!empty($class::$labels[$colName]) ? $class::$labels[$colName] : $colName).": \"{$oldValue}\" => \"{$this->$colName}\"";
         } else {
           $changes_text[] = !empty($class::$labels[$colName]) ? $class::$labels[$colName] : $colName;
         }
@@ -512,13 +512,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);
@@ -557,13 +557,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);
@@ -581,8 +581,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();
     }
@@ -689,7 +689,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() {
@@ -718,28 +718,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']).')';
       }
     }
 
@@ -763,7 +763,7 @@ 
    */
   public static function index() {
 
-    return static::colPrefix() . 'id';
+    return static::colPrefix().'id';
   }
 
   /**
@@ -774,7 +774,7 @@ 
   public static function colPrefix() {
     $classPath = explode('\\', get_called_class());
     $classPath = array_slice($classPath, 1);
-    return strtolower(implode('_', $classPath)) . '_';
+    return strtolower(implode('_', $classPath)).'_';
   }
 
   /**
@@ -808,7 +808,7 @@ 
    * @return string
    */
   public function name() {
-    return $this->{$this->nameCol()} ? $this->{$this->nameCol()} : '№' . $this->pk();
+    return $this->{$this->nameCol()} ? $this->{$this->nameCol()} : '№'.$this->pk();
   }
 
   /**
@@ -842,12 +842,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;
         }
       }
@@ -862,8 +862,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 {
@@ -927,12 +927,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;
         }
       }
@@ -1254,12 +1254,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;
         }
       }
@@ -1276,7 +1276,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']);
@@ -1409,25 +1409,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]);
   }
 
   /**
@@ -1441,9 +1441,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 '/';
@@ -1457,7 +1457,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 = '/';
     }
@@ -1482,7 +1482,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();
     $values = [];
@@ -1527,7 +1527,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()};
@@ -1665,7 +1665,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':
@@ -1942,7 +1942,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':

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

Indentation +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 echo $label !== false ? "<label>{$label}</label>" : '';
 $uid = Tools::randomString();
 if (!empty($options['value'])) {
-  $options['value'] = json_decode($options['value'], true);
+    $options['value'] = json_decode($options['value'], true);
 }
 ?>
 <div id='map<?= $uid; ?>' class="formMap"  style="width: 100%; height: 400px"></div>
@@ -24,7 +24,7 @@ 
       });
 <?php
 if ($options['value']) {
-  ?>
+    ?>
         myMap<?= $uid; ?>CurPin = new ymaps.Placemark(["<?= !empty($options['value']['lat']) ? $options['value']['lat'] : '56.01'; ?>", "<?= !empty($options['value']['lng']) ? $options['value']['lng'] : '92.85'; ?>"],
                 {iconContent: "<?= !empty($options['value']['address']) ? $options['value']['address'] : implode(',', $options['value']); ?>"},
                 {preset: 'islands#greenStretchyIcon'}

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

Indentation +5 added lines, -5 removed lines

@@ -13,14 +13,14 @@
 
 class Map extends \Ui\ActiveForm\Input {
 
-  public function parseRequest($request) {
+    public function parseRequest($request) {
     $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
     if (isset($request[$this->colName])) {
-      $this->activeForm->model->{$colName} = json_encode($request[$this->colName]);
+        $this->activeForm->model->{$colName} = json_encode($request[$this->colName]);
     } else {
-      $this->activeForm->model->{$colName} = 0;
-      $this->activeForm->model->{$colName} = '';
+        $this->activeForm->model->{$colName} = 0;
+        $this->activeForm->model->{$colName} = '';
+    }
     }
-  }
 
 }

system/modules/Ecommerce/models/Item/Option.php

Indentation +62 added lines, -62 removed lines

@@ -13,64 +13,64 @@ 
 
 class Option extends \Model {
 
-  public static $objectName = 'Свойство';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'filter_name' => ['type' => 'text'],
-      'image_file_id' => ['type' => 'image'],
-      'code' => ['type' => 'text'],
-      'type' => ['type' => 'text'],
-      'postfix' => ['type' => 'text'],
-      'default_val' => ['type' => 'text'],
-      'view' => ['type' => 'bool'],
-      'searchable' => ['type' => 'bool'],
-      //Системные
-      'weight' => ['type' => 'number'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'advance' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'item' => ['type' => 'dataManager', 'relation' => 'items'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'filter_name' => 'Название в фильтре',
-      'image_file_id' => 'Иконка',
-      'code' => 'Код',
-      'type' => 'Тип',
-      'postfix' => 'Постфикс',
-      'default_val' => 'Значение по умолчанию',
-      'view' => 'Отображается',
-      'searchable' => 'Используется при поиске',
-      'weight' => 'Вес сортировки',
-      'advance' => 'Дополнительные параметры',
-      'user_id' => 'Создатель',
-      'date_create' => 'Дата создания',
-      'item' => 'Значения для списка'
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Свойства товаров',
-          'cols' => [
-              'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
-          ],
-          'sortMode' => true
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'filter_name'],
-              ['code', 'type', 'image_file_id'],
-              ['default_val', 'postfix'],
-              ['view', 'searchable'],
-              ['item']
-          ]
-      ]
-  ];
+    public static $objectName = 'Свойство';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'filter_name' => ['type' => 'text'],
+        'image_file_id' => ['type' => 'image'],
+        'code' => ['type' => 'text'],
+        'type' => ['type' => 'text'],
+        'postfix' => ['type' => 'text'],
+        'default_val' => ['type' => 'text'],
+        'view' => ['type' => 'bool'],
+        'searchable' => ['type' => 'bool'],
+        //Системные
+        'weight' => ['type' => 'number'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'advance' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'item' => ['type' => 'dataManager', 'relation' => 'items'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'filter_name' => 'Название в фильтре',
+        'image_file_id' => 'Иконка',
+        'code' => 'Код',
+        'type' => 'Тип',
+        'postfix' => 'Постфикс',
+        'default_val' => 'Значение по умолчанию',
+        'view' => 'Отображается',
+        'searchable' => 'Используется при поиске',
+        'weight' => 'Вес сортировки',
+        'advance' => 'Дополнительные параметры',
+        'user_id' => 'Создатель',
+        'date_create' => 'Дата создания',
+        'item' => 'Значения для списка'
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Свойства товаров',
+            'cols' => [
+                'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
+            ],
+            'sortMode' => true
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'filter_name'],
+                ['code', 'type', 'image_file_id'],
+                ['default_val', 'postfix'],
+                ['view', 'searchable'],
+                ['item']
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'user' => [
             'model' => 'Users\User',
@@ -86,15 +86,15 @@ 
             'col' => 'image_file_id'
         ],
     ];
-  }
+    }
 
-  public function beforeSave() {
+    public function beforeSave() {
     if (!isset($this->id)) {
-      $this->user_id = \Users\User::$cur->id;
+        $this->user_id = \Users\User::$cur->id;
     }
     if ($this->advance && is_array($this->advance)) {
-      $this->advance = json_encode($this->advance);
+        $this->advance = json_encode($this->advance);
+    }
     }
-  }
 
 }

system/modules/Ecommerce/appControllers/EcommerceController.php

Indentation +80 added lines, -80 removed lines

@@ -10,42 +10,42 @@ 
  */
 class ecommerceController extends Controller {
 
-  public function buyCardAction() {
+    public function buyCardAction() {
     $this->view->setTitle('Покупка карты');
     $bread = [];
     $bread[] = ['text' => 'Покупка карты'];
     $user = Users\User::$cur;
     if (!empty($_POST) && !empty($_POST['card_id'])) {
-      $error = false;
-      $card = \Ecommerce\Card::get((int) $_POST['card_id']);
-      if (!$card) {
+        $error = false;
+        $card = \Ecommerce\Card::get((int) $_POST['card_id']);
+        if (!$card) {
         $error = true;
         Msg::add('Такой карты не существует', 'danger');
-      }
+        }
 
-      if (!Users\User::$cur->id) {
+        if (!Users\User::$cur->id) {
         $user_id = $this->Users->registration($_POST, true);
         if (!$user_id) {
-          $error = true;
-          $user = null;
+            $error = true;
+            $user = null;
         } else {
-          $user = Users\User::get($user_id);
+            $user = Users\User::get($user_id);
+        }
         }
-      }
-      $userCard = \Ecommerce\Card\Item::get([['card_id', $card->id], ['user_id', $user->id]]);
-      if ($userCard) {
+        $userCard = \Ecommerce\Card\Item::get([['card_id', $card->id], ['user_id', $user->id]]);
+        if ($userCard) {
         $error = true;
         Msg::add('У вас уже есть такая карта', 'danger');
-      }
+        }
 
-      $fields = \Ecommerce\UserAdds\Field::getList();
-      foreach ($fields as $field) {
+        $fields = \Ecommerce\UserAdds\Field::getList();
+        foreach ($fields as $field) {
         if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
-          $error = 1;
-          Msg::add('Вы не указали: ' . $field->name);
+            $error = 1;
+            Msg::add('Вы не указали: ' . $field->name);
+        }
         }
-      }
-      if (!$error) {
+        if (!$error) {
         $cardItem = new \Ecommerce\Card\Item();
         $cardItem->card_id = $card->id;
         $cardItem->user_id = $user->id;
@@ -58,7 +58,7 @@ 
         $cart->date_status = date('Y-m-d H:i:s');
         $cart->complete_data = date('Y-m-d H:i:s');
         if (!empty($_SESSION['cart']['cart_id'])) {
-          $cart->card_item_id = $cardItem->id;
+            $cart->card_item_id = $cardItem->id;
         }
         $cart->save();
 
@@ -73,69 +73,69 @@ 
         $extra->info = 'card:' . $card->id . '|cardItem:' . $cardItem->id;
         $extra->save();
         Tools::redirect('/ecommerce/cart/success');
-      }
+        }
     }
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function autoCompleteAction() {
+    public function autoCompleteAction() {
     $return = Cache::get('itemsAutocomplete');
     if (!$return) {
-      $items = $this->ecommerce->getItems();
-      $return = [];
-      foreach ($items as $item) {
+        $items = $this->ecommerce->getItems();
+        $return = [];
+        foreach ($items as $item) {
         $return[] = ['name' => $item->name(), 'search' => $item->search_index . ' ' . $item->name];
-      }
-      $return = json_encode($return);
-      Cache::set('itemsAutocomplete', [], $return);
+        }
+        $return = json_encode($return);
+        Cache::set('itemsAutocomplete', [], $return);
     }
     echo $return;
-  }
+    }
 
-  public function indexAction() {
+    public function indexAction() {
     if (empty($this->module->config['catalogPresentPage'])) {
-      Tools::redirect('/ecommerce/itemList');
+        Tools::redirect('/ecommerce/itemList');
     }
     //$this->view->setTitle('Каталог');
     $this->view->page();
-  }
+    }
 
-  public function itemListAction($category_id = 0) {
+    public function itemListAction($category_id = 0) {
     //search
     if (!empty($_GET['search'])) {
-      if (!empty($_GET['inCatalog'])) {
+        if (!empty($_GET['inCatalog'])) {
         $category_id = (int) $_GET['inCatalog'];
-      }
-      $search = $_GET['search'];
+        }
+        $search = $_GET['search'];
     } else {
-      $search = '';
+        $search = '';
     }
 
     //sort
     if (!empty($_GET['sort'])) {
-      $sort = $_GET['sort'];
+        $sort = $_GET['sort'];
     } elseif (!empty($this->ecommerce->config['defaultSort'])) {
-      $sort = $this->ecommerce->config['defaultSort'];
+        $sort = $this->ecommerce->config['defaultSort'];
     } else {
-      $sort = ['name' => 'asc'];
+        $sort = ['name' => 'asc'];
     }
 
     //category
     $category = null;
     if ($category_id) {
-      if (is_numeric($category_id)) {
+        if (is_numeric($category_id)) {
         $category = \Ecommerce\Category::get($category_id);
-      }
-      if (!$category) {
+        }
+        if (!$category) {
         $category = \Ecommerce\Category::get($category_id, 'alias');
-      }
-      if ($category) {
+        }
+        if ($category) {
         $category_id = $category->id;
-      } else {
+        } else {
         $category_id = 0;
-      }
+        }
     } else {
-      $category_id = 0;
+        $category_id = 0;
     }
     $active = $category_id;
 
@@ -151,17 +151,17 @@ 
     //bread
     $bread = [];
     if (!$category || !$category->name) {
-      $bread[] = array('text' => 'Каталог');
-      $this->view->setTitle('Каталог');
+        $bread[] = array('text' => 'Каталог');
+        $this->view->setTitle('Каталог');
     } else {
-      $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
-      $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
-      foreach ($categoryIds as $id) {
+        $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
+        $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
+        foreach ($categoryIds as $id) {
         $cat = Ecommerce\Category::get($id);
         $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id);
-      }
-      $bread[] = array('text' => $category->name);
-      $this->view->setTitle($category->name);
+        }
+        $bread[] = array('text' => $category->name);
+        $this->view->setTitle($category->name);
     }
 
     //items
@@ -176,30 +176,30 @@ 
 
     //params 
     if (empty(App::$cur->ecommerce->config['filtersInLast'])) {
-      $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1], 'order' => ['weight', 'asc']]);
+        $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1], 'order' => ['weight', 'asc']]);
     } else {
-      $params = $this->ecommerce->getItemsParams([
-          'parent' => $category_id,
-          'search' => trim($search),
-          'filters' => !empty($_GET['filters']) ? $_GET['filters'] : []
-      ]);
-      $ids = [];
-      foreach ($params as $param) {
+        $params = $this->ecommerce->getItemsParams([
+            'parent' => $category_id,
+            'search' => trim($search),
+            'filters' => !empty($_GET['filters']) ? $_GET['filters'] : []
+        ]);
+        $ids = [];
+        foreach ($params as $param) {
         $ids[] = $param->item_option_id;
-      }
-      if ($ids) {
+        }
+        if ($ids) {
         $options = \Ecommerce\Item\Option::getList(['where' => ['id', $ids, 'IN'], 'order' => ['weight', 'asc']]);
-      } else {
+        } else {
         $options = [];
-      }
+        }
     }
 
 
     //child categorys
     if ($category) {
-      $categorys = $category->catalogs;
+        $categorys = $category->catalogs;
     } else {
-      $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
+        $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
     }
 
     //view content
@@ -207,12 +207,12 @@ 
         'page' => $category ? $category->resolveTemplate() : (!empty(App::$cur->ecommerce->config['defaultCategoryTemplate']) ? App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current'),
         'content' => $category ? $category->resolveViewer() : (!empty(App::$cur->ecommerce->config['defaultCategoryView']) ? App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList'),
         'data' => compact('active', 'category', 'sort', 'search', 'pages', 'items', 'categorys', 'bread', 'options')]);
-  }
+    }
 
-  public function viewAction($id = '') {
+    public function viewAction($id = '') {
     $item = \Ecommerce\Item::get((int) $id);
     if (!$item) {
-      Tools::redirect('/ecommerce/', 'Такой товар не найден');
+        Tools::redirect('/ecommerce/', 'Такой товар не найден');
     }
     $active = $item->category_id;
     $catalog = $item->category;
@@ -221,10 +221,10 @@ 
 
     $catalogIds = array_values(array_filter(explode('/', $item->tree_path)));
     foreach ($catalogIds as $id) {
-      $cat = Ecommerce\Category::get($id);
-      if ($cat) {
+        $cat = Ecommerce\Category::get($id);
+        if ($cat) {
         $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id];
-      }
+        }
     }
     $bread[] = ['text' => $item->name()];
     $this->view->setTitle($item->name());
@@ -233,17 +233,17 @@ 
         'content' => $item->view ? $item->view : 'view'
     ];
     if (isset($_GET['quickview'])) {
-      $options['page'] = 'blank';
+        $options['page'] = 'blank';
     }
 
     $this->view->addMetaTag(['property' => 'og:title', 'content' => $item->name]);
     $this->view->addMetaTag(['property' => 'og:description', 'content' => $item->description]);
     if ($item->image) {
-      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
+        $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
     }
     $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . INJI_DOMAIN_NAME . '/view/' . $item->id]);
 
     $this->view->page($options);
-  }
+    }
 
 }

system/modules/Dashboard/models/Activity/Change.php

Indentation +10 added lines, -10 removed lines

@@ -15,22 +15,22 @@
 
 class Change extends \Model {
 
-  static $logging = false;
-  static $cols = [
-      'activity_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'activity'],
-      'col' => ['type' => 'text'],
-      'old' => ['type' => 'textarea'],
-      'new' => ['type' => 'textarea'],
-      'date_create' => ['type' => 'dateTime']
-  ];
+    static $logging = false;
+    static $cols = [
+        'activity_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'activity'],
+        'col' => ['type' => 'text'],
+        'old' => ['type' => 'textarea'],
+        'new' => ['type' => 'textarea'],
+        'date_create' => ['type' => 'dateTime']
+    ];
 
-  static function relations() {
+    static function relations() {
     return [
         'activity' => [
             'col' => 'activity_id',
             'model' => 'Dashboard\Activity'
         ]
     ];
-  }
+    }
 
 }

system/modules/Dashboard/models/Activity.php

Indentation +18 added lines, -18 removed lines

@@ -20,24 +20,24 @@ 
  */
 class Activity extends \Model {
 
-  static $logging = false;
-  static $cols = [
-      'type' => ['type' => 'select', 'source' => 'array',
-          'sourceArray' => [
-              'changes' => 'Изменение',
-              'new' => 'Создание',
-              'delete' => 'Удаление'
-          ]
-      ],
-      'item_id' => ['type' => 'number'],
-      'module' => ['type' => 'text'],
-      'model' => ['type' => 'text'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'changes_text' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime']
-  ];
+    static $logging = false;
+    static $cols = [
+        'type' => ['type' => 'select', 'source' => 'array',
+            'sourceArray' => [
+                'changes' => 'Изменение',
+                'new' => 'Создание',
+                'delete' => 'Удаление'
+            ]
+        ],
+        'item_id' => ['type' => 'number'],
+        'module' => ['type' => 'text'],
+        'model' => ['type' => 'text'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'changes_text' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime']
+    ];
 
-  static function relations() {
+    static function relations() {
     return [
         'user' => [
             'col' => 'user_id',
@@ -49,6 +49,6 @@ 
             'model' => 'Dashboard\Activity\Change'
         ]
     ];
-  }
+    }
 
 }