injitools / cms-Inji

system/Inji/Model.php

Braces +42 added lines, -32 removed lines

@@ -717,17 +717,21 @@ 
         if (!$query) {
             return false;
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
         if (!empty($options['group'])) {
             $query->group($options['group']);
         }
-        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]);
@@ -753,14 +757,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) {
@@ -1019,21 +1023,23 @@ 
         if (!empty($options['where'])) {
             static::fixPrefix($options['where'], '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) {
@@ -1112,8 +1118,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;
@@ -1296,8 +1303,9 @@ 
         $values = [];
 
         foreach ($this->cols() as $col => $param) {
-            if (isset($this->_params[$col]))
-                $values[$col] = $this->_params[$col];
+            if (isset($this->_params[$col])) {
+                            $values[$col] = $this->_params[$col];
+            }
         }
         if (empty($values) && empty($options['empty'])) {
             return false;
@@ -1457,8 +1465,9 @@ 
     {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }
@@ -1614,8 +1623,9 @@ 
             App::$cur->db->where($relation['relTablePrefix'] . $this->index(), $this->pk());
             App::$cur->db->where($relation['relTablePrefix'] . $relation['model']::index(), $objectId);
             $isset = App::$cur->db->select($relation['relTable'])->fetch_assoc();
-            if ($isset)
-                return true;
+            if ($isset) {
+                            return true;
+            }
 
             App::$cur->db->insert($relation['relTable'], [
                 $relation['relTablePrefix'] . $this->index() => $this->{$this->index()},

system/modules/Ui/objects/DataManager.php

Indentation +6 added lines, -6 removed lines

@@ -164,12 +164,12 @@
             <li><a href ='' onclick='inji.Ui.dataManagers.get(this).rowSelection("inverse");return false;'>Инвертировать</a></li>
             <li role="separator" class="divider"></li>
               <?php
-              foreach ($actions as $action => $actionParams) {
-                  if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-                      echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
-                  }
-              }
-              ?>
+                foreach ($actions as $action => $actionParams) {
+                    if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
+                        echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+                    }
+                }
+                ?>
           </ul>
         </div>
         <?php

system/modules/Ui/objects/Tree.php

Indentation +11 added lines, -11 removed lines

@@ -23,17 +23,17 @@
         ?>
         <ul class="treeview" data-col='tree_path'>
           <?php
-          if (is_string($objectRoot)) {
-              $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
-          } else {
-              $class = get_class($objectRoot);
-              $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
-          }
-          $count += count($items);
-          foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
-          }
-          ?>
+            if (is_string($objectRoot)) {
+                $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
+            } else {
+                $class = get_class($objectRoot);
+                $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
+            }
+            $count += count($items);
+            foreach ($items as $objectChild) {
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
+            }
+            ?>
         </ul>
         <?php
         return $count;

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
           }
           $count += count($items);
           foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
           }
           ?>
         </ul>
@@ -56,7 +56,7 @@ 
                       <ul>
                         <?php
                     }
-                    $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
+                    $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
                 }
             }
             if ($isset) {