injitools / cms-Inji

system/modules/Ui/objects/ActiveForm.php

Indentation +154 added lines, -154 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 ($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,186 +134,186 @@ 
             $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['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;
-  }
+    }
 
 }

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)) {

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;
       }

system/Inji/Tools.php

Doc Comments +1 added lines

@@ -218,6 +218,7 @@
    * @param  $number Integer Число на основе которого нужно сформировать окончание
    * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
    *         например array('яблоко', 'яблока', 'яблок')
+   * @param string[] $endingArray
    * @return String
    */
   public static function getNumEnding($number, $endingArray) {

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

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
    */
   public static function uriParse($uri) {
     $answerPos = strpos($uri, '?');
-    $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
+    $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1);
 
     foreach ($params as $key => $param) {
       if ($param != '') {
@@ -61,7 +61,7 @@ 
     $path = explode('/', $path);
     $cur = '';
     foreach ($path as $item) {
-      $cur .= $item . '/';
+      $cur .= $item.'/';
       if (!file_exists($cur)) {
         mkdir($cur);
       }
@@ -81,7 +81,7 @@ 
    */
   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);
+    list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path);
     switch ($img_type) {
       case 1:
         $img_type = 'gif';
@@ -107,14 +107,14 @@ 
 
     if ($crop === true || $crop == 'q') {
       if ($img_width > $img_height) {
-        $imgX = floor(( $img_width - $img_height ) / 2);
+        $imgX = floor(($img_width - $img_height) / 2);
         $imgY = 0;
         $img_width = $img_height;
         $new_width = $max_width;
         $new_height = $max_height;
       } else {
         $imgX = 0;
-        $imgY = floor(( $img_height - $img_width ) / 2);
+        $imgY = floor(($img_height - $img_width) / 2);
         $img_height = $img_width;
         $new_width = $max_width;
         $new_height = $max_height;
@@ -135,7 +135,7 @@ 
       $new_width = $max_width;
       $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-      $imgX = (int) (($ow / 2) - ($img_width / 2) );
+      $imgX = (int) (($ow / 2) - ($img_width / 2));
       if ($pos == 'center') {
         $imgY = (int) (($oh / 2) - ($img_height / 2));
       } else {
@@ -208,7 +208,7 @@ 
     if (!headers_sent()) {
       header("Location: {$href}");
     } else {
-      echo '\'"><script>window.location="' . $href . '";</script>';
+      echo '\'"><script>window.location="'.$href.'";</script>';
     }
     exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
   }
@@ -266,7 +266,7 @@ 
       $pathArray = $cleanPathArray;
       $cleanPathArray = [];
     } while ($changes);
-    return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
+    return (strpos($path, '/') === 0 ? '/' : '').implode('/', $pathArray);
   }
 
   /**
@@ -286,7 +286,7 @@ 
     if (empty($month[$mm - 1])) {
       return 'Не указано';
     }
-    return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
+    return ($dd > 0 ? $dd." " : '').$month[$mm - 1]." ".$yy." ".$hours;
   }
 
   /**
@@ -364,10 +364,10 @@ 
       if (in_array($file, ['.', '..'])) {
         continue;
       }
-      if (is_dir($from . '/' . $file)) {
-        self::copyFiles($from . '/' . $file, $to . '/' . $file);
+      if (is_dir($from.'/'.$file)) {
+        self::copyFiles($from.'/'.$file, $to.'/'.$file);
       } else {
-        copy($from . '/' . $file, $to . '/' . $file);
+        copy($from.'/'.$file, $to.'/'.$file);
       }
     }
   }

Braces +8 added lines, -6 removed lines

@@ -55,8 +55,9 @@ 
    * @return boolean
    */
   public static function createDir($path) {
-    if (file_exists($path))
-      return true;
+    if (file_exists($path)) {
+          return true;
+    }
 
     $path = explode('/', $path);
     $cur = '';
@@ -100,10 +101,11 @@ 
       return false;
     }
 
-    if ($img_width / $max_width > $img_height / $max_height)
-      $separator = $img_width / $max_width;
-    else
-      $separator = $img_height / $max_height;
+    if ($img_width / $max_width > $img_height / $max_height) {
+          $separator = $img_width / $max_width;
+    } else {
+          $separator = $img_height / $max_height;
+    }
 
     if ($crop === true || $crop == 'q') {
       if ($img_width > $img_height) {

system/modules/Sliders/models/Slide.php

Indentation +46 added lines, -46 removed lines

@@ -13,52 +13,52 @@ 
 
 class Slide extends \Model {
 
-  public static $objectName = "Слайд";
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'link' => ['type' => 'text'],
-      'description' => ['type' => 'html'],
-      'image_file_id' => ['type' => 'image'],
-      'preview_image_file_id' => ['type' => 'image'],
-      'slider_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'slider'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
-  public static $labels = [
-      'name' => 'Имя',
-      'link' => 'Ссылка',
-      'description' => 'Описание',
-      'date_create' => 'Дата создания',
-      'slider_id' => 'Слайдер',
-      'user_id' => 'Создатель',
-      'weight' => 'Вес',
-      'image_file_id' => 'Изображение',
-      'preview_image_file_id' => 'Превью Изображения',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Слайды',
-          'cols' => [
-              'image_file_id', 'name', 'link', 'date_create'
-          ],
-          'filters' => [
-              'slider_id', 'name', 'link', 'description', 'date_create'
-          ],
-          'sortMode' => true
-      ],
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'link'],
-              ['preview_image_file_id', 'image_file_id'],
-              ['description'],
-          ],
-      ],
-  ];
+    public static $objectName = "Слайд";
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'link' => ['type' => 'text'],
+        'description' => ['type' => 'html'],
+        'image_file_id' => ['type' => 'image'],
+        'preview_image_file_id' => ['type' => 'image'],
+        'slider_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'slider'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
+    public static $labels = [
+        'name' => 'Имя',
+        'link' => 'Ссылка',
+        'description' => 'Описание',
+        'date_create' => 'Дата создания',
+        'slider_id' => 'Слайдер',
+        'user_id' => 'Создатель',
+        'weight' => 'Вес',
+        'image_file_id' => 'Изображение',
+        'preview_image_file_id' => 'Превью Изображения',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Слайды',
+            'cols' => [
+                'image_file_id', 'name', 'link', 'date_create'
+            ],
+            'filters' => [
+                'slider_id', 'name', 'link', 'description', 'date_create'
+            ],
+            'sortMode' => true
+        ],
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'link'],
+                ['preview_image_file_id', 'image_file_id'],
+                ['description'],
+            ],
+        ],
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'slider' => [
             'model' => 'Sliders\Slider',
@@ -77,6 +77,6 @@ 
             'col' => 'user_id'
         ]
     ];
-  }
+    }
 
 }

system/modules/Files/models/Type.php

Indentation +8 added lines, -8 removed lines

@@ -13,13 +13,13 @@
 
 class Type extends \Model {
 
-  public static $cols = [
-      'dir' => ['type' => 'text'],
-      'ext' => ['type' => 'text'],
-      'group' => ['type' => 'text'],
-      'allow_resize' => ['type' => 'bool'],
-      'options' => ['type' => 'textarea'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
+    public static $cols = [
+        'dir' => ['type' => 'text'],
+        'ext' => ['type' => 'text'],
+        'group' => ['type' => 'text'],
+        'allow_resize' => ['type' => 'bool'],
+        'options' => ['type' => 'textarea'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
 
 }

system/modules/Files/install_script.php

Indentation +33 added lines, -33 removed lines

@@ -1,39 +1,39 @@
 <?php
 
 return function($step = NULL, $params = []) {
-  $options = ['max_height' => 1200, 'max_width' => 1200];
-  $types = [
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'png',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpeg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'gif',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-  ];
-  foreach ($types as $type) {
+    $options = ['max_height' => 1200, 'max_width' => 1200];
+    $types = [
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'png',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpeg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'gif',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+    ];
+    foreach ($types as $type) {
     $typeObject = new \Files\Type($type);
     $typeObject->save();
-  }
+    }
 };

system/modules/Files/Files.php

Indentation +47 added lines, -47 removed lines

@@ -10,58 +10,58 @@ 
  */
 class Files extends Module {
 
-  /**
-   * Загрузка файлов
-   * 
-   * $file - масив из переменной $_FILES[{input name}]
-   * $options - массив из опций заливки 
-   * --	[file_code]: уникальный код для системы медиаданых
-   * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
-   */
-  public function upload($file, $options = []) {
+    /**
+     * Загрузка файлов
+     * 
+     * $file - масив из переменной $_FILES[{input name}]
+     * $options - массив из опций заливки 
+     * --	[file_code]: уникальный код для системы медиаданых
+     * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
+     */
+    public function upload($file, $options = []) {
 
     $sitePath = App::$primary->path;
 
     if (!is_uploaded_file($file['tmp_name']))
-      return 0;
+        return 0;
 
     $fileinfo = pathinfo($file['name']);
     if (empty($fileinfo['extension']))
-      return 0;
+        return 0;
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
     if (!$type)
-      return 0;
+        return 0;
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
-      return 0;
+        return 0;
     }
 
     $fileObject = new Files\File();
     if (!empty($options['file_code'])) {
-      $fileObject = Files\File::get($options['file_code'], 'code');
-      if (!$fileObject) {
+        $fileObject = Files\File::get($options['file_code'], 'code');
+        if (!$fileObject) {
         $fileObject = new Files\File();
         $fileObject->code = $options['file_code'];
-      }
+        }
     }
     $fileObject->name = $fileinfo['filename'];
     $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
     if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+        unlink($sitePath . $fileObject->path);
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
     if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
-      return false;
+        return false;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
-      $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
-      if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
+        $typeOptions = json_decode($type->options, true);
+        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+        if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
         Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
-      }
+        }
     }
 
     $fileObject->type_id = $type->pk();
@@ -70,60 +70,60 @@ 
     $fileObject->save();
 
     return $fileObject->id;
-  }
-
-  /**
-   * Загрузка файлов по урл
-   * 
-   * $url - адрес файла
-   * $options - массив из опций заливки 
-   * --	[file_code]: уникальный код для системы медиаданых
-   * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
-   */
-  public function uploadFromUrl($url, $options = []) {
+    }
+
+    /**
+     * Загрузка файлов по урл
+     * 
+     * $url - адрес файла
+     * $options - массив из опций заливки 
+     * --	[file_code]: уникальный код для системы медиаданых
+     * --	[allow_types]: досупные для заливки типы файлов. Например image (тип форматов из таблицы типов файлов file_type_ext)
+     */
+    public function uploadFromUrl($url, $options = []) {
     $sitePath = App::$primary->path;
 
     $fileinfo = pathinfo($url);
     if (empty($fileinfo['extension']))
-      return 0;
+        return 0;
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
     if (!$type)
-      return 0;
+        return 0;
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
-      return 0;
+        return 0;
     }
 
     $fileObject = new Files\File();
     if (!empty($options['file_code'])) {
-      $fileObject = Files\File::get($options['file_code'], 'code');
-      if (!$fileObject) {
+        $fileObject = Files\File::get($options['file_code'], 'code');
+        if (!$fileObject) {
         $fileObject = new Files\File();
         $fileObject->code = $options['file_code'];
-      }
+        }
     }
     $fileObject->name = $fileinfo['filename'];
     $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
     if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+        unlink($sitePath . $fileObject->path);
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
     $file = @file_get_contents($url);
     if ($file === false) {
-      return 0;
+        return 0;
     }
     if (!file_put_contents($sitePath . $fileObject->path, $file)) {
-      return 0;
+        return 0;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
-      $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
-      if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
+        $typeOptions = json_decode($type->options, true);
+        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+        if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
         Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
-      }
+        }
     }
 
     $fileObject->type_id = $type->pk();
@@ -132,6 +132,6 @@ 
     $fileObject->save();
 
     return $fileObject->id;
-  }
+    }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -46,21 +46,21 @@ 
       }
     }
     $fileObject->name = $fileinfo['filename'];
-    $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-    if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+    $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+    if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+      unlink($sitePath.$fileObject->path);
 
-    Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+    Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
-    if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
+    if (!move_uploaded_file($file['tmp_name'], $sitePath.$fileObject->path)) {
       return false;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
       $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+      list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath.$fileObject->path);
       if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
-        Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
+        Tools::resizeImage($sitePath.$fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
       }
     }
 
@@ -104,25 +104,25 @@ 
       }
     }
     $fileObject->name = $fileinfo['filename'];
-    $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-    if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+    $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+    if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+      unlink($sitePath.$fileObject->path);
 
-    Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+    Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
     $file = @file_get_contents($url);
     if ($file === false) {
       return 0;
     }
-    if (!file_put_contents($sitePath . $fileObject->path, $file)) {
+    if (!file_put_contents($sitePath.$fileObject->path, $file)) {
       return 0;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
       $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+      list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath.$fileObject->path);
       if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
-        Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
+        Tools::resizeImage($sitePath.$fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
       }
     }
 

Braces +21 added lines, -14 removed lines

@@ -22,16 +22,19 @@ 
 
     $sitePath = App::$primary->path;
 
-    if (!is_uploaded_file($file['tmp_name']))
-      return 0;
+    if (!is_uploaded_file($file['tmp_name'])) {
+          return 0;
+    }
 
     $fileinfo = pathinfo($file['name']);
-    if (empty($fileinfo['extension']))
-      return 0;
+    if (empty($fileinfo['extension'])) {
+          return 0;
+    }
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
-    if (!$type)
-      return 0;
+    if (!$type) {
+          return 0;
+    }
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
       return 0;
@@ -47,8 +50,9 @@ 
     }
     $fileObject->name = $fileinfo['filename'];
     $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-    if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+    if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+          unlink($sitePath . $fileObject->path);
+    }
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
@@ -84,12 +88,14 @@ 
     $sitePath = App::$primary->path;
 
     $fileinfo = pathinfo($url);
-    if (empty($fileinfo['extension']))
-      return 0;
+    if (empty($fileinfo['extension'])) {
+          return 0;
+    }
 
     $type = Files\Type::get($fileinfo['extension'], 'ext');
-    if (!$type)
-      return 0;
+    if (!$type) {
+          return 0;
+    }
 
     if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
       return 0;
@@ -105,8 +111,9 @@ 
     }
     $fileObject->name = $fileinfo['filename'];
     $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-    if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+    if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+          unlink($sitePath . $fileObject->path);
+    }
 
     Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');