injitools / cms-Inji

system/Inji/Config.php

Braces +24 added lines, -16 removed lines

@@ -24,11 +24,13 @@ 
      */
     public static function system()
     {
-        if (isset(self::$_configs['system']))
-            return self::$_configs['system'];
+        if (isset(self::$_configs['system'])) {
+                    return self::$_configs['system'];
+        }
 
-        if (!file_exists(INJI_SYSTEM_DIR . '/config/config.php'))
-            return [];
+        if (!file_exists(INJI_SYSTEM_DIR . '/config/config.php')) {
+                    return [];
+        }
 
         return self::$_configs['system'] = include INJI_SYSTEM_DIR . '/config/config.php';
     }
@@ -41,11 +43,13 @@ 
      */
     public static function custom($path)
     {
-        if (isset(self::$_configs['custom'][$path]))
-            return self::$_configs['custom'][$path];
+        if (isset(self::$_configs['custom'][$path])) {
+                    return self::$_configs['custom'][$path];
+        }
 
-        if (!file_exists($path))
-            return [];
+        if (!file_exists($path)) {
+                    return [];
+        }
 
         return self::$_configs['custom'][$path] = include $path;
     }
@@ -61,12 +65,14 @@ 
         if (!$app) {
             $app = App::$primary;
         }
-        if (isset(self::$_configs['app'][$app->name]))
-            return self::$_configs['app'][$app->name];
+        if (isset(self::$_configs['app'][$app->name])) {
+                    return self::$_configs['app'][$app->name];
+        }
 
         $path = $app->path . "/config/config.php";
-        if (!file_exists($path))
-            return array();
+        if (!file_exists($path)) {
+                    return array();
+        }
 
         return self::$_configs['app'][$app->name] = include $path;
     }
@@ -80,13 +86,15 @@ 
     public static function share($module = '')
     {
         if ($module) {
-            if (isset($_configs['shareModules'][$module]))
-                return self::$_configs['shareModules'][$module];
+            if (isset($_configs['shareModules'][$module])) {
+                            return self::$_configs['shareModules'][$module];
+            }
 
             $path = INJI_PROGRAM_DIR . "/config/modules/{$module}.php";
         } else {
-            if (isset($_configs['share']))
-                return self::$_configs['share'];
+            if (isset($_configs['share'])) {
+                            return self::$_configs['share'];
+            }
 
             $path = INJI_PROGRAM_DIR . "/config/config.php";
         }

system/Inji/Log.php

Braces +13 added lines, -10 removed lines

@@ -79,10 +79,12 @@ 
             if (!empty($log['status'])) {
                 echo "<tr class = '{$log['status']}'><td>{$log['name']}</td><td>{$log['status']}</td></tr>";
             } else {
-                if (empty($log['end']))
-                    $log['end'] = microtime(true);
-                if (empty($log['start']))
-                    $log['start'] = microtime(true);
+                if (empty($log['end'])) {
+                                    $log['end'] = microtime(true);
+                }
+                if (empty($log['start'])) {
+                                    $log['start'] = microtime(true);
+                }
                 echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>";
             }
         }
@@ -93,12 +95,13 @@ 
     function convertSize($size)
     {
 
-        if ($size < 1024)
-            return $size . "B";
-        elseif ($size < 1048576)
-            return round($size / 1024, 2) . "KB";
-        else
-            return round($size / 1048576, 2) . "MB";
+        if ($size < 1024) {
+                    return $size . "B";
+        } elseif ($size < 1048576) {
+                    return round($size / 1024, 2) . "KB";
+        } else {
+                    return round($size / 1048576, 2) . "MB";
+        }
     }
 
     function __destruct()

system/Inji/Model.php

Braces +48 added lines, -36 removed lines

@@ -680,17 +680,21 @@ 
     {
 
         $return = array();
-        if (!empty($options['where']))
-            App::$cur->db->where($options['where']);
+        if (!empty($options['where'])) {
+                    App::$cur->db->where($options['where']);
+        }
         if (!empty($options['group'])) {
             App::$cur->db->group($options['group']);
         }
-        if (!empty($options['order']))
-            App::$cur->db->order($options['order']);
-        if (!empty($options['join']))
-            App::$cur->db->join($options['join']);
-        if (!empty($options['distinct']))
-            App::$cur->db->distinct = $options['distinct'];
+        if (!empty($options['order'])) {
+                    App::$cur->db->order($options['order']);
+        }
+        if (!empty($options['join'])) {
+                    App::$cur->db->join($options['join']);
+        }
+        if (!empty($options['distinct'])) {
+                    App::$cur->db->distinct = $options['distinct'];
+        }
 
         foreach (static::$relJoins as $join) {
             App::$cur->db->join($join[0], $join[1]);
@@ -716,14 +720,14 @@ 
         }
         static::$needJoin = [];
 
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -980,21 +984,23 @@ 
             static::fixPrefix($options['where'], 'first');
         }
         $return = array();
-        if (!empty($options['where']))
-            App::$cur->db->where($options['where']);
-        if (!empty($options['join']))
-            App::$cur->db->join($options['join']);
+        if (!empty($options['where'])) {
+                    App::$cur->db->where($options['where']);
+        }
+        if (!empty($options['join'])) {
+                    App::$cur->db->join($options['join']);
+        }
         if (!empty($options['order'])) {
             App::$cur->db->order($options['order']);
         }
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -1072,11 +1078,13 @@ 
 
         $values = array();
         foreach ($cols as $col => $param) {
-            if (isset($params[$col]))
-                $values[$col] = $params[$col];
+            if (isset($params[$col])) {
+                            $values[$col] = $params[$col];
+            }
+        }
+        if (!$values) {
+                    return false;
         }
-        if (!$values)
-            return false;
 
 
         if ($where) {
@@ -1257,11 +1265,13 @@ 
         $values = array();
 
         foreach ($this->cols() as $col => $param) {
-            if (isset($this->_params[$col]))
-                $values[$col] = $this->_params[$col];
+            if (isset($this->_params[$col])) {
+                            $values[$col] = $this->_params[$col];
+            }
+        }
+        if (!$values && empty($options['empty'])) {
+                    return false;
         }
-        if (!$values && empty($options['empty']))
-            return false;
 
         if ($this->pk()) {
             $new = false;
@@ -1417,8 +1427,9 @@ 
     {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }
@@ -1574,8 +1585,9 @@ 
             App::$cur->db->where($relation['relTablePrefix'] . $this->index(), $this->pk());
             App::$cur->db->where($relation['relTablePrefix'] . $relation['model']::index(), $objectId);
             $isset = App::$cur->db->select($relation['relTable'])->fetch_assoc();
-            if ($isset)
-                return true;
+            if ($isset) {
+                            return true;
+            }
 
             App::$cur->db->insert($relation['relTable'], [
                 $relation['relTablePrefix'] . $this->index() => $this->{$this->index()},

system/Inji/Msg.php

Braces +3 added lines, -2 removed lines

@@ -52,8 +52,9 @@
      */
     static function get($clean = false)
     {
-        if (empty($_SESSION['_INJI_MSG']))
-            return [];
+        if (empty($_SESSION['_INJI_MSG'])) {
+                    return [];
+        }
         $msgs = $_SESSION['_INJI_MSG'];
         if ($clean) {
             $_SESSION['_INJI_MSG'] = [];

system/Inji/Tools.php

Braces +8 added lines, -6 removed lines

@@ -58,8 +58,9 @@ 
      */
     static function createDir($path)
     {
-        if (file_exists($path))
-            return true;
+        if (file_exists($path)) {
+                    return true;
+        }
 
         $path = explode('/', $path);
         $cur = '';
@@ -101,10 +102,11 @@ 
         $imagecreatefromX = "imagecreatefrom{$img_type}";
         $src_res = $imagecreatefromX($img_path);
 
-        if ($img_width / $max_width > $img_height / $max_height)
-            $separator = $img_width / $max_width;
-        else
-            $separator = $img_height / $max_height;
+        if ($img_width / $max_width > $img_height / $max_height) {
+                    $separator = $img_width / $max_width;
+        } else {
+                    $separator = $img_height / $max_height;
+        }
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {

system/modules/Access/Access.php

Braces +6 added lines, -4 removed lines

@@ -15,8 +15,9 @@ 
         if (!$app) {
             $app = $this->app->type;
         }
-        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl']))
-            return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) {
+                    return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        }
 
         return '/';
     }
@@ -50,8 +51,9 @@ 
             return true;
         }
 
-        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access)))
-            return false;
+        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) {
+                    return false;
+        }
 
         return true;
     }

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

Braces +16 added lines, -4 removed lines

@@ -2,19 +2,31 @@
 <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>Контактный 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();

system/modules/Db/Db.php

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
             $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 {

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

Braces +12 added lines, -8 removed lines

@@ -30,14 +30,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();