injitools / cms-Inji

system/Inji/ComposerCmd.php

Doc Comments +4 added lines

@@ -58,6 +58,10 @@
         self::command('install', false, $path);
     }
 
+    /**
+     * @param string $command
+     * @param string $path
+     */
     static function command($command, $needOutput = true, $path = null)
     {
         include_once 'composer/vendor/autoload.php';

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/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 (';

system/modules/Modules/Modules.php

Doc Comments +4 added lines

@@ -45,6 +45,10 @@
         return $modelCols;
     }
 
+    /**
+     * @param string $colPrefix
+     * @param string $tableName
+     */
     function parseColsForTable($cols, $colPrefix, $tableName)
     {
 

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
     function parseColsForModel($cols = [])
     {
-        $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []];
+        $modelCols = ['labels' => [], 'cols' => [], 'relations' => []];
         foreach ($cols as $col) {
             $modelCols['labels'][$col['code']] = $col['label'];
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];

Braces +2 added lines, -1 removed lines

@@ -87,7 +87,8 @@
         foreach ($this->currencies as $merchantCurrency) {
             if ($merchantCurrency->currency_id == $pay->currency_id) {
                 $allowCurrencies[] = ['type' => 'primary', 'currency' => $merchantCurrency->currency];
-            } else {
+            }
+            else {
                 $transfer = Currency\ExchangeRate::get([['currency_id', $merchantCurrency->currency_id], ['target_currency_id', $pay->currency_id]]);
                 if ($transfer) {
                     $allowCurrencies[] = ['type' => 'transfer', 'currency' => $merchantCurrency->currency, 'transfer' => $transfer];

system/modules/Ui/objects/Table.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
     public $attributes = [];
     public $indexCol = null;
 
+    /**
+     * @param string[] $cols
+     */
     function setCols($cols)
     {
         $this->cols = $cols;

system/modules/View/View.php

Doc Comments +12 added lines

@@ -147,6 +147,9 @@ 
         return $result[1];
     }
 
+    /**
+     * @param string $source
+     */
     function parseSource($source)
     {
         $tags = $this->parseRaw($source);
@@ -190,6 +193,9 @@ 
         return substr($source, ( $pos + strlen($rawTag) + 2));
     }
 
+    /**
+     * @param string $type
+     */
     function getHref($type, $params)
     {
         $href = '';
@@ -531,6 +537,9 @@ 
         echo round(( microtime(true) - INJI_TIME_START), 4);
     }
 
+    /**
+     * @param string $type
+     */
     function customAsset($type, $asset, $lib = false)
     {
         if (!$lib) {
@@ -549,6 +558,9 @@ 
         }
     }
 
+    /**
+     * @param string $lineParams
+     */
     function widget($_widgetName, $_params = [], $lineParams = null)
     {
         $_paths = $this->getWidgetPaths($_widgetName);

Spacing +9 added lines, -9 removed lines

@@ -187,16 +187,16 @@ 
     {
         $pos = strpos($source, $rawTag) - 1;
         echo substr($source, 0, $pos);
-        return substr($source, ( $pos + strlen($rawTag) + 2));
+        return substr($source, ($pos + strlen($rawTag) + 2));
     }
 
     public function getHref($type, $params)
     {
         $href = '';
         if (is_string($params)) {
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params;
+            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '') . $params;
         } elseif (empty($params['template']) && !empty($params['file'])) {
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params['file'];
+            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '') . $params['file'];
         } elseif (!empty($params['template']) && !empty($params['file'])) {
             $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
         }
@@ -255,7 +255,7 @@ 
 
         $this->checkNeedLibs();
         $this->parseCss();
-        echo "\n        <script src='" . Statics::file(($this->app->type != 'app' ? '/' . $this->app->name : '' ) . "/static/system/js/Inji.js") . "'></script>";
+        echo "\n        <script src='" . Statics::file(($this->app->type != 'app' ? '/' . $this->app->name : '') . "/static/system/js/Inji.js") . "'></script>";
     }
 
     public function parseCss()
@@ -279,7 +279,7 @@ 
             if (file_exists($path)) {
                 $this->loadedCss[$href] = $href;
                 $urls[$href] = $path;
-                $timeStr.=filemtime($path);
+                $timeStr .= filemtime($path);
             } else {
                 echo "\n        <link href='{$href}' rel='stylesheet' type='text/css' />";
             }
@@ -330,7 +330,7 @@ 
                     if (strpos($css, '//') !== false)
                         $href = $css;
                     else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '') . $css;
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -356,7 +356,7 @@ 
                     if (strpos($css, '//') !== false)
                         $href = $css;
                     else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '') . $css;
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -417,7 +417,7 @@ 
                 if (file_exists($path)) {
                     $nativeUrl[$script] = $script;
                     $urls[$script] = $path;
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }
@@ -432,7 +432,7 @@ 
                     if (!empty($script['name'])) {
                         $onLoadModules[$script['name']] = $script['name'];
                     }
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }

Braces +86 added lines, -51 removed lines

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

system/objects/CodeGenerator.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
         return $return;
     }
 
+    /**
+     * @param string $path
+     */
     static function parseClass($path)
     {
         $code = file_get_contents($path);

Spacing +2 added lines, -2 removed lines

@@ -16,13 +16,13 @@
         if ($level == 0)
             $return = "[";
         foreach ($data as $key => $item) {
-            $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
+            $return .= "\n" . str_repeat(' ', ($level * 4 + 4)) . "'{$key}' => ";
             if (!is_array($item))
                 $return .= "'{$item}',";
             else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
-                $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
+                $return .= "\n" . str_repeat(' ', ($level * 4 + 4)) . "],";
             }
         }
         if ($level == 0)

Braces +9 added lines, -6 removed lines

@@ -12,20 +12,23 @@
 
     public static function genArray($data, $level = 0) {
         $return = '';
-        if ($level == 0)
-            $return = "[";
+        if ($level == 0) {
+                    $return = "[";
+        }
         foreach ($data as $key => $item) {
             $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
-            if (!is_array($item))
-                $return .= "'{$item}',";
+            if (!is_array($item)) {
+                            $return .= "'{$item}',";
+            }
             else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
                 $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
             }
         }
-        if ($level == 0)
-            $return = rtrim($return, ',') . "\n];";
+        if ($level == 0) {
+                    $return = rtrim($return, ',') . "\n];";
+        }
 
         return $return;
     }

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

Braces +6 added lines, -3 removed lines

@@ -26,7 +26,8 @@ 
                 $html .=" {$key} = '";
                 if (!is_array($value)) {
                     $html .= addcslashes($value, "'");
-                } else {
+                }
+                else {
                     $html .= json_encode($value);
                 }
                 $html .= "'";
@@ -34,9 +35,11 @@ 
         }
         if ($noCloseTag === null) {
             $html .= ' />';
-        } elseif ($noCloseTag === false) {
+        }
+        elseif ($noCloseTag === false) {
             $html .= ">{$body}</{$tag}>";
-        } else {
+        }
+        else {
             $html .= ">{$body}";
         }
         return $html;