injitools / cms-Inji

system/modules/Exchange1c/objects/Mode/File.php

Indentation +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
 
 class File extends \Exchange1c\Mode {
 
-  public function process() {
+    public function process() {
     $dir = $this->exchange->path;
     \Tools::createDir($dir);
     $file = new \Exchange1c\Exchange\File();
@@ -24,26 +24,26 @@ 
 
     $filename = \Tools::parsePath($_GET['filename']);
     if (strpos($filename, '/') !== false) {
-      $subDir = substr($filename, 0, strrpos($filename, "/") + 1);
-      \Tools::createDir($dir . '/' . $subDir);
+        $subDir = substr($filename, 0, strrpos($filename, "/") + 1);
+        \Tools::createDir($dir . '/' . $subDir);
     }
     $text = '';
     if (false === file_put_contents($dir . '/' . $filename, file_get_contents("php://input"))) {
-      $text = 'Fail on save file: ' . $filename;
-      $file->status = 'failure';
+        $text = 'Fail on save file: ' . $filename;
+        $file->status = 'failure';
     } else {
-      $file->size = ceil(filesize($dir . '/' . $filename));
-      $file->name = $filename;
-      $file->status = 'success';
+        $file->size = ceil(filesize($dir . '/' . $filename));
+        $file->name = $filename;
+        $file->status = 'success';
     }
     $file->save();
     if (strpos($filename, '1cbitrix') !== false) {
-      $data = new \SimpleXMLElement(file_get_contents($dir . '/' . $filename));
-      $orders = new \Exchange1c\Parser\Orders($data);
-      $orders->process();
+        $data = new \SimpleXMLElement(file_get_contents($dir . '/' . $filename));
+        $orders = new \Exchange1c\Parser\Orders($data);
+        $orders->process();
     }
     \App::$cur->exchange1c->response($file->status, $text, false);
     $this->end($file->status);
-  }
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -25,20 +25,20 @@
     $filename = \Tools::parsePath($_GET['filename']);
     if (strpos($filename, '/') !== false) {
       $subDir = substr($filename, 0, strrpos($filename, "/") + 1);
-      \Tools::createDir($dir . '/' . $subDir);
+      \Tools::createDir($dir.'/'.$subDir);
     }
     $text = '';
-    if (false === file_put_contents($dir . '/' . $filename, file_get_contents("php://input"))) {
-      $text = 'Fail on save file: ' . $filename;
+    if (false === file_put_contents($dir.'/'.$filename, file_get_contents("php://input"))) {
+      $text = 'Fail on save file: '.$filename;
       $file->status = 'failure';
     } else {
-      $file->size = ceil(filesize($dir . '/' . $filename));
+      $file->size = ceil(filesize($dir.'/'.$filename));
       $file->name = $filename;
       $file->status = 'success';
     }
     $file->save();
     if (strpos($filename, '1cbitrix') !== false) {
-      $data = new \SimpleXMLElement(file_get_contents($dir . '/' . $filename));
+      $data = new \SimpleXMLElement(file_get_contents($dir.'/'.$filename));
       $orders = new \Exchange1c\Parser\Orders($data);
       $orders->process();
     }

system/modules/Exchange1c/models/Exchange/File.php

Indentation +20 added lines, -20 removed lines

@@ -13,37 +13,37 @@
 
 class File extends \Model {
 
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'exchange_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'exchange'],
-      'size' => ['type' => 'number'],
-      'status' => ['type' => 'text'],
-      'deleted' => ['type' => 'bool'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'name', 'size', 'status', 'deleted', 'date_create'
-          ],
-      ]
-  ];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'exchange_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'exchange'],
+        'size' => ['type' => 'number'],
+        'status' => ['type' => 'text'],
+        'deleted' => ['type' => 'bool'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'name', 'size', 'status', 'deleted', 'date_create'
+            ],
+        ]
+    ];
 
-  public function deleteFile() {
+    public function deleteFile() {
     if ($this->exchange && file_exists($this->exchange->path . '/' . $this->name)) {
-      unlink($this->exchange->path . '/' . $this->name);
+        unlink($this->exchange->path . '/' . $this->name);
     }
     $this->deleted = 1;
     $this->save();
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'exchange' => [
             'model' => 'Exchange1c\Exchange',
             'col' => 'exchange_id'
         ]
     ];
-  }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
   ];
 
   public function deleteFile() {
-    if ($this->exchange && file_exists($this->exchange->path . '/' . $this->name)) {
-      unlink($this->exchange->path . '/' . $this->name);
+    if ($this->exchange && file_exists($this->exchange->path.'/'.$this->name)) {
+      unlink($this->exchange->path.'/'.$this->name);
     }
     $this->deleted = 1;
     $this->save();

system/modules/Ecommerce/models/Delivery.php

Indentation +59 added lines, -59 removed lines

@@ -13,65 +13,65 @@ 
 
 class Delivery extends \Model {
 
-  public static $objectName = 'Доставка';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'price' => ['type' => 'decimal'],
-      'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
-      'price_text' => ['type' => 'textarea'],
-      'max_cart_price' => ['type' => 'decimal'],
-      'icon_file_id' => ['type' => 'image'],
-      'info' => ['type' => 'html'],
-      'disabled' => ['type' => 'bool'],
-      //Системные
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'field' => ['type' => 'dataManager', 'relation' => 'fields'],
-      'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'price' => 'Стоимость',
-      'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
-      'max_cart_price' => 'Басплатно при',
-      'icon_file_id' => 'Иконка',
-      'currency_id' => 'Валюта',
-      'info' => 'Дополнительная информация',
-      'priceChanger' => 'Градация стоимости',
-      'field' => 'Поля',
-      'disabled' => 'Отключено',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Варианты доставки',
-          'cols' => [
-              'name',
-              'price',
-              'currency_id',
-              'max_cart_price',
-              'disabled',
-              'field',
-              'priceChanger',
-          ],
-          'sortMode' => true
-      ],
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'disabled'],
-              ['max_cart_price', 'icon_file_id'],
-              ['price', 'currency_id'],
-              ['price_text'],
-              ['info'],
-              ['priceChanger'],
-              ['field']
-          ]
-  ]];
+    public static $objectName = 'Доставка';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'price' => ['type' => 'decimal'],
+        'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
+        'price_text' => ['type' => 'textarea'],
+        'max_cart_price' => ['type' => 'decimal'],
+        'icon_file_id' => ['type' => 'image'],
+        'info' => ['type' => 'html'],
+        'disabled' => ['type' => 'bool'],
+        //Системные
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'field' => ['type' => 'dataManager', 'relation' => 'fields'],
+        'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'price' => 'Стоимость',
+        'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
+        'max_cart_price' => 'Басплатно при',
+        'icon_file_id' => 'Иконка',
+        'currency_id' => 'Валюта',
+        'info' => 'Дополнительная информация',
+        'priceChanger' => 'Градация стоимости',
+        'field' => 'Поля',
+        'disabled' => 'Отключено',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Варианты доставки',
+            'cols' => [
+                'name',
+                'price',
+                'currency_id',
+                'max_cart_price',
+                'disabled',
+                'field',
+                'priceChanger',
+            ],
+            'sortMode' => true
+        ],
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'disabled'],
+                ['max_cart_price', 'icon_file_id'],
+                ['price', 'currency_id'],
+                ['price_text'],
+                ['info'],
+                ['priceChanger'],
+                ['field']
+            ]
+    ]];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'icon' => [
             'model' => 'Files\File',
@@ -92,6 +92,6 @@ 
             'col' => 'delivery_id'
         ]
     ];
-  }
+    }
 
 }

system/modules/Dashboard/appAdminControllers/DashboardController.php

Indentation +19 added lines, -19 removed lines

@@ -10,38 +10,38 @@
  */
 class DashboardController extends adminController {
 
-  public function indexAction() {
+    public function indexAction() {
     $sections = $this->module->getSnippets('adminDashboardWidget');
     $this->view->setTitle('Панель управления');
     $this->view->page(['data' => compact('sections')]);
-  }
+    }
 
-  public function siteConfigAction() {
+    public function siteConfigAction() {
     if (isset($_POST['site_name'])) {
-      $config = \App::$primary->config;
-      $config['site']['name'] = $_POST['site_name'];
-      $config['site']['company_name'] = $_POST['company_name'];
-      $config['site']['email'] = $_POST['site_email'];
-      $config['site']['keywords'] = $_POST['site_keywords'];
-      $config['site']['description'] = $_POST['site_description'];
-      $config['site']['domain'] = $_POST['site_domain'];
-      if (isset($_POST['metatags'])) {
+        $config = \App::$primary->config;
+        $config['site']['name'] = $_POST['site_name'];
+        $config['site']['company_name'] = $_POST['company_name'];
+        $config['site']['email'] = $_POST['site_email'];
+        $config['site']['keywords'] = $_POST['site_keywords'];
+        $config['site']['description'] = $_POST['site_description'];
+        $config['site']['domain'] = $_POST['site_domain'];
+        if (isset($_POST['metatags'])) {
         $config['site']['metatags'] = $_POST['metatags'];
-      }
-      if (!empty($_FILES['site_logo']['tmp_name'])) {
+        }
+        if (!empty($_FILES['site_logo']['tmp_name'])) {
         $fileId = $this->Files->upload($_FILES['site_logo'], array('file_code' => 'site_logo'));
         $config['site']['site_logo'] = Files\File::get($fileId)->path;
-      }
-      Config::save('app', $config);
-      Tools::redirect('/admin/dashboard/siteConfig', 'Изменения сохранены', 'success');
+        }
+        Config::save('app', $config);
+        Tools::redirect('/admin/dashboard/siteConfig', 'Изменения сохранены', 'success');
     }
 
     $this->view->setTitle('Общие настройки сайта');
     $this->view->page();
-  }
+    }
 
-  public function phpInfoAction() {
+    public function phpInfoAction() {
     $this->view->page();
-  }
+    }
 
 }

system/modules/Migrations/objects/Walker.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
           $walker->migration = $this->migration;
           $walker->map = $this->map;
           $walker->data = &$this->data[$path->item];
-          $walker->curPath = $this->curPath . $path->item . '/';
+          $walker->curPath = $this->curPath.$path->item.'/';
           $walker->mapPath = $path;
           $walker->mapPathParent = $this->mapPath;
           $walker->migtarionLog = $this->migtarionLog;

Indentation +53 added lines, -53 removed lines

@@ -13,61 +13,61 @@ 
 
 class Walker {
 
-  public $migration = null;
-  public $map = null;
-  public $data = null;
-  public $mapPath = null;
-  public $mapPathParent = null;
-  public $curPath = '/';
-  public $migtarionLog = null;
+    public $migration = null;
+    public $map = null;
+    public $data = null;
+    public $mapPath = null;
+    public $mapPathParent = null;
+    public $curPath = '/';
+    public $migtarionLog = null;
 
-  //walk map pathes on cur path
-  public function walk() {
+    //walk map pathes on cur path
+    public function walk() {
     $walked = [];
     //walk know pathes
     foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) {
-      if (isset($this->data[$path->item])) {
+        if (isset($this->data[$path->item])) {
         if ($path->type == 'container') { //create walker for container
-          $walker = new Walker();
-          $walker->migration = $this->migration;
-          $walker->map = $this->map;
-          $walker->data = &$this->data[$path->item];
-          $walker->curPath = $this->curPath . $path->item . '/';
-          $walker->mapPath = $path;
-          $walker->mapPathParent = $this->mapPath;
-          $walker->migtarionLog = $this->migtarionLog;
-          $walker->walk();
+            $walker = new Walker();
+            $walker->migration = $this->migration;
+            $walker->map = $this->map;
+            $walker->data = &$this->data[$path->item];
+            $walker->curPath = $this->curPath . $path->item . '/';
+            $walker->mapPath = $path;
+            $walker->mapPathParent = $this->mapPath;
+            $walker->migtarionLog = $this->migtarionLog;
+            $walker->walk();
         } elseif ($path->type == 'object') { //start parse path data
-          $this->startObjectParse($path->object_id, $this->data[$path->item]);
+            $this->startObjectParse($path->object_id, $this->data[$path->item]);
         }
-      }
-      $walked[$path->item] = true;
+        }
+        $walked[$path->item] = true;
     }
     //check unparsed paths
     foreach ($this->data as $key => &$data) {
-      //skip parsed and attribtes
-      if ($key == '@attributes' || !empty($walked[$key])) {
+        //skip parsed and attribtes
+        if ($key == '@attributes' || !empty($walked[$key])) {
         continue;
-      }
-      //search object for parse
-      $object = Migration\Object::get([
-                  ['code', $key],
-                  ['migration_id', $this->migration->id]
-      ]);
-      if ($object) { //parse as object
+        }
+        //search object for parse
+        $object = Migration\Object::get([
+                    ['code', $key],
+                    ['migration_id', $this->migration->id]
+        ]);
+        if ($object) { //parse as object
         $this->startObjectParse($object, $data);
-      } else { //create new map path for configure unknown path
+        } else { //create new map path for configure unknown path
         $this->mapPath = new Migration\Map\Path();
         $this->mapPath->parent_id = $this->mapPathParent ? $this->mapPathParent->id : 0;
         $this->mapPath->path = $this->curPath;
         $this->mapPath->item = $key;
         $this->mapPath->migration_map_id = $this->map->id;
         $this->mapPath->save();
-      }
+        }
+    }
     }
-  }
 
-  private function startObjectParse($object_id, &$data) {
+    private function startObjectParse($object_id, &$data) {
     $objectParser = new Parser\Object();
     $objectParser->object = is_object($object_id) ? $object_id : \App::$cur->migrations->getMigrationObject($object_id);
     $objectParser->data = $data;
@@ -76,33 +76,33 @@ 
 
     if ($objectParser->object->clear && json_decode($objectParser->object->clear, true)) {
 
-      $where = json_decode($objectParser->object->clear, true);
-      if (!$where) {
+        $where = json_decode($objectParser->object->clear, true);
+        if (!$where) {
         $where = [];
-      } else {
+        } else {
         $where = [[$where]];
-      }
-      if ($ids) {
+        }
+        if ($ids) {
         $where[] = ['id', implode(',', $ids), 'NOT IN'];
-      }
-      if (empty(\App::$cur->migrations->ids['objectIds'])) {
+        }
+        if (empty(\App::$cur->migrations->ids['objectIds'])) {
         \App::$cur->migrations->loadObjectIds($objectParser->object->model);
-      }
-      if (!empty(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model])) {
+        }
+        if (!empty(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model])) {
         $where[] = ['id', implode(',', array_keys(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model])), 'IN'];
-      }
-      $modelName = $objectParser->object->model;
-      $objects = $modelName::getList(['where' => $where]);
-      foreach ($objects as $object) {
+        }
+        $modelName = $objectParser->object->model;
+        $objects = $modelName::getList(['where' => $where]);
+        foreach ($objects as $object) {
         $objectId = \App::$cur->migrations->findParse($object->id, $objectParser->object->model);
         if ($objectId) {
-          $objectId->delete();
-          unset(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model][$object->id]);
-          unset(\App::$cur->migrations->ids['parseIds'][$objectParser->object->model][$objectId->parse_id]);
+            $objectId->delete();
+            unset(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model][$object->id]);
+            unset(\App::$cur->migrations->ids['parseIds'][$objectParser->object->model][$objectId->parse_id]);
         }
         $object->delete();
-      }
+        }
+    }
     }
-  }
 
 }

system/modules/Exchange1c/objects/Parser/Item/Options.php

Indentation +34 added lines, -34 removed lines

@@ -13,75 +13,75 @@
 
 class Options extends \Migrations\Parser {
 
-  static $options;
+    static $options;
 
-  public function parse() {
+    public function parse() {
     if (!Options::$options) {
-      Options::$options = \Ecommerce\Item\Option::getList();
+        Options::$options = \Ecommerce\Item\Option::getList();
     }
     $options = [];
     $modelName = 'Ecommerce\Item\Option';
     foreach ($this->data['ЗначенияСвойства'] as $opt) {
-      $optionId = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option'][$opt['Ид']]->object_id;
-      if ($optionId && !isset(Options::$options[$optionId])) {
+        $optionId = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option'][$opt['Ид']]->object_id;
+        if ($optionId && !isset(Options::$options[$optionId])) {
         Options::$options = \Ecommerce\Item\Option::getList();
-      }
-      if (isset(Options::$options[$optionId]) && Options::$options[$optionId]->type == 'select') {
+        }
+        if (isset(Options::$options[$optionId]) && Options::$options[$optionId]->type == 'select') {
         if (empty($options[$optionId])) {
-          $options[$optionId] = [];
+            $options[$optionId] = [];
         } else {
-          if (!Options::$options[$optionId]->advance) {
+            if (!Options::$options[$optionId]->advance) {
             Options::$options[$optionId]->advance = ['multi' => true];
             Options::$options[$optionId]->save();
-          }
+            }
         }
         if ($opt['Значение'] && isset(\App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']])) {
-          $options[$optionId][] = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']]->object_id;
+            $options[$optionId][] = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']]->object_id;
         }
-      } else {
+        } else {
         $options[$optionId] = $opt['Значение'];
-      }
+        }
     }
     $itemParams = \Ecommerce\Item\Param::getList(['where' => ['item_id', $this->model->id]]);
     foreach ($itemParams as $itemParam) {
-      if ($itemParam->item_option_id && !isset(Options::$options[$itemParam->item_option_id])) {
+        if ($itemParam->item_option_id && !isset(Options::$options[$itemParam->item_option_id])) {
         Options::$options = \Ecommerce\Item\Option::getList();
-      }
-      if (isset(Options::$options[$itemParam->item_option_id]) && Options::$options[$itemParam->item_option_id]->type == 'select') {
+        }
+        if (isset(Options::$options[$itemParam->item_option_id]) && Options::$options[$itemParam->item_option_id]->type == 'select') {
         if (empty($options[$itemParam->item_option_id]) || !in_array($itemParam->value, $options[$itemParam->item_option_id])) {
-          $itemParam->delete();
+            $itemParam->delete();
         } else {
-          unset($options[$itemParam->item_option_id][array_search($itemParam->value, $options[$itemParam->item_option_id])]);
+            unset($options[$itemParam->item_option_id][array_search($itemParam->value, $options[$itemParam->item_option_id])]);
         }
-      } else {
+        } else {
         if (empty($options[$itemParam->item_option_id])) {
-          $itemParam->delete();
+            $itemParam->delete();
         } else {
-          $itemParam->value = $options[$itemParam->item_option_id];
-          $itemParam->save();
-          unset($options[$itemParam->item_option_id]);
+            $itemParam->value = $options[$itemParam->item_option_id];
+            $itemParam->save();
+            unset($options[$itemParam->item_option_id]);
+        }
         }
-      }
     }
     foreach ($options as $optionId => $values) {
-      if (is_array($values)) {
+        if (is_array($values)) {
         foreach ($values as $value) {
-          $itemParam = new \Ecommerce\Item\Param([
-              'item_option_id' => $optionId,
-              'item_id' => $this->model->id,
-              'value' => $value
-          ]);
-          $itemParam->save();
+            $itemParam = new \Ecommerce\Item\Param([
+                'item_option_id' => $optionId,
+                'item_id' => $this->model->id,
+                'value' => $value
+            ]);
+            $itemParam->save();
         }
-      } else {
+        } else {
         $itemParam = new \Ecommerce\Item\Param([
             'item_option_id' => $optionId,
             'item_id' => $this->model->id,
             'value' => $values
         ]);
         $itemParam->save();
-      }
+        }
+    }
     }
-  }
 
 }

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

Spacing +6 added lines, -6 removed lines

@@ -13,11 +13,11 @@ 
 
 class Mysql extends \Object {
 
-  public $config = [];       // настройки подключения выбраной базы
-  public $connect = FALSE;        // ярлык соединения с MySQL
-  public $encoding = 'utf-8';        // установленная кодировка
-  public $db_name = 'test';         // выбраная в данный момент база
-  public $table_prefix = 'inji_';   // префикс названий таблиц
+  public $config = []; // настройки подключения выбраной базы
+  public $connect = FALSE; // ярлык соединения с MySQL
+  public $encoding = 'utf-8'; // установленная кодировка
+  public $db_name = 'test'; // выбраная в данный момент база
+  public $table_prefix = 'inji_'; // префикс названий таблиц
   public $pdo = NULL;
   public $lastQuery = '';
   public $last_error = '';
@@ -71,7 +71,7 @@ 
     $this->table_prefix = '';
 
     $query->where('TABLE_SCHEMA', $old_db);
-    $query->where('TABLE_NAME', $old_prefix . $table_name);
+    $query->where('TABLE_NAME', $old_prefix.$table_name);
     $result = $query->select('COLUMNS');
     $this->db_name = $old_db;
     $this->table_prefix = $old_prefix;

Braces +12 added lines, -8 removed lines

@@ -29,14 +29,18 @@
    */
   public function init($connect_options) {
     extract($connect_options);
-    if (isset($db_name))
-      $this->db_name = $db_name;
-    if (isset($encoding))
-      $this->encoding = $encoding;
-    if (isset($table_prefix))
-      $this->table_prefix = $table_prefix;
-    if (isset($noConnectAbort))
-      $this->noConnectAbort = $noConnectAbort;
+    if (isset($db_name)) {
+          $this->db_name = $db_name;
+    }
+    if (isset($encoding)) {
+          $this->encoding = $encoding;
+    }
+    if (isset($table_prefix)) {
+          $this->table_prefix = $table_prefix;
+    }
+    if (isset($noConnectAbort)) {
+          $this->noConnectAbort = $noConnectAbort;
+    }
 
     $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
     $dt = new \DateTime();

Indentation +40 added lines, -40 removed lines

@@ -13,30 +13,30 @@ 
 
 class Mysql extends \Object {
 
-  public $config = [];       // настройки подключения выбраной базы
-  public $connect = FALSE;        // ярлык соединения с MySQL
-  public $encoding = 'utf-8';        // установленная кодировка
-  public $db_name = 'test';         // выбраная в данный момент база
-  public $table_prefix = 'inji_';   // префикс названий таблиц
-  public $pdo = NULL;
-  public $lastQuery = '';
-  public $last_error = '';
-  public $noConnectAbort = false;
-  public $dbInstance = null;
+    public $config = [];       // настройки подключения выбраной базы
+    public $connect = FALSE;        // ярлык соединения с MySQL
+    public $encoding = 'utf-8';        // установленная кодировка
+    public $db_name = 'test';         // выбраная в данный момент база
+    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $pdo = NULL;
+    public $lastQuery = '';
+    public $last_error = '';
+    public $noConnectAbort = false;
+    public $dbInstance = null;
 
-  /**
-   * Подключение к MySQL
-   */
-  public function init($connect_options) {
+    /**
+     * Подключение к MySQL
+     */
+    public function init($connect_options) {
     extract($connect_options);
     if (isset($db_name))
-      $this->db_name = $db_name;
+        $this->db_name = $db_name;
     if (isset($encoding))
-      $this->encoding = $encoding;
+        $this->encoding = $encoding;
     if (isset($table_prefix))
-      $this->table_prefix = $table_prefix;
+        $this->table_prefix = $table_prefix;
     if (isset($noConnectAbort))
-      $this->noConnectAbort = $noConnectAbort;
+        $this->noConnectAbort = $noConnectAbort;
 
     $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
     $dt = new \DateTime();
@@ -50,21 +50,21 @@ 
     $this->pdo = new \PDO($dsn, $user, $pass, $opt);
     $error = $this->pdo->errorInfo();
     if ((int) $error[0]) {
-      if ($this->noConnectAbort) {
+        if ($this->noConnectAbort) {
         return false;
-      } else {
+        } else {
         INJI_SYSTEM_ERROR($error[2], true);
-      }
+        }
     } else {
-      $this->connect = true;
-      $query = new Mysql\Query($this);
-      $query->query("SET SQL_BIG_SELECTS=1");
-      $query->query("SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION'");
-      return true;
+        $this->connect = true;
+        $query = new Mysql\Query($this);
+        $query->query("SET SQL_BIG_SELECTS=1");
+        $query->query("SET SESSION sql_mode = 'NO_ENGINE_SUBSTITUTION'");
+        return true;
+    }
     }
-  }
 
-  public function getTableCols($table_name) {
+    public function getTableCols($table_name) {
     $query = new Mysql\Query($this);
     $old_db = $this->db_name;
     $old_prefix = $this->table_prefix;
@@ -77,35 +77,35 @@ 
     $this->db_name = $old_db;
     $this->table_prefix = $old_prefix;
     return $result->getArray('COLUMN_NAME');
-  }
+    }
 
-  public function tableExist($tableName) {
+    public function tableExist($tableName) {
     $query = new Mysql\Query($this);
     return (bool) $query->query("SHOW TABLES FROM `{$this->db_name}` LIKE '{$this->table_prefix}{$tableName}'")->getArray();
-  }
+    }
 
-  public function addCol($table = false, $name = false, $param = 'TEXT NOT NULL') {
+    public function addCol($table = false, $name = false, $param = 'TEXT NOT NULL') {
     if (!$table || !$name) {
-      return false;
+        return false;
     }
     if ($param == 'pk') {
-      $param = "int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$name}`)";
+        $param = "int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`{$name}`)";
     }
     $query = new Mysql\Query($this);
     return $query->query("ALTER TABLE `{$this->db_name}`.`{$this->table_prefix}{$table}` ADD `{$name}` {$param}");
-  }
+    }
 
-  public function delCol($table = false, $name = false) {
+    public function delCol($table = false, $name = false) {
     if (!$table || !$name) {
-      return false;
+        return false;
     }
     $query = new Mysql\Query($this);
     return $query->query("ALTER TABLE `{$this->db_name}`.`{$this->table_prefix}{$table}` DROP `{$name}`");
-  }
+    }
 
-  public function getTables() {
+    public function getTables() {
     $query = new Mysql\Query($this);
     return $query->query("SHOW TABLES")->getArray();
-  }
+    }
 
 }

system/modules/Migrations/Migrations.php

Indentation +27 added lines, -27 removed lines

@@ -12,10 +12,10 @@ 
  */
 class Migrations extends \Module {
 
-  public $ids = [];
-  public $migrationObjects = [];
+    public $ids = [];
+    public $migrationObjects = [];
 
-  public function startMigration($migrationId, $mapId, $filePath) {
+    public function startMigration($migrationId, $mapId, $filePath) {
     $log = new \Migrations\Log();
     $log->migration_id = $migrationId;
     $log->migration_map_id = $mapId;
@@ -24,11 +24,11 @@ 
 
     $reader = new Migrations\Reader\Xml();
     if (!$reader->loadData($filePath)) {
-      $event = new Migrations\Log\Event();
-      $event->log_id = $log->id;
-      $event->type = 'load_data_error';
-      $event->save();
-      return false;
+        $event = new Migrations\Log\Event();
+        $event->log_id = $log->id;
+        $event->type = 'load_data_error';
+        $event->save();
+        return false;
     }
     $walker = new \Migrations\Walker();
     $walker->migration = Migrations\Migration::get($migrationId);
@@ -38,43 +38,43 @@ 
     $walker->walk();
     $log->result = 'success';
     $log->save();
-  }
+    }
 
-  public function loadParseIds($type) {
+    public function loadParseIds($type) {
     $this->ids['parseIds'][$type] = \Migrations\Id::getList(['where' => ['type', $type], 'key' => 'parse_id']);
-  }
+    }
 
-  public function loadObjectIds($type) {
+    public function loadObjectIds($type) {
     $this->ids['objectIds'][$type] = \Migrations\Id::getList(['where' => ['type', $type], 'key' => 'object_id']);
-  }
+    }
 
-  public function findObject($parseId, $type) {
+    public function findObject($parseId, $type) {
     if (empty($this->ids['parseIds'][$type])) {
-      $this->loadParseIds($type);
-      ksort($this->ids['parseIds'][$type]);
+        $this->loadParseIds($type);
+        ksort($this->ids['parseIds'][$type]);
     }
     if (!empty($this->ids['parseIds'][$type][$parseId])) {
-      return $this->ids['parseIds'][$type][$parseId];
+        return $this->ids['parseIds'][$type][$parseId];
+    }
     }
-  }
 
-  public function findParse($objectId, $type) {
+    public function findParse($objectId, $type) {
     if (empty($this->ids['objectIds'][$type])) {
-      $this->loadObjectIds($type);
-      ksort($this->ids['objectIds'][$type]);
+        $this->loadObjectIds($type);
+        ksort($this->ids['objectIds'][$type]);
     }
     if (!empty($this->ids['objectIds'][$type][$objectId])) {
-      return $this->ids['objectIds'][$type][$objectId];
+        return $this->ids['objectIds'][$type][$objectId];
+    }
     }
-  }
 
-  public function getMigrationObject($objectId) {
+    public function getMigrationObject($objectId) {
     if (empty($this->migrationObjects)) {
-      $this->migrationObjects = \Migrations\Migration\Object::getList();
+        $this->migrationObjects = \Migrations\Migration\Object::getList();
     }
     if (!empty($this->migrationObjects[$objectId])) {
-      return $this->migrationObjects[$objectId];
+        return $this->migrationObjects[$objectId];
+    }
     }
-  }
 
 }

system/modules/Ui/objects/DataManager.php

Doc Comments +3 added lines

@@ -396,6 +396,9 @@
     return $rows;
   }
 
+  /**
+   * @param DataManager $dataManager
+   */
   public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) {
     $modelName = get_class($item);
     if (!class_exists($modelName)) {

Indentation +301 added lines, -301 removed lines

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

Spacing +32 added lines, -32 removed lines

@@ -57,7 +57,7 @@ 
       $this->name = $this->managerOptions['name'];
     }
 
-    $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
+    $this->managerId = str_replace('\\', '_', 'dataManager_'.$this->modelName.'_'.$this->managerName.'_'.\Tools::randomString());
   }
 
   /**
@@ -103,7 +103,7 @@ 
     if (!empty($this->managerOptions['filters'])) {
       $buttons[] = [
           'text' => 'Фильтры',
-          'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+          'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
       ];
     }
@@ -111,7 +111,7 @@ 
       $formParams['formName'] = 'simpleItem';
       $buttons[] = [
           'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
       ];
     }
     $formParams['formName'] = !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager';
@@ -121,8 +121,8 @@ 
     }
     if (!empty($modelName::$forms[$formParams['formName']])) {
       $buttons[] = [
-          'text' => 'Создать ' . $name,
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+          'text' => 'Создать '.$name,
+          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
       ];
     }
 
@@ -152,7 +152,7 @@ 
             'className' => $action
         ];
       }
-      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\'.$return[$key]['className']) ? 'Ui\DataManager\Action\\'.$return[$key]['className'] : $return[$key]['className'];
       if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
         unset($return[$key]);
       }
@@ -183,7 +183,7 @@ 
           <?php
           foreach ($actions as $action => $actionParams) {
             if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"".str_replace('\\', '\\\\', $action)."\");return false;'>{$actionParams['className']::$name}</a></li>";
             }
           }
           ?>
@@ -233,7 +233,7 @@ 
       return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     $modelName = $this->modelName;
@@ -249,7 +249,7 @@ 
       $queryParams['start'] = $this->page * $this->limit - $this->limit;
     }
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+      $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
     }
     if (!empty($params['appType'])) {
       $queryParams['appType'] = $params['appType'];
@@ -308,7 +308,7 @@ 
             if (!empty($params['filters'][$col]['max'])) {
               if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                $date = $params['filters'][$col]['max'].' 23:59:59';
               } else {
                 $date = $params['filters'][$col]['max'];
               }
@@ -335,16 +335,16 @@ 
             }
             switch ($params['filters'][$col]['compareType']) {
               case 'contains':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
               case 'starts_with':
-                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'ends_with':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
@@ -383,7 +383,7 @@ 
         $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
       }
       $row = [];
-      $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+      $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
       $row[] = $item->pk();
       foreach ($this->managerOptions['cols'] as $key => $colName) {
         if (!empty($params['download'])) {
@@ -428,16 +428,16 @@ 
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
           $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
           $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
         case 'many':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
           $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
           $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
         default :
           if ($item->{$modelName::$cols[$colName]['relation']}) {
             if (\App::$cur->name == 'admin') {
-              $href = "<a href ='/admin/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
+              $href = "<a href ='/admin/".str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model'])."/".$item->{$modelName::$cols[$colName]['relation']}->pk()."'>";
               if (!empty($modelName::$cols[$colName]['showCol'])) {
                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
               } else {
@@ -467,18 +467,18 @@ 
           case 'many':
             $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
             $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count} ".\Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов'])."</a>";
           default:
             return $item->$colName;
         }
       } elseif (!empty($modelName::$cols[$colName]['type'])) {
-        if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+        if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
           $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
-          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-          return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+          return "<a href ='/admin/".str_replace('\\', '/view/', get_class($originalItem))."/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
         } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
-          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-          return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+          return "<a href ='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
         } else {
           return \Model::resloveTypeValue($item, $colName);
         }
@@ -511,7 +511,7 @@ 
       return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     if (!empty($params['limit'])) {
@@ -525,7 +525,7 @@ 
     ];
     $modelName = $this->modelName;
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+      $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
       foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
@@ -579,7 +579,7 @@ 
             if (!empty($params['filters'][$col]['max'])) {
               if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                $date = $params['filters'][$col]['max'].' 23:59:59';
               } else {
                 $date = $params['filters'][$col]['max'];
               }
@@ -606,16 +606,16 @@ 
             }
             switch ($params['filters'][$col]['compareType']) {
               case 'contains':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
               case 'starts_with':
-                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                 break;
               case 'ends_with':
-                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
@@ -648,7 +648,7 @@ 
       $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
     }
     $tableCols[] = '';
-    $this->table->class .=' datamanagertable';
+    $this->table->class .= ' datamanagertable';
     $this->table->setCols($tableCols);
   }
 
@@ -669,12 +669,12 @@ 
       return false;
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+      $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
       return [];
     }
     $tree = new Tree();
     $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-      $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+      $path = $category->tree_path.($category->pk() ? $category->pk()."/" : '');
       $cleanClassName = str_replace('\\', '\\\\', get_class($category));
       return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a>