Completed
Push — master ( 308a3c...ebb499 )
by Alexey
08:08
created
system/modules/View/View.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -187,16 +187,16 @@  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 201
             $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
202 202
         }
@@ -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,7 +279,7 @@  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
             }
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
                     if (strpos($css, '//') !== false)
331 331
                         $href = $css;
332 332
                     else
333
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
333
+                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '') . $css;
334 334
                     $hrefs[$href] = $href;
335 335
                 }
336 336
                 break;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
                     if (strpos($css, '//') !== false)
357 357
                         $href = $css;
358 358
                     else
359
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
359
+                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '') . $css;
360 360
                     $hrefs[$href] = $href;
361 361
                 }
362 362
                 break;
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
                 if (file_exists($path)) {
418 418
                     $nativeUrl[$script] = $script;
419 419
                     $urls[$script] = $path;
420
-                    $timeStr.=filemtime($path);
420
+                    $timeStr .= filemtime($path);
421 421
                 } else {
422 422
                     $noParsedScripts[$script] = $script;
423 423
                 }
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
                     if (!empty($script['name'])) {
433 433
                         $onLoadModules[$script['name']] = $script['name'];
434 434
                     }
435
-                    $timeStr.=filemtime($path);
435
+                    $timeStr .= filemtime($path);
436 436
                 } else {
437 437
                     $noParsedScripts[$script] = $script;
438 438
                 }
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/UserAdds/Field.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
             'map' => [
45 45
                 ['name', 'type'],
46 46
                 ['required', 'save'],
47
-                [ 'userfield']
47
+                ['userfield']
48 48
             ]
49 49
         ]
50 50
     ];
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/Delivery/Field.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
             'map' => [
45 45
                 ['name', 'type'],
46 46
                 ['required', 'save'],
47
-                [ 'userfield']
47
+                ['userfield']
48 48
             ]
49 49
         ]
50 50
     ];
Please login to merge, or discard this patch.
system/modules/UserForms/models/Input.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@
 block discarded – undo
24 24
         'label' => ['type' => 'text'],
25 25
         'type' => ['type' => 'text'],
26 26
         'required' => ['type' => 'bool'],
27
-        'form_id' => [ 'type' => 'select', 'source' => 'relation', 'relation' => 'form'],
28
-        'user_id' => [ 'type' => 'select', 'source' => 'relation', 'relation' => 'user'],
27
+        'form_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'form'],
28
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
29 29
         'input_params' => ['type' => 'textarea'],
30 30
         'weight' => ['type' => 'number']
31 31
     ];
Please login to merge, or discard this patch.
system/modules/UserForms/models/Form.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
     public static $cols = [
25 25
         'name' => ['type' => 'text'],
26 26
         'description' => ['type' => 'html'],
27
-        'user_id' => [ 'type' => 'select', 'source' => 'relation', 'relation' => 'user'],
27
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
28 28
         'date_create' => ['type' => 'dateTime'],
29 29
         //Менеджеры
30
-        'inputs' => [ 'type' => 'dataManager', 'relation' => 'inputs'],
30
+        'inputs' => ['type' => 'dataManager', 'relation' => 'inputs'],
31 31
     ];
32 32
     public static $dataManagers = [
33 33
         'manager' => [
Please login to merge, or discard this patch.
system/modules/Money/Money.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
             if (empty($blocks[$block->wallet->currency_id])) {
103 103
                 $blocks[$block->wallet->currency_id] = $block->amount;
104 104
             } else {
105
-                $blocks[$block->wallet->currency_id]+= $block->amount;
105
+                $blocks[$block->wallet->currency_id] += $block->amount;
106 106
             }
107 107
         }
108 108
         return $blocks;
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         $rootUser = $rootUser ? $rootUser : \Users\User::$cur;
169 169
         $reward = \Money\Reward::get($reward_id);
170 170
         $reward->checkBlocked();
171
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]);
171
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
172 172
         if ($reward_count >= $reward->quantity && $reward->quantity)
173 173
             return false;
174 174
         $types = $this->getSnippets('rewardType');
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
190 190
                 $amount = 0;
191 191
                 foreach ($recives as $recive) {
192
-                    $amount+=$recive->amount;
192
+                    $amount += $recive->amount;
193 193
                 }
194 194
                 if ($amount >= $reward->peruser) {
195 195
                     continue;
Please login to merge, or discard this patch.
system/modules/Money/objects/Sums.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -61,21 +61,21 @@
 block discarded – undo
61 61
             if ($first) {
62 62
                 $first = false;
63 63
             } else {
64
-                $string.= '<br />';
64
+                $string .= '<br />';
65 65
             }
66
-            $string.= '<span style="white-space:nowrap;">';
67
-            $string.= number_format($sum, 2, '.', ' ');
66
+            $string .= '<span style="white-space:nowrap;">';
67
+            $string .= number_format($sum, 2, '.', ' ');
68 68
             if (\App::$cur->money) {
69 69
                 $currency = \Money\Currency::get($currency_id);
70 70
                 if ($currency) {
71
-                    $string.= ' ' . $currency->acronym();
71
+                    $string .= ' ' . $currency->acronym();
72 72
                 } else {
73
-                    $string.= ' руб.';
73
+                    $string .= ' руб.';
74 74
                 }
75 75
             } else {
76
-                $string.= ' руб.';
76
+                $string .= ' руб.';
77 77
             }
78
-            $string.= '</span>';
78
+            $string .= '</span>';
79 79
         }
80 80
         return $string;
81 81
     }
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/Files/Files.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
         if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
60 60
             $typeOptions = json_decode($type->options, true);
61
-            list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
61
+            list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath . $fileObject->path);
62 62
             if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
63 63
                 Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
64 64
             }
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
         if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
122 122
             $typeOptions = json_decode($type->options, true);
123
-            list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
123
+            list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath . $fileObject->path);
124 124
             if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
125 125
                 Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
126 126
             }
Please login to merge, or discard this patch.