injitools / cms-Inji

system/modules/Materials/appControllers/MaterialsController.php

Braces +12 added lines, -6 removed lines

@@ -33,7 +33,8 @@ 
                     ['category_id', $category->id],
                     ['alias', $args[count($args) - 1]],
                 ];
-            } else {
+            }
+            else {
                 $where = [['alias', $path]];
             }
             $material = Materials\Material::get($where);
@@ -43,7 +44,8 @@ 
                         ['category_id', $category->id],
                         ['id', (int) $args[count($args) - 1]],
                     ];
-                } else {
+                }
+                else {
                     $where = [['alias', $path]];
                 }
                 $material = Materials\Material::get($where);
@@ -54,12 +56,14 @@ 
                     $this->categoryAction($category->id);
                 }
             }
-        } else {
+        }
+        else {
             $material = Materials\Material::get(1, 'default');
         }
         if ($material) {
             $this->viewAction($material->id);
-        } elseif (!$category && !$material) {
+        }
+        elseif (!$category && !$material) {
             Tools::header('404');
             $this->view->page([
                 'content' => '404',
@@ -92,7 +96,8 @@ 
                 'content' => '404',
                 'data' => ['text' => 'Такой страницы не найдено']
             ]);
-        } else {
+        }
+        else {
             $this->view->setTitle($category->name);
 
             $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE']]), 'limit' => 10]);
@@ -135,7 +140,8 @@ 
         }
         if ($material->image) {
             $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $material->image->path]);
-        } elseif ($logo = Files\File::get('site_logo', 'code')) {
+        }
+        elseif ($logo = Files\File::get('site_logo', 'code')) {
             $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $logo->path]);
         }
         $this->view->setTitle($material->name);

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

Indentation +7 added lines, -7 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">
@@ -16,9 +16,9 @@ 
                 <div class ="category-materials">
                     <div class ="row">
                       <?php
-                      $i = 0;
-                      foreach ($materials as $material) {
-                          ?>
+                        $i = 0;
+                        foreach ($materials as $material) {
+                            ?>
                             <div class = "col-sm-6 category-material">
                                 <a class="category-material-name" href ="<?= $material->getHref(); ?>"><h3><?= $material->name; ?></h3></a>
                                 <div class="category-material-preview"><?= $material->preview; ?></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/Sliders/widgets/slider.php

Indentation +10 added lines, -10 removed lines

@@ -14,9 +14,9 @@ 
     <!-- Indicators -->
     <ol class="carousel-indicators">
       <?php
-      $i = 0;
-      for ($i = 0; $i < count($slides); $i++) {
-          ?>
+        $i = 0;
+        for ($i = 0; $i < count($slides); $i++) {
+            ?>
             <li data-target="#sliderWidget-<?= $slider->id; ?>" data-slide-to="<?= $i; ?>" <?= !$i ? 'class="active"' : ''; ?>></li>
             <?php
         }
@@ -27,15 +27,15 @@ 
     <!-- Wrapper for slides -->
     <div class="carousel-inner" role="listbox">
       <?php
-      $i = 0;
-      foreach ($slides as $item) {
-          ?>
+        $i = 0;
+        foreach ($slides as $item) {
+            ?>
             <div class="item <?= !$i ? 'active' : ''; ?>">
               <?php
-              if ($item->link) {
-                  echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
-              }
-              ?>
+                if ($item->link) {
+                    echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
+                }
+                ?>
                 <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
                 <div class="carousel-caption">
                   <?= $item->description; ?>

system/modules/View/appAdminControllers/content/index.php

Braces +2 added lines, -1 removed lines

@@ -11,12 +11,13 @@
     '',
     ''
 ]);
-if (!empty($templates['app']['installed']))
+if (!empty($templates['app']['installed'])) {
     foreach ($templates['app']['installed'] as $template => $name) {
         $table->addRow([
             $name,
             (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/' . $template . '">Установить по умолчанию</a>' : 'Тема по умолчанию',
             '<a href = "/admin/view/template/editFile/' . $template . '">Файлы</a> <a href = "/admin/view/editTemplate/' . $template . '">Редактировать</a>'
         ]);
+}
     }
 $table->draw();

system/modules/StaticLoader/StaticLoader.php

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 
             $fileName = $fileinfo['filename'] . '.' . $fileinfo['extension'];
             if (App::$cur->db->connect) {
-                $fileObj = Files\File::get([ 'path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
+                $fileObj = Files\File::get(['path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
                 if ($fileObj) {
                     $fileName = $fileObj->original_name;
                 }

Braces +28 added lines, -17 removed lines

@@ -37,10 +37,12 @@ 
                 $scriptApp->installed = true;
                 $scriptApp->params = [];
                 $scriptApp->config = Config::app($scriptApp);
-            } else {
+            }
+            else {
                 $scriptApp = \App::$cur;
             }
-        } else {
+        }
+        else {
             $scriptApp = \App::$cur->system ? \App::$primary : \App::$cur;
         }
 
@@ -107,30 +109,38 @@ 
 
                 $sizes = explode('x', $_GET['resize']);
                 $sizes[0] = intval($sizes[0]);
-                if (isset($sizes[1]))
-                    $sizes[1] = intval($sizes[1]);
-                else
-                    $sizes[1] = 0;
+                if (isset($sizes[1])) {
+                                    $sizes[1] = intval($sizes[1]);
+                }
+                else {
+                                    $sizes[1] = 0;
+                }
 
                 if (!$sizes[0] || !$sizes[1]) {
                     header('HTTP/1.1 404 Not Found');
                     exit();
-                } elseif ($sizes[0] > 2000 || $sizes[1] > 2000) {
+                }
+                elseif ($sizes[0] > 2000 || $sizes[1] > 2000) {
                     header('HTTP/1.1 404 Not Found');
                     exit();
-                } else {
+                }
+                else {
                     $dir = App::$primary->path;
 
                     if (!empty($_GET['resize_crop'])) {
-                        if (in_array($_GET['resize_crop'], array('q', 'c')))
-                            $crop = $_GET['resize_crop'];
-                        else
-                            $crop = 'c';
+                        if (in_array($_GET['resize_crop'], array('q', 'c'))) {
+                                                    $crop = $_GET['resize_crop'];
+                        }
+                        else {
+                                                    $crop = 'c';
+                        }
+                    }
+                    elseif (!empty($_GET['resize_quadro'])) {
+                                            $crop = 'q';
+                    }
+                    else {
+                                            $crop = '';
                     }
-                    elseif (!empty($_GET['resize_quadro']))
-                        $crop = 'q';
-                    else
-                        $crop = '';
                     $pos = 'center';
                     if (!empty($_GET['resize_pos']) && in_array($_GET['resize_pos'], array('top', 'center'))) {
                         $pos = $_GET['resize_pos'];
@@ -155,7 +165,8 @@ 
 
             // Преобразуем запрос клиента If-Modified-Since в таймштамп
             $modifiedSince = strtotime($modifiedSince[0]);
-        } else {
+        }
+        else {
             // Устанавливаем время модификации в ноль
             $modifiedSince = 0;
         }

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

Braces +6 added lines, -3 removed lines

@@ -18,7 +18,8 @@ 
     public function getArray($keyCol = '') {
         if (!$keyCol) {
             return $this->pdoResult->fetchAll(\PDO::FETCH_ASSOC);
-        } else {
+        }
+        else {
             $array = [];
             while ($row = $this->pdoResult->fetch(\PDO::FETCH_ASSOC)) {
                 $array[$row[$keyCol]] = $row;
@@ -33,7 +34,8 @@ 
         while ($object = $this->pdoResult->fetchObject($class)) {
             if ($keyCol) {
                 $array[$object->$keyCol] = $object;
-            } else {
+            }
+            else {
                 $array[] = $object;
             }
         }
@@ -44,7 +46,8 @@ 
     public function fetch($className = '') {
         if ($className) {
             return $this->pdoResult->fetchObject($className);
-        } else {
+        }
+        else {
             return $this->pdoResult->fetch(\PDO::FETCH_ASSOC);
         }
     }

system/modules/Db/Db.php

Braces +5 added lines, -3 removed lines

@@ -15,11 +15,13 @@
             $param = isset($this->config['default']) ? $this->config['default'] : 'local';
         }
         if (!is_array($param)) {
-            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true])))
-                return false;
+            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) {
+                            return false;
+            }
 
             $db = $dbOption;
-        } else {
+        }
+        else {
             $db = $param;
         }
         $className = 'Db\\' . $db['driver'];

system/modules/Money/objects/MerchantHelper/WalletOne.php

Braces +24 added lines, -15 removed lines

@@ -27,20 +27,24 @@ 
 
         // Проверка наличия необходимых параметров в POST-запросе
 
-        if (!isset($data["WMI_SIGNATURE"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
+        if (!isset($data["WMI_SIGNATURE"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
+        }
 
-        if (!isset($data["WMI_PAYMENT_NO"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
+        if (!isset($data["WMI_PAYMENT_NO"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
+        }
 
-        if (!isset($data["WMI_ORDER_STATE"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
+        if (!isset($data["WMI_ORDER_STATE"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
+        }
 
         // Извлечение всех параметров POST-запроса, кроме WMI_SIGNATURE
         $params = [];
         foreach ($data as $name => $value) {
-            if ($name !== "WMI_SIGNATURE")
-                $params[$name] = $value;
+            if ($name !== "WMI_SIGNATURE") {
+                            $params[$name] = $value;
+            }
         }
 
         // Сортировка массива по именам ключей в порядке возрастания
@@ -69,11 +73,13 @@ 
                 $result['payId'] = $data["WMI_PAYMENT_NO"];
                 $result['status'] = 'success';
                 return $result;
-            } else {
+            }
+            else {
                 // Случилось что-то странное, пришло неизвестное состояние заказа
                 $result['callback'] = print_answer("Retry", "Неверное состояние " . $data["WMI_ORDER_STATE"]);
             }
-        } else {
+        }
+        else {
             // Подпись не совпадает, возможно вы поменяли настройки интернет-магазина
             $result['callback'] = print_answer("Retry", "Неверная подпись " . (!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty'));
         }
@@ -84,8 +90,9 @@ 
         $config = static::getConfig();
         $merchantCurrency = static::getMerchantCurrency($currency);
 
-        if (!$description)
-            $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+        if (!$description) {
+                    $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+        }
 
         //Секретный ключ интернет-магазина
         $key = $config['secret'];
@@ -115,13 +122,15 @@ 
         $fieldValues = "";
 
         foreach ($fields as $value) {
-            if (is_array($value))
-                foreach ($value as $v) {
+            if (is_array($value)) {
+                            foreach ($value as $v) {
                     //Конвертация из текущей кодировки (UTF-8)
                     //необходима только если кодировка магазина отлична от Windows-1251
                     $v = iconv("utf-8", "windows-1251", $v);
+            }
                     $fieldValues .= $v;
-                } else {
+                }
+                else {
                 //Конвертация из текущей кодировки (UTF-8)
                 //необходима только если кодировка магазина отлична от Windows-1251
                 $value = iconv("utf-8", "windows-1251", $value);