injitools / cms-Inji

system/Inji/Model.php

Doc Comments +4 added lines, -4 removed lines

@@ -357,7 +357,7 @@ 
     /**
      * Information extractor for col relations path
      * 
-     * @param string|array $info
+     * @param string $info
      * @return array
      */
     public static function parseColRecursion($info)
@@ -433,7 +433,7 @@ 
      * Generate params string for col by name
      * 
      * @param string $colName
-     * @return boolean|string
+     * @return false|string
      */
     public static function genColParams($colName)
     {
@@ -573,7 +573,7 @@ 
     /**
      * return relations list
      * 
-     * @return array
+     * @return string
      */
     public static function relations()
     {
@@ -1065,7 +1065,7 @@ 
      * 
      * @param array $params
      * @param array $where
-     * @return boolean
+     * @return false|null
      */
     public static function update($params, $where = [])
     {

Braces +40 added lines, -32 removed lines

@@ -718,17 +718,21 @@ 
         if (!$query) {
             return [];
         }
-        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]);
@@ -754,14 +758,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) {
@@ -781,8 +785,7 @@ 
             if ($exc->getCode() == '42S02') {
                 static::createTable();
                 $result = $query->query($queryArr);
-            }
-            else {
+            } else {
                 throw $exc;
             }
             
@@ -1027,21 +1030,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) {
@@ -1119,8 +1124,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;
@@ -1303,8 +1309,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;
@@ -1464,8 +1471,9 @@ 
     {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }

Spacing +54 added lines, -54 removed lines

@@ -211,7 +211,7 @@ 
                         $relModel = $relations[$colInfo['colParams']['relation']]['model'];
                         $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
                         if ($manageHref) {
-                            $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+                            $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relModel)."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано';
                         } else {
                             $value = $relValue ? $relValue->name() : 'Не задано';
                         }
@@ -221,7 +221,7 @@ 
             case 'image':
                 $file = Files\File::get($item->$colName);
                 if ($file) {
-                    $value = '<img src="' . $file->path . '?resize=60x120" />';
+                    $value = '<img src="'.$file->path.'?resize=60x120" />';
                 } else {
                     $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
                 }
@@ -259,12 +259,12 @@ 
             return;
         }
         if (!is_array($array)) {
-            if (!isset($cols[static::colPrefix() . $array]) && isset(static::$cols[$array])) {
+            if (!isset($cols[static::colPrefix().$array]) && isset(static::$cols[$array])) {
                 static::createCol($array);
                 $cols = static::cols(true);
             }
-            if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
-                $array = static::colPrefix() . $array;
+            if (!isset($cols[$array]) && isset($cols[static::colPrefix().$array])) {
+                $array = static::colPrefix().$array;
             } else {
                 static::checkForJoin($array, $rootModel);
             }
@@ -273,14 +273,14 @@ 
         switch ($searchtype) {
             case 'key':
                 foreach ($array as $key => $item) {
-                    if (!isset($cols[static::colPrefix() . $key]) && isset(static::$cols[$key])) {
+                    if (!isset($cols[static::colPrefix().$key]) && isset(static::$cols[$key])) {
                         static::createCol($key);
                         $cols = static::cols(true);
                     }
-                    if (!isset($cols[$key]) && isset($cols[static::colPrefix() . $key])) {
-                        $array[static::colPrefix() . $key] = $item;
+                    if (!isset($cols[$key]) && isset($cols[static::colPrefix().$key])) {
+                        $array[static::colPrefix().$key] = $item;
                         unset($array[$key]);
-                        $key = static::colPrefix() . $key;
+                        $key = static::colPrefix().$key;
                     }
                     if (is_array($array[$key])) {
                         static::fixPrefix($array[$key], 'key', $rootModel);
@@ -291,12 +291,12 @@ 
                 break;
             case 'first':
                 if (isset($array[0]) && is_string($array[0])) {
-                    if (!isset($cols[static::colPrefix() . $array[0]]) && isset(static::$cols[$array[0]])) {
+                    if (!isset($cols[static::colPrefix().$array[0]]) && isset(static::$cols[$array[0]])) {
                         static::createCol($array[0]);
                         $cols = static::cols(true);
                     }
-                    if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
-                        $array[0] = static::colPrefix() . $array[0];
+                    if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix().$array[0]])) {
+                        $array[0] = static::colPrefix().$array[0];
                     } else {
                         static::checkForJoin($array[0], $rootModel);
                     }
@@ -329,13 +329,13 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+                        $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
                         break;
                     case 'one':
                     case 'many':
                         $relCol = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($relCol);
-                        $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+                        $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
                         break;
                 }
                 $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel);
@@ -376,13 +376,13 @@ 
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
                         //$info['modelName'] = $relations[$rel]['model'];
-                        $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+                        $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
                         break;
                     case 'one':
                         $relCol = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($relCol);
                         //$info['modelName'] = $relations[$rel]['model'];
-                        $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+                        $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
                         break;
                 }
                 $info = $relations[$rel]['model']::parseColRecursion($info);
@@ -400,8 +400,8 @@ 
             } else {
                 $info['colParams'] = [];
             }
-            if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
-                $info['col'] = static::colPrefix() . $info['col'];
+            if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix().$info['col']])) {
+                $info['col'] = static::colPrefix().$info['col'];
             }
             $info['modelName'] = get_called_class();
         }
@@ -507,7 +507,7 @@ 
         if ($params === false) {
             return false;
         }
-        return App::$cur->db->addCol(static::table(), static::colPrefix() . $colName, $params);
+        return App::$cur->db->addCol(static::table(), static::colPrefix().$colName, $params);
     }
 
     public static function createTable()
@@ -537,28 +537,28 @@ 
             return true;
         }
         $cols = [
-            $colPrefix . 'id' => 'pk'
+            $colPrefix.'id' => 'pk'
         ];
         $className = get_called_class();
         if (!empty($className::$cols)) {
             foreach ($className::$cols as $colName => $colParams) {
                 if ($colName == 'date_create') {
-                    $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+                    $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
                     continue;
                 }
                 $params = $className::genColParams($colName);
                 if ($params) {
-                    $cols[$colPrefix . $colName] = $params;
+                    $cols[$colPrefix.$colName] = $params;
                 }
             }
         }
-        if (empty($cols[$colPrefix . 'date_create'])) {
-            $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+        if (empty($cols[$colPrefix.'date_create'])) {
+            $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
         }
         $tableIndexes = [];
         if ($indexes) {
             foreach ($indexes as $indexName => $index) {
-                $tableIndexes[] = $index['type'] . ' ' . App::$cur->db->table_prefix . $indexName . ' (' . implode(',', $index['cols']) . ')';
+                $tableIndexes[] = $index['type'].' '.App::$cur->db->table_prefix.$indexName.' ('.implode(',', $index['cols']).')';
             }
         }
 
@@ -584,7 +584,7 @@ 
     public static function index()
     {
 
-        return static::colPrefix() . 'id';
+        return static::colPrefix().'id';
     }
 
     /**
@@ -596,7 +596,7 @@ 
     {
         $classPath = explode('\\', get_called_class());
         $classPath = array_slice($classPath, 1);
-        return strtolower(implode('_', $classPath)) . '_';
+        return strtolower(implode('_', $classPath)).'_';
     }
 
     /**
@@ -661,12 +661,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        App::$cur->db->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        App::$cur->db->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -681,8 +681,8 @@ 
             }
             if ($param !== null) {
                 $cols = static::cols();
-                if (!isset($cols[$col]) && isset($cols[static::colPrefix() . $col])) {
-                    $col = static::colPrefix() . $col;
+                if (!isset($cols[$col]) && isset($cols[static::colPrefix().$col])) {
+                    $col = static::colPrefix().$col;
                 }
                 App::$cur->db->where($col, $param);
             } else {
@@ -742,12 +742,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -1063,12 +1063,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -1085,7 +1085,7 @@ 
         } else {
             $cols .= '*';
         }
-        $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
+        $cols .= ') as `count`'.(!empty($options['cols']) ? ','.$options['cols'] : '');
         $query->cols = $cols;
         if (!empty($options['group'])) {
             $query->group($options['group']);
@@ -1223,25 +1223,25 @@ 
         $itemModel = $class::$treeCategory;
         $oldPath = $this->tree_path;
         $this->tree_path = $this->getCatalogTree($this);
-        $itemsTable = \App::$cur->db->table_prefix . $itemModel::table();
-        $itemTreeCol = $itemModel::colPrefix() . 'tree_path';
+        $itemsTable = \App::$cur->db->table_prefix.$itemModel::table();
+        $itemTreeCol = $itemModel::colPrefix().'tree_path';
 
-        $categoryTreeCol = $this->colPrefix() . 'tree_path';
-        $categoryTable = \App::$cur->db->table_prefix . $this->table();
+        $categoryTreeCol = $this->colPrefix().'tree_path';
+        $categoryTable = \App::$cur->db->table_prefix.$this->table();
         if ($oldPath) {
             \App::$cur->db->query('UPDATE
-                ' . $categoryTable . ' 
+                ' . $categoryTable.' 
                     SET 
-                        ' . $categoryTreeCol . ' = REPLACE(' . $categoryTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $categoryTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $categoryTreeCol.' = REPLACE('.$categoryTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $categoryTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
 
             \App::$cur->db->query('UPDATE
-                ' . $itemsTable . '
+                ' . $itemsTable.'
                     SET 
-                        ' . $itemTreeCol . ' = REPLACE(' . $itemTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $itemTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $itemTreeCol.' = REPLACE('.$itemTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $itemTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
         }
-        $itemModel::update([$itemTreeCol => $this->tree_path . $this->id . '/'], [$itemModel::colPrefix() . $this->index(), $this->id]);
+        $itemModel::update([$itemTreeCol => $this->tree_path.$this->id.'/'], [$itemModel::colPrefix().$this->index(), $this->id]);
     }
 
     /**
@@ -1256,9 +1256,9 @@ 
         $catalogParent = $catalogClass::get($catalog->parent_id);
         if ($catalog && $catalogParent) {
             if ($catalogParent->tree_path) {
-                return $catalogParent->tree_path . $catalogParent->id . '/';
+                return $catalogParent->tree_path.$catalogParent->id.'/';
             } else {
-                return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
+                return $this->getCatalogTree($catalogParent).$catalogParent->id.'/';
             }
         }
         return '/';
@@ -1273,7 +1273,7 @@ 
         $categoryModel = $class::$categoryModel;
         $category = $categoryModel::get($this->{$categoryModel::index()});
         if ($category) {
-            $this->tree_path = $category->tree_path . $category->pk() . '/';
+            $this->tree_path = $category->tree_path.$category->pk().'/';
         } else {
             $this->tree_path = '/';
         }
@@ -1299,7 +1299,7 @@ 
             $this->changeCategoryTree();
         }
         if (!empty($this->_changedParams) && $this->pk()) {
-            Inji::$inst->event('modelItemParamsChanged-' . get_called_class(), $this);
+            Inji::$inst->event('modelItemParamsChanged-'.get_called_class(), $this);
         }
         $this->beforeSave();
 
@@ -1337,7 +1337,7 @@ 
         }
         $this->_params = $result->fetch();
         if ($new) {
-            Inji::$inst->event('modelCreatedItem-' . get_called_class(), $this);
+            Inji::$inst->event('modelCreatedItem-'.get_called_class(), $this);
         }
         $this->afterSave();
         return $this->{$this->index()};
@@ -1483,7 +1483,7 @@ 
         static::fixPrefix($params);
         $className = get_called_class();
         foreach ($params as $paramName => $value) {
-            $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $paramName);
+            $shortName = preg_replace('!'.$this->colPrefix().'!', '', $paramName);
             if (!empty($className::$cols[$shortName])) {
                 switch ($className::$cols[$shortName]['type']) {
                     case 'decimal':
@@ -1763,7 +1763,7 @@ 
     {
         static::fixPrefix($name);
         $className = get_called_class();
-        $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $name);
+        $shortName = preg_replace('!'.$this->colPrefix().'!', '', $name);
         if (!empty($className::$cols[$shortName])) {
             switch ($className::$cols[$shortName]['type']) {
                 case 'decimal':

system/modules/Ecommerce/appControllers/CartController.php

Braces +5 added lines, -4 removed lines

@@ -270,10 +270,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();
 

Spacing +13 added lines, -13 removed lines

@@ -62,7 +62,7 @@ 
                         $warecount = $cartitem->price->offer->warehouseCount($cart->id);
                         if ($cartitem->count > $warecount) {
                             $error = true;
-                            Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+                            Msg::add('Вы заказали <b>'.$cartitem->item->name.'</b> больше чем есть на складе. на складе: <b>'.$warecount.'</b>', 'danger');
                         }
                     }
                 }
@@ -74,7 +74,7 @@ 
                     foreach ($deliverys[$cart->delivery_id]->fields as $field) {
                         if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
                             $error = 1;
-                            Msg::add('Вы не указали: ' . $field->name);
+                            Msg::add('Вы не указали: '.$field->name);
                         }
                     }
                 }
@@ -90,7 +90,7 @@ 
                 foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
                     if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
                         $error = 1;
-                        Msg::add('Вы не указали: ' . $field->name);
+                        Msg::add('Вы не указали: '.$field->name);
                     }
                 }
                 if (!empty($_POST['discounts']['card_item_id'])) {
@@ -127,13 +127,13 @@ 
                     }
                     $cart = \Ecommerce\Cart::get($cart->id);
                     if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
-                        $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
-                        $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-                        \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
+                        $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/admin/ecommerce/Cart">Админ панель</a>';
+                        $title = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+                        \Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
                     }
                     if ($this->notifications) {
                         $notification = new Notifications\Notification();
-                        $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+                        $notification->name = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
                         $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
                         $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
                         $notification->save();
@@ -179,10 +179,10 @@ 
             'href' => '/ecommerce/cart'
         ];
         $bread[] = [
-            'text' => 'Заказ: №' . $cart->id,
-            'href' => '/ecommerce/cart/orderDetail/' . $cart->id
+            'text' => 'Заказ: №'.$cart->id,
+            'href' => '/ecommerce/cart/orderDetail/'.$cart->id
         ];
-        $this->view->setTitle('Заказ №' . $cart->id);
+        $this->view->setTitle('Заказ №'.$cart->id);
         $this->view->page(['data' => compact('cart', 'bread')]);
     }
 
@@ -275,7 +275,7 @@ 
             $result->send();
         }
 
-        $item->sales ++;
+        $item->sales++;
         $item->save();
 
         if (empty($_GET['count']))
@@ -288,7 +288,7 @@ 
 
         if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
             $result->success = false;
-            $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+            $result->content = 'На складе недостаточно товара! Доступно: '.$price->offer->warehouseCount();
             $result->send();
         }
 
@@ -305,7 +305,7 @@ 
             $cart->addItem($price->id, $count);
         }
         $cart->calc();
-        $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
+        $result->successMsg = '<a href="/ecommerce/view/'.$item->id.'">'.$item->name().($price->offer->name() ? ' ('.$price->offer->name().')' : '').'</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
         $result->send();
     }
 

system/modules/Ui/appAdminControllers/content/dataManager/view.php

Indentation +12 added lines, -12 removed lines

@@ -58,11 +58,11 @@ 
     ]]);
     ?>)</h3>
   <?php
-  foreach (\Dashboard\Comment::getList([ 'where' => [
-          ['item_id', $item->id],
-          ['model', $modelName],
-      ], 'order' => ['date_create', 'desc']]) as $comment) {
-      ?>
+    foreach (\Dashboard\Comment::getList([ 'where' => [
+            ['item_id', $item->id],
+            ['model', $modelName],
+        ], 'order' => ['date_create', 'desc']]) as $comment) {
+        ?>
       <div class="row">
         <div class="col-sm-3" style="max-width: 300px;">
           <a href='/admin/Users/view/User/<?= $comment->user->pk(); ?>'><?= $comment->user->name(); ?></a><br />
@@ -73,14 +73,14 @@ 
         </div>
       </div>
       <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 <div>
   <?php
-  $form = new \Ui\Form();
-  $form->begin();
-  $form->input('textarea', 'comment', 'Комментарий');
-  $form->end();
-  ?>
+    $form = new \Ui\Form();
+    $form->begin();
+    $form->input('textarea', 'comment', 'Комментарий');
+    $form->end();
+    ?>
 </div>

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@ 
                 case 'relation':
                     $relations = $colInfo['modelName']::relations();
                     $relValue = $relations[$colInfo['colParams']['relation']]['model']::get($item->$colName);
-                    $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relations[$colInfo['colParams']['relation']]['model']) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+                    $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relations[$colInfo['colParams']['relation']]['model'])."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано';
                     break;
             }
             break;
         case 'image':
             $file = Files\File::get($item->$colName);
             if ($file) {
-                $value = '<img src="' . $file->path . '?resize=60x120" />';
+                $value = '<img src="'.$file->path.'?resize=60x120" />';
             } else {
                 $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
             }
@@ -58,7 +58,7 @@ 
     ]]);
     ?>)</h3>
   <?php
-  foreach (\Dashboard\Comment::getList([ 'where' => [
+  foreach (\Dashboard\Comment::getList(['where' => [
           ['item_id', $item->id],
           ['model', $modelName],
       ], 'order' => ['date_create', 'desc']]) as $comment) {

system/modules/Ui/widgets/DataManager/rowButtons.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $buttons = [];
 foreach ($actions as $action => $actionParams) {
     if (class_exists($actionParams['className']) && $actionParams['className']::$rowAction) {
-        $buttons[]= $actionParams['className']::rowButton($dataManager, $item, $params, $actionParams);
+        $buttons[] = $actionParams['className']::rowButton($dataManager, $item, $params, $actionParams);
     }
 }
 echo implode(' ', $buttons);

system/modules/Users/Users.php

Doc Comments +9 added lines

@@ -92,6 +92,9 @@ 
         }
     }
 
+    /**
+     * @param string $user_mail
+     */
     public function passre($user_mail)
     {
         $user = $this->get($user_mail, 'mail');
@@ -322,6 +325,9 @@ 
         return $user->id;
     }
 
+    /**
+     * @param string $pass
+     */
     public function hashpass($pass)
     {
         return password_hash($pass, PASSWORD_DEFAULT);
@@ -359,6 +365,9 @@ 
         return $return;
     }
 
+    /**
+     * @param integer $cat_id
+     */
     public function addUserActivity($user_id, $cat_id , $text = '')
     {
         $ua = new Users\Activity([

Braces +13 added lines, -10 removed lines

@@ -196,17 +196,20 @@
      */

     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;

     }

Spacing +34 added lines, -34 removed lines

@@ -24,8 +24,8 @@ 
         if (isset($_GET['logout'])) {

             return $this->logOut();

         }

-        if (filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_session_hash') && filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_id')) {

-            return $this->cuntinueSession(filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_session_hash'), filter_input(INPUT_COOKIE, $this->cookiePrefix . '_user_id'));

+        if (filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_session_hash') && filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_id')) {

+            return $this->cuntinueSession(filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_session_hash'), filter_input(INPUT_COOKIE, $this->cookiePrefix.'_user_id'));

         }

         if (isset($_POST['autorization']) && trim(filter_input(INPUT_POST, 'user_login')) && trim(filter_input(INPUT_POST, 'user_pass'))) {

             unset($_POST['autorization']);

@@ -41,18 +41,18 @@ 
 

     public function logOut($redirect = true)

     {

-        if (!empty($_COOKIE[$this->cookiePrefix . "_user_session_hash"]) && !empty($_COOKIE[$this->cookiePrefix . "_user_id"])) {

+        if (!empty($_COOKIE[$this->cookiePrefix."_user_session_hash"]) && !empty($_COOKIE[$this->cookiePrefix."_user_id"])) {

             $session = Users\Session::get([

-                        ['user_id', $_COOKIE[$this->cookiePrefix . "_user_id"]],

-                        ['hash', $_COOKIE[$this->cookiePrefix . "_user_session_hash"]]

+                        ['user_id', $_COOKIE[$this->cookiePrefix."_user_id"]],

+                        ['hash', $_COOKIE[$this->cookiePrefix."_user_session_hash"]]

             ]);

             if ($session) {

                 $session->delete();

             }

         }

         if (!headers_sent()) {

-            setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");

-            setcookie($this->cookiePrefix . "_user_id", '', 0, "/");

+            setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");

+            setcookie($this->cookiePrefix."_user_id", '', 0, "/");

         }

         if ($redirect) {

             if (!empty($this->config['logoutUrl'][$this->app->type])) {

@@ -70,25 +70,25 @@ 
         ]);

         if ($session && $session->user && $session->user->blocked) {

             if (!headers_sent()) {

-                setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");

-                setcookie($this->cookiePrefix . "_user_id", '', 0, "/");

+                setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");

+                setcookie($this->cookiePrefix."_user_id", '', 0, "/");

             }

             Msg::add('Ваш аккаунт заблокирован', 'info');

             return;

         }

         if ($session && $session->user && !$session->user->blocked) {

             if (!headers_sent()) {

-                setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");

-                setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");

+                setcookie($this->cookiePrefix."_user_session_hash", $session->hash, time() + 360000, "/");

+                setcookie($this->cookiePrefix."_user_id", $session->user_id, time() + 360000, "/");

             }

             if (!empty($this->config['needActivation']) && $session->user->activation) {

                 if (!headers_sent()) {

-                    setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");

-                    setcookie($this->cookiePrefix . "_user_id", '', 0, "/");

+                    setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");

+                    setcookie($this->cookiePrefix."_user_id", '', 0, "/");

                 }

-                Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');

+                Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$session->user->id.'"><b>повторно выслать ссылку активации</b></a>');

             } elseif ($session->user->activation) {

-                Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');

+                Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$session->user->id.'"><b>повторно выслать ссылку активации</b></a>');

             }

             if (!$session->user->mail && !empty($this->config['noMailNotify'])) {

                 Msg::add($this->config['noMailNotify']);

@@ -98,8 +98,8 @@ 
             Users\User::$cur->save();

         } else {

             if (!headers_sent()) {

-                setcookie($this->cookiePrefix . "_user_session_hash", '', 0, "/");

-                setcookie($this->cookiePrefix . "_user_id", '', 0, "/");

+                setcookie($this->cookiePrefix."_user_session_hash", '', 0, "/");

+                setcookie($this->cookiePrefix."_user_id", '', 0, "/");

             }

             Msg::add('Ваша сессия устарела или более недействительна, вам необходимо пройти <a href = "/users/login">авторизацию</a> заново', 'info');

         }

@@ -109,7 +109,7 @@ 
     {

         $user = $this->get($user_mail, 'mail');

         if (!$user) {

-            Msg::add('Пользователь ' . $user_mail . ' не найден, проверьте првильность ввода e-mail или зарегистрируйтесь', 'danger');

+            Msg::add('Пользователь '.$user_mail.' не найден, проверьте првильность ввода e-mail или зарегистрируйтесь', 'danger');

             return false;

         }

         $passre = Users\Passre::get([['user_id', $user->id], ['status', 1]]);

@@ -117,10 +117,10 @@ 
             $passre->status = 2;

             $passre->save();

         }

-        $hash = $user->id . '_' . Tools::randomString(50);

+        $hash = $user->id.'_'.Tools::randomString(50);

         $passre = new Users\Passre(['user_id' => $user->id, 'status' => 1, 'hash' => $hash]);

         $passre->save();

-        Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $user_mail, 'Восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для продолжения восстановления пароля перейдите по ссылке: <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/?passrecont=1&hash=' . $hash . '">' . idn_to_utf8(INJI_DOMAIN_NAME) . '/?passrecont=1&hash=' . $hash . '</a>');

+        Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, $user_mail, 'Восстановление пароля на сайте '.idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />для продолжения восстановления пароля перейдите по ссылке: <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/?passrecont=1&hash='.$hash.'">'.idn_to_utf8(INJI_DOMAIN_NAME).'/?passrecont=1&hash='.$hash.'</a>');

         Tools::redirect('/', 'На указанный почтовый ящик была выслана инструкция по восстановлению пароля', 'success');

     }

 

@@ -138,7 +138,7 @@ 
             $user->pass = $this->hashpass($pass);

             $user->save();

             $this->autorization($user->mail, $user->pass, 'mail');

-            Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $user->mail, 'Новый пароль на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />Ваш новый пароль: ' . $pass);

+            Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, $user->mail, 'Новый пароль на сайте '.idn_to_utf8(INJI_DOMAIN_NAME), 'Было запрошено восстановление пароля на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />Ваш новый пароль: '.$pass);

             Tools::redirect('/', 'На указанный почтовый ящик был выслан новый пароль', 'success');

         }

     }

@@ -151,9 +151,9 @@ 
         $user = $this->get($login, $ltype);

         if ($user && $this->verifypass($pass, $user->pass) && !$user->blocked) {

             if (!empty($this->config['needActivation']) && $session->user->activation) {

-                Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $session->user->id . '"><b>повторно выслать ссылку активации</b></a>');

+                Tools::redirect('/', 'Этот аккаунт ещё не активирован. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$session->user->id.'"><b>повторно выслать ссылку активации</b></a>');

             } elseif ($user->activation) {

-                Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/' . $user->id . '"><b>повторно выслать ссылку активации</b></a>');

+                Msg::add('Этот аккаунт ещё не активирован, не все функции могут быть доступны. <br />Если вы не получали письмо с ссылкой для активации, нажмите на - <a href = "/users/resendActivation/'.$user->id.'"><b>повторно выслать ссылку активации</b></a>');

             }

             if (!$user->mail && !empty($this->config['noMailNotify'])) {

                 Msg::add($this->config['noMailNotify']);

@@ -172,7 +172,7 @@ 
             if ($user && $user->blocked) {

                 Msg::add('Вы заблокированы', 'danger');

             } elseif ($user) {

-                Msg::add('Вы ошиблись при наборе пароля или логина, попробуйте ещё раз или воспользуйтесь <a href = "?passre=1&user_mail=' . $user->mail . '">Восстановлением пароля</a>', 'danger');

+                Msg::add('Вы ошиблись при наборе пароля или логина, попробуйте ещё раз или воспользуйтесь <a href = "?passre=1&user_mail='.$user->mail.'">Восстановлением пароля</a>', 'danger');

             } else {

                 Msg::add('Данный почтовый ящик не зарегистрирован в системе', 'danger');

             }

@@ -195,8 +195,8 @@ 
         $session->save();

 

         if (!headers_sent()) {

-            setcookie($this->cookiePrefix . "_user_session_hash", $session->hash, time() + 360000, "/");

-            setcookie($this->cookiePrefix . "_user_id", $session->user_id, time() + 360000, "/");

+            setcookie($this->cookiePrefix."_user_session_hash", $session->hash, time() + 360000, "/");

+            setcookie($this->cookiePrefix."_user_id", $session->user_id, time() + 360000, "/");

         } else {

             Msg::add('Не удалось провести авторизацию. Попробуйте позже', 'info');

         }

@@ -318,20 +318,20 @@ 
             $this->autorization($user_mail, $pass, 'mail');

         }

         if (!empty($this->config['needActivation'])) {

-            $from = 'noreply@' . INJI_DOMAIN_NAME;

+            $from = 'noreply@'.INJI_DOMAIN_NAME;

             $to = $user_mail;

-            $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);

-            $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;

-            $text .='<br />';

+            $subject = 'Регистрация на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);

+            $text = 'Вы были зарегистрированы на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: '.$pass;

             $text .= '<br />';

-            $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';

+            $text .= '<br />';

+            $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://'.INJI_DOMAIN_NAME.'/users/activation/'.$user->id.'/'.$user->activation.'">http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/users/activation/'.$user->id.'/'.$user->activation.'</a>';

             Tools::sendMail($from, $to, $subject, $text);

             Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль и ссылка для активации', 'success');

         } else {

-            $from = 'noreply@' . INJI_DOMAIN_NAME;

+            $from = 'noreply@'.INJI_DOMAIN_NAME;

             $to = $user_mail;

-            $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);

-            $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;

+            $subject = 'Регистрация на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);

+            $text = 'Вы были зарегистрированы на сайте '.idn_to_utf8(INJI_DOMAIN_NAME).'<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: '.$pass;

             Tools::sendMail($from, $to, $subject, $text);

             Msg::add('Вы были зарегистрированы. На указанный почтовый ящик был выслан ваш пароль', 'success');

         }

system/modules/Ecommerce/models/UserAdds/Field.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             'map' => [
                 ['name', 'type'],
                 ['required', 'save'],
-                [ 'userfield']
+                ['userfield']
             ]
         ]
     ];

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

Doc Comments +3 added lines, -1 removed lines

@@ -28,7 +28,6 @@ 
      * Construct new data manager
      * 
      * @param string|array $modelNameOrOptions
-     * @param string $dataManager
      * @throws Exception
      */
     public function __construct($modelNameOrOptions, $managerName = 'manager')
@@ -386,6 +385,9 @@ 
         return $rows;
     }
 
+    /**
+     * @param DataManager $dataManager
+     */
     public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null)
     {
         $modelName = get_class($item);

Spacing +31 added lines, -31 removed lines

@@ -58,7 +58,7 @@ 
             $this->name = $this->managerOptions['name'];
         }
 
-        $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
+        $this->managerId = str_replace('\\', '_', 'dataManager_'.$this->modelName.'_'.$this->managerName.'_'.\Tools::randomString());
     }
 
     /**
@@ -102,13 +102,13 @@ 
         if (!empty($this->managerOptions['filters'])) {
             $buttons[] = [
                 'text' => 'Фильтры',
-                'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+                'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
             ];
         }
         $buttons[] = [
             'text' => 'Добавить элемент',
-            'onclick' => 'inji.Ui.forms.popUp("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ')',
+            'onclick' => 'inji.Ui.forms.popUp("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).')',
         ];
 
         return $buttons;
@@ -138,7 +138,7 @@ 
                     'className' => $action
                 ];
             }
-            $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+            $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\'.$return[$key]['className']) ? 'Ui\DataManager\Action\\'.$return[$key]['className'] : $return[$key]['className'];
             if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
                 unset($return[$key]);
             }
@@ -170,7 +170,7 @@ 
               <?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>";
+                      echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"".str_replace('\\', '\\\\', $action)."\");return false;'>{$actionParams['className']::$name}</a></li>";
                   }
               }
               ?>
@@ -221,7 +221,7 @@ 
             return [];
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         $modelName = $this->modelName;
@@ -237,7 +237,7 @@ 
             $queryParams['start'] = $this->page * $this->limit - $this->limit;
         }
         if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-            $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+            $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
         }
         if (!empty($params['appType'])) {
             $queryParams['appType'] = $params['appType'];
@@ -296,7 +296,7 @@ 
                         if (!empty($params['filters'][$col]['max'])) {
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                                $date = $params['filters'][$col]['max'].' 23:59:59';
                             } else {
                                 $date = $params['filters'][$col]['max'];
                             }
@@ -323,16 +323,16 @@ 
                         }
                         switch ($params['filters'][$col]['compareType']) {
                             case 'contains':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'equals':
                                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                                 break;
                             case 'starts_with':
-                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'ends_with':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                                 break;
                         }
                         break;
@@ -371,7 +371,7 @@ 
                 $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
             }
             $row = [];
-            $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+            $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
             $row[] = $item->pk();
             foreach ($this->managerOptions['cols'] as $key => $colName) {
                 if (!empty($params['download'])) {
@@ -417,16 +417,16 @@ 
                     $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                     $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
                     $count = $count ? $count : 'Нет';
-                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
                 case 'many':
                     $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                     $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
                     $count = $count ? $count : 'Нет';
-                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
                 default :
                     if ($item->{$modelName::$cols[$colName]['relation']}) {
                         if (\App::$cur->name == 'admin') {
-                            $href = "<a href ='/admin/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
+                            $href = "<a href ='/admin/".str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model'])."/".$item->{$modelName::$cols[$colName]['relation']}->pk()."'>";
                             if (!empty($modelName::$cols[$colName]['showCol'])) {
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
                             } else {
@@ -456,18 +456,18 @@ 
                     case'many':
                         $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                         $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-                        return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
+                        return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count} ".\Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов'])."</a>";
                     default:
                         return $item->$colName;
                 }
             } elseif (!empty($modelName::$cols[$colName]['type'])) {
-                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
-                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($originalItem))."/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
                 } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
-                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
                 } else {
                     return \Model::resloveTypeValue($item, $colName);
                 }
@@ -502,7 +502,7 @@ 
             return [];
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         if (!empty($params['limit'])) {
@@ -516,7 +516,7 @@ 
         ];
         $modelName = $this->modelName;
         if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-            $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+            $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
         }
         if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
             foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
@@ -570,7 +570,7 @@ 
                         if (!empty($params['filters'][$col]['max'])) {
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                                $date = $params['filters'][$col]['max'].' 23:59:59';
                             } else {
                                 $date = $params['filters'][$col]['max'];
                             }
@@ -597,16 +597,16 @@ 
                         }
                         switch ($params['filters'][$col]['compareType']) {
                             case 'contains':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'equals':
                                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                                 break;
                             case 'starts_with':
-                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'ends_with':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                                 break;
                         }
                         break;
@@ -640,7 +640,7 @@ 
             $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
         }
         $tableCols[] = '';
-        $this->table->class .=' datamanagertable';
+        $this->table->class .= ' datamanagertable';
         $this->table->setCols($tableCols);
     }
 
@@ -663,13 +663,13 @@ 
             return false;
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         $tree = new Tree();
         $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-            return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-path ='" . $category->tree_path . ($category->pk() ? $category->pk() . "/" : '') . "'> " . $category->name . "</a> 
-                                    <a href = '#' onclick = 'inji.Ui.forms.popUp(\"" . str_replace('\\', '\\\\', get_class($category)) . ':' . $category->pk() . "\")' class ='glyphicon glyphicon-edit'></a>&nbsp;    
+            return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-path ='".$category->tree_path.($category->pk() ? $category->pk()."/" : '')."'> ".$category->name."</a> 
+                                    <a href = '#' onclick = 'inji.Ui.forms.popUp(\"" . str_replace('\\', '\\\\', get_class($category)).':'.$category->pk()."\")' class ='glyphicon glyphicon-edit'></a>&nbsp;    
                 <a onclick='inji.Ui.dataManagers.get(this).delCategory({$category->pk()});return false;' class ='glyphicon glyphicon-remove'></a>";
         });
         ?>

system/modules/Ecommerce/models/Delivery/Field.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             'map' => [
                 ['name', 'type'],
                 ['required', 'save'],
-                [ 'userfield']
+                ['userfield']
             ]
         ]
     ];

system/modules/Ecommerce/widgets/cart/fields.php

Indentation +16 added lines, -16 removed lines

@@ -1,16 +1,16 @@ 
 <fieldset>
   <?php
-  if (\Users\User::$cur->id) {
-      $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
-      $values = [];
-      foreach ($userAdds as $userAdd) {
-          $values[$userAdd->id] = $userAdd->values(['array' => true]);
-      }
-      if ($userAdds) {
-          $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
-          echo '<hr />';
-      }
-      ?>
+    if (\Users\User::$cur->id) {
+        $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
+        $values = [];
+        foreach ($userAdds as $userAdd) {
+            $values[$userAdd->id] = $userAdd->values(['array' => true]);
+        }
+        if ($userAdds) {
+            $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
+            echo '<hr />';
+        }
+        ?>
       <script>
           var userAddsValues = <?= json_encode($values); ?>;
           inji.onLoad(function () {
@@ -24,9 +24,9 @@ 
           })
       </script>
       <?php
-  }
-  foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
-      $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
-  }
-  ?>
+    }
+    foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
+        $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
+    }
+    ?>
 </fieldset>
\ No newline at end of file