injitools / cms-Inji

system/modules/Exchange1c/objects/Parser/Item/Options.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 
         $options = [];
-        $itemParams = \Ecommerce\Item\Param::getList(['where' => ['item_id', $this->model->id],'key'=>'item_option_id']);
+        $itemParams = \Ecommerce\Item\Param::getList(['where' => ['item_id', $this->model->id], 'key'=>'item_option_id']);
         foreach ($this->object->object->params as $param) {
             if ($param->type == 'paramValue' && isset($itemParams[$param->value])) {
                 $options[$param->value] = $itemParams[$param->value]->value;

system/Inji/Model.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1958,7 +1958,7 @@
             }
         }
         if (!$params) {
-            return FALSE;
+            return false;
         }
         return new $model($params);
     }

Spacing +7 added lines, -7 removed lines

@@ -967,12 +967,12 @@ 
         static::$needJoin = [];
 
         if (!empty($options['limit'])) {
-            $limit = (int)$options['limit'];
+            $limit = (int) $options['limit'];
         } else {
             $limit = 0;
         }
         if (!empty($options['start'])) {
-            $start = (int)$options['start'];
+            $start = (int) $options['start'];
         } else {
             $start = 0;
         }
@@ -1261,12 +1261,12 @@ 
             $query->order($options['order']);
         }
         if (!empty($options['limit'])) {
-            $limit = (int)$options['limit'];
+            $limit = (int) $options['limit'];
         } else {
             $limit = 0;
         }
         if (!empty($options['start'])) {
-            $start = (int)$options['start'];
+            $start = (int) $options['start'];
         } else {
             $start = 0;
         }
@@ -1991,13 +1991,13 @@ 
         if (!empty($className::$cols[$shortName])) {
             switch ($className::$cols[$shortName]['type']) {
                 case 'decimal':
-                    $value = (float)$value;
+                    $value = (float) $value;
                     break;
                 case 'number':
-                    $value = (int)$value;
+                    $value = (int) $value;
                     break;
                 case 'bool':
-                    $value = (bool)$value;
+                    $value = (bool) $value;
                     break;
             }
         }

system/modules/Ecommerce/widgets/items/showOptions.php

Indentation +19 added lines, -19 removed lines

@@ -31,25 +31,25 @@
             <span class="caption">Вид:</span>
             <span class="group">
               <?php
-              for ($i = 2; $i < 5; $i++) {
-                  $curLimit = $limit * $i;
-                  $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit]));
-                  echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>";
-                  echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : '';
-                  echo $curLimit;
-                  echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : '';
-                  echo "</a> ";
-              }
-              if (!empty(App::$cur->ecommerce->config['list_all'])) {
-                  $curLimit = 'all';
-                  $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit]));
-                  echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>";
-                  echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : '';
-                  echo 'Все';
-                  echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : '';
-                  echo "</a> ";
-              }
-              ?>
+                for ($i = 2; $i < 5; $i++) {
+                    $curLimit = $limit * $i;
+                    $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit]));
+                    echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>";
+                    echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : '';
+                    echo $curLimit;
+                    echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : '';
+                    echo "</a> ";
+                }
+                if (!empty(App::$cur->ecommerce->config['list_all'])) {
+                    $curLimit = 'all';
+                    $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit]));
+                    echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>";
+                    echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : '';
+                    echo 'Все';
+                    echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : '';
+                    echo "</a> ";
+                }
+                ?>
             </span>
             <span class="group">
                 <a rel="nofollow" href ='#' onclick="inji.onLoad(function () {

Spacing +3 added lines, -3 removed lines

@@ -17,12 +17,12 @@
     <div class="row">
         <div class="col-sm-6 ecommerce-showoptions-sort">
             <span class="caption">Сортировка:</span>
-            <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price','asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a>
-            <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales','desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a>
+            <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price', 'asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a>
+            <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales', 'desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a>
             <?php
             if (!empty(App::$cur->ecommerce->config['isset_sort'])) {
                 ?>
-                <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset','desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a>
+                <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset', 'desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a>
                 <?php
             }
             ?>

system/modules/Server/appControllers/ServerController.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 class ServerController extends Controller {
     function csrfAction($key = '') {
         $result = new \Server\Result();
-        $key = (string)$key;
+        $key = (string) $key;
         if (!$key) {
             $result->success = false;
             return $result->send();

system/modules/Exchange1c/appAdminControllers/Exchange1cController.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
         ini_set('memory_limit', '2000M');
         ignore_user_abort(true);
         set_time_limit(0);
-        $reExchange = Exchange1c\Exchange::get((int)$_GET['item_pk']);
+        $reExchange = Exchange1c\Exchange::get((int) $_GET['item_pk']);
 
         $exchange = new \Exchange1c\Exchange();
         $exchange->type = $reExchange->type;

system/Inji/Tools.php

Spacing +5 added lines, -5 removed lines

@@ -148,9 +148,9 @@ 
             $new_width = $max_width;
             $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-            $imgX = (int)(($ow / 2) - ($img_width / 2));
+            $imgX = (int) (($ow / 2) - ($img_width / 2));
             if ($pos == 'center') {
-                $imgY = (int)(($oh / 2) - ($img_height / 2));
+                $imgY = (int) (($oh / 2) - ($img_height / 2));
             } else {
                 $imgY = 0;
             }
@@ -292,9 +292,9 @@ 
      * @return string
      */
     public static function toRusDate($date) {
-        $yy = (int)substr($date, 0, 4);
-        $mm = (int)substr($date, 5, 2);
-        $dd = (int)substr($date, 8, 2);
+        $yy = (int) substr($date, 0, 4);
+        $mm = (int) substr($date, 5, 2);
+        $dd = (int) substr($date, 8, 2);
 
         $hours = substr($date, 11, 5);
 

system/modules/Ecommerce/appControllers/EcommerceController.php

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
     public function submitReviewAction() {
         $result = new \Server\Result();
         if (!empty($_POST['review']['item_id']) && !empty($_POST['review']['name']) && !empty($_POST['review']['text'])) {
-            $item = Ecommerce\Item::get((int)$_POST['review']['item_id']);
+            $item = Ecommerce\Item::get((int) $_POST['review']['item_id']);
             if (!$item) {
                 $result->success = false;
                 $result->content = ['errorText' => 'Товар не найден'];
@@ -23,7 +23,7 @@ 
                 'item_id' => $item->id,
                 'user_id' => \Users\User::$cur->id,
                 'name' => htmlspecialchars($_POST['review']['name']),
-                'rating' => (int)$_POST['review']['rating'],
+                'rating' => (int) $_POST['review']['rating'],
                 'text' => htmlspecialchars($_POST['review']['text']),
                 'mail' => !empty($_POST['review']['email']) ? htmlspecialchars($_POST['review']['email']) : '',
                 'file_id' => !empty($_FILES['review']['tmp_name']['file']) ? App::$cur->files->upload([
@@ -47,7 +47,7 @@ 
         $user = Users\User::$cur;
         if (!empty($_POST) && !empty($_POST['card_id'])) {
             $error = false;
-            $card = \Ecommerce\Card::get((int)$_POST['card_id']);
+            $card = \Ecommerce\Card::get((int) $_POST['card_id']);
             if (!$card) {
                 $error = true;
                 Msg::add('Такой карты не существует', 'danger');
@@ -133,7 +133,7 @@ 
         //search
         if (!empty($_GET['search'])) {
             if (!empty($_GET['inCatalog'])) {
-                $category_id = (int)$_GET['inCatalog'];
+                $category_id = (int) $_GET['inCatalog'];
             }
             $search = $_GET['search'];
         } else {
@@ -275,7 +275,7 @@ 
     }
 
     public function viewAction($id = '', $quick = 0) {
-        $item = \Ecommerce\Item::get((int)$id);
+        $item = \Ecommerce\Item::get((int) $id);
         if (!$item) {
             Tools::redirect('/ecommerce/', 'Такой товар не найден');
         }
@@ -323,7 +323,7 @@ 
 
     public function toggleFavAction($itemId) {
         $result = new Server\Result();
-        $item = \Ecommerce\Item::get((int)$itemId);
+        $item = \Ecommerce\Item::get((int) $itemId);
         if (!$item) {
             $result->success = false;
             $result->content = 'Товар не найден';

system/modules/Ecommerce/models/Item.php

Spacing +1 added lines, -1 removed lines

@@ -364,7 +364,7 @@
     public function inFav() {
         if (\Users\User::$cur->id) {
             $fav = \Ecommerce\Favorite::get([['user_id', \Users\User::$cur->id], ['item_id', $this->id]]);
-            return (bool)$fav;
+            return (bool) $fav;
         } else {
             $favs = !empty($_COOKIE['ecommerce_favitems']) ? json_decode($_COOKIE['ecommerce_favitems'], true) : [];
             return in_array($this->id, $favs);

system/modules/Migrations/objects/Parser/Object/Param.php

Doc Comments +3 added lines

@@ -27,6 +27,9 @@
         }
     }
 
+    /**
+     * @param \Model[] $params
+     */
     private function parseData(&$data, $params) {
         $objectParamValue = [
             'col' => '',