injitools / cms-Inji

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 +311 added lines, -311 removed lines

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

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

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

Indentation +22 added lines, -22 removed lines

@@ -4,36 +4,36 @@ 
 $optionsHtml = '';
 
 foreach ($options['values'] as $key => $value) {
-  $selected = '';
+    $selected = '';
 
-  $primaryValue = isset($options['value']) ? $options['value'] : null;
-  $primaryValue = is_array($primaryValue) && isset($primaryValue['primary']) ? $primaryValue['primary'] : $primaryValue;
-  if (is_numeric($key) && !is_array($primaryValue) && $primaryValue !== '') {
+    $primaryValue = isset($options['value']) ? $options['value'] : null;
+    $primaryValue = is_array($primaryValue) && isset($primaryValue['primary']) ? $primaryValue['primary'] : $primaryValue;
+    if (is_numeric($key) && !is_array($primaryValue) && $primaryValue !== '') {
     $primaryValue = (int) $primaryValue;
-  }
-  if (
-          (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) ||
+    }
+    if (
+            (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) ||
           (is_array($primaryValue) && (in_array($key, $primaryValue) || (isset($form->userDataTree[$name]) && in_array($key, $form->userDataTree[$name]))))
-  ) {
+    ) {
     $selected = ' selected="selected"';
-  }
-  if (is_array($value)) {
+    }
+    if (is_array($value)) {
     $aditionalInputs[] = $value['input'];
     if ($selected) {
-      $showedInput = count($aditionalInputs) - 1;
-      $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
+        $showedInput = count($aditionalInputs) - 1;
+        $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
     }
     $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
-  } else {
+    } else {
     $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
-  }
+    }
 }
 ?>
 <?= empty($options['noContainer']) ? '<div class="form-group">' : ''; ?>
 <?= $label !== false ? "<label>{$label}" : ''; ?>
 <?php
 if ($label !== false && !empty($options['createBtn'])) {
-  echo ' (<a href="" onclick="' . $options['createBtn']['onclick'] . ';this.disabled=true;return false;">' . $options['createBtn']['text'] . '</a>)';
+    echo ' (<a href="" onclick="' . $options['createBtn']['onclick'] . ';this.disabled=true;return false;">' . $options['createBtn']['text'] . '</a>)';
 }
 ?>
 <?= $label !== false ? "</label>" : ''; ?>
@@ -42,18 +42,18 @@ 
 </select>
 <?php
 foreach ($aditionalInputs as $key => $input) {
-  $input['options']['noContainer'] = true;
+    $input['options']['noContainer'] = true;
 
-  if ($key !== $showedInput) {
+    if ($key !== $showedInput) {
     $input['options']['disabled'] = true;
     $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
-  } else {
+    } else {
     $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
-  }
-  if ($input['type'] == 'select') {
+    }
+    if ($input['type'] == 'select') {
     $input['options']['values'] = \Ui\ActiveForm::getOptionsList($input);
-  }
-  $form->input($input['type'], empty($input['name']) ? $name . '[aditional]' : $input['name'], false, $input['options']);
+    }
+    $form->input($input['type'], empty($input['name']) ? $name . '[aditional]' : $input['name'], false, $input['options']);
 }
 ?>
 <?= empty($options['noContainer']) ? '</div>' : ''; ?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
       $showedInput = count($aditionalInputs) - 1;
       $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
     }
-    $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
+    $optionsHtml .= "<option data-aditionalInput='".(count($aditionalInputs) - 1)."' value ='{$key}'{$selected}>{$value['text']}</option>";
   } else {
     $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
   }
@@ -33,7 +33,7 @@ 
 <?= $label !== false ? "<label>{$label}" : ''; ?>
 <?php
 if ($label !== false && !empty($options['createBtn'])) {
-  echo ' (<a href="" onclick="' . $options['createBtn']['onclick'] . ';this.disabled=true;return false;">' . $options['createBtn']['text'] . '</a>)';
+  echo ' (<a href="" onclick="'.$options['createBtn']['onclick'].';this.disabled=true;return false;">'.$options['createBtn']['text'].'</a>)';
 }
 ?>
 <?= $label !== false ? "</label>" : ''; ?>
@@ -46,14 +46,14 @@ 
 
   if ($key !== $showedInput) {
     $input['options']['disabled'] = true;
-    $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
+    $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'].' hidden' : 'hidden';
   } else {
     $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
   }
   if ($input['type'] == 'select') {
     $input['options']['values'] = \Ui\ActiveForm::getOptionsList($input);
   }
-  $form->input($input['type'], empty($input['name']) ? $name . '[aditional]' : $input['name'], false, $input['options']);
+  $form->input($input['type'], empty($input['name']) ? $name.'[aditional]' : $input['name'], false, $input['options']);
 }
 ?>
 <?= empty($options['noContainer']) ? '</div>' : ''; ?>
\ No newline at end of file

system/modules/Ui/objects/ActiveForm.php

Spacing +9 added lines, -9 removed lines

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

Indentation +156 added lines, -156 removed lines

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

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

Indentation +44 added lines, -44 removed lines

@@ -13,15 +13,15 @@ 
 
 class Input extends \Object {
 
-  public $form = null;
-  public $activeForm = null;
-  public $activeFormParams = [];
-  public $modelName = '';
-  public $colName = '';
-  public $colParams = [];
-  public $options = [];
+    public $form = null;
+    public $activeForm = null;
+    public $activeFormParams = [];
+    public $modelName = '';
+    public $colName = '';
+    public $colParams = [];
+    public $options = [];
 
-  public function draw() {
+    public function draw() {
     $inputName = $this->colName();
     $inputLabel = $this->colLabel();
 
@@ -31,78 +31,78 @@ 
 
     $preset = $this->preset();
     if ($preset !== null) {
-      $inputOptions['disabled'] = true;
-      $this->form->input('hidden', $inputName, '', $inputOptions);
-      return true;
+        $inputOptions['disabled'] = true;
+        $this->form->input('hidden', $inputName, '', $inputOptions);
+        return true;
     }
     $classPath = explode('\\', get_called_class());
     $inputType = lcfirst(array_pop($classPath));
     $this->form->input($inputType, $inputName, $inputLabel, $inputOptions);
     return true;
-  }
+    }
 
-  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} = $request[$this->colName];
+        $this->activeForm->model->{$colName} = $request[$this->colName];
     } else {
-      $this->activeForm->model->{$colName} = 0;
-      $this->activeForm->model->{$colName} = '';
+        $this->activeForm->model->{$colName} = 0;
+        $this->activeForm->model->{$colName} = '';
+    }
     }
-  }
 
-  public function value() {
+    public function value() {
     $value = isset($this->colParams['default']) ? $this->colParams['default'] : '';
     if ($this->activeForm) {
-      $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
-      $value = ($this->activeForm && $this->activeForm->model && isset($this->activeForm->model->{$colName})) ? $this->activeForm->model->{$colName} : $value;
+        $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
+        $value = ($this->activeForm && $this->activeForm->model && isset($this->activeForm->model->{$colName})) ? $this->activeForm->model->{$colName} : $value;
     }
     return $value;
-  }
+    }
 
-  public function preset() {
+    public function preset() {
     $preset = !empty($this->activeForm->form['preset'][$this->colName]) ? $this->activeForm->form['preset'][$this->colName] : [];
     if (!empty($this->activeForm->form['userGroupPreset'][\Users\User::$cur->group_id][$this->colName])) {
-      $preset = array_merge($preset, $this->activeForm->form['userGroupPreset'][\Users\User::$cur->group_id][$this->colName]);
+        $preset = array_merge($preset, $this->activeForm->form['userGroupPreset'][\Users\User::$cur->group_id][$this->colName]);
     }
     if ($preset) {
-      $value = '';
-      if (!empty($preset['value'])) {
+        $value = '';
+        if (!empty($preset['value'])) {
         $value = $preset['value'];
-      } elseif (!empty($preset['userCol'])) {
+        } elseif (!empty($preset['userCol'])) {
         if (strpos($preset['userCol'], ':')) {
-          $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
-          $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
-          $value = \Users\User::$cur->$rel->$param;
+            $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
+            $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
+            $value = \Users\User::$cur->$rel->$param;
         }
-      }
-      return $value;
+        }
+        return $value;
     }
     return null;
-  }
+    }
 
-  public function colName() {
+    public function colName() {
     return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}]".(stristr($this->colName, '[')?$this->colName:"[{$this->colName}]");
-  }
+    }
 
-  public function colLabel() {
+    public function colLabel() {
     $modelName = $this->modelName;
     return isset($this->colParams['label']) ? $this->colParams['label'] : (($this->activeForm->model && !empty($modelName::$labels[$this->colName])) ? $modelName::$labels[$this->colName] : $this->colName);
-  }
+    }
 
-  public function readOnly() {
+    public function readOnly() {
     return !empty($this->activeForm->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($this->colName, $this->activeForm->form['userGroupReadonly'][\Users\User::$cur->group_id]);
-  }
+    }
 
-  public function validate(&$request) {
+    public function validate(&$request) {
     if (empty($request[$this->colName]) && !empty($this->colParams['required'])) {
-      throw new \Exception('Вы не заполнили: ' . $this->colLabel());
+        throw new \Exception('Вы не заполнили: ' . $this->colLabel());
     }
     if (!empty($this->colParams['validator'])) {
-      $modelName = $this->modelName;
-      $validator = $modelName::validator($this->colParams['validator']);
-      $validator($this->activeForm, $request);
+        $modelName = $this->modelName;
+        $validator = $modelName::validator($this->colParams['validator']);
+        $validator($this->activeForm, $request);
+    }
     }
-  }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
   }
 
   public function colName() {
-    return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}]" . (stristr($this->colName, '[') ? $this->colName : "[{$this->colName}]");
+    return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}]".(stristr($this->colName, '[') ? $this->colName : "[{$this->colName}]");
   }
 
   public function colLabel() {
@@ -97,7 +97,7 @@ 
 
   public function validate(&$request) {
     if (empty($request[$this->colName]) && !empty($this->colParams['required'])) {
-      throw new \Exception('Вы не заполнили: ' . $this->colLabel());
+      throw new \Exception('Вы не заполнили: '.$this->colLabel());
     }
     if (!empty($this->colParams['validator'])) {
       $modelName = $this->modelName;

system/modules/Ecommerce/appAdminControllers/EcommerceController.php

Indentation +36 added lines, -36 removed lines

@@ -10,28 +10,28 @@ 
  */
 class EcommerceController extends adminController {
 
-  public function dashboardAction() {
+    public function dashboardAction() {
     $this->view->setTitle('Онлайн магазин');
     $forms = \Ecommerce\Item::$magicForms;
     \Ecommerce\Item::$forms['simpleItem']['handler']();
     $this->view->page();
-  }
+    }
 
-  public function configureAction() {
+    public function configureAction() {
     if (!empty($_POST['config'])) {
-      $config = App::$cur->ecommerce->config;
-      $config['view_empty_warehouse'] = empty($_POST['config']['view_empty_warehouse']) ? false : true;
-      $config['view_empty_image'] = empty($_POST['config']['view_empty_image']) ? false : true;
-      $config['sell_empty_warehouse'] = empty($_POST['config']['sell_empty_warehouse']) ? false : true;
-      $config['sell_over_warehouse'] = empty($_POST['config']['sell_over_warehouse']) ? false : true;
-      $config['notify_mail'] = $_POST['config']['notify_mail'];
-      $config['defaultCategoryView'] = $_POST['config']['defaultCategoryView'];
-      $config['defaultCurrency'] = $_POST['config']['defaultCurrency'];
-      $config['orderPrefix'] = $_POST['config']['orderPrefix'];
-      $config['show_zero_price'] = empty($_POST['config']['show_zero_price']) ? false : true;
-      $config['show_without_price'] = empty($_POST['config']['show_without_price']) ? false : true;
-      Config::save('module', $config, 'Ecommerce');
-      Tools::redirect('/admin/ecommerce/configure', 'Настройки были изменены', 'success');
+        $config = App::$cur->ecommerce->config;
+        $config['view_empty_warehouse'] = empty($_POST['config']['view_empty_warehouse']) ? false : true;
+        $config['view_empty_image'] = empty($_POST['config']['view_empty_image']) ? false : true;
+        $config['sell_empty_warehouse'] = empty($_POST['config']['sell_empty_warehouse']) ? false : true;
+        $config['sell_over_warehouse'] = empty($_POST['config']['sell_over_warehouse']) ? false : true;
+        $config['notify_mail'] = $_POST['config']['notify_mail'];
+        $config['defaultCategoryView'] = $_POST['config']['defaultCategoryView'];
+        $config['defaultCurrency'] = $_POST['config']['defaultCurrency'];
+        $config['orderPrefix'] = $_POST['config']['orderPrefix'];
+        $config['show_zero_price'] = empty($_POST['config']['show_zero_price']) ? false : true;
+        $config['show_without_price'] = empty($_POST['config']['show_without_price']) ? false : true;
+        Config::save('module', $config, 'Ecommerce');
+        Tools::redirect('/admin/ecommerce/configure', 'Настройки были изменены', 'success');
     }
     $managers = [
         'Ecommerce\Delivery',
@@ -51,51 +51,51 @@ 
     ];
     $this->view->setTitle('Настройки магазина');
     $this->view->page(['data' => compact('managers')]);
-  }
+    }
 
-  public function reBlockIndexAction() {
+    public function reBlockIndexAction() {
     set_time_limit(0);
     $carts = Cart::getList();
     foreach ($carts as $cart) {
-      $cart->save();
+        $cart->save();
     }
     Tools::redirect('/admin/ecommerce/configure', 'Данные о блокировках обновлены');
-  }
+    }
 
-  public function reSearchIndexAction($i = 0) {
+    public function reSearchIndexAction($i = 0) {
     set_time_limit(0);
     $count = 100;
     $items = Ecommerce\Item::getList(['start' => $i * $count, 'limit' => $count]);
     if (!$items) {
-      Tools::redirect('/admin/ecommerce/configure', 'Поисковый индекс обновлен');
+        Tools::redirect('/admin/ecommerce/configure', 'Поисковый индекс обновлен');
     } else {
-      $i++;
-      foreach ($items as $key => $item) {
+        $i++;
+        foreach ($items as $key => $item) {
         $item->save();
         unset($items[$key]);
         unset($item);
-      }
-      echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
-      Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+        }
+        echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
+        Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+    }
     }
-  }
 
-  public function newOrdersSubscribeAction() {
+    public function newOrdersSubscribeAction() {
     $this->Notifications->subscribe('Ecommerce-orders');
-  }
+    }
 
-  public function closeCartAction($cartId = 0) {
+    public function closeCartAction($cartId = 0) {
     $cart = Ecommerce\Cart::get((int) $cartId);
     $result = new Server\Result();
     if ($cart && $cart->cart_status_id != 5) {
-      $cart->cart_status_id = 5;
-      $cart->save();
-      $result->successMsg = 'Заказ был завершен';
-      $result->send();
+        $cart->cart_status_id = 5;
+        $cart->save();
+        $result->successMsg = 'Заказ был завершен';
+        $result->send();
     }
     $result->success = false;
     $result->content = 'Такая корзина не найдена';
     $result->send();
-  }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -75,8 +75,8 @@
         unset($items[$key]);
         unset($item);
       }
-      echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
-      Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+      echo 'Происходит процесс индексации: проиндексировано '.$i * $count;
+      Tools::redirect('/admin/ecommerce/reSearchIndex/'.$i);
     }
   }
 

system/modules/Ecommerce/models/Item.php

Indentation +202 added lines, -202 removed lines

@@ -13,57 +13,57 @@ 
 
 class Item extends \Model {
 
-  public static $categoryModel = 'Ecommerce\Category';
-  public static $objectName = 'Товар';
-  public static $labels = [
-      'name' => 'Название',
-      'alias' => 'Алиас',
-      'category_id' => 'Раздел',
-      'description' => 'Описание',
-      'item_type_id' => 'Тип товара',
-      'image_file_id' => 'Изображение',
-      'best' => 'Лучшее предложение',
-      'options' => 'Параметры',
-      'offers' => 'Торговые предложения',
-      'widget' => 'Виджет для отображения в каталоге',
-      'view' => 'Шаблон для отображения полной информации',
-      'deleted' => 'Удален',
-      'imgs' => 'Фото'
-  ];
-  public static $cols = [
-      //Основные параметры
-      'category_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'category'],
-      'image_file_id' => ['type' => 'image'],
-      'name' => ['type' => 'text'],
-      'alias' => ['type' => 'text'],
-      'description' => ['type' => 'html'],
-      'item_type_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'type'],
-      'best' => ['type' => 'bool'],
-      'deleted' => ['type' => 'bool'],
-      //Системные
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'weight' => ['type' => 'number'],
-      'sales' => ['type' => 'number'],
-      'imported' => ['type' => 'text'],
-      'tree_path' => ['type' => 'text'],
-      'search_index' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-      'widget' => ['type' => 'text'],
-      'view' => ['type' => 'text'],
-      //Менеджеры
-      'options' => ['type' => 'dataManager', 'relation' => 'options'],
-      'offers' => ['type' => 'dataManager', 'relation' => 'offers'],
-      'imgs' => ['type' => 'dataManager', 'relation' => 'images'],
-  ];
+    public static $categoryModel = 'Ecommerce\Category';
+    public static $objectName = 'Товар';
+    public static $labels = [
+        'name' => 'Название',
+        'alias' => 'Алиас',
+        'category_id' => 'Раздел',
+        'description' => 'Описание',
+        'item_type_id' => 'Тип товара',
+        'image_file_id' => 'Изображение',
+        'best' => 'Лучшее предложение',
+        'options' => 'Параметры',
+        'offers' => 'Торговые предложения',
+        'widget' => 'Виджет для отображения в каталоге',
+        'view' => 'Шаблон для отображения полной информации',
+        'deleted' => 'Удален',
+        'imgs' => 'Фото'
+    ];
+    public static $cols = [
+        //Основные параметры
+        'category_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'category'],
+        'image_file_id' => ['type' => 'image'],
+        'name' => ['type' => 'text'],
+        'alias' => ['type' => 'text'],
+        'description' => ['type' => 'html'],
+        'item_type_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'type'],
+        'best' => ['type' => 'bool'],
+        'deleted' => ['type' => 'bool'],
+        //Системные
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'weight' => ['type' => 'number'],
+        'sales' => ['type' => 'number'],
+        'imported' => ['type' => 'text'],
+        'tree_path' => ['type' => 'text'],
+        'search_index' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+        'widget' => ['type' => 'text'],
+        'view' => ['type' => 'text'],
+        //Менеджеры
+        'options' => ['type' => 'dataManager', 'relation' => 'options'],
+        'offers' => ['type' => 'dataManager', 'relation' => 'offers'],
+        'imgs' => ['type' => 'dataManager', 'relation' => 'images'],
+    ];
 
-  public static function simpleItemHandler($request) {
+    public static function simpleItemHandler($request) {
     if ($request) {
-      $item = new Item();
-      $item->name = $request['name'];
-      $item->description = $request['description'];
-      $item->category_id = $request['category'];
-      $item->save();
-      if (!empty($_FILES['ActiveForm_simpleItem']['tmp_name']['Ecommerce\Item']['image'])) {
+        $item = new Item();
+        $item->name = $request['name'];
+        $item->description = $request['description'];
+        $item->category_id = $request['category'];
+        $item->save();
+        if (!empty($_FILES['ActiveForm_simpleItem']['tmp_name']['Ecommerce\Item']['image'])) {
         $file_id = \App::$primary->files->upload([
             'tmp_name' => $_FILES['ActiveForm_simpleItem']['tmp_name']['Ecommerce\Item']['image'],
             'name' => $_FILES['ActiveForm_simpleItem']['name']['Ecommerce\Item']['image'],
@@ -75,131 +75,131 @@ 
             'accept_group' => 'image'
         ]);
         if ($file_id) {
-          $item->image_file_id = $file_id;
-          $item->save();
+            $item->image_file_id = $file_id;
+            $item->save();
+        }
         }
-      }
-      if (!empty($request['options']['option'])) {
+        if (!empty($request['options']['option'])) {
         foreach ($request['options']['option'] as $key => $option_id) {
-          $param = new Item\Param();
-          $param->item_id = $item->id;
-          $param->value = $request['options']['value'][$key];
-          $param->item_option_id = $option_id;
-          $param->save();
+            $param = new Item\Param();
+            $param->item_id = $item->id;
+            $param->value = $request['options']['value'][$key];
+            $param->item_option_id = $option_id;
+            $param->save();
         }
-      }
-      $offer = new Item\Offer();
-      $offer->item_id = $item->id;
-      $offer->save();
-      if (!empty($request['offerOptions']['option'])) {
+        }
+        $offer = new Item\Offer();
+        $offer->item_id = $item->id;
+        $offer->save();
+        if (!empty($request['offerOptions']['option'])) {
         foreach ($request['offerOptions']['option'] as $key => $option_id) {
-          $param = new Item\Offer\Param();
-          $param->item_offer_id = $offer->id;
-          $param->value = $request['offerOptions']['value'][$key];
-          $param->item_offer_option_id = $option_id;
-          $param->save();
+            $param = new Item\Offer\Param();
+            $param->item_offer_id = $offer->id;
+            $param->value = $request['offerOptions']['value'][$key];
+            $param->item_offer_option_id = $option_id;
+            $param->save();
+        }
         }
-      }
-      $price = new Item\Offer\Price();
-      $price->price = $request['price'];
-      $price->item_offer_id = $offer->id;
-      $price->currency_id = $request['currency'];
-      $price->save();
+        $price = new Item\Offer\Price();
+        $price->price = $request['price'];
+        $price->item_offer_id = $offer->id;
+        $price->currency_id = $request['currency'];
+        $price->save();
+    }
     }
-  }
 
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Товары',
-          'cols' => [
-              'name',
-              'imgs',
-              'category_id',
-              'item_type_id',
-              'best',
-              'deleted',
-              'options',
-              'offers',
-          ],
-          'categorys' => [
-              'model' => 'Ecommerce\Category',
-          ],
-          'sortMode' => true
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'alias'],
-              ['category_id', 'item_type_id', 'deleted'],
-              ['widget', 'view'],
-              ['best', 'image_file_id'],
-              ['description'],
-              ['imgs'],
-              ['options'],
-              ['offers'],
-          ]
-      ],
-      'simpleItem' => [
-          'options' => [
-              'access' => [
-                  'groups' => [
-                      3
-                  ]
-              ],
-          ],
-          'name' => 'Простой товар с ценой',
-          'inputs' => [
-              'name' => ['type' => 'text'],
-              'description' => ['type' => 'html'],
-              'category' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Category', 'label' => 'Категория'],
-              'image' => ['type' => 'image', 'label' => 'Изображение'],
-              'price' => ['type' => 'text', 'label' => 'Цена'],
-              'currency' => ['type' => 'select', 'source' => 'model', 'model' => 'Money\Currency', 'label' => 'Валюта'],
-              'options' => ['type' => 'dynamicList', 'source' => 'options', 'options' => [
-                      'inputs' => [
-                          'option' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Item\Option', 'label' => 'Свойство'],
-                          'value' => ['type' => 'dynamicType', 'typeSource' => 'selfMethod', 'selfMethod' => 'realType', 'label' => 'Значение'],
-                      ]
-                  ]
-              ],
-              'offerOptions' => ['type' => 'dynamicList', 'source' => 'options', 'options' => [
-                      'inputs' => [
-                          'option' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Item\Offer\Option', 'label' => 'Свойство предложения'],
-                          'value' => ['type' => 'dynamicType', 'typeSource' => 'selfMethod', 'selfMethod' => 'realType', 'label' => 'Значение'],
-                      ]
-                  ],'label'=>'Параметры предложения'
-              ]
-          ],
-          'map' => [
-              ['name', 'category'],
-              ['description'],
-              ['image'],
-              ['price', 'currency'],
-              ['options'],
-              ['offerOptions'],
-          ],
-          'handler' => 'simpleItemHandler'
-      ]
-  ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Товары',
+            'cols' => [
+                'name',
+                'imgs',
+                'category_id',
+                'item_type_id',
+                'best',
+                'deleted',
+                'options',
+                'offers',
+            ],
+            'categorys' => [
+                'model' => 'Ecommerce\Category',
+            ],
+            'sortMode' => true
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'alias'],
+                ['category_id', 'item_type_id', 'deleted'],
+                ['widget', 'view'],
+                ['best', 'image_file_id'],
+                ['description'],
+                ['imgs'],
+                ['options'],
+                ['offers'],
+            ]
+        ],
+        'simpleItem' => [
+            'options' => [
+                'access' => [
+                    'groups' => [
+                        3
+                    ]
+                ],
+            ],
+            'name' => 'Простой товар с ценой',
+            'inputs' => [
+                'name' => ['type' => 'text'],
+                'description' => ['type' => 'html'],
+                'category' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Category', 'label' => 'Категория'],
+                'image' => ['type' => 'image', 'label' => 'Изображение'],
+                'price' => ['type' => 'text', 'label' => 'Цена'],
+                'currency' => ['type' => 'select', 'source' => 'model', 'model' => 'Money\Currency', 'label' => 'Валюта'],
+                'options' => ['type' => 'dynamicList', 'source' => 'options', 'options' => [
+                        'inputs' => [
+                            'option' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Item\Option', 'label' => 'Свойство'],
+                            'value' => ['type' => 'dynamicType', 'typeSource' => 'selfMethod', 'selfMethod' => 'realType', 'label' => 'Значение'],
+                        ]
+                    ]
+                ],
+                'offerOptions' => ['type' => 'dynamicList', 'source' => 'options', 'options' => [
+                        'inputs' => [
+                            'option' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Item\Offer\Option', 'label' => 'Свойство предложения'],
+                            'value' => ['type' => 'dynamicType', 'typeSource' => 'selfMethod', 'selfMethod' => 'realType', 'label' => 'Значение'],
+                        ]
+                    ],'label'=>'Параметры предложения'
+                ]
+            ],
+            'map' => [
+                ['name', 'category'],
+                ['description'],
+                ['image'],
+                ['price', 'currency'],
+                ['options'],
+                ['offerOptions'],
+            ],
+            'handler' => 'simpleItemHandler'
+        ]
+    ];
 
-  public function realType() {
+    public function realType() {
     if ($this->option && $this->option->type) {
-      $type = $this->option->type;
+        $type = $this->option->type;
 
-      if ($type == 'select') {
+        if ($type == 'select') {
         return [
             'type' => 'select',
             'source' => 'relation',
             'relation' => 'option:items',
         ];
-      }
-      return $type;
+        }
+        return $type;
     }
     return 'text';
-  }
+    }
 
-  public static function indexes() {
+    public static function indexes() {
     return [
         'ecommerce_item_item_category_id' => [
             'type' => 'INDEX',
@@ -220,45 +220,45 @@ 
             ]
         ],
     ];
-  }
+    }
 
-  public function beforeSave() {
+    public function beforeSave() {
 
     if ($this->id) {
-      $this->search_index = $this->name . ' ';
-      if ($this->category) {
+        $this->search_index = $this->name . ' ';
+        if ($this->category) {
         $this->search_index .= $this->category->name . ' ';
-      }
-      if ($this->options) {
+        }
+        if ($this->options) {
         foreach ($this->options as $option) {
-          if ($option->item_option_searchable && $option->value) {
+            if ($option->item_option_searchable && $option->value) {
             if ($option->item_option_type != 'select') {
-              $this->search_index .= $option->value . ' ';
+                $this->search_index .= $option->value . ' ';
             } elseif (!empty($option->option->items[$option->value])) {
-              $option->option->items[$option->value]->value . ' ';
+                $option->option->items[$option->value]->value . ' ';
             }
-          }
+            }
+        }
         }
-      }
-      if ($this->offers) {
+        if ($this->offers) {
         foreach ($this->offers as $offer) {
-          if ($offer->options) {
+            if ($offer->options) {
             foreach ($offer->options as $option) {
-              if ($option->item_offer_option_searchable && $option->value) {
+                if ($option->item_offer_option_searchable && $option->value) {
                 if ($option->item_offer_option_type != 'select') {
-                  $this->search_index .= $option->value . ' ';
+                    $this->search_index .= $option->value . ' ';
                 } elseif (!empty($option->option->items[$option->value])) {
-                  $option->option->items[$option->value]->value . ' ';
+                    $option->option->items[$option->value]->value . ' ';
                 }
-              }
+                }
+            }
             }
-          }
         }
-      }
+        }
+    }
     }
-  }
 
-  public static function relations() {
+    public static function relations() {
 
     return [
         'category' => [
@@ -296,55 +296,55 @@ 
             'col' => 'user_id'
         ]
     ];
-  }
+    }
 
-  public function getPrice() {
+    public function getPrice() {
     $offers = $this->offers(['key' => false]);
     $curPrice = null;
 
     foreach ($offers[0]->prices as $price) {
-      if (!$price->type) {
+        if (!$price->type) {
         $curPrice = $price;
-      } elseif (
-              (!$price->type->roles && !$curPrice) ||
+        } elseif (
+                (!$price->type->roles && !$curPrice) ||
               ($price->type->roles && !$curPrice && strpos($price->type->roles, "|" . \Users\User::$cur->role_id . "|") !== false)
-      ) {
+        ) {
         $curPrice = $price;
-      }
+        }
     }
     return $curPrice;
-  }
+    }
 
-  public function name() {
+    public function name() {
     if (!empty(\App::$primary->ecommerce->config['item_option_as_name'])) {
-      $param = Item\Param::get([['item_id', $this->id], ['item_option_id', \App::$primary->ecommerce->config['item_option_as_name']]]);
-      if ($param && $param->value) {
+        $param = Item\Param::get([['item_id', $this->id], ['item_option_id', \App::$primary->ecommerce->config['item_option_as_name']]]);
+        if ($param && $param->value) {
         return $param->value;
-      }
+        }
     }
     return $this->name;
-  }
+    }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     if ($this->id) {
-      if ($this->options) {
+        if ($this->options) {
         foreach ($this->options as $option) {
-          $option->delete();
+            $option->delete();
+        }
         }
-      }
-      if ($this->offers) {
+        if ($this->offers) {
         foreach ($this->offers as $offer) {
-          $offer->delete();
+            $offer->delete();
         }
-      }
-      if ($this->image) {
+        }
+        if ($this->image) {
         $this->image->delete();
-      }
+        }
+    }
     }
-  }
 
-  public function getHref() {
+    public function getHref() {
     return "/ecommerce/view/{$this->pk()}";
-  }
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -71,7 +71,7 @@ 
             'size' => $_FILES['ActiveForm_simpleItem']['size']['Ecommerce\Item']['image'],
             'error' => $_FILES['ActiveForm_simpleItem']['error']['Ecommerce\Item']['image'],
                 ], [
-            'upload_code' => 'activeForm:' . 'Ecommerce\Item' . ':' . $item->pk(),
+            'upload_code' => 'activeForm:'.'Ecommerce\Item'.':'.$item->pk(),
             'accept_group' => 'image'
         ]);
         if ($file_id) {
@@ -168,7 +168,7 @@ 
                           'option' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Item\Offer\Option', 'label' => 'Свойство предложения'],
                           'value' => ['type' => 'dynamicType', 'typeSource' => 'selfMethod', 'selfMethod' => 'realType', 'label' => 'Значение'],
                       ]
-                  ],'label'=>'Параметры предложения'
+                  ], 'label'=>'Параметры предложения'
               ]
           ],
           'map' => [
@@ -225,17 +225,17 @@ 
   public function beforeSave() {
 
     if ($this->id) {
-      $this->search_index = $this->name . ' ';
+      $this->search_index = $this->name.' ';
       if ($this->category) {
-        $this->search_index .= $this->category->name . ' ';
+        $this->search_index .= $this->category->name.' ';
       }
       if ($this->options) {
         foreach ($this->options as $option) {
           if ($option->item_option_searchable && $option->value) {
             if ($option->item_option_type != 'select') {
-              $this->search_index .= $option->value . ' ';
+              $this->search_index .= $option->value.' ';
             } elseif (!empty($option->option->items[$option->value])) {
-              $option->option->items[$option->value]->value . ' ';
+              $option->option->items[$option->value]->value.' ';
             }
           }
         }
@@ -246,9 +246,9 @@ 
             foreach ($offer->options as $option) {
               if ($option->item_offer_option_searchable && $option->value) {
                 if ($option->item_offer_option_type != 'select') {
-                  $this->search_index .= $option->value . ' ';
+                  $this->search_index .= $option->value.' ';
                 } elseif (!empty($option->option->items[$option->value])) {
-                  $option->option->items[$option->value]->value . ' ';
+                  $option->option->items[$option->value]->value.' ';
                 }
               }
             }
@@ -271,7 +271,7 @@ 
             'col' => 'item_id',
             //'resultKey' => 'code',
             'resultKey' => 'item_option_id',
-            'join' => [Item\Option::table(), Item\Option::index() . ' = ' . Item\Param::colPrefix() . Item\Option::index()]
+            'join' => [Item\Option::table(), Item\Option::index().' = '.Item\Param::colPrefix().Item\Option::index()]
         ],
         'offers' => [
             'type' => 'many',
@@ -307,7 +307,7 @@ 
         $curPrice = $price;
       } elseif (
               (!$price->type->roles && !$curPrice) ||
-              ($price->type->roles && !$curPrice && strpos($price->type->roles, "|" . \Users\User::$cur->role_id . "|") !== false)
+              ($price->type->roles && !$curPrice && strpos($price->type->roles, "|".\Users\User::$cur->role_id."|") !== false)
       ) {
         $curPrice = $price;
       }