Completed
Push — master ( 8cf912...d192c7 )
by Alexey
05:24
created
system/modules/Ecommerce/objects/CloseCartBtn.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
             $cart->save();
50 50
         }
51 51
         $count = count($carts);
52
-        return 'Завершено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['корзина', 'корзины', 'корзин']);
52
+        return 'Завершено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['корзина', 'корзины', 'корзин']);
53 53
     }
54 54
 
55 55
 }
Please login to merge, or discard this patch.
system/modules/Ecommerce/snippets/payTypeHandler/onlinePay.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
                         'currency_id' => $currency_id,
21 21
                         'user_id' => \Users\User::$cur->id,
22 22
                         'sum' => $sum,
23
-                        'description' => 'Оплата заказа №' . $cart->id . ' в онлайн-магазине',
23
+                        'description' => 'Оплата заказа №'.$cart->id.' в онлайн-магазине',
24 24
                         'type' => 'pay',
25 25
                         'pay_status_id' => 1,
26 26
                         'callback_module' => 'Ecommerce',
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
                     $pay->save();
33 33
                 }
34 34
             }
35
-            return ['/money/merchants/pay/?data=' . $cart->id, 'Ваш заказ был создан. Вам необходимо оплатить счета, после чего с вами свяжется администратор для уточнения дополнительной информации', 'success'];
35
+            return ['/money/merchants/pay/?data='.$cart->id, 'Ваш заказ был создан. Вам необходимо оплатить счета, после чего с вами свяжется администратор для уточнения дополнительной информации', 'success'];
36 36
         }
37 37
     }
38 38
         ];
Please login to merge, or discard this patch.
system/modules/Ecommerce/Ecommerce.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
         $name = '';
53 53
         foreach ($fields as $field) {
54 54
             if ($field->save && !empty($data[$field->id])) {
55
-                $name .= htmlspecialchars($data[$field->id]) . ' ';
55
+                $name .= htmlspecialchars($data[$field->id]).' ';
56 56
             }
57 57
         }
58 58
         $name = trim($name);
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
         $name = '';
110 110
         foreach ($fields as $field) {
111 111
             if ($field->save && !empty($data[$field->id])) {
112
-                $name .= htmlspecialchars($data[$field->id]) . ' ';
112
+                $name .= htmlspecialchars($data[$field->id]).' ';
113 113
             }
114 114
         }
115 115
         $name = trim($name);
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
             foreach ($options['sort'] as $col => $direction) {
197 197
                 switch ($col) {
198 198
                     case 'price':
199
-                        $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
199
+                        $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
200 200
                         break;
201 201
                     case 'name':
202 202
                         $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
@@ -217,10 +217,10 @@  discard block
 block discarded – undo
217 217
         if (!empty($this->config['view_filter'])) {
218 218
             if (!empty($this->config['view_filter']['options'])) {
219 219
                 foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
220
-                    $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
221
-                        'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
222
-                        'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
223
-                        'inner', 'option' . $optionId];
220
+                    $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
221
+                        'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
222
+                        'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
223
+                        'inner', 'option'.$optionId];
224 224
                 }
225 225
             }
226 226
         }
@@ -230,18 +230,18 @@  discard block
 block discarded – undo
230 230
                 switch ($col) {
231 231
                     case 'price':
232 232
                         if (!empty($filter['min'])) {
233
-                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
233
+                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['min'], '>='];
234 234
                         }
235 235
                         if (!empty($filter['max'])) {
236
-                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
236
+                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['max'], '<='];
237 237
                         }
238 238
                         break;
239 239
                     case 'options':
240 240
                         foreach ($filter as $optionId => $optionValue) {
241
-                            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
242
-                                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
243
-                                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
244
-                                'inner', 'option' . $optionId];
241
+                            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
242
+                                'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
243
+                                'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
244
+                                'inner', 'option'.$optionId];
245 245
                         }
246 246
                         break;
247 247
                 }
@@ -256,13 +256,13 @@  discard block
 block discarded – undo
256 256
                     continue;
257 257
                 }
258 258
                 $category = \Ecommerce\Category::get($categoryId);
259
-                $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
259
+                $where[] = ['tree_path', $category->tree_path.(int) $categoryId.'/%', 'LIKE', $first ? 'AND' : 'OR'];
260 260
                 $first = false;
261 261
             }
262 262
             $selectOptions['where'][] = $where;
263 263
         } elseif (!empty($options['parent'])) {
264 264
             $category = \Ecommerce\Category::get($options['parent']);
265
-            $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
265
+            $selectOptions['where'][] = ['tree_path', $category->tree_path.(int) $options['parent'].'/%', 'LIKE'];
266 266
         }
267 267
 
268 268
         //search
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
             foreach (explode(' ', $searchStr) as $part) {
273 273
                 $part = trim($part);
274 274
                 if ($part && strlen($part) > 2) {
275
-                    $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
275
+                    $searchArr[] = ['search_index', '%'.$part.'%', 'LIKE'];
276 276
                 }
277 277
             }
278 278
             if (!empty($searchArr)) {
@@ -282,18 +282,18 @@  discard block
 block discarded – undo
282 282
         if (empty($this->config['view_empty_warehouse'])) {
283 283
             $selectOptions['where'][] = [
284 284
                 '(
285
-          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
286
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
287
-            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
285
+          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix().'count`),0) 
286
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Item\Offer\Warehouse::table().' iciw 
287
+            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().'
288 288
             )
289 289
           -
290
-          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0)
291
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Warehouse\Block::table() . ' iewb
292
-            inner JOIN ' . \App::$cur->db->table_prefix . \Ecommerce\Cart::table() . ' icc ON icc.' . \Ecommerce\Cart::index() . ' = iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index() . ' AND (
293
-                (`' . \Ecommerce\Cart::colPrefix() . 'warehouse_block` = 1 and `' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(2,3,6)) ||
294
-                (`' . \Ecommerce\Cart::colPrefix() . \Ecommerce\Cart\Status::index() . '` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
290
+          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix().'count) ,0)
291
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Warehouse\Block::table().' iewb
292
+            inner JOIN ' . \App::$cur->db->table_prefix.\Ecommerce\Cart::table().' icc ON icc.'.\Ecommerce\Cart::index().' = iewb.'.\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index().' AND (
293
+                (`' . \Ecommerce\Cart::colPrefix().'warehouse_block` = 1 and `'.\Ecommerce\Cart::colPrefix().'cart_status_id` in(2,3,6)) ||
294
+                (`' . \Ecommerce\Cart::colPrefix().\Ecommerce\Cart\Status::index().'` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
295 295
             )
296
-            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
296
+            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().')
297 297
           )',
298 298
                 0,
299 299
                 '>'
@@ -301,15 +301,15 @@  discard block
 block discarded – undo
301 301
         }
302 302
 
303 303
 
304
-        $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
304
+        $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index().' = '.Ecommerce\Item\Offer::colPrefix().Ecommerce\Item::index(), 'inner'];
305 305
         $selectOptions['join'][] = [Ecommerce\Item\Offer\Price::table(),
306
-            Ecommerce\Item\Offer::index() . ' = ' . Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer::index() . ' and ' . Ecommerce\Item\Offer\Price::colPrefix() . 'price>0', 'inner'];
306
+            Ecommerce\Item\Offer::index().' = '.Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer::index().' and '.Ecommerce\Item\Offer\Price::colPrefix().'price>0', 'inner'];
307 307
         $selectOptions['join'][] = [
308
-            Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index() . ' = ' . Ecommerce\Item\Offer\Price\Type::index() .
309
-            ' and (' . Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles="" || ' . Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles LIKE "%|' . \Users\User::$cur->role_id . '|%")'
308
+            Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index().' = '.Ecommerce\Item\Offer\Price\Type::index().
309
+            ' and ('.Ecommerce\Item\Offer\Price\Type::colPrefix().'roles="" || '.Ecommerce\Item\Offer\Price\Type::colPrefix().'roles LIKE "%|'.\Users\User::$cur->role_id.'|%")'
310 310
         ];
311 311
         $selectOptions['where'][] = [
312
-            [Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index(), 0],
312
+            [Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index(), 0],
313 313
             [Ecommerce\Item\Offer\Price\Type::index(), 0, '>', 'OR']
314 314
         ];
315 315
 
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         $items = Ecommerce\Item::getList($selectOptions);
333 333
         $items = Ecommerce\Item\Param::getList([
334 334
                     'where' => ['item_id', array_keys($items), 'IN'],
335
-                    'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index() . ' = ' . \Ecommerce\Item\Param::colPrefix() .Ecommerce\Item\Option::index(). ' and ' . \Ecommerce\Item\Option::colPrefix() . 'searchable = 1', 'inner']],
335
+                    'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index().' = '.\Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' and '.\Ecommerce\Item\Option::colPrefix().'searchable = 1', 'inner']],
336 336
                     'distinct' => \Ecommerce\Item\Option::index()
337 337
         ]);
338 338
         return $items;
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
         if (is_array($counts)) {
366 366
             $sum = 0;
367 367
             foreach ($counts as $count) {
368
-                $sum +=$count['count'];
368
+                $sum += $count['count'];
369 369
             }
370 370
             return $sum;
371 371
         }
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 
402 402
         if (!empty($conf['files']['aditionTemplateFiels'])) {
403 403
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
404
-                $return[$file['file']] = '- ' . $file['name'];
404
+                $return[$file['file']] = '- '.$file['name'];
405 405
             }
406 406
         }
407 407
         return $return;
Please login to merge, or discard this patch.
system/modules/Libs/Libs.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     public function loadLib($libName, $options = [])
14 14
     {
15 15
 
16
-        $className = 'Libs\\' . ucfirst($libName);
16
+        $className = 'Libs\\'.ucfirst($libName);
17 17
         if (class_exists($className)) {
18 18
             if (!empty($className::$composerPacks)) {
19 19
                 foreach ($className::$composerPacks as $packageName => $version) {
@@ -25,12 +25,12 @@  discard block
 block discarded – undo
25 25
                     $this->loadLib($rLib);
26 26
                 }
27 27
             }
28
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
28
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
29 29
                 foreach ($className::$files['css'] as $file) {
30 30
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
31 31
                         App::$cur->view->customAsset('css', $file, $libName);
32 32
                     } else {
33
-                        App::$cur->view->customAsset('css', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
33
+                        App::$cur->view->customAsset('css', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
34 34
                     }
35 35
                 }
36 36
             }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
40 40
                         App::$cur->view->customAsset('js', $file, $libName);
41 41
                     } else {
42
-                        App::$cur->view->customAsset('js', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
42
+                        App::$cur->view->customAsset('js', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
43 43
                     }
44 44
                 }
45 45
             }
@@ -50,30 +50,30 @@  discard block
 block discarded – undo
50 50
     {
51 51
         $libPath = preg_replace('!^libs/!', '', $file);
52 52
         $libName = substr($libPath, 0, strpos($libPath, '/'));
53
-        $className = 'Libs\\' . ucfirst($libName);
53
+        $className = 'Libs\\'.ucfirst($libName);
54 54
         if (class_exists($className)) {
55 55
             if (!empty($className::$programDirs)) {
56 56
                 $fileDir = substr($libPath, strlen($libName) + 1, strpos($libPath, '/', strlen($libName) + 1) - strlen($libName) - 1);
57 57
                 foreach ($className::$programDirs as $programDir) {
58 58
                     if ($programDir == $fileDir) {
59
-                        include $dir . $file;
59
+                        include $dir.$file;
60 60
                         exit();
61 61
                     }
62 62
                 }
63 63
             }
64 64
         }
65
-        return $dir . $file;
65
+        return $dir.$file;
66 66
     }
67 67
 
68 68
     public function getPath($args)
69 69
     {
70 70
         if (!empty($args[0])) {
71
-            $libName = 'Libs\\' . ucfirst($args[0]);
71
+            $libName = 'Libs\\'.ucfirst($args[0]);
72 72
             if (class_exists($libName)) {
73 73
                 $file = implode('/', array_slice($args, 1));
74 74
                 foreach ($libName::$staticDirs as $dir) {
75 75
                     if (strpos($file, $dir) === 0) {
76
-                        return \App::$primary->path . '/vendor/' . $file;
76
+                        return \App::$primary->path.'/vendor/'.$file;
77 77
                     }
78 78
                 }
79 79
             }
Please login to merge, or discard this patch.
system/modules/View/appAdminControllers/ViewController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
             $templates = App::$primary->view->config;
49 49
             $templates['app']['installed'][$_POST['name']] = $_POST['name'];
50 50
             Config::save('module', $templates, 'View', App::$primary);
51
-            $path = App::$primary->path . '/templates/' . $_POST['name'] . '/index.html';
52
-            $pathMap = App::$primary->path . '/templates/' . $_POST['name'] . '/map.html';
53
-            Tools::createDir(App::$primary->path . '/templates/' . $_POST['name']);
51
+            $path = App::$primary->path.'/templates/'.$_POST['name'].'/index.html';
52
+            $pathMap = App::$primary->path.'/templates/'.$_POST['name'].'/map.html';
53
+            Tools::createDir(App::$primary->path.'/templates/'.$_POST['name']);
54 54
             file_put_contents($path, $text);
55 55
             file_put_contents($pathMap, trim($_POST['map']));
56 56
             $template = [
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
                 'name' => $_POST['name'],
59 59
                 'file' => 'index.html',
60 60
             ];
61
-            Config::save(App::$primary->path . '/templates/' . $_POST['name'] . '/config.php', $template);
61
+            Config::save(App::$primary->path.'/templates/'.$_POST['name'].'/config.php', $template);
62 62
             Tools::redirect('/admin/View');
63 63
         }
64 64
         $this->view->page();
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
         $this->view->setTitle('Редактирование шаблона');
70 70
         App::$cur->view->customAsset('css', '/static/moduleAsset/View/css/blockDrop.css');
71 71
         App::$cur->view->customAsset('js', '/static/moduleAsset/View/js/blockDrop.js');
72
-        $template = Config::custom(App::$primary->path . '/templates/' . $templateName . '/config.php');
73
-        $pathMap = App::$primary->path . '/templates/' . $templateName . '/map.html';
72
+        $template = Config::custom(App::$primary->path.'/templates/'.$templateName.'/config.php');
73
+        $pathMap = App::$primary->path.'/templates/'.$templateName.'/map.html';
74 74
         if (!empty($_POST)) {
75 75
             $templates = App::$primary->view->config;
76 76
             $templates['app']['installed'][$templateName] = $_POST['name'];
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
             $template['template_name'] = $templateName;
82 82
             $template['name'] = $templateName;
83
-            Config::save(App::$primary->path . '/templates/' . $_POST['name'] . '/config.php', $template);
83
+            Config::save(App::$primary->path.'/templates/'.$_POST['name'].'/config.php', $template);
84 84
             Tools::redirect('/admin/View');
85 85
         }
86 86
         $template['map'] = file_get_contents($pathMap);
Please login to merge, or discard this patch.
system/modules/View/appControllers/ViewController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function editorcssAction()
14 14
     {
15
-        if (file_exists($this->view->template->path . '/css/editor.css')) {
16
-            Tools::redirect('/static/templates/' . $this->view->template['name'] . '/css/editor.css');
15
+        if (file_exists($this->view->template->path.'/css/editor.css')) {
16
+            Tools::redirect('/static/templates/'.$this->view->template['name'].'/css/editor.css');
17 17
         } else {
18 18
             header("Content-type: text/css");
19 19
             exit();
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
         if ($args) {
27 27
             $moduleName = ucfirst($args[0]);
28 28
             $params = array_slice($args, 1);
29
-            if (file_exists($this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php')) {
30
-                include_once $this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php';
29
+            if (file_exists($this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php')) {
30
+                include_once $this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php';
31 31
                 $module = new $moduleName($this->module->app);
32 32
                 $cotroller = $module->findController();
33 33
                 $cotroller->params = $params;
Please login to merge, or discard this patch.
system/modules/View/objects/Template.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     {
95 95
         $this->setParams($params);
96 96
         if (!$this->path) {
97
-            $this->path = $this->app->view->templatesPath . '/' . $this->name;
97
+            $this->path = $this->app->view->templatesPath.'/'.$this->name;
98 98
         }
99 99
         $this->loadConfig();
100 100
         $this->setPage();
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     public function loadConfig($configPath = '')
111 111
     {
112 112
         if (!$configPath) {
113
-            $configPath = $this->path . '/config.php';
113
+            $configPath = $this->path.'/config.php';
114 114
         }
115 115
         $this->configPath = $configPath;
116 116
         $this->config = \Config::custom($this->configPath);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
         }
141 141
         $this->page = $page;
142 142
         if (!$this->pagePath) {
143
-            $this->pagePath = $this->path . '/' . $this->page . '.html';
143
+            $this->pagePath = $this->path.'/'.$this->page.'.html';
144 144
         }
145 145
         $this->pagePath = \Tools::pathsResolve($this->getPagePaths(), $this->pagePath);
146 146
     }
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
             $page = $this->page;
158 158
         }
159 159
         return [
160
-            'template' => $this->path . '/' . $page . '.html',
161
-            'defaultPage' => \Module::getModulePath('View') . '/templatePages/' . $page . '.html'
160
+            'template' => $this->path.'/'.$page.'.html',
161
+            'defaultPage' => \Module::getModulePath('View').'/templatePages/'.$page.'.html'
162 162
         ];
163 163
     }
164 164
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
                 $this->content = \Controller::$cur->method;
195 195
             }
196 196
             if ((!$this->contentPath || $content) && \Module::$cur) {
197
-                $this->contentPath = \Module::$cur->path . '/' . \Module::$cur->app->type . "Controllers/content/{$this->content}.php";
197
+                $this->contentPath = \Module::$cur->path.'/'.\Module::$cur->app->type."Controllers/content/{$this->content}.php";
198 198
             }
199 199
             $this->contentPath = \Tools::pathsResolve($this->getContentPaths(), $this->contentPath);
200 200
         }
@@ -214,33 +214,33 @@  discard block
 block discarded – undo
214 214
         $paths = [];
215 215
         if ($this->module) {
216 216
             if (\Controller::$cur) {
217
-                $paths['templateModuleController'] = $this->path . "/modules/{$this->module->moduleName}/" . \Controller::$cur->name . "/{$content}.php";
217
+                $paths['templateModuleController'] = $this->path."/modules/{$this->module->moduleName}/".\Controller::$cur->name."/{$content}.php";
218 218
             }
219
-            $paths['templateModule'] = $this->path . "/modules/{$this->module->moduleName}/{$content}.php";
219
+            $paths['templateModule'] = $this->path."/modules/{$this->module->moduleName}/{$content}.php";
220 220
         }
221 221
         if (\Module::$cur) {
222 222
             if (\Controller::$cur) {
223
-                $paths['templateCurModuleController'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
223
+                $paths['templateCurModuleController'] = $this->path."/modules/".\Module::$cur->moduleName."/".\Controller::$cur->name."/{$content}.php";
224 224
             }
225
-            $paths['templateCurModule'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/{$content}.php";
225
+            $paths['templateCurModule'] = $this->path."/modules/".\Module::$cur->moduleName."/{$content}.php";
226 226
         }
227 227
         if (\Controller::$cur) {
228
-            $paths['appControllerContentController'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
229
-            $paths['appControllerContent'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
230
-            $paths['controllerContentController'] = \Controller::$cur->path . "/content/" . \Controller::$cur->name . "/{$content}.php";
231
-            $paths['controllerContent'] = \Controller::$cur->path . "/content/{$content}.php";
232
-            $paths['moduleControllerContentController'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
233
-            $paths['moduleControllerContent'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
228
+            $paths['appControllerContentController'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
229
+            $paths['appControllerContent'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
230
+            $paths['controllerContentController'] = \Controller::$cur->path."/content/".\Controller::$cur->name."/{$content}.php";
231
+            $paths['controllerContent'] = \Controller::$cur->path."/content/{$content}.php";
232
+            $paths['moduleControllerContentController'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
233
+            $paths['moduleControllerContent'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
234 234
         }
235 235
         if ($this->module) {
236 236
             if (\Controller::$cur) {
237
-                $paths['customModuleTemplateControllerContentController'] = $this->path . "/modules/" . $this->module->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
237
+                $paths['customModuleTemplateControllerContentController'] = $this->path."/modules/".$this->module->moduleName."/".\Controller::$cur->name."/{$content}.php";
238 238
             }
239
-            $paths['customModuleTemplateControllerContent'] = $this->path . "/modules/" . $this->module->moduleName . "/{$content}.php";
239
+            $paths['customModuleTemplateControllerContent'] = $this->path."/modules/".$this->module->moduleName."/{$content}.php";
240 240
         }
241 241
         if ($this->module && \Controller::$cur) {
242
-            $paths['customModuleControllerContentController'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
243
-            $paths['customModuleControllerContent'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
242
+            $paths['customModuleControllerContentController'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
243
+            $paths['customModuleControllerContent'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
244 244
         }
245 245
         return $paths;
246 246
     }
@@ -260,10 +260,10 @@  discard block
 block discarded – undo
260 260
         if (!$templatesPath) {
261 261
             $templatesPath = $app->view->templatesPath;
262 262
         }
263
-        if (file_exists($templatesPath . '/' . $templateName)) {
263
+        if (file_exists($templatesPath.'/'.$templateName)) {
264 264
             return new Template([
265 265
                 'name' => $templateName,
266
-                'path' => $templatesPath . '/' . $templateName,
266
+                'path' => $templatesPath.'/'.$templateName,
267 267
                 'app' => $app
268 268
             ]);
269 269
         }
Please login to merge, or discard this patch.
system/modules/View/objects/Adapter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function el($name, $option = [])
14 14
     {
15
-        $className = get_called_class() . '\\' . $name;
15
+        $className = get_called_class().'\\'.$name;
16 16
         if (class_exists($className)) {
17 17
             return new $className();
18 18
         }
Please login to merge, or discard this patch.
system/modules/Users/models/User/Info.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,16 +89,16 @@
 block discarded – undo
89 89
 
90 90
     public function name()
91 91
     {
92
-        if ($this->first_name . $this->last_name . $this->middle_name) {
92
+        if ($this->first_name.$this->last_name.$this->middle_name) {
93 93
             $name = '';
94 94
             if ($this->first_name) {
95
-                $name.=$this->first_name;
95
+                $name .= $this->first_name;
96 96
             }
97 97
             if ($this->middle_name) {
98
-                $name.=($name ? ' ' : '') . $this->middle_name;
98
+                $name .= ($name ? ' ' : '').$this->middle_name;
99 99
             }
100 100
             if ($this->last_name) {
101
-                $name.=($name ? ' ' : '') . $this->last_name;
101
+                $name .= ($name ? ' ' : '').$this->last_name;
102 102
             }
103 103
             return $name;
104 104
         } else {
Please login to merge, or discard this patch.