injitools / cms-Inji

system/modules/Ecommerce/appControllers/CartController.php

Indentation +107 added lines, -107 removed lines

@@ -10,146 +10,146 @@ 
  */
 class CartController extends Controller {
 
-  public function indexAction() {
+    public function indexAction() {
     $cart = '';
     $deliverys = \Ecommerce\Delivery::getList(['order' => ['weight', 'ASC']]);
     $payTypes = \Ecommerce\PayType::getList(['order' => ['weight', 'ASC']]);
     if (!empty($_SESSION['cart']['cart_id'])) {
-      $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
-      if (!empty($_POST)) {
+        $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
+        if (!empty($_POST)) {
         $error = false;
         if (!Users\User::$cur->id) {
-          $user_id = $this->Users->registration($_POST, true);
-          if (!$user_id) {
+            $user_id = $this->Users->registration($_POST, true);
+            if (!$user_id) {
             $error = true;
-          } else {
+            } else {
             $user = Users\User::get($user_id);
-          }
+            }
         } else {
-          $user = Users\User::$cur;
+            $user = Users\User::$cur;
         }
         $ids = [];
         if (!empty($_POST['cartItems'])) {
-          foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
+            foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
             $cartItem = \Ecommerce\Cart\Item::get((int) $cartItemId);
             if (!$cartItem) {
-              continue;
+                continue;
             }
             if ($cartItem->cart_id != $cart->id) {
-              continue;
+                continue;
             }
             $count = (float) $cartItemCont;
             if ($count < 0.001) {
-              $count = 1;
+                $count = 1;
             }
             $cartItem->count = $count;
             $cartItem->save();
             $ids[] = $cartItemId;
-          }
+            }
         }
         foreach ($cart->cartItems as $cartItem) {
-          if (!in_array($cartItem->id, $ids)) {
+            if (!in_array($cartItem->id, $ids)) {
             $cartItem->delete();
-          }
+            }
         }
         $cart = Ecommerce\Cart::get($cart->id);
         if (!$cart->cartItems) {
-          $error = true;
-          //Tools::redirect('/ecommerce', 'Ваша корзина пуста');
+            $error = true;
+            //Tools::redirect('/ecommerce', 'Ваша корзина пуста');
         }
         if (empty($this->module->config['sell_over_warehouse'])) {
-          foreach ($cart->cartItems as $cartitem) {
+            foreach ($cart->cartItems as $cartitem) {
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
-              $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+                $error = true;
+                Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+            }
             }
-          }
         }
         if ($deliverys && empty($deliverys[$_POST['delivery']])) {
-          $error = 1;
-          Msg::add('Выберите способ доставки', 'danger');
+            $error = 1;
+            Msg::add('Выберите способ доставки', 'danger');
         } elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
-          $cart->delivery_id = $_POST['delivery'];
-          foreach ($deliverys[$cart->delivery_id]->fields as $field) {
+            $cart->delivery_id = $_POST['delivery'];
+            foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
-              $error = 1;
-              Msg::add('Вы не указали: ' . $field->name, 'danger');
+                $error = 1;
+                Msg::add('Вы не указали: ' . $field->name, 'danger');
+            }
             }
-          }
         }
         if ($payTypes && (empty($_POST['payType']) || empty($payTypes[$_POST['payType']]))) {
-          $error = 1;
-          Msg::add('Выберите способ оплаты', 'danger');
+            $error = 1;
+            Msg::add('Выберите способ оплаты', 'danger');
         } elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
-          $payType = $payTypes[$_POST['payType']];
-          $cart->paytype_id = $payType->id;
+            $payType = $payTypes[$_POST['payType']];
+            $cart->paytype_id = $payType->id;
         } else {
-          $payType = null;
+            $payType = null;
         }
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
-          if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
+            if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
             Msg::add('Вы не указали: ' . $field->name, 'danger');
-          }
+            }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
-          $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
-          if (!$userCard) {
+            $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
+            if (!$userCard) {
             $error = true;
             Msg::add('Такой карты не существует', 'danger');
-          } elseif ($userCard->user_id != $user->id) {
+            } elseif ($userCard->user_id != $user->id) {
             $error = true;
             Msg::add('Это не ваша карта', 'danger');
-          } else {
+            } else {
             $cart->card_item_id = $userCard->id;
-          }
+            }
         }
         $cart->save();
         if (!$error && !empty($_POST['action']) && $_POST['action'] = 'order') {
-          $cart->user_id = $user->user_id;
-          $this->module->parseFields($_POST['userAdds']['fields'], $cart);
-          if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
+            $cart->user_id = $user->user_id;
+            $this->module->parseFields($_POST['userAdds']['fields'], $cart);
+            if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
             $this->module->parseDeliveryFields($_POST['deliveryFields'], $cart, $deliverys[$cart->delivery_id]->fields);
-          }
-          $cart->cart_status_id = 2;
-          $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
-          $cart->date_status = date('Y-m-d H:i:s');
-          $cart->complete_data = date('Y-m-d H:i:s');
-          $cart->warehouse_block = 1;
-          $cart->save();
+            }
+            $cart->cart_status_id = 2;
+            $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
+            $cart->date_status = date('Y-m-d H:i:s');
+            $cart->complete_data = date('Y-m-d H:i:s');
+            $cart->warehouse_block = 1;
+            $cart->save();
 
-          $cart = \Ecommerce\Cart::get($cart->id);
-          foreach ($cart->cartItems as $cartItem) {
+            $cart = \Ecommerce\Cart::get($cart->id);
+            foreach ($cart->cartItems as $cartItem) {
             $cartItem->discount = $cartItem->discount();
             $cartItem->final_price = $cartItem->price->price - $cartItem->discount;
             $cartItem->save();
-          }
-          $cart = \Ecommerce\Cart::get($cart->id);
-          if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
+            }
+            $cart = \Ecommerce\Cart::get($cart->id);
+            if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
             $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
             $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
-          }
-          if ($this->notifications) {
+            }
+            if ($this->notifications) {
             $notification = new Notifications\Notification();
             $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
-          }
-          $handlers = $this->ecommerce->getSnippets('payTypeHandler');
-          $redirect = ['/ecommerce/cart/success'];
-          if ($payType && !empty($handlers[$payType->handler]['handler'])) {
+            }
+            $handlers = $this->ecommerce->getSnippets('payTypeHandler');
+            $redirect = ['/ecommerce/cart/success'];
+            if ($payType && !empty($handlers[$payType->handler]['handler'])) {
             $newRedirect = $handlers[$payType->handler]['handler']($cart);
             if (!empty($newRedirect)) {
-              $redirect = $newRedirect;
+                $redirect = $newRedirect;
+            }
             }
-          }
-          unset($_SESSION['cart']['cart_id']);
-          call_user_func_array(['Tools', 'redirect'], $redirect);
+            unset($_SESSION['cart']['cart_id']);
+            call_user_func_array(['Tools', 'redirect'], $redirect);
+        }
         }
-      }
     }
     $this->view->setTitle('Корзина');
     $bread = [];
@@ -162,12 +162,12 @@ 
         'href' => '/ecommerce/cart'
     ];
     $this->view->page(['data' => compact('cart', 'items', 'deliverys', 'payTypes', 'packItem', 'bread')]);
-  }
+    }
 
-  public function orderDetailAction($id = 0) {
+    public function orderDetailAction($id = 0) {
     $cart = Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      $this->url->redirect('/', 'Это не ваша корзина');
+        $this->url->redirect('/', 'Это не ваша корзина');
     }
     $bread[] = [
         'text' => 'Каталог',
@@ -183,54 +183,54 @@ 
     ];
     $this->view->setTitle('Заказ №' . $cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
-  }
+    }
 
-  public function continueAction($id = 0) {
+    public function continueAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     $_SESSION['cart']['cart_id'] = $cart->id;
     Tools::redirect('/ecommerce/cart');
-  }
+    }
 
-  public function deleteAction($id = 0) {
+    public function deleteAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     if (!empty($_SESSION['cart']['cart_id']) && $_SESSION['cart']['cart_id'] == $cart->id) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $cart->delete();
     Tools::redirect('/users/cabinet/ecommerceOrdersHistory', 'Корзина была удалена', 'success');
-  }
+    }
 
-  public function refillAction($id = 0) {
+    public function refillAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if (!empty($_SESSION['cart']['cart_id'])) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $newCart = $this->ecommerce->getCurCart();
     foreach ($cart->cartItems as $cartitem) {
-      $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
+        $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
     }
 
     $newCart->save();
 
     Tools::redirect('/ecommerce/cart/');
-  }
+    }
 
-  public function successAction() {
+    public function successAction() {
     $bread = [];
     $bread[] = [
         'text' => 'Каталог',
@@ -246,70 +246,70 @@ 
     ];
     $this->view->setTitle('Заказ принят');
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function addAction() {
+    public function addAction() {
     $result = new Server\Result();
     if (empty($_GET['itemOfferPriceId'])) {
-      $result->success = false;
-      $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
+        $result->send();
     }
     $price = \Ecommerce\Item\Offer\Price::get((int) $_GET['itemOfferPriceId']);
     if (!$price) {
-      $result->success = false;
-      $result->content = 'Такой цены не найдено';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такой цены не найдено';
+        $result->send();
     }
     $item = $price->offer->item;
 
     if (!$item) {
-      $result->success = false;
-      $result->content = 'Такого товара не существует';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такого товара не существует';
+        $result->send();
     }
 
     $item->sales ++;
     $item->save();
 
     if (empty($_GET['count']))
-      $count = 1;
+        $count = 1;
     else
-      $count = (float) $_GET['count'];
+        $count = (float) $_GET['count'];
 
     $cart = $this->ecommerce->getCurCart();
     $stages = Ecommerce\Cart\Stage::getList();
     if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
-      $result->success = false;
-      $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
-      $result->send();
+        $result->success = false;
+        $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+        $result->send();
     }
 
     $isset = false;
     foreach ($cart->cartItems as $cartItem) {
-      if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
+        if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
         $cartItem->count += $count;
         $cartItem->save();
         $isset = true;
         break;
-      }
+        }
     }
     if (!$isset) {
-      $cart->addItem($price->id, $count);
+        $cart->addItem($price->id, $count);
     }
     $cart->date_last_activ = date('Y-m-d H:i:s');
     $cart->calc();
     $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
-  }
+    }
 
-  public function getcartAction() {
+    public function getcartAction() {
     $result = new Server\Result();
     ob_start();
     $this->view->widget('Ecommerce\cart');
     $result->content = ob_get_contents();
     ob_end_clean();
     $result->send();
-  }
+    }
 
 }

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/Exchange1c/objects/Parser/Item/Options.php

Indentation +34 added lines, -34 removed lines

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

system/modules/Migrations/Migrations.php

Indentation +27 added lines, -27 removed lines

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

system/modules/Migrations/objects/Walker.php

Indentation +53 added lines, -53 removed lines

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

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

Indentation +22 added lines, -22 removed lines

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

system/modules/Ui/objects/ActiveForm.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;
-  }
+    }
 
 }

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

Indentation +18 added lines, -18 removed lines

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