injitools / cms-Inji

system/Inji/Html.php

Spacing +1 added lines, -1 removed lines

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

system/Inji/Log.php

Braces +13 added lines, -10 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -83,22 +83,22 @@
                     $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>";
+                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>Memory</th><th>' . $this->convertSize(memory_get_peak_usage()) . ' of ' . ini_get('memory_limit') . '</th></tr></table></div>';
+        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>';
     }
 
     public function convertSize($size)
     {
 
         if ($size < 1024)
-            return $size . "B";
+            return $size."B";
         elseif ($size < 1048576)
-            return round($size / 1024, 2) . "KB";
+            return round($size / 1024, 2)."KB";
         else
-            return round($size / 1048576, 2) . "MB";
+            return round($size / 1048576, 2)."MB";
     }
 
     public function __destruct()

system/Inji/Msg.php

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -2 removed lines

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

system/Inji/Tools.php

Braces +8 added lines, -6 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
     public 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 != '') {
@@ -64,7 +64,7 @@ 
         $path = explode('/', $path);
         $cur = '';
         foreach ($path as $item) {
-            $cur .= $item . '/';
+            $cur .= $item.'/';
             if (!file_exists($cur)) {
                 mkdir($cur);
             }
@@ -85,7 +85,7 @@ 
     public 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 {
@@ -206,7 +206,7 @@ 
         if (!headers_sent()) {
             header("Location: {$href}");
         } else {
-            echo '\'"><script>window.location="' . $href . '";</script>';
+            echo '\'"><script>window.location="'.$href.'";</script>';
         }
         exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
     }
@@ -266,7 +266,7 @@ 
             $pathArray = $cleanPathArray;
             $cleanPathArray = [];
         } while ($changes);
-        return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
+        return (strpos($path, '/') === 0 ? '/' : '').implode('/', $pathArray);
     }
 
     /**
@@ -287,7 +287,7 @@ 
         if (empty($month[$mm - 1])) {
             return 'Не указано';
         }
-        return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
+        return ($dd > 0 ? $dd." " : '').$month[$mm - 1]." ".$yy." ".$hours;
     }
 
     /**
@@ -369,10 +369,10 @@ 
             if (in_array($file, ['.', '..'])) {
                 continue;
             }
-            if (is_dir($from . '/' . $file)) {
-                self::copyFiles($from . '/' . $file, $to . '/' . $file);
+            if (is_dir($from.'/'.$file)) {
+                self::copyFiles($from.'/'.$file, $to.'/'.$file);
             } else {
-                copy($from . '/' . $file, $to . '/' . $file);
+                copy($from.'/'.$file, $to.'/'.$file);
             }
         }
     }

system/modules/Access/Access.php

Braces +6 added lines, -4 removed lines

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

system/modules/Db/Db.php

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
             $param = isset($this->config['default']) ? $this->config['default'] : 'local';
         }
         if (!is_array($param)) {
-            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true])))
-                return false;
+            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) {
+                            return false;
+            }
 
             $db = $dbOption;
         } else {

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@ 
         } else {
             $db = $param;
         }
-        $className = 'Db\\' . $db['driver'];
+        $className = 'Db\\'.$db['driver'];
         $this->connection = new $className();
         $this->connection->init($db);
         $this->connection->dbInstance = $this;
         $this->connect = $this->connection->connect;
         $this->dbConfig = $db;
 
-        $this->className = 'Db\\' . $this->dbConfig['driver'];
-        $this->QueryClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Query';
-        $this->ResultClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Result';
+        $this->className = 'Db\\'.$this->dbConfig['driver'];
+        $this->QueryClassName = 'Db\\'.$this->dbConfig['driver'].'\\Query';
+        $this->ResultClassName = 'Db\\'.$this->dbConfig['driver'].'\\Result';
     }
 
     public function __call($name, $params)
@@ -55,7 +55,7 @@ 
 
     public function newQuery()
     {
-        if($this->QueryClassName) {
+        if ($this->QueryClassName) {
             return new $this->QueryClassName($this->connection);
         }
         return false;

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

Braces +12 added lines, -8 removed lines

@@ -30,14 +30,18 @@
     public function init($connect_options)
     {
         extract($connect_options);
-        if (isset($db_name))
-            $this->db_name = $db_name;
-        if (isset($encoding))
-            $this->encoding = $encoding;
-        if (isset($table_prefix))
-            $this->table_prefix = $table_prefix;
-        if (isset($noConnectAbort))
-            $this->noConnectAbort = $noConnectAbort;
+        if (isset($db_name)) {
+                    $this->db_name = $db_name;
+        }
+        if (isset($encoding)) {
+                    $this->encoding = $encoding;
+        }
+        if (isset($table_prefix)) {
+                    $this->table_prefix = $table_prefix;
+        }
+        if (isset($noConnectAbort)) {
+                    $this->noConnectAbort = $noConnectAbort;
+        }
 
         $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
         $dt = new \DateTime();

Spacing +6 added lines, -6 removed lines

@@ -13,11 +13,11 @@ 
 
 class Mysql extends \Object
 {
-    public $config = [];       // настройки подключения выбраной базы
-    public $connect = FALSE;        // ярлык соединения с MySQL
-    public $encoding = 'utf-8';        // установленная кодировка
-    public $db_name = 'test';         // выбраная в данный момент база
-    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $config = []; // настройки подключения выбраной базы
+    public $connect = FALSE; // ярлык соединения с MySQL
+    public $encoding = 'utf-8'; // установленная кодировка
+    public $db_name = 'test'; // выбраная в данный момент база
+    public $table_prefix = 'inji_'; // префикс названий таблиц
     public $pdo = NULL;
     public $lastQuery = '';
     public $last_error = '';
@@ -71,7 +71,7 @@ 
         $this->table_prefix = '';
 
         $query->where('TABLE_SCHEMA', $old_db);
-        $query->where('TABLE_NAME', $old_prefix . $table_name);
+        $query->where('TABLE_NAME', $old_prefix.$table_name);
         $result = $query->select('COLUMNS');
         $this->db_name = $old_db;
         $this->table_prefix = $old_prefix;

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

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     static $forms = [
         'manager' => [
             'map' => [
-                ['price', 'currency_id',],
+                ['price', 'currency_id', ],
                 ['item_offer_price_type_id', 'item_offer_id']
             ]
     ]];

system/modules/Files/Files.php

Braces +24 added lines, -16 removed lines

@@ -22,16 +22,19 @@ 
 
         $sitePath = App::$primary->path;
 
-        if (!is_uploaded_file($file['tmp_name']))
-            return 0;
+        if (!is_uploaded_file($file['tmp_name'])) {
+                    return 0;
+        }
 
         $fileinfo = pathinfo($file['name']);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -47,13 +50,15 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
-        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path))
-            return false;
+        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
+                    return false;
+        }
 
         $fileObject->type_id = $type->pk();
         $fileObject->original_name = $file['name'];
@@ -76,12 +81,14 @@ 
         $sitePath = App::$primary->path;
 
         $fileinfo = pathinfo($url);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -97,8 +104,9 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 

Spacing +10 added lines, -10 removed lines

@@ -46,13 +46,13 @@ 
             }
         }
         $fileObject->name = $fileinfo['filename'];
-        $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+        if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+            unlink($sitePath.$fileObject->path);
 
-        Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+        Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
-        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path))
+        if (!move_uploaded_file($file['tmp_name'], $sitePath.$fileObject->path))
             return false;
 
         $fileObject->type_id = $type->pk();
@@ -96,17 +96,17 @@ 
             }
         }
         $fileObject->name = $fileinfo['filename'];
-        $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+        if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+            unlink($sitePath.$fileObject->path);
 
-        Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+        Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
         $file = @file_get_contents($url);
         if ($file === false) {
             return 0;
         }
-        file_put_contents($sitePath . $fileObject->path, $file);
+        file_put_contents($sitePath.$fileObject->path, $file);
 
         $fileObject->type_id = $type->pk();
         $fileObject->original_name = $fileinfo['basename'];