injitools / cms-Inji

index.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     }
 }
 
-require_once( INJI_SYSTEM_DIR . '/init.php' );
+require_once(INJI_SYSTEM_DIR . '/init.php');
 /**
  * System error messages
  */

system/Inji/Html.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $html = "<{$tag}";
         if ($attributes && is_array($attributes)) {
             foreach ($attributes as $key => $value) {
-                $html .=" {$key} = '";
+                $html .= " {$key} = '";
                 if (!is_array($value)) {
                     $html .= addcslashes($value, "'");
                 } else {

system/Inji/Log.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
                 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>";
             }
         }
-        echo '<tr><th>Summary</th><th>' . round(( microtime(true) - $this->startTime), 5) . '</th></tr>';
+        echo '<tr><th>Summary</th><th>' . round((microtime(true) - $this->startTime), 5) . '</th></tr>';
         echo '<tr><th>Memory</th><th>' . $this->convertSize(memory_get_peak_usage()) . ' of ' . ini_get('memory_limit') . '</th></tr></table></div>';
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -1035,7 +1035,7 @@
         } else {
             $cols .= '*';
         }
-        $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
+        $cols .= ') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
         App::$cur->db->cols = $cols;
         if (!empty($options['group'])) {
             App::$cur->db->group($options['group']);

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()},

Doc Comments +7 added lines, -4 removed lines

@@ -357,7 +357,7 @@ 
     /**
      * Information extractor for col relations path
      * 
-     * @param string|array $info
+     * @param string $info
      * @return array
      */
     public static function parseColRecursion($info)
@@ -429,6 +429,9 @@ 
         return Model::$cols[static::table()];
     }
 
+    /**
+     * @param string $colName
+     */
     public static function genColParams($colName)
     {
         if (empty(static::$cols[$colName]) || static::$storage['type'] == 'moduleConfig') {
@@ -482,7 +485,7 @@ 
      * Create new col in data base
      * 
      * @param string $colName
-     * @return boolean
+     * @return false|null
      */
     public static function createCol($colName)
     {
@@ -567,7 +570,7 @@ 
     /**
      * return relations list
      * 
-     * @return array
+     * @return string
      */
     public static function relations()
     {
@@ -1063,7 +1066,7 @@ 
      * 
      * @param array $params
      * @param array $where
-     * @return boolean
+     * @return false|null
      */
     public static function update($params, $where = [])
     {

system/Inji/Msg.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
             if (!empty($_SESSION['_INJI_MSG'])) {
                 foreach ($_SESSION['_INJI_MSG'] as $key => $msg) {
                     if ($msg['text'] == $text) {
-                        $msg['count'] ++;
+                        $msg['count']++;
                         return true;
                     }
                 }

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/modules/Callbacks/appControllers/content/index.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <div class = 'callbacks'>
   <h1>Отзывы</h1>
   <?php
-  $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
-  foreach ($callbacks as $callback) {
-      echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
-      echo "<p>" . nl2br($callback->text) . "</p>";
-  }
-  ?>
+    $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
+    foreach ($callbacks as $callback) {
+        echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
+        echo "<p>" . nl2br($callback->text) . "</p>";
+    }
+    ?>
 </div>
 <h3>Можете и вы в свободной форме оставить свой отзыв</h3>
 <?php

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

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
         }

 

         $widgetSize = !empty($section['size']) ? $section['size'] : 1;

-        $rowSum+=$widgetSize;

+        $rowSum += $widgetSize;

         ?>

         <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div>

         <?php

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

Indentation +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
     <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();
-  $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']);
-  ?>
+    $form = new Ui\Form();
+    $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']);
+    ?>
   <h2>Дополнительные мета теги</h2>
   <div class ="form-group">
     <button type = 'button' class = 'btn btn-primary ' onclick = 'addMeta()'>Добавить <i class = 'glyphicon glyphicon-plus'></i></button>

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

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     function newQuery()
     {
-        if($this->QueryClassName) {
+        if ($this->QueryClassName) {
             return new $this->QueryClassName($this->connection);
         }
         return false;

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 {