injitools / cms-Inji

system/modules/Db/objects/Mysql/Mysql.php

Spacing +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
 
 class Mysql extends \Object
 {
-    public $config = array();       // настройки подключения выбраной базы
-    public $connect = FALSE;        // ярлык соединения с MySQL
-    public $encoding = 'utf-8';        // установленная кодировка
-    public $db_name = 'test';         // выбраная в данный момент база
-    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $config = array(); // настройки подключения выбраной базы
+    public $connect = FALSE; // ярлык соединения с MySQL
+    public $encoding = 'utf-8'; // установленная кодировка
+    public $db_name = 'test'; // выбраная в данный момент база
+    public $table_prefix = 'inji_'; // префикс названий таблиц
     public $pdo = NULL;
     public $lastQuery = '';
     public $last_error = '';

Braces +12 added lines, -8 removed lines

@@ -30,14 +30,18 @@
     public function init($connect_options)
     {
         extract($connect_options);
-        if (isset($db_name))
-            $this->db_name = $db_name;
-        if (isset($encoding))
-            $this->encoding = $encoding;
-        if (isset($table_prefix))
-            $this->table_prefix = $table_prefix;
-        if (isset($noConnectAbort))
-            $this->noConnectAbort = $noConnectAbort;
+        if (isset($db_name)) {
+                    $this->db_name = $db_name;
+        }
+        if (isset($encoding)) {
+                    $this->encoding = $encoding;
+        }
+        if (isset($table_prefix)) {
+                    $this->table_prefix = $table_prefix;
+        }
+        if (isset($noConnectAbort)) {
+                    $this->noConnectAbort = $noConnectAbort;
+        }
 
         $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
         $dt = new \DateTime();

system/modules/Ecommerce/appAdminControllers/content/configure.php

Indentation +13 added lines, -13 removed lines

@@ -3,14 +3,14 @@ 
 <ul class="nav nav-tabs" role="tablist">
   <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Настройки</a></li>
   <?php
-  $dataManagers = [];
-  foreach ($managers as $manager) {
-      $dataManager = new Ui\DataManager($manager);
-      $dataManagers[$manager] = $dataManager;
-      $code = 'tab_' . str_replace('\\', '_', $manager);
-      echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
-  }
-  ?>
+    $dataManagers = [];
+    foreach ($managers as $manager) {
+        $dataManager = new Ui\DataManager($manager);
+        $dataManagers[$manager] = $dataManager;
+        $code = 'tab_' . str_replace('\\', '_', $manager);
+        echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
+    }
+    ?>
 </ul>
 <div class="tab-content">
   <div role="tabpanel" class="tab-pane fade in active" id="home">
@@ -52,17 +52,17 @@ 
     </script>
   </div>
   <?php
-  foreach ($dataManagers as $manager => $dataManager) {
-      $code = 'tab_' . str_replace('\\', '_', $manager);
-      ?>
+    foreach ($dataManagers as $manager => $dataManager) {
+        $code = 'tab_' . str_replace('\\', '_', $manager);
+        ?>
       <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>">
         <?php
         $dataManager->draw();
         ?>
       </div>
       <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 
 

system/modules/Ecommerce/appAdminControllers/content/itemsCounter.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 ?>
 <ul class="nav nav-list-main">
   <?php
-  $catalogs = Catalog::get_list(['order' => ['catalog_name', 'asc']]);
-  foreach ($catalogs as $catalog) {
-      if ($catalog->catalog_parent_id == 0) {
-          showChildsCatalogs($catalog, $catalogs, $catalogIds);
-      }
-  }
-  ?>
+    $catalogs = Catalog::get_list(['order' => ['catalog_name', 'asc']]);
+    foreach ($catalogs as $catalog) {
+        if ($catalog->catalog_parent_id == 0) {
+            showChildsCatalogs($catalog, $catalogs, $catalogIds);
+        }
+    }
+    ?>
 </ul>
 <?php
 function showChildsCatalogs($parent, $catalogs, $catalogIds)

system/modules/Ecommerce/appControllers/CartController.php

Spacing +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
             $result->send();
         }
 
-        $item->sales ++;
+        $item->sales++;
         $item->save();
 
         if (empty($_GET['count']))

Braces +8 added lines, -6 removed lines

@@ -271,10 +271,11 @@ 
         $item->sales ++;
         $item->save();
 
-        if (empty($_GET['count']))
-            $count = 1;
-        else
-            $count = (float) $_GET['count'];
+        if (empty($_GET['count'])) {
+                    $count = 1;
+        } else {
+                    $count = (float) $_GET['count'];
+        }
 
         $cart = $this->ecommerce->getCurCart();
 
@@ -313,8 +314,9 @@ 
 
     function delcartitemAction($cci_id = 0)
     {
-        if (empty($_SESSION['cart']['cart_id']))
-            exit('У вас нет корзины');
+        if (empty($_SESSION['cart']['cart_id'])) {
+                    exit('У вас нет корзины');
+        }
         $cartItem = \Ecommerce\Cart\Item::get((int) $cci_id);
         if (!$cartItem || $cartItem->cart_id != $_SESSION['cart']['cart_id']) {
             exit('Этот элемент корзины не относится к вашей корзине');

system/modules/Ecommerce/appControllers/content/Cart/index.php

Indentation +10 added lines, -10 removed lines

@@ -49,12 +49,12 @@ 
                 <?php $this->widget('Ecommerce\cart/fields', ['form' => $form, 'cart' => $cart]); ?>
               </fieldset>
               <?php
-              $packchecked = '';
-              $packItem = false;
-              $packSum = 0;
-              if ($packItem) {
-                  $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked';
-                  ?>
+                $packchecked = '';
+                $packItem = false;
+                $packSum = 0;
+                if ($packItem) {
+                    $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked';
+                    ?>
                   <fieldset id="additional">
                     <h2 class="secondary-title">Дополнительно</h2>
                     <div class=" checkout-payment-form">
@@ -78,8 +78,8 @@ 
                     </div>
                   </fieldset>
                   <?php
-              }
-              ?>
+                }
+                ?>
             </div>                                    
           </div>
           <div class="col-sm-8">
@@ -338,8 +338,8 @@ 
             <hr />
             <div class="order_page-finish">
               <?php
-              $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
-              ?>
+                $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
+                ?>
               <div class="order_page-orderBtn">
                 <button name ="action" value ="order" data-loading-text="Подождите.." class="btn btn-primary">Подтверждение заказа</button>
               </div>

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
                         }
                         $helpText = '';
                         if ((float) $delivery->max_cart_price) {
-                            $helpText.= 'При заказе товаров на сумму от ' . $delivery->max_cart_price . ' руб - бесплатно';
+                            $helpText .= 'При заказе товаров на сумму от ' . $delivery->max_cart_price . ' руб - бесплатно';
                         }
                         if ($delivery->info) {
                             if ($helpText) {

Braces +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
   <div class="cart-order_page">
     <h2>Быстрое оформление заказа</h2>
     <?php
-    if (!$cart || !$cart->cartItems)
-        echo "<h1>Ваша корзина пуста</h1>";
-    else {
+    if (!$cart || !$cart->cartItems) {
+            echo "<h1>Ваша корзина пуста</h1>";
+    } else {
         $sums = [];
         $cartDelivery = $cart->delivery;
         $deliveryPrice = 0;

system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php

Indentation +87 added lines, -87 removed lines

@@ -6,11 +6,11 @@ 
     </tr>
   </thead>
   <?php
-  $orderDeatilCols = [
-      'id' => '№ Заказа',
-      'complete_data' => 'Дата заказа'
-  ];
-  ?>
+    $orderDeatilCols = [
+        'id' => '№ Заказа',
+        'complete_data' => 'Дата заказа'
+    ];
+    ?>
   <tbody>
     <tr>
       <td class="text-left" style="width: 50%;">              
@@ -63,91 +63,91 @@ 
     </thead>
     <tbody>
       <?php
-      $sums = [];
-      foreach ($cart->cartItems as $cartItem) {
-          $item = $cartItem->item;
-          $itemName = $item->name();
-          if (!isset($sums[$cartItem->price->currency_id])) {
-              $sums[$cartItem->price->currency_id] = $cartItem->price->price;
-          } else {
-              $sums[$cartItem->price->currency_id] += $cartItem->price->price;
-          }
-          ?>
+        $sums = [];
+        foreach ($cart->cartItems as $cartItem) {
+            $item = $cartItem->item;
+            $itemName = $item->name();
+            if (!isset($sums[$cartItem->price->currency_id])) {
+                $sums[$cartItem->price->currency_id] = $cartItem->price->price;
+            } else {
+                $sums[$cartItem->price->currency_id] += $cartItem->price->price;
+            }
+            ?>
           <tr>
             <td class="text-left"><?= $itemName; ?></td>
             <td class="text-right"><?= $cartItem->count; ?></td>
             <td class="text-right"><?= $cartItem->price->price; ?> 
               <?php
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
-                  if ($currency) {
-                      echo $currency->acronym();
-                  } else {
-                      echo 'руб.';
-                  }
-              } else {
-                  echo 'руб.';
-              }
-              ?></td>
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
+                    if ($currency) {
+                        echo $currency->acronym();
+                    } else {
+                        echo 'руб.';
+                    }
+                } else {
+                    echo 'руб.';
+                }
+                ?></td>
             <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?>
               <?php
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
-                  if ($currency) {
-                      echo $currency->acronym();
-                  } else {
-                      echo 'руб.';
-                  }
-              } else {
-                  echo 'руб.';
-              }
-              ?></td>
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
+                    if ($currency) {
+                        echo $currency->acronym();
+                    } else {
+                        echo 'руб.';
+                    }
+                } else {
+                    echo 'руб.';
+                }
+                ?></td>
             <td class="text-right" style="white-space: nowrap;">
               <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1);
                         return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a>
           </tr>
           <?php
-      }
-      ?>
+        }
+        ?>
     </tbody>
     <tfoot>
       <tr>
         <td colspan="2"></td>
         <td class="text-right"><b>Сумма</b></td>
         <td class="text-right"><?php
-          foreach ($sums as $currency_id => $sum) {
-              if (!$sum) {
-                  continue;
-              }
-              echo number_format($sum, 2, '.', ' ');
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($currency_id);
-                  if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-              } else {
-                  echo '&nbsp;руб.';
-              }
-              echo '<br />';
-          }
-          ?></td>
+            foreach ($sums as $currency_id => $sum) {
+                if (!$sum) {
+                    continue;
+                }
+                echo number_format($sum, 2, '.', ' ');
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($currency_id);
+                    if ($currency) {
+                        echo '&nbsp;' . $currency->acronym();
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                } else {
+                    echo '&nbsp;руб.';
+                }
+                echo '<br />';
+            }
+            ?></td>
         <td></td>
       </tr>
       <?php
-      $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
-      $deliveryPrice = $cart->delivery->price;
-      if (!isset($sums[$deliveryCurrency])) {
-          $sums[$deliveryCurrency] = $deliveryPrice;
-      } else {
-          $sums[$deliveryCurrency] += $deliveryPrice;
-      }
-      $delCurrency = false;
-      if (App::$cur->money) {
-          $delCurrency = Money\Currency::get($deliveryPrice);
-      }
-      ?>
+        $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
+        $deliveryPrice = $cart->delivery->price;
+        if (!isset($sums[$deliveryCurrency])) {
+            $sums[$deliveryCurrency] = $deliveryPrice;
+        } else {
+            $sums[$deliveryCurrency] += $deliveryPrice;
+        }
+        $delCurrency = false;
+        if (App::$cur->money) {
+            $delCurrency = Money\Currency::get($deliveryPrice);
+        }
+        ?>
       <tr>
         <td colspan="2"></td>
         <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td>
@@ -158,24 +158,24 @@ 
         <td colspan="2"></td>
         <td class="text-right"><b>Итого</b></td>
         <td class="text-right"><?php
-          foreach ($sums as $currency_id => $sum) {
-              if (!$sum) {
-                  continue;
-              }
-              echo number_format($sum, 2, '.', ' ');
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($currency_id);
-                  if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-              } else {
-                  echo '&nbsp;руб.';
-              }
-              echo '<br />';
-          }
-          ?></td>
+            foreach ($sums as $currency_id => $sum) {
+                if (!$sum) {
+                    continue;
+                }
+                echo number_format($sum, 2, '.', ' ');
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($currency_id);
+                    if ($currency) {
+                        echo '&nbsp;' . $currency->acronym();
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                } else {
+                    echo '&nbsp;руб.';
+                }
+                echo '<br />';
+            }
+            ?></td>
         <td></td>
       </tr>
     </tfoot>

system/modules/Ecommerce/appControllers/content/buyCard.php

Indentation +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@
                       <td>
                         <ul>
                           <?php
-                          foreach ($card->levels as $level) {
-                              ?>
+                            foreach ($card->levels as $level) {
+                                ?>
                               <li><?= $level->name; ?> - <?= $level->discount->name; ?></li>
                               <?php
-                          }
-                          ?>
+                            }
+                            ?>
                         </ul>
                       </td>
                       <td>

system/modules/Ecommerce/appControllers/content/itemList.php

Indentation +8 added lines, -8 removed lines

@@ -19,18 +19,18 @@
       <div class="items-icons">	
         <div class="row">	
           <?php
-          $i = 0;
-          foreach ($items as $item) {
-              ?>
+            $i = 0;
+            foreach ($items as $item) {
+                ?>
               <div class="col-sm-4">		
                 <?php $this->widget('Ecommerce\items/item', ['item' => $item]); ?>
               </div>
               <?php
-              if (!( ++$i % 3)) {
-                  echo '</div><div class="row">';
-              }
-          }
-          ?>
+                if (!( ++$i % 3)) {
+                    echo '</div><div class="row">';
+                }
+            }
+            ?>
         </div>
       </div>
       <div class="text-center">

system/modules/Ecommerce/models/Cart.php

Braces +3 added lines, -2 removed lines

@@ -275,8 +275,9 @@
                 break;
             }
         }
-        if (!$price)
-            return false;
+        if (!$price) {
+                    return false;
+        }
 
         if ($count <= 0) {
             $count = 1;