injitools / cms-Inji

system/modules/Users/appControllers/content/cabinet.php

Indentation +12 added lines, -12 removed lines

@@ -26,20 +26,20 @@
         </div>
         <div class="col-sm-9">
           <?php
-          if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
-              foreach ($sections as $section) {
-                  if (!empty($section['smallWidget'])) {
-                      $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
-                      $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
-                      ?>
+            if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
+                foreach ($sections as $section) {
+                    if (!empty($section['smallWidget'])) {
+                        $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
+                        $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
+                        ?>
                       <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $this->widget($widgetName); ?></div>
                       <?php
-                  }
-              }
-          } else {
-              $this->widget($sections[$activeSection]['fullWidget']);
-          }
-          ?>
+                    }
+                }
+            } else {
+                $this->widget($sections[$activeSection]['fullWidget']);
+            }
+            ?>
         </div>
       </div>
     </div>

system/modules/Money/appControllers/content/confirmTransfer.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
     <h2>Подтверждение перевода №<?= $transfer->id; ?></h2>

     <p>Перевод валюты <?= $transfer->currency->name(); ?> на сумму <?= $transfer->amount; ?> пользователю <?= $transfer->toUser->name(); ?></p>

     <?php

-    if($transfer->comment){

+    if ($transfer->comment) {

         echo "<p>Комментарий: {$transfer->comment}</p>";

     }

     ?>

system/modules/Money/appControllers/content/pay.php

Indentation +14 added lines, -14 removed lines

@@ -10,12 +10,12 @@ 
         <th></th>
       </tr>
       <?php
-      foreach ($merchants as $merchant) {
-          $allowCurrencies = $merchant->allowCurrencies($pay);
-          if (!$allowCurrencies) {
-              continue;
-          }
-          ?>
+        foreach ($merchants as $merchant) {
+            $allowCurrencies = $merchant->allowCurrencies($pay);
+            if (!$allowCurrencies) {
+                continue;
+            }
+            ?>
           <tr>
             <td>
               <img src="<?= Statics::file($merchant->image ? $merchant->image->path : '/static/system/images/no-image.png', '150x150'); ?>" class="img-responsive" />
@@ -23,23 +23,23 @@ 
             </td>
             <td>
               <?php
-              foreach ($allowCurrencies as $allowCurrency) {
-                  $className = 'Money\MerchantHelper\\' . $merchant->object_name;
-                  $sum = $className::getFinalSum($pay, $allowCurrency);
-                  ?>
+                foreach ($allowCurrencies as $allowCurrency) {
+                    $className = 'Money\MerchantHelper\\' . $merchant->object_name;
+                    $sum = $className::getFinalSum($pay, $allowCurrency);
+                    ?>
                   <b><?= $allowCurrency['currency']->name(); ?></b>
                   <a class="btn btn-primary" href ="/money/merchants/go/<?= $pay->id; ?>/<?= $merchant->id; ?>/<?= $allowCurrency['currency']->id; ?>">Оплатить <?= $sum; ?> <?= $allowCurrency['currency']->acronym(); ?></a>
                   <?php
-              }
-              ?>
+                }
+                ?>
             </td>
             <td width="100%">
               <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?>
             </td>
           </tr>
           <?php
-      }
-      ?>
+        }
+        ?>
     </table>
   </div>
 </div>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
             <td>
               <?php
               foreach ($allowCurrencies as $allowCurrency) {
-                  $className = 'Money\MerchantHelper\\' . $merchant->object_name;
+                  $className = 'Money\MerchantHelper\\'.$merchant->object_name;
                   $sum = $className::getFinalSum($pay, $allowCurrency);
                   ?>
                   <b><?= $allowCurrency['currency']->name(); ?></b>
@@ -34,7 +34,7 @@ 
               ?>
             </td>
             <td width="100%">
-              <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?>
+              <?= $merchant->previewImage ? '<img src="'.$merchant->previewImage->path.'" class="img-responsive" />' : ''; ?>
             </td>
           </tr>
           <?php

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

Spacing +2 added lines, -2 removed lines

@@ -9,10 +9,10 @@
         </div>
         <?php
         ++$i;
-        if (!( $i % 3)) {
+        if (!($i % 3)) {
             echo '<div class="clearfix hidden-xs"></div>';
         }
-        if (!( $i % 2)) {
+        if (!($i % 2)) {
             echo '<div class="clearfix visible-xs"></div>';
         }
     }

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

Braces +3 added lines, -3 removed lines

@@ -3,9 +3,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;

Indentation +37 added lines, -37 removed lines

@@ -3,13 +3,13 @@ 
     <div class="cart-order_page">
       <h2>Быстрое оформление заказа</h2>
       <?php
-      if (!$cart || !$cart->cartItems)
-          echo "<h1>Ваша корзина пуста</h1>";
-      else {
-          $form = new Ui\Form;
-          $form->action = "/ecommerce/cart";
-          $form->begin();
-          ?>
+        if (!$cart || !$cart->cartItems)
+            echo "<h1>Ваша корзина пуста</h1>";
+        else {
+            $form = new Ui\Form;
+            $form->action = "/ecommerce/cart";
+            $form->begin();
+            ?>
           <div class="row">
             <div class="col-sm-4">
               <div class="order_page-info">
@@ -86,14 +86,14 @@ 
                     </thead>
                     <tbody>
                       <?php
-                      if (class_exists('Money\Currency')) {
-                          $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
-                      } else {
-                          $defaultCurrency = '';
-                      }
-                      foreach ($cart->cartItems as $cartItem) {
-                          $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
-                          ?>
+                        if (class_exists('Money\Currency')) {
+                            $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
+                        } else {
+                            $defaultCurrency = '';
+                        }
+                        foreach ($cart->cartItems as $cartItem) {
+                            $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
+                            ?>
                           <tr class="cart_item_id<?= $cartItem->id; ?> item" data-cart_item_id = '<?php echo $cartItem->id; ?>' data-priceam = '<?php echo $cartItem->price->price; ?>' data-item_offer_price_id = '<?php echo $cartItem->price->id; ?>'>
                             <td class="text-center image">                            
                               <a href="/ecommerce/view/<?php echo $cartItem->item->id; ?>">
@@ -119,41 +119,41 @@ 
                             </td>
                           </tr>
                           <?php
-                      }
-                      ?>
+                        }
+                        ?>
                     </tbody>
                     <tfoot>
                       <?php
-                      $colspan = $cart->hasDiscount() ? 5 : 4;
-                      ?>
+                        $colspan = $cart->hasDiscount() ? 5 : 4;
+                        ?>
                       <tr class="order_page-sum">
                         <td colspan="<?= $colspan; ?>" class="text-right">Сумма:</td>
                         <td colspan="2" class="text-right"><?= $cart->itemsSum(); ?></td>
                       </tr>
                       <?php
-                      if ($cart->hasDiscount()) {
-                          ?>
+                        if ($cart->hasDiscount()) {
+                            ?>
                           <tr class="order_page-discountSum">
                             <td colspan="<?= $colspan; ?>" class="text-right">Скидка:</td>
                             <td colspan="2" class="text-right"><?= $cart->discountSum(); ?></td>
                           </tr>
                           <?php
-                      }
-                      if ($cart->delivery) {
-                          ?>
+                        }
+                        if ($cart->delivery) {
+                            ?>
                           <tr class="order_page-deliverySum">
                             <td colspan="<?= $colspan; ?>" class="text-right"><?= $cart->delivery->name; ?>:</td>
                             <td colspan="2" class="text-right"><?php
-                              if ($cart->delivery && $cart->delivery->price_text) {
-                                  echo $cart->delivery->price_text;
-                              } else {
-                                  echo $cart->deliverySum();
-                              }
-                              ?></td>
+                                if ($cart->delivery && $cart->delivery->price_text) {
+                                    echo $cart->delivery->price_text;
+                                } else {
+                                    echo $cart->deliverySum();
+                                }
+                                ?></td>
                           </tr>
                           <?php
-                      }
-                      ?>
+                        }
+                        ?>
                       <tr class="order_page-total">
                         <td colspan="<?= $colspan; ?>" class="text-right">Итого:</td>
                         <td colspan="2" class="text-right"><?= $cart->finalSum(); ?></td>
@@ -165,8 +165,8 @@ 
                 <div class="clearfix"></div>
                 <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>
@@ -175,9 +175,9 @@ 
             </div>
           </div>
           <?php
-          $form->end(false);
-      }
-      ?>
+            $form->end(false);
+        }
+        ?>
     </div>
   </div>
 </div>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
                               </a>
                             </td>
                             <td class="text-left name">
-                              <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name() . ($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' (' . $cartItem->price->offer->name . ')' : ''); ?></a>
+                              <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name().($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' ('.$cartItem->price->offer->name.')' : ''); ?></a>
                             </td>
                             <td class="text-left quantity">
                               <?php $this->widget('Ecommerce\cart/ranger', compact('form', 'cart', 'cartItem')); ?>

system/modules/Materials/appControllers/content/category.php

Indentation +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@ 
   <div class="row">
     <div class="col-md-3">
       <?php
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <div class="content">
@@ -34,8 +34,8 @@ 
             ?>
           </div>
           <?php
-          $pages->draw();
-          ?>
+            $pages->draw();
+            ?>
         </div>
       </div>
     </div>

system/modules/Materials/appControllers/content/materialWithCategorys.php

Indentation +5 added lines, -5 removed lines

@@ -2,11 +2,11 @@
   <div class="row">
     <div class="col-md-3">
       <?php
-      $category = $material->category;
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        $category = $material->category;
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <div class="content">

system/modules/Menu/widgets/menu.php

Braces +10 added lines, -8 removed lines

@@ -9,18 +9,20 @@
 $menu = \Menu\Menu::get($code, 'code');
 if ($menu) {
     foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
-        if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
-            $active = ' class = "active" ';
-        else
-            $active = '';
+        if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
+                    $active = ' class = "active" ';
+        } else {
+                    $active = '';
+        }
         echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
         if ($item->childs(['order' => ['weight', 'asc']])) {
             echo "<ul>";
             foreach ($item->childs as $item) {
-                if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
-                    $active = ' class = "active" ';
-                else
-                    $active = '';
+                if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
+                                    $active = ' class = "active" ';
+                } else {
+                                    $active = '';
+                }
                 echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
             }
             echo "</ul>";

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

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         'manager' => [
             'map' => [
                 ['name', 'code'],
-                ['delivery', 'electronic','discount']
+                ['delivery', 'electronic', 'discount']
             ]
         ]
     ];