injitools / cms-Inji

system/modules/View/appAdminControllers/TemplateController.php

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
             $content = file_get_contents($template->path . '/' . Tools::parsePath($_GET['path']));
             $this->libs->loadLib('Ace');
             $this->view->page(['content' => 'Template/edit', 'data' => compact('template', 'content')]);
-        } else {
+        }
+        else {
             $this->view->page(['content' => 'Template/chooseFile', 'data' => compact('template')]);
         }
     }

system/modules/View/appAdminControllers/content/Template/chooseFile.php

Braces +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= $template->config['file']; ?>'>Основной файл темы</a>

 <hr/>

 <?php

-foreach ($template->config['css'] as $file) {

-    if (file_exists($template->path . '/css/' . $file)) {

+foreach ($template->config['css'] as $file) {
+    if (file_exists($template->path . '/css/' . $file)) {
         ?>

         <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/' . $file; ?>'><?= $file; ?></a>

         <?php

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/View/objects/Template.php

Braces +2 added lines, -1 removed lines

@@ -165,7 +165,8 @@
     public function setModule($module = null) {
         if (!$module && !$this->module) {
             $this->module = \Module::$cur;
-        } else {
+        }
+        else {
             $this->module = $module;
         }
         if (is_string($this->module)) {

system/modules/View/appControllers/ViewController.php

Braces +2 added lines, -1 removed lines

@@ -13,7 +13,8 @@
     public function editorcssAction() {
         if (file_exists($this->view->template->path . '/css/editor.css')) {
             Tools::redirect('/static/templates/' . $this->view->template['name'] . '/css/editor.css');
-        } else {
+        }
+        else {
             header("Content-type: text/css");
             exit();
         }

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/StaticLoader/Controllers/StaticLoaderController.php

Braces +2 added lines, -1 removed lines

@@ -17,7 +17,8 @@
         }
         if (!file_exists($path)) {
             Tools::header(404, true);
-        } else {
+        }
+        else {
             $this->module->giveFile($path);
         }
     }

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'];