injitools / cms-Inji

system/Inji/Tools.php

Doc Comments +1 added lines

@@ -216,6 +216,7 @@
      * @param  $number Integer Число на основе которого нужно сформировать окончание
      * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
      *         например array('яблоко', 'яблока', 'яблок')
+     * @param string[] $endingArray
      * @return String
      */
     static function getNumEnding($number, $endingArray)

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
     static function uriParse($uri)
     {
         $answerPos = strpos($uri, '?');
-        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
+        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1);
 
         foreach ($params as $key => $param) {
             if ($param != '') {
@@ -85,7 +85,7 @@ 
     static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center')
     {
         ini_set("gd.jpeg_ignore_warning", 1);
-        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
+        list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path);
         switch ($img_type) {
             case 1:
                 $img_type = 'gif';
@@ -108,14 +108,14 @@ 
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {
-                $imgX = floor(( $img_width - $img_height ) / 2);
+                $imgX = floor(($img_width - $img_height) / 2);
                 $imgY = 0;
                 $img_width = $img_height;
                 $new_width = $max_width;
                 $new_height = $max_height;
             } else {
                 $imgX = 0;
-                $imgY = floor(( $img_height - $img_width ) / 2);
+                $imgY = floor(($img_height - $img_width) / 2);
                 $img_height = $img_width;
                 $new_width = $max_width;
                 $new_height = $max_height;
@@ -136,7 +136,7 @@ 
             $new_width = $max_width;
             $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-            $imgX = (int) (($ow / 2) - ($img_width / 2) );
+            $imgX = (int) (($ow / 2) - ($img_width / 2));
             if ($pos == 'center') {
                 $imgY = (int) (($oh / 2) - ($img_height / 2));
             } else {

Braces +27 added lines, -15 removed lines

@@ -41,7 +41,8 @@ 
         foreach ($params as $key => $param) {
             if ($param != '') {
                 $params[$key] = urldecode($param);
-            } else {
+            }
+            else {
                 unset($params[$key]);
             }
         }
@@ -55,8 +56,9 @@ 
      * @return boolean
      */
     public static function createDir($path) {
-        if (file_exists($path))
-            return true;
+        if (file_exists($path)) {
+                    return true;
+        }
 
         $path = explode('/', $path);
         $cur = '';
@@ -100,10 +102,12 @@ 
             return false;
         }
 
-        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) {
@@ -112,7 +116,8 @@ 
                 $img_width = $img_height;
                 $new_width = $max_width;
                 $new_height = $max_height;
-            } else {
+            }
+            else {
                 $imgX = 0;
                 $imgY = floor(( $img_height - $img_width ) / 2);
                 $img_height = $img_width;
@@ -122,7 +127,8 @@ 
             if ($pos == 'top') {
                 $imgY = 0;
             }
-        } elseif ($crop == 'c') {
+        }
+        elseif ($crop == 'c') {
 //Вычисляем некий коэффициент масштабирования
             $k1 = $img_width / $max_width;
             $k2 = $img_height / $max_height;
@@ -138,10 +144,12 @@ 
             $imgX = (int) (($ow / 2) - ($img_width / 2) );
             if ($pos == 'center') {
                 $imgY = (int) (($oh / 2) - ($img_height / 2));
-            } else {
+            }
+            else {
                 $imgY = 0;
             }
-        } else {
+        }
+        else {
             $imgX = 0;
             $imgY = 0;
             $new_width = floor($img_width / $separator);
@@ -156,7 +164,8 @@ 
         if ($img_type == 'jpeg') {
             imageinterlace($new_res, 1); // чересстрочное формирование изображение
             imagejpeg($new_res, $img_path, 85);
-        } else {
+        }
+        else {
             $imageX = "image{$img_type}";
             $imageX($new_res, $img_path);
         }
@@ -207,7 +216,8 @@ 
         }
         if (!headers_sent()) {
             header("Location: {$href}");
-        } else {
+        }
+        else {
             echo '\'"><script>window.location="' . $href . '";</script>';
         }
         exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
@@ -224,7 +234,8 @@ 
         $number = $number % 100;
         if ($number >= 11 && $number <= 19) {
             $ending = $endingArray[2];
-        } else {
+        }
+        else {
             $i = $number % 10;
             switch ($i) {
                 case (1): $ending = $endingArray[0];
@@ -366,7 +377,8 @@ 
             }
             if (is_dir($from . '/' . $file)) {
                 self::copyFiles($from . '/' . $file, $to . '/' . $file);
-            } else {
+            }
+            else {
                 copy($from . '/' . $file, $to . '/' . $file);
             }
         }

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

Doc Comments +6 added lines

@@ -29,6 +29,9 @@ 
     public $params = [];
     public $distinct = false;
 
+    /**
+     * @param  $instance
+     */
     function __construct($instance = null)
     {
         if (!$instance) {
@@ -47,6 +50,9 @@ 
         return $this->curInstance->pdo->lastInsertId();
     }
 
+    /**
+     * @param string $table
+     */
     public function select($table)
     {
         $this->operation = 'SELECT';

Spacing +7 added lines, -7 removed lines

@@ -186,12 +186,12 @@ 
                     $newValue = '';
                     foreach ($value as $item) {
                         if ($newValue) {
-                            $newValue.=',';
+                            $newValue .= ',';
                         }
                         if (is_string($item)) {
-                            $newValue .='"' . $item . '"';
+                            $newValue .= '"' . $item . '"';
                         } else {
-                            $newValue .=$item;
+                            $newValue .= $item;
                         }
                     }
                     $value = '(' . $newValue . ')';
@@ -270,12 +270,12 @@ 
                     $newValue = '';
                     foreach ($value as $item) {
                         if ($newValue) {
-                            $newValue.=',';
+                            $newValue .= ',';
                         }
                         if (is_string($item)) {
-                            $newValue .='"' . $item . '"';
+                            $newValue .= '"' . $item . '"';
                         } else {
-                            $newValue .=$item;
+                            $newValue .= $item;
                         }
                     }
                     $value = '(' . $newValue . ')';
@@ -381,7 +381,7 @@ 
                     }
                 }
                 $update = implode(',', $updates);
-                $query .=" SET {$update}";
+                $query .= " SET {$update}";
             case 'SELECT':
             case 'DELETE':
                 $this->buildWhere($this->where);

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

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
     public $having = [];
     public $havingString = '';
     public $cols = [];
-    public $order = NULL;
+    public $order = null;
     public $join = [];
     public $group = [];
     public $limit = '';
@@ -137,7 +137,7 @@ 
     public function limit($start = 0, $len = 0) {
         $start = intval($start);
         $len = intval($len);
-        $this->limit = "LIMIT {$start}";
+        $this->limit = "limit {$start}";
         if ($len !== 0)
             $this->limit .= ",{$len}";
     }
@@ -178,7 +178,7 @@ 
             elseif ($concatenation === true)
                 $concatenation = '';
 
-            if ($this->whereString == NULL)
+            if ($this->whereString == null)
                 $this->whereString = ' WHERE ';
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
@@ -215,7 +215,7 @@ 
             while (isset($where[++$i])) {
                 $item = $where[$i];
                 if (isset($where[$i + 1]) && !isset($where[$i - 1]) && is_array($where[$i])) {
-                    if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
+                    if ($this->whereString != null && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
                         if (!isset($item[3])) {
                             $concatenation = 'AND';
                         } else {
@@ -225,7 +225,7 @@ 
                         $this->whereString .= "{$concatenation} ";
                     }
 
-                    if ($this->whereString != NULL)
+                    if ($this->whereString != null)
                         $this->whereString .= '(';
                     else
                         $this->whereString = 'WHERE (';
@@ -262,7 +262,7 @@ 
             elseif ($concatenation === true)
                 $concatenation = '';
 
-            if ($this->havingString == NULL)
+            if ($this->havingString == null)
                 $this->havingString = ' HAVING ';
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
@@ -299,7 +299,7 @@ 
             while (isset($where[++$i])) {
                 $item = $where[$i];
                 if (isset($where[$i + 1]) && !isset($where[$i - 1]) && is_array($where[$i])) {
-                    if ($this->havingString != NULL && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
+                    if ($this->havingString != null && substr($this->havingString, -1, 1) != '(' && $this->havingString != 'HAVING ') {
                         if (!isset($item[3])) {
                             $concatenation = 'AND';
                         } else {
@@ -309,7 +309,7 @@ 
                         $this->havingString .= "{$concatenation} ";
                     }
 
-                    if ($this->havingString != NULL)
+                    if ($this->havingString != null)
                         $this->havingString .= '(';
                     else
                         $this->havingString = 'HAVING (';

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
  */

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
 function INJI_SYSTEM_ERROR($msg, $fatal = false) {
     if ($fatal) {
         exit("<div style = 'text-align:center;font-size:20px;margin-top:25%;'>{$msg}</div>");
-    } else {
+    }
+    else {
         echo "<div style = 'text-align:center;font-size:20px;margin-top:25%;'>{$msg}</div>";
     }
 }

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 +23 added lines, -14 removed lines

@@ -19,9 +19,11 @@ 
     public function __construct() {
         if (!empty($_SERVER['REQUEST_TIME_FLOAT'])) {
             $this->startTime = $_SERVER['REQUEST_TIME_FLOAT'];
-        } elseif (!empty($_SERVER['REQUEST_TIME'])) {
+        }
+        elseif (!empty($_SERVER['REQUEST_TIME'])) {
             $this->startTime = $_SERVER['REQUEST_TIME'];
-        } else {
+        }
+        else {
             $this->startTime = time();
         }
         $this->log[] = array('name' => 'System init', 'start' => $this->startTime, 'end' => microtime(true));
@@ -39,7 +41,8 @@ 
         if ($this->run) {
             if ($key === false) {
                 $this->log[$this->lastLog]['end'] = microtime(true);
-            } else {
+            }
+            else {
                 $this->log[$key]['end'] = microtime(true);
             }
         }
@@ -70,11 +73,14 @@ 
         foreach ($this->log as $log) {
             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);
+            }
+            else {
+                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>";
             }
         }
@@ -84,12 +90,15 @@ 
 
     public 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";
+        }
     }
 
     public 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']);

Doc Comments +7 added lines, -4 removed lines

@@ -437,6 +437,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $new
+     */
     public function logChanges($new) {
         if (!App::$cur->db->connect || !App::$cur->dashboard) {
             return false;
@@ -539,7 +542,7 @@ 
     /**
      * Information extractor for col relations path
      * 
-     * @param string|array $info
+     * @param string $info
      * @return array
      */
     public static function parseColRecursion($info) {
@@ -625,7 +628,7 @@ 
      * Generate params string for col by name
      * 
      * @param string $colName
-     * @return boolean|string
+     * @return false|string
      */
     public static function genColParams($colName) {
         if (empty(static::$cols[$colName]) || static::$storage['type'] == 'moduleConfig') {
@@ -780,7 +783,7 @@ 
     /**
      * return relations list
      * 
-     * @return array
+     * @return string
      */
     public static function relations() {
         return [];
@@ -1303,7 +1306,7 @@ 
      * 
      * @param array $params
      * @param array $where
-     * @return boolean
+     * @return false|null
      */
     public static function update($params, $where = []) {
         static::fixPrefix($params);

Braces +159 added lines, -86 removed lines

@@ -151,10 +151,12 @@ 
             }
             if (strpos($valuePath, ':')) {
                 return self::getColValue($object->$rel, $param, $convert, $manageHref);
-            } else {
+            }
+            else {
                 return $convert ? Model::resloveTypeValue($object->$rel, $param, $manageHref) : $object->$rel->$param;
             }
-        } else {
+        }
+        else {
             return $convert ? Model::resloveTypeValue($object, $valuePath, $manageHref) : $object->$valuePath;
         }
     }
@@ -193,7 +195,8 @@ 
                     case 'method':
                         if (!empty($colInfo['colParams']['params'])) {
                             $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']);
-                        } else {
+                        }
+                        else {
                             $values = $colInfo['colParams']['module']->$colInfo['colParams']['method']();
                         }
                         $value = !empty($values[$item->$colName]) ? $values[$item->$colName] : 'Не задано';
@@ -210,7 +213,8 @@ 
                         $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
                         if ($manageHref) {
                             $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
-                        } else {
+                        }
+                        else {
                             $value = $relValue ? $relValue->name() : 'Не задано';
                         }
                         break;
@@ -220,7 +224,8 @@ 
                 $file = Files\File::get($item->$colName);
                 if ($file) {
                     $value = '<img src="' . $file->path . '?resize=60x120" />';
-                } else {
+                }
+                else {
                     $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
                 }
                 break;
@@ -228,7 +233,8 @@ 
                 $file = Files\File::get($item->$colName);
                 if ($file) {
                     $value = '<a href="' . $file->path . '">' . $file->name . '.' . $file->type->ext . '</a>';
-                } else {
+                }
+                else {
                     $value = 'Файл не загружен';
                 }
                 break;
@@ -279,7 +285,8 @@ 
                     $onclick .= 'return false;';
                     $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                     $value .= $content;
-                } else {
+                }
+                else {
                     $value = 'Местоположение не заданно';
                 }
 
@@ -299,7 +306,8 @@ 
                                 $itemModel = get_class($curItem);
                                 $relation = $itemModel::getRelation($relationName);
                                 $sourceModel = $relation['model'];
-                            } else {
+                            }
+                            else {
                                 $relation = static::getRelation($type['relation']);
                                 $sourceModel = $relation['model'];
                             }
@@ -307,10 +315,12 @@ 
                             $value = $sourceModel::get($item->$colName);
                             if ($value) {
                                 $value = $value->name();
-                            } else {
+                            }
+                            else {
                                 $value = $item->$colName;
                             }
-                        } else {
+                        }
+                        else {
                             switch ($type) {
                                 case 'map':
                                     if ($item->$colName && json_decode($item->$colName, true)) {
@@ -351,7 +361,8 @@ 
                                         $onclick .= 'return false;';
                                         $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                                         $value .= $content;
-                                    } else {
+                                    }
+                                    else {
                                         $value = 'Местоположение не заданно';
                                     }
 
@@ -393,7 +404,8 @@ 
             }
             if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
                 $array = static::colPrefix() . $array;
-            } else {
+            }
+            else {
                 static::checkForJoin($array, $rootModel);
             }
             return;
@@ -412,7 +424,8 @@ 
                     }
                     if (is_array($array[$key])) {
                         static::fixPrefix($array[$key], 'key', $rootModel);
-                    } else {
+                    }
+                    else {
                         static::checkForJoin($key, $rootModel);
                     }
                 }
@@ -425,10 +438,12 @@ 
                     }
                     if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
                         $array[0] = static::colPrefix() . $array[0];
-                    } else {
+                    }
+                    else {
                         static::checkForJoin($array[0], $rootModel);
                     }
-                } elseif (isset($array[0]) && is_array($array[0])) {
+                }
+                elseif (isset($array[0]) && is_array($array[0])) {
                     foreach ($array as &$item) {
                         static::fixPrefix($item, 'first', $rootModel);
                     }
@@ -461,7 +476,8 @@ 
                 }
                 if (strlen($oldValue) + strlen($this->_params[$fullColName]) < 200) {
                     $changes_text[] = (!empty($class::$labels[$colName]) ? $class::$labels[$colName] : $colName) . ": \"{$oldValue}\" => \"{$this->$colName}\"";
-                } else {
+                }
+                else {
                     $changes_text[] = !empty($class::$labels[$colName]) ? $class::$labels[$colName] : $colName;
                 }
             }
@@ -480,7 +496,8 @@ 
                 ]);
                 $change->save();
             }
-        } elseif ($new) {
+        }
+        elseif ($new) {
             $activity = new Dashboard\Activity([
                 'user_id' => \Users\User::$cur->id,
                 'module' => substr($class, 0, strpos($class, '\\')),
@@ -568,7 +585,8 @@ 
                 }
                 $info = $relations[$rel]['model']::parseColRecursion($info);
             }
-        } else {
+        }
+        else {
             $cols = static::cols();
             if (!empty(static::$labels[$info['col']])) {
                 $info['label'] = static::$labels[$info['col']];
@@ -576,9 +594,11 @@ 
 
             if (isset(static::$cols[$info['col']])) {
                 $info['colParams'] = static::$cols[$info['col']];
-            } elseif (isset(static::$cols[str_replace(static::colPrefix(), '', $info['col'])])) {
+            }
+            elseif (isset(static::$cols[str_replace(static::colPrefix(), '', $info['col'])])) {
                 $info['colParams'] = static::$cols[str_replace(static::colPrefix(), '', $info['col'])];
-            } else {
+            }
+            else {
                 $info['colParams'] = [];
             }
             if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
@@ -709,7 +729,8 @@ 
             $tableName = static::table();
             $colPrefix = static::colPrefix();
             $indexes = static::indexes();
-        } else {
+        }
+        else {
             $tableName = $this->table();
             $colPrefix = $this->colPrefix();
             $indexes = $this->indexes();
@@ -855,7 +876,8 @@ 
         static::$needJoin = [];
         if (is_array($param)) {
             App::$cur->db->where($param);
-        } else {
+        }
+        else {
             if ($col === null) {
 
                 $col = static::index();
@@ -866,7 +888,8 @@ 
                     $col = static::colPrefix() . $col;
                 }
                 App::$cur->db->where($col, $param);
-            } else {
+            }
+            else {
                 return false;
             }
         }
@@ -898,22 +921,27 @@ 
         if (!$query) {
             return [];
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
-        if (!empty($options['cols']))
-            $query->cols = $options['cols'];
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
+        if (!empty($options['cols'])) {
+                    $query->cols = $options['cols'];
+        }
         if (!empty($options['group'])) {
             $query->group($options['group']);
         }
         if (!empty($options['having'])) {
             $query->having($options['having']);
         }
-        if (!empty($options['order']))
-            $query->order($options['order']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
-        if (!empty($options['distinct']))
-            $query->distinct = $options['distinct'];
+        if (!empty($options['order'])) {
+                    $query->order($options['order']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
+        if (!empty($options['distinct'])) {
+                    $query->distinct = $options['distinct'];
+        }
 
         foreach (static::$relJoins as $join) {
             $query->join($join[0], $join[1]);
@@ -939,13 +967,15 @@ 
         }
         static::$needJoin = [];
 
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        }
         else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        }
         else {
             $start = 0;
         }
@@ -954,7 +984,8 @@ 
         }
         if (isset($options['key'])) {
             $key = $options['key'];
-        } else {
+        }
+        else {
             $key = static::index();
         }
         try {
@@ -966,7 +997,8 @@ 
             if ($exc->getCode() == '42S02') {
                 static::createTable();
                 $result = $query->query($queryArr);
-            } else {
+            }
+            else {
                 throw $exc;
             }
         }
@@ -1029,7 +1061,8 @@ 
         $classPath = explode('\\', get_called_class());
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
         $appType = App::$cur->type;
@@ -1038,7 +1071,8 @@ 
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (!empty($storage[$classPath[1]])) {
@@ -1070,17 +1104,20 @@ 
         $classPath = explode('\\', get_called_class());
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             if (empty($options['appType'])) {
                 $appType = App::$cur->type;
-            } else {
+            }
+            else {
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (!empty($storage[$classPath[1]])) {
@@ -1088,7 +1125,8 @@ 
             $class = get_called_class();
             if (isset($options['key'])) {
                 $arrayKey = $options['key'];
-            } else {
+            }
+            else {
                 $arrayKey = static::index();
             }
             foreach ($storage[$classPath[1]] as $key => $item) {
@@ -1101,7 +1139,8 @@ 
                 usort($items, function($a, $b) use($options) {
                     if ($a->{$options['order'][0]} > $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
                         return 1;
-                    } elseif ($a->{$options['order'][0]} < $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
+                    }
+                    elseif ($a->{$options['order'][0]} < $b->{$options['order'][0]} && $options['order'][1] = 'asc') {
                         return -1;
                     }
                     return 0;
@@ -1131,12 +1170,14 @@ 
         $count = 0;
         if (empty($options['appType'])) {
             $appType = App::$cur->type;
-        } else {
+        }
+        else {
             $appType = $options['appType'];
         }
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
         if (!empty($moduleConfig['storage'][$appType][$classPath[1]])) {
@@ -1149,7 +1190,8 @@ 
                     if (Model::checkWhere($item, $options['where'])) {
                         $count++;
                     }
-                } else {
+                }
+                else {
                     $count++;
                 }
             }
@@ -1185,7 +1227,8 @@ 
                 }
 
                 return $result;
-            } else {
+            }
+            else {
                 return forward_static_call_array(['Model', 'checkWhere'], array_merge([$item], $where));
             }
         }
@@ -1221,20 +1264,24 @@ 
         if (!empty($options['group'])) {
             static::fixPrefix($options['group'], 'first');
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
         if (!empty($options['order'])) {
             $query->order($options['order']);
         }
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        }
         else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        }
         else {
             $start = 0;
         }
@@ -1270,10 +1317,12 @@ 
         if (!empty($options['distinct'])) {
             if (is_bool($options['distinct'])) {
                 $cols .= 'DISTINCT *';
-            } else {
+            }
+            else {
                 $cols .= "DISTINCT {$options['distinct']}";
             }
-        } else {
+        }
+        else {
             $cols .= '*';
         }
         $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
@@ -1292,7 +1341,8 @@ 
         if (!empty($options['group'])) {
             $count = $result->getArray();
             return $count;
-        } else {
+        }
+        else {
             $count = $result->fetch();
             return $count['count'];
         }
@@ -1312,8 +1362,9 @@ 
 
         $values = [];
         foreach ($cols as $col => $param) {
-            if (isset($params[$col]))
-                $values[$col] = $params[$col];
+            if (isset($params[$col])) {
+                            $values[$col] = $params[$col];
+            }
         }
         if (empty($values)) {
             return false;
@@ -1358,18 +1409,21 @@ 
 
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
 
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             if (empty($options['appType'])) {
                 $appType = App::$cur->type;
-            } else {
+            }
+            else {
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (empty($storage[$classPath[1]])) {
@@ -1382,7 +1436,8 @@ 
                     break;
                 }
             }
-        } else {
+        }
+        else {
             $id = !empty($storage['scheme'][$classPath[1]]['ai']) ? $storage['scheme'][$classPath[1]]['ai'] : 1;
             $this->$col = $id;
             $storage['scheme'][$classPath[1]]['ai'] = $id + 1;
@@ -1390,12 +1445,14 @@ 
         }
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             $moduleConfig['storage'][$appType] = $storage;
-        } else {
+        }
+        else {
             $moduleConfig['storage'] = $storage;
         }
         if (empty(static::$storage['options']['share'])) {
             Config::save('module', $moduleConfig, $classPath[0]);
-        } else {
+        }
+        else {
             Config::save('share', $moduleConfig, $classPath[0]);
         }
         return true;
@@ -1442,7 +1499,8 @@ 
         if ($catalog && $catalogParent) {
             if ($catalogParent->tree_path) {
                 return $catalogParent->tree_path . $catalogParent->id . '/';
-            } else {
+            }
+            else {
                 return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
             }
         }
@@ -1458,7 +1516,8 @@ 
         $category = $categoryModel::get($this->{$categoryModel::index()});
         if ($category) {
             $this->tree_path = $category->tree_path . $category->pk() . '/';
-        } else {
+        }
+        else {
             $this->tree_path = '/';
         }
     }
@@ -1507,11 +1566,13 @@ 
             if ($this->get($this->_params[$this->index()])) {
                 App::$cur->db->where($this->index(), $this->_params[$this->index()]);
                 App::$cur->db->update($this->table(), $values);
-            } else {
+            }
+            else {
 
                 $this->_params[$this->index()] = App::$cur->db->insert($this->table(), $values);
             }
-        } else {
+        }
+        else {
             $new = true;
             $this->_params[$this->index()] = App::$cur->db->insert($this->table(), $values);
         }
@@ -1561,18 +1622,21 @@ 
         $classPath = explode('\\', get_called_class());
         if (!empty(static::$storage['options']['share'])) {
             $moduleConfig = Config::share($classPath[0]);
-        } else {
+        }
+        else {
             $moduleConfig = Config::module($classPath[0], strpos(static::$storage['type'], 'system') !== false);
         }
 
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             if (empty($options['appType'])) {
                 $appType = App::$cur->type;
-            } else {
+            }
+            else {
                 $appType = $options['appType'];
             }
             $storage = !empty($moduleConfig['storage'][$appType]) ? $moduleConfig['storage'][$appType] : [];
-        } else {
+        }
+        else {
             $storage = !empty($moduleConfig['storage']) ? $moduleConfig['storage'] : [];
         }
         if (empty($storage[$classPath[1]])) {
@@ -1587,12 +1651,14 @@ 
         }
         if (!empty($moduleConfig['storage']['appTypeSplit'])) {
             $moduleConfig['storage'][$appType] = $storage;
-        } else {
+        }
+        else {
             $moduleConfig['storage'] = $storage;
         }
         if (empty(static::$storage['options']['share'])) {
             Config::save('module', $moduleConfig, $classPath[0]);
-        } else {
+        }
+        else {
             Config::save('share', $moduleConfig, $classPath[0]);
         }
         return true;
@@ -1650,8 +1716,9 @@ 
     public static function findRelation($col) {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }
@@ -1706,7 +1773,8 @@ 
         if ($relation) {
             if (!isset($relation['type'])) {
                 $type = 'to';
-            } else {
+            }
+            else {
                 $type = $relation['type'];
             }
             $getCol = null;
@@ -1722,7 +1790,8 @@ 
                     if (empty($ids)) {
                         if (empty($params['count'])) {
                             return [];
-                        } else {
+                        }
+                        else {
                             return 0;
                         }
                     }
@@ -1777,10 +1846,12 @@ 
                     return $relation['model']::getCount($options);
                 }
                 return 0;
-            } else {
+            }
+            else {
                 if (class_exists($relation['model'])) {
                     $this->loadedRelations[$name][json_encode($params)] = $relation['model']::$getType($options, $getCol, $getParams);
-                } else {
+                }
+                else {
                     $this->loadedRelations[$name][json_encode($params)] = [];
                 }
             }
@@ -1851,7 +1922,8 @@ 
         static::fixPrefix($fixedName);
         if (isset($this->_params[$fixedName])) {
             return new Value($this, $fixedName);
-        } elseif (isset($this->_params[$name])) {
+        }
+        elseif (isset($this->_params[$name])) {
             return new Value($this, $name);
         }
         return call_user_func_array([$this, 'loadRelation'], array_merge([$name], $params));
@@ -1886,7 +1958,8 @@ 
         static::fixPrefix($fixedName);
         if (isset($this->_params[$fixedName])) {
             return new Value($this, $fixedName);
-        } elseif ($this->_params[$name]) {
+        }
+        elseif ($this->_params[$name]) {
             return new Value($this, $name);
         }
         return null;

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -1271,7 +1271,7 @@ 
             if (is_bool($options['distinct'])) {
                 $cols .= 'DISTINCT *';
             } else {
-                $cols .= "DISTINCT {$options['distinct']}";
+                $cols .= "distinct {$options['distinct']}";
             }
         } else {
             $cols .= '*';
@@ -1653,7 +1653,7 @@ 
             if ($rel['col'] == $col)
                 return $relName;
         }
-        return NULL;
+        return null;
     }
 
     /**
@@ -1765,7 +1765,7 @@ 
                     $options = [$relation['col'], $this->pk()];
                     break;
                 default:
-                    if ($this->$relation['col'] === NULL) {
+                    if ($this->$relation['col'] === null) {
                         return null;
                     }
                     $getType = 'get';
@@ -1786,7 +1786,7 @@ 
             }
             return $this->loadedRelations[$name][json_encode($params)];
         }
-        return NULL;
+        return null;
     }
 
     /**

system/modules/Ecommerce/Ecommerce.php

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
         if (is_array($counts)) {
             $sum = 0;
             foreach ($counts as $count) {
-                $sum +=$count['count'];
+                $sum += $count['count'];
             }
             return $sum;
         }

Braces +12 added lines, -6 removed lines

@@ -86,7 +86,8 @@ 
                         $user->{$path[0]}->{$path[1]} = $info->value;
                         $relations[$path[0]] = $path[0];
                     }
-                } else {
+                }
+                else {
                     if (!$user->{$field->userfield}) {
                         $user->{$field->userfield} = $info->value;
                     }
@@ -142,7 +143,8 @@ 
                         $user->{$path[0]}->{$path[1]} = $info->value;
                         $relations[$path[0]] = $path[0];
                     }
-                } else {
+                }
+                else {
                     if (!$user->{$field->userfield}) {
                         $user->{$field->userfield} = $info->value;
                     }
@@ -262,7 +264,8 @@ 
                                     $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                                 }
                                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-                            } else {
+                            }
+                            else {
                                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
                             }
                             $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
@@ -281,7 +284,8 @@ 
                                     $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                                 }
                                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-                            } else {
+                            }
+                            else {
                                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
                             }
                             $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
@@ -306,7 +310,8 @@ 
                 $first = false;
             }
             $selectOptions['where'][] = $where;
-        } elseif (!empty($options['parent'])) {
+        }
+        elseif (!empty($options['parent'])) {
             $category = \Ecommerce\Category::get($options['parent']);
             $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
         }
@@ -492,7 +497,8 @@ 
             foreach ($cartItem->price->offer->bonuses as $bonus) {
                 if ($bonus->limited && $bonus->left <= 0) {
                     continue;
-                } elseif ($bonus->limited && $bonus->left > 0) {
+                }
+                elseif ($bonus->limited && $bonus->left > 0) {
                     $bonus->left -= 1;
                     $bonus->save();
                 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -223,7 +223,7 @@
         ];
 
         $selectOptions['where'][] = [
-            [Ecommerce\Item\Offer\Price\Type::index(), NULL, 'is'],
+            [Ecommerce\Item\Offer\Price\Type::index(), null, 'is'],
             [
                 [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '', '=', 'OR'],
                 [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '%|' . \Users\User::$cur->role_id . '|%', 'LIKE', 'OR'],

system/modules/Ecommerce/appControllers/CartController.php

Spacing +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
             $result->send();
         }
 
-        $item->sales ++;
+        $item->sales++;
         $item->save();
 
         if (empty($_GET['count']))

Braces +20 added lines, -11 removed lines

@@ -22,10 +22,12 @@ 
                     $user_id = $this->Users->registration($_POST, true);
                     if (!$user_id) {
                         $error = true;
-                    } else {
+                    }
+                    else {
                         $user = Users\User::get($user_id);
                     }
-                } else {
+                }
+                else {
                     $user = Users\User::$cur;
                 }
                 $ids = [];
@@ -69,7 +71,8 @@ 
                 if ($deliverys && empty($deliverys[$_POST['delivery']])) {
                     $error = 1;
                     Msg::add('Выберите способ доставки', 'danger');
-                } elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
+                }
+                elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
                     $cart->delivery_id = $_POST['delivery'];
                     foreach ($deliverys[$cart->delivery_id]->fields as $field) {
                         if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
@@ -81,10 +84,12 @@ 
                 if ($payTypes && (empty($_POST['payType']) || empty($payTypes[$_POST['payType']]))) {
                     $error = 1;
                     Msg::add('Выберите способ оплаты', 'danger');
-                } elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
+                }
+                elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
                     $payType = $payTypes[$_POST['payType']];
                     $cart->paytype_id = $payType->id;
-                } else {
+                }
+                else {
                     $payType = null;
                 }
                 foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
@@ -98,10 +103,12 @@ 
                     if (!$userCard) {
                         $error = true;
                         Msg::add('Такой карты не существует', 'danger');
-                    } elseif ($userCard->user_id != $user->id) {
+                    }
+                    elseif ($userCard->user_id != $user->id) {
                         $error = true;
                         Msg::add('Это не ваша карта', 'danger');
-                    } else {
+                    }
+                    else {
                         $cart->card_item_id = $userCard->id;
                     }
                 }
@@ -272,10 +279,12 @@ 
         $item->sales ++;
         $item->save();
 
-        if (empty($_GET['count']))
-            $count = 1;
-        else
-            $count = (float) $_GET['count'];
+        if (empty($_GET['count'])) {
+                    $count = 1;
+        }
+        else {
+                    $count = (float) $_GET['count'];
+        }
 
         $cart = $this->ecommerce->getCurCart();
         $stages = Ecommerce\Cart\Stage::getList();

system/modules/Ecommerce/models/Item/Offer.php

Spacing +2 added lines, -2 removed lines

@@ -72,12 +72,12 @@
     {
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
         if ($warehouse) {
-            $warehouse->count +=(float) $count;
+            $warehouse->count += (float) $count;
             $warehouse->save();
         } else {
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
             if ($warehouse) {
-                $warehouse->count +=(float) $count;
+                $warehouse->count += (float) $count;
                 $warehouse->save();
             }
         }

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
         $code .= '$' . $this->name . ' = ';
         if (is_array($this->value)) {
             $code .= \CodeGenerator::genArray($this->value);
-        } else {
+        }
+        else {
             $code .= '"' . str_replace('"', '\"', $this->value) . '";';
         }
         return $code;

system/modules/Exchange1c/objects/Parser/Orders.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
         foreach ($cart->cartItems as $cartItem) {
             $isset = false;
             foreach ($cItems as $key => $cItem) {
-                if (!($cItem['item_id'] == $cartItem->item_id )) {
+                if (!($cItem['item_id'] == $cartItem->item_id)) {
                     continue;
                 }
                 $isset = true;

Braces +8 added lines, -4 removed lines

@@ -47,7 +47,8 @@ 
                 $payed = true;
                 $date = new \DateTime((string) $reqs['Дата оплаты по 1С']);
                 $cart->payed_date = $date->format('Y-m-d H:i:s');
-            } elseif (
+            }
+            elseif (
                     (!empty($reqs['Отменен']) && $reqs['Отменен'] == 'true') ||
                     (!empty($reqs['Дата оплаты по 1С']) && $reqs['Дата оплаты по 1С'] == 'T')) {
                 $cancel = true;
@@ -57,10 +58,12 @@ 
             $cart->payed = $payed;
             if ($payed && $cart->cart_status_id == 5) {
                 
-            } elseif ($payed && $cart->cart_status_id == 3) {
+            }
+            elseif ($payed && $cart->cart_status_id == 3) {
                 $cart->cart_status_id = 5;
                 $cart->save();
-            } elseif ($cancel && $cart->cart_status_id == 3) {
+            }
+            elseif ($cancel && $cart->cart_status_id == 3) {
                 $cart->cart_status_id = 4;
             }
             if ($cart->warehouse_block && !$payed && !$cancel && !empty($reqs['Проведен']) && $reqs['Проведен'] == 'true') {
@@ -104,7 +107,8 @@ 
             $itemPrice = number_format((string) $item->ЦенаЗаЕдиницу, 2, '.', '');
             if (!empty($pricesByPrice[$itemPrice])) {
                 $price = $pricesByPrice[$itemPrice];
-            } else {
+            }
+            else {
                 $rolePrice = 0;
                 foreach ($siteItem->prices as $priceId => $itemPrice) {
                     if (!$itemPrice->type->cipt_roles) {