injitools / cms-Inji

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

Braces +24 added lines, -6 removed lines

@@ -2,27 +2,45 @@
 <form action = '' method = 'POST' enctype="multipart/form-data">
   <div class ="form-group">
     <label>Название сайта</label>
-    <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) echo \App::$primary->config['site']['name']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) {
+    echo \App::$primary->config['site']['name'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Название компании</label>
-    <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) echo \App::$primary->config['site']['company_name']; ?>' />
+    <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) {
+    echo \App::$primary->config['site']['company_name'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Основной домен</label>
-    <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) echo \App::$primary->config['site']['domain']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) {
+    echo \App::$primary->config['site']['domain'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Контактный email</label>
-    <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) {
+    echo \App::$primary->config['site']['email'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Ключевые слова</label>
-    <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) {
+    echo \App::$primary->config['site']['keywords'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Краткое описание сайта</label>
-    <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) {
+    echo \App::$primary->config['site']['description'];
+}
+?>' />
   </div>
   <?php
   $form = new Ui\Form();

system/modules/Ecommerce/appControllers/CartController.php

Braces +5 added lines, -4 removed lines

@@ -271,10 +271,11 @@
     $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/Db/objects/Mysql/Mysql.php

Braces +12 added lines, -8 removed lines

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

system/Inji/Tools.php

Braces +8 added lines, -6 removed lines

@@ -55,8 +55,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 +101,11 @@ 
       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) {

system/modules/Files/Files.php

Braces +21 added lines, -14 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,8 +50,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') . '/');
 
@@ -84,12 +88,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;
@@ -105,8 +111,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') . '/');
 

system/Inji/Model.php

Braces +39 added lines, -30 removed lines

@@ -730,22 +730,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]);
@@ -771,14 +776,14 @@ 
     }
     static::$needJoin = [];
 
-    if (!empty($options['limit']))
-      $limit = (int) $options['limit'];
-    else {
+    if (!empty($options['limit'])) {
+          $limit = (int) $options['limit'];
+    } else {
       $limit = 0;
     }
-    if (!empty($options['start']))
-      $start = (int) $options['start'];
-    else {
+    if (!empty($options['start'])) {
+          $start = (int) $options['start'];
+    } else {
       $start = 0;
     }
     if ($limit || $start) {
@@ -1045,21 +1050,23 @@ 
     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'];
-    else {
+    if (!empty($options['limit'])) {
+          $limit = (int) $options['limit'];
+    } else {
       $limit = 0;
     }
-    if (!empty($options['start']))
-      $start = (int) $options['start'];
-    else {
+    if (!empty($options['start'])) {
+          $start = (int) $options['start'];
+    } else {
       $start = 0;
     }
     if ($limit || $start) {
@@ -1136,8 +1143,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;
@@ -1474,8 +1482,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;
   }

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

Braces +53 added lines, -42 removed lines

@@ -125,12 +125,14 @@ 
     if (!is_array($order)) {
       $this->order[] = "{$order} {$type}";
     } else {
-      foreach ($order as $item)
-        if (!is_array($item)) {
+      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 +140,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 = '') {
@@ -151,10 +154,12 @@ 
       }
     } 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 +178,15 @@ 
         $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)) {
@@ -205,12 +212,12 @@ 
         $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 {
+      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;
       while (isset($where[++$i])) {
         $item = $where[$i];
@@ -225,10 +232,11 @@ 
             $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)) {
@@ -257,13 +265,15 @@ 
       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)) {
@@ -289,12 +299,12 @@ 
         $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 {
+      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;
       while (isset($where[++$i])) {
         $item = $where[$i];
@@ -309,10 +319,11 @@ 
             $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)) {

system/modules/Users/Users.php

Braces +13 added lines, -10 removed lines

@@ -217,17 +217,20 @@
    * @return boolean|\User\User
    */
   public function get($idn, $ltype = 'id') {
-    if (!$idn)
-      return false;
+    if (!$idn) {
+          return false;
+    }
 
-    if (is_numeric($idn) && $ltype != 'login')
-      $user = Users\User::get($idn, 'id');
-    elseif ($ltype == 'login')
-      $user = Users\User::get($idn, 'login');
-    else
-      $user = Users\User::get($idn, 'mail');
-    if (!$user)
-      return [];
+    if (is_numeric($idn) && $ltype != 'login') {
+          $user = Users\User::get($idn, 'id');
+    } elseif ($ltype == 'login') {
+          $user = Users\User::get($idn, 'login');
+    } else {
+          $user = Users\User::get($idn, 'mail');
+    }
+    if (!$user) {
+          return [];
+    }
 
     return $user;
   }