Completed
Push — master ( 8e3681...c9e152 )
by Alexey
04:35
created
system/modules/Widgets/appAdminControllers/content/widgetChooser.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 </select>
38 38
 <?php
39 39
 foreach ($widgets as $code => $options) {
40
-    echo "<div id = 'params_" . str_replace('\\', '-', $code) . "' class = 'widgetParams' style='display:none;'>";
40
+    echo "<div id = 'params_".str_replace('\\', '-', $code)."' class = 'widgetParams' style='display:none;'>";
41 41
     if (isset($options['params']) && !is_array($options['params'])) {
42 42
         $options['params']();
43 43
     } elseif (isset($options['params'])) {
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
                 if ($param['type'] == 'select') {
49 49
                     echo "<div class = 'form-group'>
50 50
                         <label>{$param['name']}</label>
51
-                        <select name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control' >";
51
+                        <select name = 'params[".str_replace('\\', '-', $code)."][]' class = 'form-control' >";
52 52
                     foreach ($param['model']::get_list() as $item) {
53 53
                         echo "<option value = '{$item->pk()}'>{$item->$param['showCol']}</option>";
54 54
                     }
@@ -57,12 +57,12 @@  discard block
 block discarded – undo
57 57
                 } elseif ($param['type'] == 'textarea') {
58 58
                     echo "<div class = 'form-group'>
59 59
                         <label>{$param['name']}</label>
60
-                        <textarea name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control'></textarea>
60
+                        <textarea name = 'params[".str_replace('\\', '-', $code)."][]' class = 'form-control'></textarea>
61 61
                         </div>";
62 62
                 } else {
63 63
                     echo "<div class = 'form-group'>
64 64
                         <label>{$param['name']}</label>
65
-                        <input name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control' />
65
+                        <input name = 'params[".str_replace('\\', '-', $code)."][]' class = 'form-control' />
66 66
                         </div>";
67 67
                 }
68 68
             }
Please login to merge, or discard this patch.
system/modules/View/View.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -37,17 +37,17 @@  discard block
 block discarded – undo
37 37
         if (!empty($this->config[$this->app->type]['current'])) {
38 38
             $templateName = $this->config[$this->app->type]['current'];
39 39
             if (!empty($this->config[$this->app->type]['installed'][$templateName]['location'])) {
40
-                $this->templatesPath = App::$primary->path . "/templates";
40
+                $this->templatesPath = App::$primary->path."/templates";
41 41
             }
42 42
         }
43 43
         if (!$this->templatesPath) {
44
-            $this->templatesPath = $this->app->path . "/templates";
44
+            $this->templatesPath = $this->app->path."/templates";
45 45
         }
46 46
         $this->template = \View\Template::get($templateName, $this->app, $this->templatesPath);
47 47
         if (!$this->template) {
48 48
             $this->template = new \View\Template([
49 49
                 'name' => 'default',
50
-                'path' => $this->templatesPath . '/default',
50
+                'path' => $this->templatesPath.'/default',
51 51
                 'app' => $this->app
52 52
             ]);
53 53
         }
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
                 case 'WIDGET':
165 165
                     $source = $this->cutTag($source, $rawTag);
166 166
                     $params = array_slice($tag, 2);
167
-                    $this->widget($tag[1], ['params' => $params], ':' . implode(':', $params));
167
+                    $this->widget($tag[1], ['params' => $params], ':'.implode(':', $params));
168 168
                     break;
169 169
                 case 'HEAD':
170 170
                     $source = $this->cutTag($source, $rawTag);
@@ -187,18 +187,18 @@  discard block
 block discarded – undo
187 187
     {
188 188
         $pos = strpos($source, $rawTag) - 1;
189 189
         echo substr($source, 0, $pos);
190
-        return substr($source, ( $pos + strlen($rawTag) + 2));
190
+        return substr($source, ($pos + strlen($rawTag) + 2));
191 191
     }
192 192
 
193 193
     public function getHref($type, $params)
194 194
     {
195 195
         $href = '';
196 196
         if (is_string($params)) {
197
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params;
197
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params;
198 198
         } elseif (empty($params['template']) && !empty($params['file'])) {
199
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params['file'];
199
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params['file'];
200 200
         } elseif (!empty($params['template']) && !empty($params['file'])) {
201
-            $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
201
+            $href = $this->app->templatesPath."/{$this->template->name}/{$type}/{$params['file']}";
202 202
         }
203 203
         return $href;
204 204
     }
@@ -235,16 +235,16 @@  discard block
 block discarded – undo
235 235
 
236 236
         echo "<title>{$this->title}</title>\n";
237 237
 
238
-        if (!empty($this->template->config['favicon']) && file_exists($this->template->path . "/{$this->template->config['favicon']}")) {
238
+        if (!empty($this->template->config['favicon']) && file_exists($this->template->path."/{$this->template->config['favicon']}")) {
239 239
             echo "        <link rel='shortcut icon' href='/templates/{$this->template->name}/{$this->template->config['favicon']}' />";
240
-        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path . "/static/images/{$this->template->config['favicon']}")) {
240
+        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path."/static/images/{$this->template->config['favicon']}")) {
241 241
             echo "        <link rel='shortcut icon' href='/static/images/{$this->template->config['favicon']}' />";
242
-        } elseif (file_exists($this->app->path . '/static/images/favicon.ico')) {
242
+        } elseif (file_exists($this->app->path.'/static/images/favicon.ico')) {
243 243
             echo "        <link rel='shortcut icon' href='/static/images/favicon.ico' />";
244 244
         }
245 245
 
246 246
         foreach ($this->getMetaTags() as $meta) {
247
-            echo "\n        " . Html::el('meta', $meta, '', null);
247
+            echo "\n        ".Html::el('meta', $meta, '', null);
248 248
         }
249 249
 
250 250
         if (!empty(Inji::$config['assets']['js'])) {
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 
256 256
         $this->checkNeedLibs();
257 257
         $this->parseCss();
258
-        echo "\n        <script src='" . Statics::file(($this->app->type != 'app' ? '/' . $this->app->name : '' ) . "/static/system/js/Inji.js") . "'></script>";
258
+        echo "\n        <script src='".Statics::file(($this->app->type != 'app' ? '/'.$this->app->name : '')."/static/system/js/Inji.js")."'></script>";
259 259
     }
260 260
 
261 261
     public function parseCss()
@@ -279,25 +279,25 @@  discard block
 block discarded – undo
279 279
             if (file_exists($path)) {
280 280
                 $this->loadedCss[$href] = $href;
281 281
                 $urls[$href] = $path;
282
-                $timeStr.=filemtime($path);
282
+                $timeStr .= filemtime($path);
283 283
             } else {
284 284
                 echo "\n        <link href='{$href}' rel='stylesheet' type='text/css' />";
285 285
             }
286 286
         }
287 287
         $timeMd5 = md5($timeStr);
288 288
         $cacheDir = Cache::getDir('static');
289
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.css')) {
289
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.css')) {
290 290
             foreach ($urls as $primaryUrl => $url) {
291 291
                 $source = file_get_contents($url);
292 292
                 $rootPath = substr($primaryUrl, 0, strrpos($primaryUrl, '/'));
293 293
                 $levelUpPath = substr($rootPath, 0, strrpos($rootPath, '/'));
294
-                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1' . $levelUpPath, $source);
295
-                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1' . $rootPath, $source);
296
-                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1' . $rootPath . '/$2', $source);
297
-                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url(' . $rootPath . '/$1$2', $source);
294
+                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1'.$levelUpPath, $source);
295
+                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1'.$rootPath, $source);
296
+                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1'.$rootPath.'/$2', $source);
297
+                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url('.$rootPath.'/$1$2', $source);
298 298
                 $cssAll .= $source;
299 299
             }
300
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.css', $cssAll);
300
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.css', $cssAll);
301 301
         }
302 302
         echo "\n        <link href='/{$cacheDir}/all{$timeMd5}.css' rel='stylesheet' type='text/css' />";
303 303
     }
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
                     if (strpos($css, '//') !== false)
330 330
                         $href = $css;
331 331
                     else
332
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
332
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
333 333
                     $hrefs[$href] = $href;
334 334
                 }
335 335
                 break;
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
                     if (strpos($css, '://') !== false)
343 343
                         $href = $css;
344 344
                     else
345
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
345
+                        $href = $this->app->templatesPath."/{$this->template->name}/css/{$css}";
346 346
                     $hrefs[$href] = $href;
347 347
                 }
348 348
                 break;
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
                     if (strpos($css, '//') !== false)
356 356
                         $href = $css;
357 357
                     else
358
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
358
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
359 359
                     $hrefs[$href] = $href;
360 360
                 }
361 361
                 break;
@@ -375,9 +375,9 @@  discard block
 block discarded – undo
375 375
         if (!empty($this->app->config['site']['metatags'])) {
376 376
             foreach ($this->app->config['site']['metatags'] as $meta) {
377 377
                 if (!empty($meta['name'])) {
378
-                    $metas['metaName:' . $meta['name']] = $meta;
378
+                    $metas['metaName:'.$meta['name']] = $meta;
379 379
                 } elseif (!empty($meta['property'])) {
380
-                    $metas['metaProperty:' . $meta['property']] = $meta;
380
+                    $metas['metaProperty:'.$meta['property']] = $meta;
381 381
                 }
382 382
             }
383 383
         }
@@ -390,9 +390,9 @@  discard block
 block discarded – undo
390 390
     public function addMetaTag($meta)
391 391
     {
392 392
         if (!empty($meta['name'])) {
393
-            $this->dynMetas['metaName:' . $meta['name']] = $meta;
393
+            $this->dynMetas['metaName:'.$meta['name']] = $meta;
394 394
         } elseif (!empty($meta['property'])) {
395
-            $this->dynMetas['metaProperty:' . $meta['property']] = $meta;
395
+            $this->dynMetas['metaProperty:'.$meta['property']] = $meta;
396 396
         }
397 397
     }
398 398
 
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
                 if (file_exists($path)) {
417 417
                     $nativeUrl[$script] = $script;
418 418
                     $urls[$script] = $path;
419
-                    $timeStr.=filemtime($path);
419
+                    $timeStr .= filemtime($path);
420 420
                 } else {
421 421
                     $noParsedScripts[$script] = $script;
422 422
                 }
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
                     if (!empty($script['name'])) {
432 432
                         $onLoadModules[$script['name']] = $script['name'];
433 433
                     }
434
-                    $timeStr.=filemtime($path);
434
+                    $timeStr .= filemtime($path);
435 435
                 } else {
436 436
                     $noParsedScripts[$script] = $script;
437 437
                 }
@@ -440,20 +440,20 @@  discard block
 block discarded – undo
440 440
 
441 441
         $timeMd5 = md5($timeStr);
442 442
         $cacheDir = Cache::getDir('static');
443
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.js')) {
443
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.js')) {
444 444
             foreach ($urls as $url) {
445
-                $scriptAll .= ';' . file_get_contents($url);
445
+                $scriptAll .= ';'.file_get_contents($url);
446 446
             }
447
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.js', $scriptAll);
447
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.js', $scriptAll);
448 448
         }
449 449
         $options = [
450 450
             'scripts' => array_values($noParsedScripts),
451 451
             'compresedScripts' => $nativeUrl,
452 452
             'styles' => [],
453
-            'appRoot' => $this->app->type == 'app' ? '/' : '/' . $this->app->name . '/',
453
+            'appRoot' => $this->app->type == 'app' ? '/' : '/'.$this->app->name.'/',
454 454
             'onLoadModules' => $onLoadModules
455 455
         ];
456
-        $options['scripts'][] = '/' . $cacheDir . '/all' . $timeMd5 . '.js';
456
+        $options['scripts'][] = '/'.$cacheDir.'/all'.$timeMd5.'.js';
457 457
         $this->widget('View\bodyEnd', compact('options'));
458 458
     }
459 459
 
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
                     if (strpos($js, '//') !== false)
501 501
                         $href = $js;
502 502
                     else
503
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
503
+                        $href = $this->app->templatesPath."/{$this->template->name}/js/{$js}";
504 504
                     $resultArray[] = $href;
505 505
                 }
506 506
                 break;
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
     {
538 538
         if ($add && !empty($this->app->config['site']['name'])) {
539 539
             if ($title) {
540
-                $this->title = $title . ' - ' . $this->app->config['site']['name'];
540
+                $this->title = $title.' - '.$this->app->config['site']['name'];
541 541
             } else {
542 542
                 $this->title = $this->app->config['site']['name'];
543 543
             }
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
                     }
567 567
                 }
568 568
                 if (!$paramArray)
569
-                    $lineParams = ':' . implode(':', $_params);
569
+                    $lineParams = ':'.implode(':', $_params);
570 570
             }
571 571
         }
572 572
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";
@@ -585,24 +585,24 @@  discard block
 block discarded – undo
585 585
         if (strpos($widgetName, '\\')) {
586 586
             $widgetName = explode('\\', $widgetName);
587 587
 
588
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
589
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '.php';
588
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'/'.$widgetName[1].'.php';
589
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'.php';
590 590
             App::$cur->$widgetName[0];
591 591
             $modulePaths = Module::getModulePaths(ucfirst($widgetName[0]));
592 592
             foreach ($modulePaths as $pathName => $path) {
593
-                $paths[$pathName . '_widgetDir'] = $path . '/widgets/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
594
-                $paths[$pathName] = $path . '/widgets/' . $widgetName[1] . '.php';
593
+                $paths[$pathName.'_widgetDir'] = $path.'/widgets/'.$widgetName[1].'/'.$widgetName[1].'.php';
594
+                $paths[$pathName] = $path.'/widgets/'.$widgetName[1].'.php';
595 595
             }
596 596
             return $paths;
597 597
         } else {
598
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
599
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '.php';
598
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
599
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'.php';
600 600
 
601
-            $paths['curAppPath_widgetDir'] = $this->app->path . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
602
-            $paths['curAppPath'] = $this->app->path . '/widgets/' . $widgetName . '.php';
601
+            $paths['curAppPath_widgetDir'] = $this->app->path.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
602
+            $paths['curAppPath'] = $this->app->path.'/widgets/'.$widgetName.'.php';
603 603
 
604
-            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
605
-            $paths['systemPath'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '.php';
604
+            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
605
+            $paths['systemPath'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'.php';
606 606
         }
607 607
         return $paths;
608 608
     }
Please login to merge, or discard this patch.
system/modules/View/appAdminControllers/content/Template/chooseFile.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@
 block discarded – undo
3 3
 <hr/>
4 4
 <?php
5 5
 foreach ($template->config['css'] as $file) {
6
-    if (file_exists($template->path . '/css/' . $file)) {
6
+    if (file_exists($template->path.'/css/'.$file)) {
7 7
         ?>
8
-        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/' . $file; ?>'><?= $file; ?></a>
8
+        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/'.$file; ?>'><?= $file; ?></a>
9 9
         <?php
10 10
     }
11 11
 }
Please login to merge, or discard this patch.
system/modules/Sitemap/Sitemap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     {
28 28
         header("Content-Type: text/xml");
29 29
         header("Expires: Thu, 19 Feb 1998 13:24:18 GMT");
30
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
30
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
31 31
         header("Cache-Control: no-cache, must-revalidate");
32 32
         header("Cache-Control: post-check=0,pre-check=0");
33 33
         header("Cache-Control: max-age=0");
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         $root->setAttribute("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9");
40 40
         $root = $xml->appendChild($root);
41 41
 
42
-        $addToXml = function ($xml, $parent, $nodeName, $text) {
42
+        $addToXml = function($xml, $parent, $nodeName, $text) {
43 43
             $node = $parent->appendChild($xml->createElement($nodeName));
44 44
             $node->appendChild($xml->createTextNode($text));
45 45
             return $node;
Please login to merge, or discard this patch.
system/modules/Sitemap/install_script.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-return function ($step = NULL, $params = []) {
3
+return function($step = NULL, $params = []) {
4 4
 
5 5
     $groups = [
6 6
         [
Please login to merge, or discard this patch.
system/modules/Materials/Materials.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
         if (!empty($conf['files']['aditionTemplateFiels'])) {
43 43
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
44
-                $return[$file['file']] = '- ' . $file['name'];
44
+                $return[$file['file']] = '- '.$file['name'];
45 45
             }
46 46
         }
47 47
         return $return;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
         if (!empty($conf['files']['aditionTemplateFiels'])) {
79 79
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
80
-                $return[$file['file']] = '- ' . $file['name'];
80
+                $return[$file['file']] = '- '.$file['name'];
81 81
             }
82 82
         }
83 83
         return $return;
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
             $map[] = [
92 92
                 'name' => $mat->name,
93 93
                 'url' => [
94
-                    'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($mat->getHref())
94
+                    'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($mat->getHref())
95 95
                 ],
96 96
             ];
97 97
         }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
                 $map[] = [
105 105
                     'name' => $mat->name,
106 106
                     'url' => [
107
-                        'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($mat->getHref())
107
+                        'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($mat->getHref())
108 108
                     ],
109 109
                 ];
110 110
             }
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
           <td class="text-left" style="width: 50%;">              
19 19
             <?php
20 20
             foreach ($orderDeatilCols as $col => $label) {
21
-                echo "<b>{$label}</b> " . $cart->$col . "<br>";
21
+                echo "<b>{$label}</b> ".$cart->$col."<br>";
22 22
             }
23 23
             ?>
24 24
           </td>
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
             <?php
42 42
             if ($cart->infos) {
43 43
                 foreach ($cart->infos as $info) {
44
-                    echo "<b>{$info->field->name()}</b> " . $info->value . "<br>";
44
+                    echo "<b>{$info->field->name()}</b> ".$info->value."<br>";
45 45
                 }
46 46
             }
47 47
             ?>
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
                   if (App::$cur->money) {
126 126
                       $currency = Money\Currency::get($currency_id);
127 127
                       if ($currency) {
128
-                          echo '&nbsp;' . $currency->acronym();
128
+                          echo '&nbsp;'.$currency->acronym();
129 129
                       } else {
130 130
                           echo '&nbsp;руб.';
131 131
                       }
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
                   if (App::$cur->money) {
169 169
                       $currency = Money\Currency::get($currency_id);
170 170
                       if ($currency) {
171
-                          echo '&nbsp;' . $currency->acronym();
171
+                          echo '&nbsp;'.$currency->acronym();
172 172
                       } else {
173 173
                           echo '&nbsp;руб.';
174 174
                       }
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
                     case'2':
208 208
                         $price = Ecommerce\Item\Offer\Price::get($status->info);
209 209
                         if ($price) {
210
-                            echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a>";
210
+                            echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a>";
211 211
                         } else {
212 212
                             echo 'Товар удален';
213 213
                         }
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
                         $info = explode('|', $status->info);
217 217
                         $price = Ecommerce\Item\Offer\Price::get($info[0]);
218 218
                         if ($price) {
219
-                            echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a> " . ($info[1] > 0 ? '+' . $info[1] : $info[1]);
219
+                            echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a> ".($info[1] > 0 ? '+'.$info[1] : $info[1]);
220 220
                         } else {
221 221
                             echo 'Товар удален';
222 222
                         }
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object/Value.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
75 75
         if ($this->model->{$this->param->value}) {
76 76
           $file = \Files\File::get($this->model->{$this->param->value});
77
-          if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
77
+          if ($file && $value && file_exists($dir.'/'.$value) && file_exists(\App::$primary->path.$file->path) && md5_file($dir.'/'.$value) == md5_file(\App::$primary->path.$file->path)) {
78 78
             $notEq = false;
79 79
           }
80 80
           if ($file && $notEq) {
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
           }
84 84
         }
85 85
         if ($notEq) {
86
-          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
86
+          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir.'/'.$value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
87 87
         }
88 88
         break;
89 89
       default:
Please login to merge, or discard this patch.
system/modules/Ecommerce/Ecommerce.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     $name = '';
49 49
     foreach ($fields as $field) {
50 50
       if ($field->save && !empty($data[$field->id])) {
51
-        $name .= htmlspecialchars($data[$field->id]) . ' ';
51
+        $name .= htmlspecialchars($data[$field->id]).' ';
52 52
       }
53 53
     }
54 54
     $name = trim($name);
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     $name = '';
105 105
     foreach ($fields as $field) {
106 106
       if ($field->save && !empty($data[$field->id])) {
107
-        $name .= htmlspecialchars($data[$field->id]) . ' ';
107
+        $name .= htmlspecialchars($data[$field->id]).' ';
108 108
       }
109 109
     }
110 110
     $name = trim($name);
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
       foreach ($options['sort'] as $col => $direction) {
190 190
         switch ($col) {
191 191
           case 'price':
192
-            $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
192
+            $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
193 193
             break;
194 194
           case 'name':
195 195
             $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
@@ -208,22 +208,22 @@  discard block
 block discarded – undo
208 208
       $selectOptions['where'][] = ['image_file_id', 0, '!='];
209 209
     }
210 210
 
211
-    $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
211
+    $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index().' = '.Ecommerce\Item\Offer::colPrefix().Ecommerce\Item::index(), 'inner'];
212 212
 
213 213
     $selectOptions['join'][] = [Ecommerce\Item\Offer\Price::table(),
214
-        Ecommerce\Item\Offer::index() . ' = ' . Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer::index() .
215
-        (empty($this->config['show_zero_price']) ? ' and ' . Ecommerce\Item\Offer\Price::colPrefix() . 'price>0' : ''),
214
+        Ecommerce\Item\Offer::index().' = '.Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer::index().
215
+        (empty($this->config['show_zero_price']) ? ' and '.Ecommerce\Item\Offer\Price::colPrefix().'price>0' : ''),
216 216
         empty($this->config['show_without_price']) ? 'inner' : 'left'];
217 217
 
218 218
     $selectOptions['join'][] = [
219
-        Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index() . ' = ' . Ecommerce\Item\Offer\Price\Type::index()
219
+        Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index().' = '.Ecommerce\Item\Offer\Price\Type::index()
220 220
     ];
221 221
 
222 222
     $selectOptions['where'][] = [
223 223
         [Ecommerce\Item\Offer\Price\Type::index(), NULL, 'is'],
224 224
         [
225
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '', '=', 'OR'],
226
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '%|' . \Users\User::$cur->role_id . '|%', 'LIKE', 'OR'],
225
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '', '=', 'OR'],
226
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '%|'.\Users\User::$cur->role_id.'|%', 'LIKE', 'OR'],
227 227
         ],
228 228
     ];
229 229
 
@@ -231,10 +231,10 @@  discard block
 block discarded – undo
231 231
     if (!empty($this->config['view_filter'])) {
232 232
       if (!empty($this->config['view_filter']['options'])) {
233 233
         foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
234
-          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
235
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
236
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
237
-              'inner', 'option' . $optionId];
234
+          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
235
+              'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
236
+              'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
237
+              'inner', 'option'.$optionId];
238 238
         }
239 239
       }
240 240
     }
@@ -244,10 +244,10 @@  discard block
 block discarded – undo
244 244
         switch ($col) {
245 245
           case 'price':
246 246
             if (!empty($filter['min'])) {
247
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
247
+              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['min'], '>='];
248 248
             }
249 249
             if (!empty($filter['max'])) {
250
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
250
+              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['max'], '<='];
251 251
             }
252 252
             break;
253 253
           case 'options':
@@ -258,14 +258,14 @@  discard block
 block discarded – undo
258 258
                 foreach ($optionValue as $val) {
259 259
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
260 260
                 }
261
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
261
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
262 262
               } else {
263
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
263
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($optionValue);
264 264
               }
265
-              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
266
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
267
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value ' . $qstr . '',
268
-                  'inner', 'option' . $optionId];
265
+              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
266
+                  'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
267
+                  'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value '.$qstr.'',
268
+                  'inner', 'option'.$optionId];
269 269
             }
270 270
             break;
271 271
           case 'offerOptions':
@@ -277,14 +277,14 @@  discard block
 block discarded – undo
277 277
                 foreach ($optionValue as $val) {
278 278
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
279 279
                 }
280
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
280
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
281 281
               } else {
282
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
282
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($optionValue);
283 283
               }
284
-              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
285
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
286
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
287
-                  'inner', 'offerOption' . $optionId];
284
+              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index().' = '.'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer::index().' AND '.
285
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer\Option::index().' = "'.(int) $optionId.'" AND '.
286
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().'value '.$qstr,
287
+                  'inner', 'offerOption'.$optionId];
288 288
             }
289 289
             break;
290 290
         }
@@ -299,13 +299,13 @@  discard block
 block discarded – undo
299 299
           continue;
300 300
         }
301 301
         $category = \Ecommerce\Category::get($categoryId);
302
-        $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
302
+        $where[] = ['tree_path', $category->tree_path.(int) $categoryId.'/%', 'LIKE', $first ? 'AND' : 'OR'];
303 303
         $first = false;
304 304
       }
305 305
       $selectOptions['where'][] = $where;
306 306
     } elseif (!empty($options['parent'])) {
307 307
       $category = \Ecommerce\Category::get($options['parent']);
308
-      $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
308
+      $selectOptions['where'][] = ['tree_path', $category->tree_path.(int) $options['parent'].'/%', 'LIKE'];
309 309
     }
310 310
 
311 311
     //search
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
       foreach (explode(' ', $searchStr) as $part) {
316 316
         $part = trim($part);
317 317
         if ($part && strlen($part) > 2) {
318
-          $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
318
+          $searchArr[] = ['search_index', '%'.$part.'%', 'LIKE'];
319 319
         }
320 320
       }
321 321
       if (!empty($searchArr)) {
@@ -334,19 +334,19 @@  discard block
 block discarded – undo
334 334
       }
335 335
       $selectOptions['where'][] = [
336 336
           '(
337
-          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
338
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
339
-            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
340
-                ' . ($warehouseIds ? ' AND iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Warehouse::index() . ' IN(' . implode(',', $warehouseIds) . ')' : '') . '
337
+          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix().'count`),0) 
338
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Item\Offer\Warehouse::table().' iciw 
339
+            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().'
340
+                ' . ($warehouseIds ? ' AND iciw.'.\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Warehouse::index().' IN('.implode(',', $warehouseIds).')' : '').'
341 341
             )
342 342
           -
343
-          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0)
344
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Warehouse\Block::table() . ' iewb
345
-            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 (
346
-                (`' . \Ecommerce\Cart::colPrefix() . 'warehouse_block` = 1 and `' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(2,3,6)) ||
347
-                (`' . \Ecommerce\Cart::colPrefix() . \Ecommerce\Cart\Status::index() . '` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
343
+          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix().'count) ,0)
344
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Warehouse\Block::table().' iewb
345
+            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 (
346
+                (`' . \Ecommerce\Cart::colPrefix().'warehouse_block` = 1 and `'.\Ecommerce\Cart::colPrefix().'cart_status_id` in(2,3,6)) ||
347
+                (`' . \Ecommerce\Cart::colPrefix().\Ecommerce\Cart\Status::index().'` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
348 348
             )
349
-            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
349
+            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().')
350 350
           )',
351 351
           0,
352 352
           '>'
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
     $items = Ecommerce\Item::getList($selectOptions);
375 375
     $items = Ecommerce\Item\Param::getList([
376 376
                 'where' => ['item_id', array_keys($items), 'IN'],
377
-                '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']],
377
+                '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']],
378 378
                 'distinct' => \Ecommerce\Item\Option::index()
379 379
     ]);
380 380
     return $items;
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
405 405
     if (is_array($counts)) {
406 406
       $sum = 0;
407 407
       foreach ($counts as $count) {
408
-        $sum +=$count['count'];
408
+        $sum += $count['count'];
409 409
       }
410 410
       return $sum;
411 411
     }
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
 
440 440
     if (!empty($conf['files']['aditionTemplateFiels'])) {
441 441
       foreach ($conf['files']['aditionTemplateFiels'] as $file) {
442
-        $return[$file['file']] = '- ' . $file['name'];
442
+        $return[$file['file']] = '- '.$file['name'];
443 443
       }
444 444
     }
445 445
     return $return;
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
       $map[] = [
514 514
           'name' => $item->name,
515 515
           'url' => [
516
-              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
516
+              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
517 517
           ],
518 518
       ];
519 519
     }
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
         $map[] = [
527 527
             'name' => $item->name,
528 528
             'url' => [
529
-                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
529
+                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
530 530
             ],
531 531
         ];
532 532
       }
Please login to merge, or discard this patch.