injitools / cms-Inji

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

Braces +86 added lines, -51 removed lines

@@ -59,7 +59,8 @@ 
                 $source = str_replace('</body>', '{BODYEND}</body>', $source);
             }
             $this->parseSource($source);
-        } else {
+        }
+        else {
             $this->content();
         }
     }
@@ -80,7 +81,8 @@ 
         //set content
         if (!empty($params['content'])) {
             $this->template->setContent($params['content']);
-        } elseif (!$this->template->contentPath) {
+        }
+        elseif (!$this->template->contentPath) {
             $this->template->setContent();
         }
         //set data
@@ -98,7 +100,8 @@ 
         }
         if (!file_exists($this->template->contentPath)) {
             echo 'Content not found';
-        } else {
+        }
+        else {
             extract($this->contentData);
             include $this->template->contentPath;
         }
@@ -126,15 +129,17 @@ 
         }
         if (!$data) {
             echo 'Content not found';
-        } else {
+        }
+        else {
             extract($this->contentData);
             include $data['contentPath'];
         }
     }
 
     private function parseRaw($source) {
-        if (!$source)
-            return [];
+        if (!$source) {
+                    return [];
+        }
 
         preg_match_all("|{([^}]+)}|", $source, $result);
         return $result[1];
@@ -185,9 +190,11 @@ 
         $href = '';
         if (is_string($params)) {
             $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params;
-        } elseif (empty($params['template']) && !empty($params['file'])) {
+        }
+        elseif (empty($params['template']) && !empty($params['file'])) {
             $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params['file'];
-        } elseif (!empty($params['template']) && !empty($params['file'])) {
+        }
+        elseif (!empty($params['template']) && !empty($params['file'])) {
             $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
         }
         return $href;
@@ -225,9 +232,11 @@ 
 
         if (!empty($this->template->config['favicon']) && file_exists($this->template->path . "/{$this->template->config['favicon']}")) {
             echo "        <link rel='shortcut icon' href='/templates/{$this->template->name}/{$this->template->config['favicon']}' />";
-        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path . "/static/images/{$this->template->config['favicon']}")) {
+        }
+        elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path . "/static/images/{$this->template->config['favicon']}")) {
             echo "        <link rel='shortcut icon' href='/static/images/{$this->template->config['favicon']}' />";
-        } elseif (file_exists($this->app->path . '/static/images/favicon.ico')) {
+        }
+        elseif (file_exists($this->app->path . '/static/images/favicon.ico')) {
             echo "        <link rel='shortcut icon' href='/static/images/favicon.ico' />";
         }
 
@@ -267,7 +276,8 @@ 
                 $this->loadedCss[$href] = $href;
                 $urls[$href] = $path;
                 $timeStr.=filemtime($path);
-            } else {
+            }
+            else {
                 echo "\n        <link href='{$href}' rel='stylesheet' type='text/css' />";
             }
         }
@@ -311,10 +321,12 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '//') !== false)
-                        $href = $css;
-                    else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    if (strpos($css, '//') !== false) {
+                                            $href = $css;
+                    }
+                    else {
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -324,10 +336,12 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '://') !== false)
-                        $href = $css;
-                    else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                    if (strpos($css, '://') !== false) {
+                                            $href = $css;
+                    }
+                    else {
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -337,10 +351,12 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '//') !== false)
-                        $href = $css;
-                    else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    if (strpos($css, '//') !== false) {
+                                            $href = $css;
+                    }
+                    else {
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -360,7 +376,8 @@ 
             foreach ($this->app->config['site']['metatags'] as $meta) {
                 if (!empty($meta['name'])) {
                     $metas['metaName:' . $meta['name']] = $meta;
-                } elseif (!empty($meta['property'])) {
+                }
+                elseif (!empty($meta['property'])) {
                     $metas['metaProperty:' . $meta['property']] = $meta;
                 }
             }
@@ -374,7 +391,8 @@ 
     public function addMetaTag($meta) {
         if (!empty($meta['name'])) {
             $this->dynMetas['metaName:' . $meta['name']] = $meta;
-        } elseif (!empty($meta['property'])) {
+        }
+        elseif (!empty($meta['property'])) {
             $this->dynMetas['metaProperty:' . $meta['property']] = $meta;
         }
     }
@@ -391,20 +409,24 @@ 
         $noParsedScripts = [];
         foreach ($scripts as $script) {
             if (is_string($script)) {
-                if (!empty($urls[$script]))
-                    continue;
+                if (!empty($urls[$script])) {
+                                    continue;
+                }
 
                 $path = $this->app->staticLoader->parsePath($script);
                 if (file_exists($path)) {
                     $nativeUrl[$script] = $script;
                     $urls[$script] = $path;
                     $timeStr.=filemtime($path);
-                } else {
+                }
+                else {
                     $noParsedScripts[$script] = $script;
                 }
-            } elseif (!empty($script['file'])) {
-                if (!empty($urls[$script['file']]))
-                    continue;
+            }
+            elseif (!empty($script['file'])) {
+                if (!empty($urls[$script['file']])) {
+                                    continue;
+                }
 
                 $path = $this->app->staticLoader->parsePath($script['file']);
                 if (file_exists($path)) {
@@ -414,7 +436,8 @@ 
                         $onLoadModules[$script['name']] = $script['name'];
                     }
                     $timeStr.=filemtime($path);
-                } else {
+                }
+                else {
                     $noParsedScripts[$script] = $script;
                 }
             }
@@ -461,12 +484,15 @@ 
                         $this->genScriptArray($js, $type, $resultArray);
                         continue;
                     }
-                    if (strpos($js, '//') !== false)
-                        $href = $js;
-                    else
-                        $href = $this->getHref('js', $js);
-                    if (!$href)
-                        continue;
+                    if (strpos($js, '//') !== false) {
+                                            $href = $js;
+                    }
+                    else {
+                                            $href = $this->getHref('js', $js);
+                    }
+                    if (!$href) {
+                                            continue;
+                    }
 
                     $resultArray[] = $href;
                 }
@@ -477,10 +503,12 @@ 
                         $this->genScriptArray($js, $type, $resultArray);
                         continue;
                     }
-                    if (strpos($js, '//') !== false)
-                        $href = $js;
-                    else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                    if (strpos($js, '//') !== false) {
+                                            $href = $js;
+                    }
+                    else {
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                    }
                     $resultArray[] = $href;
                 }
                 break;
@@ -492,12 +520,14 @@ 
                             continue;
                         }
                         $asset = $js;
-                    } else {
+                    }
+                    else {
                         $asset = [];
                     }
                     $asset['file'] = $this->getHref('js', $js);
-                    if (!$asset['file'])
-                        continue;
+                    if (!$asset['file']) {
+                                            continue;
+                    }
                     $resultArray[] = $asset;
                 }
                 break;
@@ -507,7 +537,8 @@ 
     public function customAsset($type, $asset, $lib = false) {
         if (!$lib) {
             $this->dynAssets[$type][] = $asset;
-        } else {
+        }
+        else {
             $this->libAssets[$type][$lib][] = $asset;
         }
     }
@@ -516,10 +547,12 @@ 
         if ($add && !empty($this->app->config['site']['name'])) {
             if ($title) {
                 $this->title = $title . ' - ' . $this->app->config['site']['name'];
-            } else {
+            }
+            else {
                 $this->title = $this->app->config['site']['name'];
             }
-        } else {
+        }
+        else {
             $this->title = $title;
         }
     }
@@ -542,8 +575,9 @@ 
                         $paramArray = true;
                     }
                 }
-                if (!$paramArray)
-                    $lineParams = ':' . implode(':', $_params);
+                if (!$paramArray) {
+                                    $lineParams = ':' . implode(':', $_params);
+                }
             }
         }
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";
@@ -570,7 +604,8 @@ 
                 $paths[$pathName] = $path . '/widgets/' . $widgetName[1] . '.php';
             }
             return $paths;
-        } else {
+        }
+        else {
             $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
             $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '.php';
 

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

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/Mysql.php

Braces +16 added lines, -10 removed lines

@@ -29,14 +29,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();
@@ -52,10 +56,12 @@ 
         if ((int) $error[0]) {
             if ($this->noConnectAbort) {
                 return false;
-            } else {
+            }
+            else {
                 INJI_SYSTEM_ERROR($error[2], true);
             }
-        } else {
+        }
+        else {
             $this->connect = true;
             $query = new Mysql\Query($this);
             $query->query("SET SQL_BIG_SELECTS=1");

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

Braces +100 added lines, -59 removed lines

@@ -34,7 +34,8 @@ 
     public function __construct($instance = null) {
         if (!$instance) {
             $this->curInstance = \App::$cur->db->connection;
-        } else {
+        }
+        else {
             $this->curInstance = $instance;
         }
     }
@@ -79,7 +80,8 @@ 
     public function cols($cols) {
         if (is_array($cols)) {
             $this->cols = array_merge($this->cols, array_values($cols));
-        } else {
+        }
+        else {
             $this->cols[] = $cols;
         }
     }
@@ -90,11 +92,13 @@ 
                 if (!is_array($item)) {
                     call_user_func_array(array($this, 'join'), $table);
                     break;
-                } else {
+                }
+                else {
                     $this->join($item);
                 }
             }
-        } else {
+        }
+        else {
             $this->join[] = [$table, $where, $type, $alias];
         }
     }
@@ -102,7 +106,8 @@ 
     public function where($where = '', $value = '', $operation = false, $concatenation = 'AND') {
         if (!is_array($where)) {
             $this->where[] = [$where, $value, $operation, $concatenation];
-        } else {
+        }
+        else {
             $this->where[] = $where;
         }
     }
@@ -110,7 +115,8 @@ 
     public function having($where = '', $value = '', $operation = false, $concatenation = 'AND') {
         if (!is_array($where)) {
             $this->having[] = [$where, $value, $operation, $concatenation];
-        } else {
+        }
+        else {
             $this->having[] = $where;
         }
     }
@@ -124,13 +130,17 @@ 
 
         if (!is_array($order)) {
             $this->order[] = "{$order} {$type}";
-        } else {
-            foreach ($order as $item)
-                if (!is_array($item)) {
+        }
+        else {
+            foreach ($order as $item) {
+                            if (!is_array($item)) {
                     call_user_func_array(array($this, 'order'), $order);
+            }
                     break;
-                } else
-                    $this->order($item);
+                }
+                else {
+                                    $this->order($item);
+                }
         }
     }
 
@@ -138,8 +148,9 @@ 
         $start = intval($start);
         $len = intval($len);
         $this->limit = "LIMIT {$start}";
-        if ($len !== 0)
-            $this->limit .= ",{$len}";
+        if ($len !== 0) {
+                    $this->limit .= ",{$len}";
+        }
     }
 
     public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') {
@@ -149,12 +160,15 @@ 
             foreach ($joins as $joinAr) {
                 $join .= call_user_func_array([$this, 'buildJoin'], $joinAr);
             }
-        } else {
+        }
+        else {
             $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-            if ($alias)
-                $join .= " AS `{$alias}`";
-            if ($where)
-                $join .= " ON {$where}";
+            if ($alias) {
+                            $join .= " AS `{$alias}`";
+            }
+            if ($where) {
+                            $join .= " ON {$where}";
+            }
         }
         return $join;
     }
@@ -173,13 +187,16 @@ 
                 $operation = '=';
             }
 
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            }
+            elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->whereString == NULL)
-                $this->whereString = ' WHERE ';
+            if ($this->whereString == NULL) {
+                            $this->whereString = ' WHERE ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
                 if (is_array($value)) {
@@ -190,25 +207,31 @@ 
                         }
                         if (is_string($item)) {
                             $newValue .='"' . $item . '"';
-                        } else {
+                        }
+                        else {
                             $newValue .=$item;
                         }
                     }
                     $value = '(' . $newValue . ')';
-                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "({$value})";
-                } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "\"{$value}\"";
                 }
-            } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+            }
+            elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
                 $this->params[] = $value;
                 $value = "?";
             }
 
-            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
-                $this->whereString .= " {$where} {$operation} {$value} ";
-            else
-                $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') {
+                            $this->whereString .= " {$where} {$operation} {$value} ";
+            }
+            else {
+                            $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
         }
         else {
             $i = -1;
@@ -218,23 +241,27 @@ 
                     if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
                         if (!isset($item[3])) {
                             $concatenation = 'AND';
-                        } else {
+                        }
+                        else {
                             $concatenation = $item[3];
                         }
 
                         $this->whereString .= "{$concatenation} ";
                     }
 
-                    if ($this->whereString != NULL)
-                        $this->whereString .= '(';
-                    else
-                        $this->whereString = 'WHERE (';
+                    if ($this->whereString != NULL) {
+                                            $this->whereString .= '(';
+                    }
+                    else {
+                                            $this->whereString = 'WHERE (';
+                    }
                 }
 
                 if (!is_array($item)) {
                     call_user_func_array(array($this, 'buildWhere'), $where);
                     break;
-                } else {
+                }
+                else {
                     $this->buildWhere($item);
                 }
                 if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
@@ -257,13 +284,16 @@ 
             if (empty($operation)) {
                 $operation = '=';
             }
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            }
+            elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->havingString == NULL)
-                $this->havingString = ' HAVING ';
+            if ($this->havingString == NULL) {
+                            $this->havingString = ' HAVING ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
                 if (is_array($value)) {
@@ -274,25 +304,31 @@ 
                         }
                         if (is_string($item)) {
                             $newValue .='"' . $item . '"';
-                        } else {
+                        }
+                        else {
                             $newValue .=$item;
                         }
                     }
                     $value = '(' . $newValue . ')';
-                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "({$value})";
-                } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
+                }
+                elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
                     $value = "\"{$value}\"";
                 }
-            } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+            }
+            elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
                 $this->params[] = $value;
                 $value = "?";
             }
 
-            if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ')
-                $this->havingString .= " {$where} {$operation} {$value} ";
-            else
-                $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
+            if (substr($this->havingString, -1, 1) == '(' || substr($this->havingString, -2, 2) == 'E ') {
+                            $this->havingString .= " {$where} {$operation} {$value} ";
+            }
+            else {
+                            $this->havingString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
         }
         else {
             $i = -1;
@@ -302,23 +338,27 @@ 
                     if ($this->havingString != NULL && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
                         if (!isset($item[3])) {
                             $concatenation = 'AND';
-                        } else {
+                        }
+                        else {
                             $concatenation = $item[3];
                         }
 
                         $this->havingString .= "{$concatenation} ";
                     }
 
-                    if ($this->havingString != NULL)
-                        $this->havingString .= '(';
-                    else
-                        $this->havingString = 'HAVING (';
+                    if ($this->havingString != NULL) {
+                                            $this->havingString .= '(';
+                    }
+                    else {
+                                            $this->havingString = 'HAVING (';
+                    }
                 }
 
                 if (!is_array($item)) {
                     call_user_func_array(array($this, 'buildHaving'), $where);
                     break;
-                } else {
+                }
+                else {
                     $this->buildHaving($item);
                 }
                 if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
@@ -376,7 +416,8 @@ 
                     if (!in_array($item, array('CURRENT_TIMESTAMP'))) {
                         $this->params[] = $item;
                         $updates[] = "`{$key}` = ?";
-                    } else {
+                    }
+                    else {
                         $updates[] = "`{$key}` = {$item}";
                     }
                 }

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);
         }
     }