injitools / cms-Inji

system/modules/Ecommerce/models/Category.php

Indentation +73 added lines, -73 removed lines

@@ -13,50 +13,50 @@ 
 
 class Category extends \Model {
 
-  public static $objectName = 'Категория магазина';
-  public static $treeCategory = 'Ecommerce\Item';
-  public static $cols = [
-      //Основные параметры
-      'parent_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'parent'],
-      'name' => ['type' => 'text'],
-      'alias' => ['type' => 'text'],
-      'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsCategoryList', 'module' => 'Ecommerce'],
-      'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesCategoryList', 'module' => 'Ecommerce'],
-      'description' => ['type' => 'html'],
-      'image_file_id' => ['type' => 'image'],
-      'options_inherit' => ['type' => 'bool'],
-      //Системные
-      'imported' => ['type' => 'bool'],
-      'weight' => ['type' => 'number'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'tree_path' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'options' => ['type' => 'dataManager', 'relation' => 'options'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'alias' => 'Алиас',
-      'parent_id' => 'Родительская категория',
-      'image_file_id' => 'Изображение',
-      'description' => 'Описание',
-      'options_inherit' => 'Наследовать набор свойств',
-      'options' => 'Свойства товаров',
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'alias'],
-              ['parent_id', 'image_file_id'],
-              ['viewer', 'template'],
-              ['options_inherit'],
-              ['options'],
-              ['description']
-          ]
-      ]
-  ];
+    public static $objectName = 'Категория магазина';
+    public static $treeCategory = 'Ecommerce\Item';
+    public static $cols = [
+        //Основные параметры
+        'parent_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'parent'],
+        'name' => ['type' => 'text'],
+        'alias' => ['type' => 'text'],
+        'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsCategoryList', 'module' => 'Ecommerce'],
+        'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesCategoryList', 'module' => 'Ecommerce'],
+        'description' => ['type' => 'html'],
+        'image_file_id' => ['type' => 'image'],
+        'options_inherit' => ['type' => 'bool'],
+        //Системные
+        'imported' => ['type' => 'bool'],
+        'weight' => ['type' => 'number'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'tree_path' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'options' => ['type' => 'dataManager', 'relation' => 'options'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'alias' => 'Алиас',
+        'parent_id' => 'Родительская категория',
+        'image_file_id' => 'Изображение',
+        'description' => 'Описание',
+        'options_inherit' => 'Наследовать набор свойств',
+        'options' => 'Свойства товаров',
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'alias'],
+                ['parent_id', 'image_file_id'],
+                ['viewer', 'template'],
+                ['options_inherit'],
+                ['options'],
+                ['description']
+            ]
+        ]
+    ];
 
-  public static function indexes() {
+    public static function indexes() {
     return [
         'ecommerce_category_category_parent_id' => [
             'type' => 'INDEX',
@@ -71,9 +71,9 @@ 
             ]
         ],
     ];
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'items' => [
             'type' => 'many',
@@ -103,50 +103,50 @@ 
             'col' => 'parent_id',
         ]
     ];
-  }
+    }
 
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Категории товаров',
-          'cols' => [
-              'name',
-              'parent_id',
-          ],
-          'sortMode' => true
-      ]
-  ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Категории товаров',
+            'cols' => [
+                'name',
+                'parent_id',
+            ],
+            'sortMode' => true
+        ]
+    ];
 
-  public function beforeSave() {
+    public function beforeSave() {
     if ($this->id && $this->id == $this->parent_id) {
-      $this->parent_id = 0;
-      \Msg::add('Категория не может быть сама себе родителем');
+        $this->parent_id = 0;
+        \Msg::add('Категория не может быть сама себе родителем');
+    }
     }
-  }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     foreach ($this->catalogs as $category) {
-      $category->delete();
+        $category->delete();
+    }
     }
-  }
 
-  public function resolveTemplate() {
+    public function resolveTemplate() {
     if ($this->template !== 'inherit') {
-      return $this->template;
+        return $this->template;
     } elseif ($this->template == 'inherit' && $this->category) {
-      return $this->category->resolveTemplate(true);
+        return $this->category->resolveTemplate(true);
     } else {
-      return (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current');
+        return (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current');
+    }
     }
-  }
 
-  public function resolveViewer() {
+    public function resolveViewer() {
     if ($this->viewer !== 'inherit') {
-      return $this->viewer;
+        return $this->viewer;
     } elseif ($this->viewer == 'inherit' && $this->category) {
-      return $this->category->resolveViewer(true);
+        return $this->category->resolveViewer(true);
     } else {
-      return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
+        return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
+    }
     }
-  }
 
 }

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

Indentation +36 added lines, -36 removed lines

@@ -13,22 +13,22 @@ 
 
 class Image extends \Model {
 
-  static $objectName = 'Фото товара';
-  static $labels = [
-      'file_id' => 'Изображение',
-      'item_id' => 'Товар',
-      'name' => 'Название',
-      'description' => 'Описание',
-  ];
-  static $cols = [
-      'file_id' => ['type' => 'image'],
-      'item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'item'],
-      'name' => ['type' => 'text'],
-      'description' => ['type' => 'html'],
-      'weight' => ['type' => 'number'],
-  ];
+    static $objectName = 'Фото товара';
+    static $labels = [
+        'file_id' => 'Изображение',
+        'item_id' => 'Товар',
+        'name' => 'Название',
+        'description' => 'Описание',
+    ];
+    static $cols = [
+        'file_id' => ['type' => 'image'],
+        'item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'item'],
+        'name' => ['type' => 'text'],
+        'description' => ['type' => 'html'],
+        'weight' => ['type' => 'number'],
+    ];
 
-  static function relations() {
+    static function relations() {
     return [
         'item' => [
             'col' => 'item_id',
@@ -39,30 +39,30 @@ 
             'model' => 'Files\File'
         ]
     ];
-  }
+    }
 
-  static $dataManagers = [
-      'manager' => [
-          'name' => 'Фото товара',
-          'cols' => [
-              'file_id', 'name'
-          ]
-      ]
-  ];
-  static $forms = [
-      'manager' => [
-          'map' => [
-              ['name'],
-              ['item_id', 'file_id'],
-              ['description']
-          ]
-      ]
-  ];
+    static $dataManagers = [
+        'manager' => [
+            'name' => 'Фото товара',
+            'cols' => [
+                'file_id', 'name'
+            ]
+        ]
+    ];
+    static $forms = [
+        'manager' => [
+            'map' => [
+                ['name'],
+                ['item_id', 'file_id'],
+                ['description']
+            ]
+        ]
+    ];
 
-  function beforeDelete() {
+    function beforeDelete() {
     if ($this->file) {
-      $this->file->delete();
+        $this->file->delete();
+    }
     }
-  }
 
 }

system/modules/Ecommerce/models/Delivery/Save.php

Indentation +6 added lines, -6 removed lines

@@ -13,12 +13,12 @@ 
 
 class Save extends \Model {
 
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user']
-  ];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user']
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'values' => [
             'type' => 'many',
@@ -31,6 +31,6 @@ 
             'col' => 'user_id'
         ]
     ];
-  }
+    }
 
 }

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

Indentation +20 added lines, -20 removed lines

@@ -13,43 +13,43 @@
 
 class Init extends \Exchange1c\Mode {
 
-  public function process() {
+    public function process() {
     echo "zip=no\n";
     echo 'file_limit=' . \Tools::toBytes(ini_get('post_max_size'));
     $this->end();
 
     //clean files
     if (!empty(\App::$cur->exchange1c->config['maxSaveFilesInterval'])) {
-      $query = \App::$cur->db->newQuery();
-      $query->operation = 'select';
-      $query->table = \Exchange1c\Exchange\File::table();
-      $query->cols = \Exchange1c\Exchange\File::colPrefix() . 'id';
-      $queryArr = $query->buildQuery();
-      $queryArr['query'].=' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
-      try {
+        $query = \App::$cur->db->newQuery();
+        $query->operation = 'select';
+        $query->table = \Exchange1c\Exchange\File::table();
+        $query->cols = \Exchange1c\Exchange\File::colPrefix() . 'id';
+        $queryArr = $query->buildQuery();
+        $queryArr['query'].=' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
+        try {
         $ids = array_keys($query->query($queryArr)->getArray(\Exchange1c\Exchange\File::colPrefix().'id'));
-      } catch (\PDOException $exc) {
+        } catch (\PDOException $exc) {
         if ($exc->getCode() == '42S02') {
-          \Exchange1c\Exchange\File::createTable();
+            \Exchange1c\Exchange\File::createTable();
         } elseif ($exc->getCode() == '42S22') {
-          $cols = \Exchange1c\Exchange\File::cols();
-          foreach (\Exchange1c\Exchange\File::$cols as $colName => $params) {
+            $cols = \Exchange1c\Exchange\File::cols();
+            foreach (\Exchange1c\Exchange\File::$cols as $colName => $params) {
             if (!isset($cols[\Exchange1c\Exchange\File::colPrefix() . $colName])) {
-              \Exchange1c\Exchange\File::createCol($colName);
+                \Exchange1c\Exchange\File::createCol($colName);
+            }
             }
-          }
         }
         $ids = array_keys($query->query($queryArr)->getArray(\Exchange1c\Exchange\File::colPrefix().'id'));
-      }
-      foreach (array_chunk($ids, 500) as $idGroup) {
+        }
+        foreach (array_chunk($ids, 500) as $idGroup) {
         $dfiles = \Exchange1c\Exchange\File::getList(['where' => ['id', $idGroup, 'IN']]);
         foreach ($dfiles as $dfile) {
-          $dfile->deleteFile();
-          unset($dfile);
+            $dfile->deleteFile();
+            unset($dfile);
         }
         unset($dfiles);
-      }
+        }
+    }
     }
-  }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 
   public function process() {
     echo "zip=no\n";
-    echo 'file_limit=' . \Tools::toBytes(ini_get('post_max_size'));
+    echo 'file_limit='.\Tools::toBytes(ini_get('post_max_size'));
     $this->end();
 
     //clean files
@@ -23,9 +23,9 @@ 
       $query = \App::$cur->db->newQuery();
       $query->operation = 'select';
       $query->table = \Exchange1c\Exchange\File::table();
-      $query->cols = \Exchange1c\Exchange\File::colPrefix() . 'id';
+      $query->cols = \Exchange1c\Exchange\File::colPrefix().'id';
       $queryArr = $query->buildQuery();
-      $queryArr['query'].=' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
+      $queryArr['query'] .= ' where `'.\Exchange1c\Exchange\File::colPrefix().'deleted` = 0 AND  `'.\Exchange1c\Exchange\File::colPrefix().'date_create` < NOW() - INTERVAL '.\App::$cur->exchange1c->config['maxSaveFilesInterval'];
       try {
         $ids = array_keys($query->query($queryArr)->getArray(\Exchange1c\Exchange\File::colPrefix().'id'));
       } catch (\PDOException $exc) {
@@ -34,7 +34,7 @@ 
         } elseif ($exc->getCode() == '42S22') {
           $cols = \Exchange1c\Exchange\File::cols();
           foreach (\Exchange1c\Exchange\File::$cols as $colName => $params) {
-            if (!isset($cols[\Exchange1c\Exchange\File::colPrefix() . $colName])) {
+            if (!isset($cols[\Exchange1c\Exchange\File::colPrefix().$colName])) {
               \Exchange1c\Exchange\File::createCol($colName);
             }
           }

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

Indentation +12 added lines, -12 removed lines

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

Spacing +5 added lines, -5 removed lines

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

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

Indentation +20 added lines, -20 removed lines

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

Spacing +2 added lines, -2 removed lines

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

system/modules/Ecommerce/models/Delivery.php

Indentation +59 added lines, -59 removed lines

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

system/modules/Dashboard/appAdminControllers/DashboardController.php

Indentation +19 added lines, -19 removed lines

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

system/modules/Migrations/objects/Walker.php

Spacing +1 added lines, -1 removed lines

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

Indentation +53 added lines, -53 removed lines

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