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/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/Migrations/objects/Walker.php

Indentation +53 added lines, -53 removed lines

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

system/modules/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

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

Indentation +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
 
 class Select extends \Ui\ActiveForm\Input {
 
-  public function draw() {
+    public function draw() {
     $inputName = $this->colName();
     $inputLabel = $this->colLabel();
     $inputParams = $this->colParams;
@@ -25,41 +25,41 @@ 
     ];
     $modelName = '';
     switch ($inputParams['source']) {
-      case 'model':
+        case 'model':
         $modelName = $inputParams['model'];
         break;
-      case 'relation':
+        case 'relation':
         if ($this->activeForm->modelName) {
-          $itemModelName = $this->activeForm->modelName;
-          $relation = $itemModelName::getRelation($inputParams['relation']);
-          if ($relation['model'] && class_exists($relation['model'])) {
+            $itemModelName = $this->activeForm->modelName;
+            $relation = $itemModelName::getRelation($inputParams['relation']);
+            if ($relation['model'] && class_exists($relation['model'])) {
             $modelName = $relation['model'];
-          }
+            }
         }
     }
     if (!empty($modelName)) {
-      $inputOptions['createBtn'] = [
-          'text' => 'Создать',
-          'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
-          . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;'
-      ];
+        $inputOptions['createBtn'] = [
+            'text' => 'Создать',
+            'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+            . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;'
+        ];
     }
     if (!empty($inputOptions['values'][$this->activeForm->model->{$this->colName}]) &&
             is_array($inputOptions['values'][$this->activeForm->model->{$this->colName}]) &&
             !empty($inputOptions['values'][$this->activeForm->model->{$this->colName}]['input'])) {
-      $aditionalCol = $inputOptions['values'][$this->activeForm->model->{$this->colName}]['input']['name'];
-      $inputOptions['aditionalValue'] = $this->activeForm->model->$aditionalCol;
+        $aditionalCol = $inputOptions['values'][$this->activeForm->model->{$this->colName}]['input']['name'];
+        $inputOptions['aditionalValue'] = $this->activeForm->model->$aditionalCol;
     }
 
     $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;
     }
     $this->form->input('select', $inputName, $inputLabel, $inputOptions);
     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);
+    }
     }
-  }
 
 }

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

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()}";
-  }
+    }
 
 }

system/Inji/Tools.php

Indentation +227 added lines, -227 removed lines

@@ -12,84 +12,84 @@ 
  */
 class Tools extends Model {
 
-  /**
-   * Return random string
-   * 
-   * @param int $length
-   * @param string $characters
-   * @return string
-   */
-  public static function randomString($length = 20, $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') {
+    /**
+     * Return random string
+     * 
+     * @param int $length
+     * @param string $characters
+     * @return string
+     */
+    public static function randomString($length = 20, $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') {
     $charactersLength = strlen($characters);
     $randomString = '';
     for ($i = 0; $i < $length; $i++) {
-      $randomString .= $characters[rand(0, $charactersLength - 1)];
+        $randomString .= $characters[rand(0, $charactersLength - 1)];
     }
     return $randomString;
-  }
+    }
 
-  /**
-   * Clean and return user query params
-   * 
-   * @param string $uri
-   * @return array
-   */
-  public static function uriParse($uri) {
+    /**
+     * Clean and return user query params
+     * 
+     * @param string $uri
+     * @return array
+     */
+    public static function uriParse($uri) {
     $answerPos = strpos($uri, '?');
     $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
 
     foreach ($params as $key => $param) {
-      if ($param != '') {
+        if ($param != '') {
         $params[$key] = urldecode($param);
-      } else {
+        } else {
         unset($params[$key]);
-      }
+        }
     }
     return $params;
-  }
+    }
 
-  /**
-   * Recursive create dir
-   * 
-   * @param string $path
-   * @return boolean
-   */
-  public static function createDir($path) {
+    /**
+     * Recursive create dir
+     * 
+     * @param string $path
+     * @return boolean
+     */
+    public static function createDir($path) {
     if (file_exists($path))
-      return true;
+        return true;
 
     $path = explode('/', $path);
     $cur = '';
     foreach ($path as $item) {
-      $cur .= $item . '/';
-      if (!file_exists($cur)) {
+        $cur .= $item . '/';
+        if (!file_exists($cur)) {
         mkdir($cur);
-      }
+        }
     }
     return true;
-  }
+    }
 
-  /**
-   * Resize image in path
-   * 
-   * @param string $img_path
-   * @param int $max_width
-   * @param int $max_height
-   * @param string|false $crop
-   * @param string $pos
-   * @return string
-   */
-  public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') {
+    /**
+     * Resize image in path
+     * 
+     * @param string $img_path
+     * @param int $max_width
+     * @param int $max_height
+     * @param string|false $crop
+     * @param string $pos
+     * @return string
+     */
+    public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') {
     ini_set("gd.jpeg_ignore_warning", 1);
     list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
     switch ($img_type) {
-      case 1:
+        case 1:
         $img_type = 'gif';
         break;
-      case 3:
+        case 3:
         $img_type = 'png';
         break;
-      case 2:
+        case 2:
       default:
         $img_type = 'jpeg';
         break;
@@ -97,55 +97,55 @@ 
     $imagecreatefromX = "imagecreatefrom{$img_type}";
     $src_res = $imagecreatefromX($img_path);
     if (!$src_res) {
-      return false;
+        return false;
     }
 
     if ($img_width / $max_width > $img_height / $max_height)
-      $separator = $img_width / $max_width;
+        $separator = $img_width / $max_width;
     else
-      $separator = $img_height / $max_height;
+        $separator = $img_height / $max_height;
 
     if ($crop === true || $crop == 'q') {
-      if ($img_width > $img_height) {
+        if ($img_width > $img_height) {
         $imgX = floor(( $img_width - $img_height ) / 2);
         $imgY = 0;
         $img_width = $img_height;
         $new_width = $max_width;
         $new_height = $max_height;
-      } else {
+        } else {
         $imgX = 0;
         $imgY = floor(( $img_height - $img_width ) / 2);
         $img_height = $img_width;
         $new_width = $max_width;
         $new_height = $max_height;
-      }
-      if ($pos == 'top') {
+        }
+        if ($pos == 'top') {
         $imgY = 0;
-      }
+        }
     } elseif ($crop == 'c') {
 //Вычисляем некий коэффициент масштабирования
-      $k1 = $img_width / $max_width;
-      $k2 = $img_height / $max_height;
-      $k = $k1 > $k2 ? $k2 : $k1;
-      $ow = $img_width;
-      $oh = $img_height;
+        $k1 = $img_width / $max_width;
+        $k2 = $img_height / $max_height;
+        $k = $k1 > $k2 ? $k2 : $k1;
+        $ow = $img_width;
+        $oh = $img_height;
 //Вычисляем размеры области для нового изображения
-      $img_width = intval($max_width * $k);
-      $img_height = intval($max_height * $k);
-      $new_width = $max_width;
-      $new_height = $max_height;
+        $img_width = intval($max_width * $k);
+        $img_height = intval($max_height * $k);
+        $new_width = $max_width;
+        $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-      $imgX = (int) (($ow / 2) - ($img_width / 2) );
-      if ($pos == 'center') {
+        $imgX = (int) (($ow / 2) - ($img_width / 2) );
+        if ($pos == 'center') {
         $imgY = (int) (($oh / 2) - ($img_height / 2));
-      } else {
+        } else {
         $imgY = 0;
-      }
+        }
     } else {
-      $imgX = 0;
-      $imgY = 0;
-      $new_width = floor($img_width / $separator);
-      $new_height = floor($img_height / $separator);
+        $imgX = 0;
+        $imgY = 0;
+        $new_width = floor($img_width / $separator);
+        $new_height = floor($img_height / $separator);
     }
 
     $new_res = imagecreatetruecolor($new_width, $new_height);
@@ -154,128 +154,128 @@ 
     imagecopyresampled($new_res, $src_res, 0, 0, $imgX, $imgY, $new_width, $new_height, $img_width, $img_height);
 
     if ($img_type == 'jpeg') {
-      imageinterlace($new_res, 1); // чересстрочное формирование изображение
-      imagejpeg($new_res, $img_path, 85);
+        imageinterlace($new_res, 1); // чересстрочное формирование изображение
+        imagejpeg($new_res, $img_path, 85);
     } else {
-      $imageX = "image{$img_type}";
-      $imageX($new_res, $img_path);
+        $imageX = "image{$img_type}";
+        $imageX($new_res, $img_path);
     }
 
     imagedestroy($new_res);
     imagedestroy($src_res);
     return $img_type;
-  }
+    }
 
-  /**
-   * Send mail
-   * 
-   * @param string $from
-   * @param string $to
-   * @param string $subject
-   * @param string $text
-   * @param string $charset
-   * @param string $ctype
-   * @return boolean
-   */
-  public static function sendMail($from, $to, $subject, $text, $charset = 'utf-8', $ctype = 'text/html') {
+    /**
+     * Send mail
+     * 
+     * @param string $from
+     * @param string $to
+     * @param string $subject
+     * @param string $text
+     * @param string $charset
+     * @param string $ctype
+     * @return boolean
+     */
+    public static function sendMail($from, $to, $subject, $text, $charset = 'utf-8', $ctype = 'text/html') {
     $msg = compact('from', 'to', 'subject', 'text', 'charset', 'ctype');
     $msg = Inji::$inst->event('sendMail', $msg);
     if (is_array($msg)) {
-      $headers = "From: {$msg['from']}\r\n";
-      $headers .= "Content-type: {$msg['ctype']}; charset={$msg['charset']}\r\n";
-      $headers .= "Mime-Version: 1.0\r\n";
-      return mail($msg['to'], $msg['subject'], $msg['text'], $headers);
+        $headers = "From: {$msg['from']}\r\n";
+        $headers .= "Content-type: {$msg['ctype']}; charset={$msg['charset']}\r\n";
+        $headers .= "Mime-Version: 1.0\r\n";
+        return mail($msg['to'], $msg['subject'], $msg['text'], $headers);
     }
     return $msg;
-  }
+    }
 
-  /**
-   * Redirect user from any place of code
-   * 
-   * Also add message to message query for view
-   * 
-   * @param string $href
-   * @param string $text
-   * @param string $status
-   */
-  public static function redirect($href = null, $text = false, $status = 'info') {
+    /**
+     * Redirect user from any place of code
+     * 
+     * Also add message to message query for view
+     * 
+     * @param string $href
+     * @param string $text
+     * @param string $status
+     */
+    public static function redirect($href = null, $text = false, $status = 'info') {
     if ($href === null) {
-      $href = $_SERVER['REQUEST_URI'];
+        $href = $_SERVER['REQUEST_URI'];
     }
     if ($text !== false) {
-      Msg::add($text, $status);
+        Msg::add($text, $status);
     }
     if (!headers_sent()) {
-      header("Location: {$href}");
+        header("Location: {$href}");
     } else {
-      echo '\'"><script>window.location="' . $href . '";</script>';
+        echo '\'"><script>window.location="' . $href . '";</script>';
     }
     exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
-  }
+    }
 
-  /**
-   * Функция возвращает окончание для множественного числа слова на основании числа и массива окончаний
-   * @param  $number Integer Число на основе которого нужно сформировать окончание
-   * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
-   *         например array('яблоко', 'яблока', 'яблок')
-   * @return String
-   */
-  public static function getNumEnding($number, $endingArray) {
+    /**
+     * Функция возвращает окончание для множественного числа слова на основании числа и массива окончаний
+     * @param  $number Integer Число на основе которого нужно сформировать окончание
+     * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
+     *         например array('яблоко', 'яблока', 'яблок')
+     * @return String
+     */
+    public static function getNumEnding($number, $endingArray) {
     $number = $number % 100;
     if ($number >= 11 && $number <= 19) {
-      $ending = $endingArray[2];
+        $ending = $endingArray[2];
     } else {
-      $i = $number % 10;
-      switch ($i) {
+        $i = $number % 10;
+        switch ($i) {
         case (1): $ending = $endingArray[0];
-          break;
+            break;
         case (2):
         case (3):
         case (4): $ending = $endingArray[1];
-          break;
+            break;
         default: $ending = $endingArray[2];
-      }
+        }
     }
     return $ending;
-  }
+    }
 
-  /**
-   * Clean request path
-   * 
-   * @param string $path
-   * @return string
-   */
-  public static function parsePath($path) {
+    /**
+     * Clean request path
+     * 
+     * @param string $path
+     * @return string
+     */
+    public static function parsePath($path) {
     $path = str_replace('\\', '/', $path);
     $pathArray = explode('/', $path);
     $cleanPathArray = [];
     do {
-      $changes = 0;
-      foreach ($pathArray as $pathItem) {
+        $changes = 0;
+        foreach ($pathArray as $pathItem) {
         if (trim($pathItem) === '' || $pathItem == '.') {
-          $changes++;
-          continue;
+            $changes++;
+            continue;
         }
         if ($pathItem == '..') {
-          array_pop($cleanPathArray);
-          $changes++;
-          continue;
+            array_pop($cleanPathArray);
+            $changes++;
+            continue;
         }
         $cleanPathArray[] = $pathItem;
-      }
-      $pathArray = $cleanPathArray;
-      $cleanPathArray = [];
+        }
+        $pathArray = $cleanPathArray;
+        $cleanPathArray = [];
     } while ($changes);
     return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
-  }
+    }
 
-  /**
-   * Show date in rus
-   * 
-   * @param string $date
-   * @return string
-   */
-  public static function toRusDate($date) {
+    /**
+     * Show date in rus
+     * 
+     * @param string $date
+     * @return string
+     */
+    public static function toRusDate($date) {
     $yy = (int) substr($date, 0, 4);
     $mm = (int) substr($date, 5, 2);
     $dd = (int) substr($date, 8, 2);
@@ -284,114 +284,114 @@ 
 
     $month = array('января', 'февраля', 'марта', 'апреля', 'мая', 'июня', 'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря');
     if (empty($month[$mm - 1])) {
-      return 'Не указано';
+        return 'Не указано';
     }
     return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
-  }
+    }
 
-  /**
-   * Set header
-   * 
-   * @param string $code
-   * @param boolean $exit
-   */
-  public static function header($code, $exit = false) {
+    /**
+     * Set header
+     * 
+     * @param string $code
+     * @param boolean $exit
+     */
+    public static function header($code, $exit = false) {
     if (!headers_sent()) {
-      switch ($code) {
+        switch ($code) {
         case '404':
           header('HTTP/1.1 404 Not Found');
-          break;
+            break;
         default :
           header($code);
-      }
+        }
     }
     if ($exit) {
-      exit;
+        exit;
+    }
     }
-  }
 
-  /**
-   * Return exist path from array
-   * 
-   * If no exist path in array - return default
-   * 
-   * @param array $paths
-   * @param string|false $default
-   * @return string|false
-   */
-  public static function pathsResolve($paths = [], $default = false) {
+    /**
+     * Return exist path from array
+     * 
+     * If no exist path in array - return default
+     * 
+     * @param array $paths
+     * @param string|false $default
+     * @return string|false
+     */
+    public static function pathsResolve($paths = [], $default = false) {
     foreach ($paths as $path) {
-      if (file_exists($path)) {
+        if (file_exists($path)) {
         return $path;
-      }
+        }
     }
     return $default;
-  }
+    }
 
-  /**
-   * Convert acronyms to bites
-   * 
-   * @param string $val
-   * @return int
-   */
-  public static function toBytes($val) {
+    /**
+     * Convert acronyms to bites
+     * 
+     * @param string $val
+     * @return int
+     */
+    public static function toBytes($val) {
     $val = trim($val);
     $last = strtolower($val[strlen($val) - 1]);
     switch ($last) {
-      case 'g':
+        case 'g':
         $val *= 1024;
-      case 'm':
+        case 'm':
         $val *= 1024;
-      case 'k':
+        case 'k':
         $val *= 1024;
     }
 
     return $val;
-  }
+    }
 
-  /**
-   * Recursive copy directories and files
-   * 
-   * @param string $from
-   * @param string $to
-   */
-  public static function copyFiles($from, $to) {
+    /**
+     * Recursive copy directories and files
+     * 
+     * @param string $from
+     * @param string $to
+     */
+    public static function copyFiles($from, $to) {
     $from = rtrim($from, '/');
     $to = rtrim($to, '/');
     self::createDir($to);
     $files = scandir($from);
     foreach ($files as $file) {
-      if (in_array($file, ['.', '..'])) {
+        if (in_array($file, ['.', '..'])) {
         continue;
-      }
-      if (is_dir($from . '/' . $file)) {
+        }
+        if (is_dir($from . '/' . $file)) {
         self::copyFiles($from . '/' . $file, $to . '/' . $file);
-      } else {
+        } else {
         copy($from . '/' . $file, $to . '/' . $file);
-      }
+        }
+    }
     }
-  }
 
-  /**
-   * Translit function
-   * 
-   * @param string $str
-   * @return string
-   */
-  public static function translit($str) {
+    /**
+     * Translit function
+     * 
+     * @param string $str
+     * @return string
+     */
+    public static function translit($str) {
     $rus = array('А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я', 'а', 'б', 'в', 'г', 'д', 'е', 'ё', 'ж', 'з', 'и', 'й', 'к', 'л', 'м', 'н', 'о', 'п', 'р', 'с', 'т', 'у', 'ф', 'х', 'ц', 'ч', 'ш', 'щ', 'ъ', 'ы', 'ь', 'э', 'ю', 'я');
     $lat = array('A', 'B', 'V', 'G', 'D', 'E', 'E', 'Gh', 'Z', 'I', 'Y', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'T', 'U', 'F', 'H', 'C', 'Ch', 'Sh', 'Sch', 'Y', 'Y', 'Y', 'E', 'Yu', 'Ya', 'a', 'b', 'v', 'g', 'd', 'e', 'e', 'gh', 'z', 'i', 'y', 'k', 'l', 'm', 'n', 'o', 'p', 'r', 's', 't', 'u', 'f', 'h', 'c', 'ch', 'sh', 'sch', 'y', 'y', 'y', 'e', 'yu', 'ya');
     return str_replace($rus, $lat, $str);
-  }
+    }
 
-  /**
-   * get youtube video ID from URL
-   *
-   * @author http://stackoverflow.com/a/6556662
-   * @param string $url
-   * @return string Youtube video id or FALSE if none found. 
-   */
-  public static function youtubeIdFromUrl($url) {
+    /**
+     * get youtube video ID from URL
+     *
+     * @author http://stackoverflow.com/a/6556662
+     * @param string $url
+     * @return string Youtube video id or FALSE if none found. 
+     */
+    public static function youtubeIdFromUrl($url) {
     $pattern = '%^# Match any youtube URL
         (?:https?://)?  # Optional scheme. Either http or https
         (?:www\.)?      # Optional www subdomain
@@ -409,20 +409,20 @@ 
     ;
     $result = preg_match($pattern, $url, $matches);
     if (false !== $result) {
-      return $matches[1];
+        return $matches[1];
     }
     return false;
-  }
+    }
 
-  /**
-   * check array is associative
-   *
-   * @author http://stackoverflow.com/a/173479
-   * @param array $arr
-   * @return boolean
-   */
-  public static function isAssoc(&$arr) {
+    /**
+     * check array is associative
+     *
+     * @author http://stackoverflow.com/a/173479
+     * @param array $arr
+     * @return boolean
+     */
+    public static function isAssoc(&$arr) {
     return array_keys($arr) !== range(0, count($arr) - 1);
-  }
+    }
 
 }