injitools / cms-Inji

system/modules/Ecommerce/models/Category.php

Braces +8 added lines, -4 removed lines

@@ -132,9 +132,11 @@ 
     public function resolveTemplate() {
         if ($this->template !== 'inherit') {
             return $this->template;
-        } elseif ($this->template == 'inherit' && $this->category) {
+        }
+        elseif ($this->template == 'inherit' && $this->category) {
             return $this->category->resolveTemplate(true);
-        } else {
+        }
+        else {
             return (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current');
         }
     }
@@ -142,9 +144,11 @@ 
     public function resolveViewer() {
         if ($this->viewer !== 'inherit') {
             return $this->viewer;
-        } elseif ($this->viewer == 'inherit' && $this->category) {
+        }
+        elseif ($this->viewer == 'inherit' && $this->category) {
             return $this->category->resolveViewer(true);
-        } else {
+        }
+        else {
             return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
         }
     }

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

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
             <?= $text ?>
             <p>Спасибо за покупки в нашем интернет-магазине!</p>
             <?php
-        } else {
+        }
+        else {
             ?>
             <h1 class="heading-title">У вас нет недавних заказов</h1>
             <p>У вас нет недавних заказов</p>

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

Braces +24 added lines, -12 removed lines

@@ -71,7 +71,8 @@ 
                       $itemName = $item->name();
                       if (!isset($sums[$cartItem->price->currency_id])) {
                           $sums[$cartItem->price->currency_id] = $cartItem->price->price;
-                      } else {
+                      }
+                      else {
                           $sums[$cartItem->price->currency_id] += $cartItem->price->price;
                       }
                       ?>
@@ -84,10 +85,12 @@ 
                                   $currency = Money\Currency::get($cartItem->price->currency_id);
                                   if ($currency) {
                                       echo $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo 'руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo 'руб.';
                               }
                               ?></td>
@@ -97,10 +100,12 @@ 
                                   $currency = Money\Currency::get($cartItem->price->currency_id);
                                   if ($currency) {
                                       echo $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo 'руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo 'руб.';
                               }
                               ?></td>
@@ -126,10 +131,12 @@ 
                                   $currency = Money\Currency::get($currency_id);
                                   if ($currency) {
                                       echo '&nbsp;' . $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo '&nbsp;руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo '&nbsp;руб.';
                               }
                               echo '<br />';
@@ -142,7 +149,8 @@ 
                     $deliveryPrice = $cart->delivery->price;
                     if (!isset($sums[$deliveryCurrency])) {
                         $sums[$deliveryCurrency] = $deliveryPrice;
-                    } else {
+                    }
+                    else {
                         $sums[$deliveryCurrency] += $deliveryPrice;
                     }
                     $delCurrency = false;
@@ -169,10 +177,12 @@ 
                                   $currency = Money\Currency::get($currency_id);
                                   if ($currency) {
                                       echo '&nbsp;' . $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo '&nbsp;руб.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo '&nbsp;руб.';
                               }
                               echo '<br />';
@@ -208,7 +218,8 @@ 
                                     $price = Ecommerce\Item\Offer\Price::get($status->info);
                                     if ($price) {
                                         echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a>";
-                                    } else {
+                                    }
+                                    else {
                                         echo 'Товар удален';
                                     }
                                     break;
@@ -217,7 +228,8 @@ 
                                     $price = Ecommerce\Item\Offer\Price::get($info[0]);
                                     if ($price) {
                                         echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a> " . ($info[1] > 0 ? '+' . $info[1] : $info[1]);
-                                    } else {
+                                    }
+                                    else {
                                         echo 'Товар удален';
                                     }
                                     break;

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

Braces +7 added lines, -4 removed lines

@@ -3,8 +3,9 @@ 
         <div class="cart-order_page">
             <h2>Быстрое оформление заказа</h2>
             <?php
-            if (!$cart || !$cart->cartItems)
-                echo "<h1>Ваша корзина пуста</h1>";
+            if (!$cart || !$cart->cartItems) {
+                            echo "<h1>Ваша корзина пуста</h1>";
+            }
             else {
                 $form = new Ui\Form;
                 $form->action = "/ecommerce/cart";
@@ -88,7 +89,8 @@ 
                                       <?php
                                       if (class_exists('Money\Currency')) {
                                           $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
-                                      } else {
+                                      }
+                                      else {
                                           $defaultCurrency = '';
                                       }
                                       foreach ($cart->cartItems as $cartItem) {
@@ -146,7 +148,8 @@ 
                                                 <td colspan="2" class="text-right"><?php
                                                   if ($cart->delivery && $cart->delivery->price_text) {
                                                       echo $cart->delivery->price_text;
-                                                  } else {
+                                                  }
+                                                  else {
                                                       echo $cart->deliverySum();
                                                   }
                                                   ?></td>

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

Braces +8 added lines, -5 removed lines

@@ -18,13 +18,16 @@
                         <ul class="item-options">
                           <?php
                           foreach ($item->options as $param) {
-                              if (!$param->item_option_view || !$param->value)
-                                  continue;
+                              if (!$param->item_option_view || !$param->value) {
+                                                                continue;
+                              }
                               if ($param->item_option_type == 'select') {
-                                  if (empty($param->option->items[$param->value]))
-                                      continue;
+                                  if (empty($param->option->items[$param->value])) {
+                                                                        continue;
+                                  }
                                   $value = $param->option->items[$param->value]->value;
-                              } else {
+                              }
+                              else {
                                   $value = $param->value;
                               }
                               $paramName = $param->item_option_name;

system/modules/Ecommerce/appControllers/EcommerceController.php

Braces +20 added lines, -10 removed lines

@@ -28,7 +28,8 @@ 
                 if (!$user_id) {
                     $error = true;
                     $user = null;
-                } else {
+                }
+                else {
                     $user = Users\User::get($user_id);
                 }
             }
@@ -107,16 +108,19 @@ 
                 $category_id = (int) $_GET['inCatalog'];
             }
             $search = $_GET['search'];
-        } else {
+        }
+        else {
             $search = '';
         }
 
         //sort
         if (!empty($_GET['sort'])) {
             $sort = $_GET['sort'];
-        } elseif (!empty($this->ecommerce->config['defaultSort'])) {
+        }
+        elseif (!empty($this->ecommerce->config['defaultSort'])) {
             $sort = $this->ecommerce->config['defaultSort'];
-        } else {
+        }
+        else {
             $sort = ['name' => 'asc'];
         }
 
@@ -131,10 +135,12 @@ 
             }
             if ($category) {
                 $category_id = $category->id;
-            } else {
+            }
+            else {
                 $category_id = 0;
             }
-        } else {
+        }
+        else {
             $category_id = 0;
         }
         $active = $category_id;
@@ -153,7 +159,8 @@ 
         if (!$category || !$category->name) {
             $bread[] = array('text' => 'Каталог');
             $this->view->setTitle('Каталог');
-        } else {
+        }
+        else {
             $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
             $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
             foreach ($categoryIds as $id) {
@@ -177,7 +184,8 @@ 
         //params 
         if (empty(App::$cur->ecommerce->config['filtersInLast'])) {
             $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1], 'order' => ['weight', 'asc']]);
-        } else {
+        }
+        else {
             $params = $this->ecommerce->getItemsParams([
                 'parent' => $category_id,
                 'search' => trim($search),
@@ -189,7 +197,8 @@ 
             }
             if ($ids) {
                 $options = \Ecommerce\Item\Option::getList(['where' => ['id', $ids, 'IN'], 'order' => ['weight', 'asc']]);
-            } else {
+            }
+            else {
                 $options = [];
             }
         }
@@ -198,7 +207,8 @@ 
         //child categorys
         if ($category) {
             $categorys = $category->catalogs;
-        } else {
+        }
+        else {
             $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
         }
 

system/modules/Ecommerce/appControllers/CartController.php

Braces +20 added lines, -11 removed lines

@@ -22,10 +22,12 @@ 
                     $user_id = $this->Users->registration($_POST, true);
                     if (!$user_id) {
                         $error = true;
-                    } else {
+                    }
+                    else {
                         $user = Users\User::get($user_id);
                     }
-                } else {
+                }
+                else {
                     $user = Users\User::$cur;
                 }
                 $ids = [];
@@ -69,7 +71,8 @@ 
                 if ($deliverys && empty($deliverys[$_POST['delivery']])) {
                     $error = 1;
                     Msg::add('Выберите способ доставки', 'danger');
-                } elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
+                }
+                elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
                     $cart->delivery_id = $_POST['delivery'];
                     foreach ($deliverys[$cart->delivery_id]->fields as $field) {
                         if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
@@ -81,10 +84,12 @@ 
                 if ($payTypes && (empty($_POST['payType']) || empty($payTypes[$_POST['payType']]))) {
                     $error = 1;
                     Msg::add('Выберите способ оплаты', 'danger');
-                } elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
+                }
+                elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
                     $payType = $payTypes[$_POST['payType']];
                     $cart->paytype_id = $payType->id;
-                } else {
+                }
+                else {
                     $payType = null;
                 }
                 foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
@@ -98,10 +103,12 @@ 
                     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;
                     }
                 }
@@ -272,10 +279,12 @@ 
         $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();
         $stages = Ecommerce\Cart\Stage::getList();

system/modules/Geography/Geography.php

Braces +2 added lines, -1 removed lines

@@ -13,7 +13,8 @@
     function init() {
         if (!empty(App::$primary->config['site']['domain'])) {
             $domain = App::$primary->config['site']['domain'];
-        } else {
+        }
+        else {
             $domain = implode('.', array_slice(explode('.', idn_to_utf8(INJI_DOMAIN_NAME)), -2));
         }
         $alias = str_replace($domain, '', idn_to_utf8(INJI_DOMAIN_NAME));

system/modules/Dashboard/appAdminControllers/content/siteConfig.php

Braces +24 added lines, -6 removed lines

@@ -2,27 +2,45 @@
 <form action = '' method = 'POST' enctype="multipart/form-data">
     <div class ="form-group">
         <label>Название сайта</label>
-        <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) echo \App::$primary->config['site']['name']; ?>' />
+        <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) {
+    echo \App::$primary->config['site']['name'];
+}
+?>' />
     </div>
     <div class ="form-group">
         <label>Название компании</label>
-        <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) echo \App::$primary->config['site']['company_name']; ?>' />
+        <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) {
+    echo \App::$primary->config['site']['company_name'];
+}
+?>' />
     </div>
     <div class ="form-group">
         <label>Основной домен</label>
-        <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) echo \App::$primary->config['site']['domain']; ?>' />
+        <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) {
+    echo \App::$primary->config['site']['domain'];
+}
+?>' />
     </div>
     <div class ="form-group">
         <label>Контактный email</label>
-        <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' />
+        <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) {
+    echo \App::$primary->config['site']['email'];
+}
+?>' />
     </div>
     <div class ="form-group">
         <label>Ключевые слова</label>
-        <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' />
+        <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) {
+    echo \App::$primary->config['site']['keywords'];
+}
+?>' />
     </div>
     <div class ="form-group">
         <label>Краткое описание сайта</label>
-        <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' />
+        <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) {
+    echo \App::$primary->config['site']['description'];
+}
+?>' />
     </div>
     <?php
     $form = new Ui\Form();