injitools / cms-Inji

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

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

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

Doc Comments +3 added lines

@@ -15,6 +15,9 @@
 {
     public $xml = null;
 
+    /**
+     * @param \SimpleXMLElement $xml
+     */
     public function __construct($xml)
     {
         $this->xml = $xml;

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

system/modules/Libs/Libs.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                     $this->loadLib($rLib);
                 }
             }
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
                 foreach ($className::$files['css'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('css', $file, $libName);

Braces +4 added lines, -2 removed lines

@@ -28,7 +28,8 @@ 
                 foreach ($className::$files['css'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('css', $file, $libName);
-                    } else {
+                    }
+                    else {
                         App::$cur->view->customAsset('css', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
                     }
                 }
@@ -37,7 +38,8 @@ 
                 foreach ($className::$files['js'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('js', $file, $libName);
-                    } else {
+                    }
+                    else {
                         App::$cur->view->customAsset('js', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
                     }
                 }

system/modules/Ui/objects/ActiveForm.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
                             $this->model->_params[$modelName::index()] = 0;
                         }
                         $relOptions['model']::fixPrefix($relOptions['col']);
-                        $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
+                        $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
                 } elseif (!empty($modelName::$cols[$col])) {

Braces +32 added lines, -16 removed lines

@@ -35,7 +35,8 @@ 
             if (is_string($form)) {
                 $this->formName = $form;
             }
-        } else {
+        }
+        else {
             $this->model = $model;
             $this->modelName = get_class($model);
             if (is_array($form)) {
@@ -43,7 +44,8 @@ 
                     throw new \Exception('empty form');
                 }
                 $this->form = $form;
-            } else {
+            }
+            else {
                 $this->formName = $form;
                 $this->form = \App::$cur->ui->getModelForm($this->modelName, $form);
                 if (empty($this->form)) {
@@ -57,9 +59,11 @@ 
 
         if (!empty($this->form['name'])) {
             $this->header = $this->form['name'];
-        } elseif (!empty($modeName::$objectName)) {
+        }
+        elseif (!empty($modeName::$objectName)) {
             $this->header = $modeName::$objectName;
-        } else {
+        }
+        else {
             $this->header = $this->modelName;
         }
     }
@@ -76,7 +80,8 @@ 
                     $colPath = explode(':', $col);
                     if ($this->model->{$colPath[1]}) {
                         $inputs[$col] = new ActiveForm($this->model->{$colPath[1]}, $colPath[2]);
-                    } else {
+                    }
+                    else {
                         $relOptions = $modelName::getRelation($colPath[1]);
                         if (!isset($this->model->_params[$modelName::index()])) {
                             $this->model->_params[$modelName::index()] = 0;
@@ -85,7 +90,8 @@ 
                         $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
-                } elseif (!empty($modelName::$cols[$col])) {
+                }
+                elseif (!empty($modelName::$cols[$col])) {
                     $inputs[$col] = $modelName::$cols[$col];
                 }
             }
@@ -108,7 +114,8 @@ 
                     $text = 'Новый элемент был успешно добавлен';
                     \Msg::add($text, 'success');
                     \Msg::show();
-                } else {
+                }
+                else {
                     $presets = !empty($this->form['preset']) ? $this->form['preset'] : [];
                     if (!empty($this->form['userGroupPreset'][\Users\User::$cur->group_id])) {
                         $presets = array_merge($presets, $this->form['userGroupPreset'][\Users\User::$cur->group_id]);
@@ -145,12 +152,14 @@ 
                         foreach ($presets as $col => $preset) {
                             if (!empty($preset['value'])) {
                                 $this->model->$col = $preset['value'];
-                            } elseif (!empty($preset['userCol'])) {
+                            }
+                            elseif (!empty($preset['userCol'])) {
                                 if (strpos($preset['userCol'], ':')) {
                                     $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
                                     $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
                                     $this->model->$col = \Users\User::$cur->$rel->$param;
-                                } else {
+                                }
+                                else {
                                     $this->model->$col = \Users\User::$cur->{$preset['userCol']};
                                 }
                             }
@@ -158,7 +167,8 @@ 
                         if (!$this->parent) {
                             if (!empty($this->form['successText'])) {
                                 $text = $this->form['successText'];
-                            } else {
+                            }
+                            else {
                                 $text = $this->model->pk() ? 'Изменения были успешно сохранены' : 'Новый элемент был успешно добавлен';
                             }
                             \Msg::add($text, 'success');
@@ -170,7 +180,8 @@ 
                         }
                         if ($ajax) {
                             \Msg::show();
-                        } elseif (!empty($_GET['redirectUrl'])) {
+                        }
+                        elseif (!empty($_GET['redirectUrl'])) {
                             \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
                         }
                         $successId = $this->model->pk();
@@ -196,7 +207,8 @@ 
     public function drawCol($colName, $options, $form, $params = []) {
         if (is_object($options)) {
             $options->draw();
-        } else {
+        }
+        else {
             $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
             $input = new $inputClassName();
             $input->form = $form;
@@ -223,7 +235,8 @@ 
             case 'method':
                 if (!empty($inputParams['params'])) {
                     $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']);
-                } else {
+                }
+                else {
                     $values = \App::$cur->$inputParams['module']->$inputParams['method']();
                 }
                 break;
@@ -254,7 +267,8 @@ 
                 }
                 if (!empty($params['noEmptyValue'])) {
                     $values = [];
-                } else {
+                }
+                else {
                     $values = [0 => 'Не задано'];
                 }
                 foreach ($items as $key => $item) {
@@ -265,10 +279,12 @@ 
                                     $values[$key] = $inputParams['showCol']['class']::{$inputParams['showCol']['method']}($item);
                                     break;
                             }
-                        } else {
+                        }
+                        else {
                             $values[$key] = $item->$inputParams['showCol'];
                         }
-                    } else {
+                    }
+                    else {
                         $values[$key] = $item->name();
                     }
                 }