Completed
Push — master ( 361860...56fb42 )
by Alexey
05:41
created
system/modules/View/View.php 1 patch
Braces   +43 added lines, -32 removed lines patch added patch discarded remove patch
@@ -140,8 +140,9 @@  discard block
 block discarded – undo
140 140
 
141 141
     private function parseRaw($source)
142 142
     {
143
-        if (!$source)
144
-            return [];
143
+        if (!$source) {
144
+                    return [];
145
+        }
145 146
 
146 147
         preg_match_all("|{([^}]+)}|", $source, $result);
147 148
         return $result[1];
@@ -327,10 +328,11 @@  discard block
 block discarded – undo
327 328
                         $this->ResolveCssHref($css, $type, $hrefs);
328 329
                         continue;
329 330
                     }
330
-                    if (strpos($css, '//') !== false)
331
-                        $href = $css;
332
-                    else
333
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
331
+                    if (strpos($css, '//') !== false) {
332
+                                            $href = $css;
333
+                    } else {
334
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
335
+                    }
334 336
                     $hrefs[$href] = $href;
335 337
                 }
336 338
                 break;
@@ -340,10 +342,11 @@  discard block
 block discarded – undo
340 342
                         $this->ResolveCssHref($css, $type, $hrefs);
341 343
                         continue;
342 344
                     }
343
-                    if (strpos($css, '://') !== false)
344
-                        $href = $css;
345
-                    else
346
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
345
+                    if (strpos($css, '://') !== false) {
346
+                                            $href = $css;
347
+                    } else {
348
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
349
+                    }
347 350
                     $hrefs[$href] = $href;
348 351
                 }
349 352
                 break;
@@ -353,10 +356,11 @@  discard block
 block discarded – undo
353 356
                         $this->ResolveCssHref($css, $type, $hrefs);
354 357
                         continue;
355 358
                     }
356
-                    if (strpos($css, '//') !== false)
357
-                        $href = $css;
358
-                    else
359
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
359
+                    if (strpos($css, '//') !== false) {
360
+                                            $href = $css;
361
+                    } else {
362
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
363
+                    }
360 364
                     $hrefs[$href] = $href;
361 365
                 }
362 366
                 break;
@@ -410,8 +414,9 @@  discard block
 block discarded – undo
410 414
         $noParsedScripts = [];
411 415
         foreach ($scripts as $script) {
412 416
             if (is_string($script)) {
413
-                if (!empty($urls[$script]))
414
-                    continue;
417
+                if (!empty($urls[$script])) {
418
+                                    continue;
419
+                }
415 420
 
416 421
                 $path = $this->app->staticLoader->parsePath($script);
417 422
                 if (file_exists($path)) {
@@ -422,8 +427,9 @@  discard block
 block discarded – undo
422 427
                     $noParsedScripts[$script] = $script;
423 428
                 }
424 429
             } elseif (!empty($script['file'])) {
425
-                if (!empty($urls[$script['file']]))
426
-                    continue;
430
+                if (!empty($urls[$script['file']])) {
431
+                                    continue;
432
+                }
427 433
 
428 434
                 $path = $this->app->staticLoader->parsePath($script['file']);
429 435
                 if (file_exists($path)) {
@@ -482,12 +488,14 @@  discard block
 block discarded – undo
482 488
                         $this->genScriptArray($js, $type, $resultArray);
483 489
                         continue;
484 490
                     }
485
-                    if (strpos($js, '//') !== false)
486
-                        $href = $js;
487
-                    else
488
-                        $href = $this->getHref('js', $js);
489
-                    if (!$href)
490
-                        continue;
491
+                    if (strpos($js, '//') !== false) {
492
+                                            $href = $js;
493
+                    } else {
494
+                                            $href = $this->getHref('js', $js);
495
+                    }
496
+                    if (!$href) {
497
+                                            continue;
498
+                    }
491 499
 
492 500
                     $resultArray[] = $href;
493 501
                 }
@@ -498,10 +506,11 @@  discard block
 block discarded – undo
498 506
                         $this->genScriptArray($js, $type, $resultArray);
499 507
                         continue;
500 508
                     }
501
-                    if (strpos($js, '//') !== false)
502
-                        $href = $js;
503
-                    else
504
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
509
+                    if (strpos($js, '//') !== false) {
510
+                                            $href = $js;
511
+                    } else {
512
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
513
+                    }
505 514
                     $resultArray[] = $href;
506 515
                 }
507 516
                 break;
@@ -517,8 +526,9 @@  discard block
 block discarded – undo
517 526
                         $asset = [];
518 527
                     }
519 528
                     $asset['file'] = $this->getHref('js', $js);
520
-                    if (!$asset['file'])
521
-                        continue;
529
+                    if (!$asset['file']) {
530
+                                            continue;
531
+                    }
522 532
                     $resultArray[] = $asset;
523 533
                 }
524 534
                 break;
@@ -568,8 +578,9 @@  discard block
 block discarded – undo
568 578
                         $paramArray = true;
569 579
                     }
570 580
                 }
571
-                if (!$paramArray)
572
-                    $lineParams = ':' . implode(':', $_params);
581
+                if (!$paramArray) {
582
+                                    $lineParams = ':' . implode(':', $_params);
583
+                }
573 584
             }
574 585
         }
575 586
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/CartController.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -270,10 +270,11 @@
 block discarded – undo
270 270
         $item->sales ++;
271 271
         $item->save();
272 272
 
273
-        if (empty($_GET['count']))
274
-            $count = 1;
275
-        else
276
-            $count = (float) $_GET['count'];
273
+        if (empty($_GET['count'])) {
274
+                    $count = 1;
275
+        } else {
276
+                    $count = (float) $_GET['count'];
277
+        }
277 278
 
278 279
         $cart = $this->ecommerce->getCurCart();
279 280
 
Please login to merge, or discard this patch.
system/modules/Money/Money.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -167,8 +167,9 @@
 block discarded – undo
167 167
         $reward = \Money\Reward::get($reward_id);
168 168
         $reward->checkBlocked();
169 169
         $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id ]]);
170
-        if ($reward_count >= $reward->quantity && $reward->quantity)
171
-            return false;
170
+        if ($reward_count >= $reward->quantity && $reward->quantity) {
171
+                    return false;
172
+        }
172 173
         $types = $this->getSnippets('rewardType');
173 174
         foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
174 175
             $user = $rootUser;
Please login to merge, or discard this patch.
system/modules/Users/Users.php 1 patch
Braces   +13 added lines, -10 removed lines patch added patch discarded remove patch
@@ -196,17 +196,20 @@
 block discarded – undo
196 196
      */
197 197
     public function get($idn, $ltype = 'id')
198 198
     {
199
-        if (!$idn)
200
-            return false;
199
+        if (!$idn) {
200
+                    return false;
201
+        }
201 202
 
202
-        if (is_numeric($idn) && $ltype != 'login')
203
-            $user = Users\User::get($idn, 'id');
204
-        elseif ($ltype == 'login')
205
-            $user = Users\User::get($idn, 'login');
206
-        else
207
-            $user = Users\User::get($idn, 'mail');
208
-        if (!$user)
209
-            return [];
203
+        if (is_numeric($idn) && $ltype != 'login') {
204
+                    $user = Users\User::get($idn, 'id');
205
+        } elseif ($ltype == 'login') {
206
+                    $user = Users\User::get($idn, 'login');
207
+        } else {
208
+                    $user = Users\User::get($idn, 'mail');
209
+        }
210
+        if (!$user) {
211
+                    return [];
212
+        }
210 213
 
211 214
         return $user;
212 215
     }
Please login to merge, or discard this patch.
system/modules/Db/objects/Mysql/Query.php 1 patch
Braces   +51 added lines, -40 removed lines patch added patch discarded remove patch
@@ -126,12 +126,14 @@  discard block
 block discarded – undo
126 126
         if (!is_array($order)) {
127 127
             $this->order[] = "{$order} {$type}";
128 128
         } else {
129
-            foreach ($order as $item)
130
-                if (!is_array($item)) {
129
+            foreach ($order as $item) {
130
+                            if (!is_array($item)) {
131 131
                     call_user_func_array(array($this, 'order'), $order);
132
+            }
132 133
                     break;
133
-                } else
134
-                    $this->order($item);
134
+                } else {
135
+                                    $this->order($item);
136
+                }
135 137
         }
136 138
     }
137 139
 
@@ -140,8 +142,9 @@  discard block
 block discarded – undo
140 142
         $start = intval($start);
141 143
         $len = intval($len);
142 144
         $this->limit = "LIMIT {$start}";
143
-        if ($len !== 0)
144
-            $this->limit .= ",{$len}";
145
+        if ($len !== 0) {
146
+                    $this->limit .= ",{$len}";
147
+        }
145 148
     }
146 149
 
147 150
     public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '')
@@ -154,10 +157,12 @@  discard block
 block discarded – undo
154 157
             }
155 158
         } else {
156 159
             $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
157
-            if ($alias)
158
-                $join .= " AS `{$alias}`";
159
-            if ($where)
160
-                $join .= " ON {$where}";
160
+            if ($alias) {
161
+                            $join .= " AS `{$alias}`";
162
+            }
163
+            if ($where) {
164
+                            $join .= " ON {$where}";
165
+            }
161 166
         }
162 167
         return $join;
163 168
     }
@@ -177,13 +182,15 @@  discard block
 block discarded – undo
177 182
                 $operation = '=';
178 183
             }
179 184
 
180
-            if ($concatenation === false)
181
-                $concatenation = 'AND';
182
-            elseif ($concatenation === true)
183
-                $concatenation = '';
185
+            if ($concatenation === false) {
186
+                            $concatenation = 'AND';
187
+            } elseif ($concatenation === true) {
188
+                            $concatenation = '';
189
+            }
184 190
 
185
-            if ($this->whereString == NULL)
186
-                $this->whereString = ' WHERE ';
191
+            if ($this->whereString == NULL) {
192
+                            $this->whereString = ' WHERE ';
193
+            }
187 194
 
188 195
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
189 196
                 if (is_array($value)) {
@@ -199,22 +206,22 @@  discard block
 block discarded – undo
199 206
                         }
200 207
                     }
201 208
                     $value = '(' . $newValue . ')';
202
-                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value))
203
-                    $value = "({$value})";
204
-                elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value))
205
-                    $value = "\"{$value}\"";
206
-            }
207
-            elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
209
+                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
210
+                                    $value = "({$value})";
211
+                } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
212
+                                    $value = "\"{$value}\"";
213
+                }
214
+            } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
208 215
                 $this->params[] = $value;
209 216
                 $value = "?";
210 217
             }
211 218
 
212
-            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
213
-                $this->whereString .= " {$where} {$operation} {$value} ";
214
-            else
215
-                $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
216
-        }
217
-        else {
219
+            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') {
220
+                            $this->whereString .= " {$where} {$operation} {$value} ";
221
+            } else {
222
+                            $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
223
+            }
224
+        } else {
218 225
             $i = -1;
219 226
             while (isset($where[++$i])) {
220 227
                 $item = $where[$i];
@@ -229,28 +236,32 @@  discard block
 block discarded – undo
229 236
                         $this->whereString .= "{$concatenation} ";
230 237
                     }
231 238
 
232
-                    if ($this->whereString != NULL)
233
-                        $this->whereString .= '(';
234
-                    else
235
-                        $this->whereString = 'WHERE (';
239
+                    if ($this->whereString != NULL) {
240
+                                            $this->whereString .= '(';
241
+                    } else {
242
+                                            $this->whereString = 'WHERE (';
243
+                    }
236 244
                 }
237 245
 
238 246
                 if (!is_array($item)) {
239 247
                     call_user_func_array(array($this, 'buildWhere'), $where);
240 248
                     break;
241 249
                 } else {
242
-                    if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(')
243
-                        if (!isset($item[3]))
250
+                    if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(') {
251
+                                            if (!isset($item[3]))
244 252
                             $concatenation = 'AND';
245
-                        else
246
-                            $concatenation = $item[3];
247
-                    elseif (substr($this->whereString, -1, 1) != '(')
248
-                        $this->whereString = 'WHERE ';
253
+                    } else {
254
+                                                    $concatenation = $item[3];
255
+                        }
256
+                    elseif (substr($this->whereString, -1, 1) != '(') {
257
+                                            $this->whereString = 'WHERE ';
258
+                    }
249 259
 
250 260
                     $this->buildWhere($item);
251 261
                 }
252
-                if (!isset($where[$i + 1]) && isset($where[$i - 1]))
253
-                    $this->whereString .= ') ';
262
+                if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
263
+                                    $this->whereString .= ') ';
264
+                }
254 265
             }
255 266
         }
256 267
     }
Please login to merge, or discard this patch.
system/modules/Dashboard/appAdminControllers/content/siteConfig.php 1 patch
Braces   +20 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2,23 +2,38 @@
 block discarded – undo
2 2
 <form action = '' method = 'POST' enctype="multipart/form-data">
3 3
   <div class ="form-group">
4 4
     <label>Название сайта</label>
5
-    <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) echo \App::$primary->config['site']['name']; ?>' />
5
+    <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) {
6
+    echo \App::$primary->config['site']['name'];
7
+}
8
+?>' />
6 9
   </div>
7 10
   <div class ="form-group">
8 11
     <label>Название компании</label>
9
-    <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) echo \App::$primary->config['site']['company_name']; ?>' />
12
+    <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) {
13
+    echo \App::$primary->config['site']['company_name'];
14
+}
15
+?>' />
10 16
   </div>
11 17
   <div class ="form-group">
12 18
     <label>Контактный email</label>
13
-    <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' />
19
+    <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) {
20
+    echo \App::$primary->config['site']['email'];
21
+}
22
+?>' />
14 23
   </div>
15 24
   <div class ="form-group">
16 25
     <label>Ключевые слова</label>
17
-    <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' />
26
+    <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) {
27
+    echo \App::$primary->config['site']['keywords'];
28
+}
29
+?>' />
18 30
   </div>
19 31
   <div class ="form-group">
20 32
     <label>Краткое описание сайта</label>
21
-    <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' />
33
+    <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) {
34
+    echo \App::$primary->config['site']['description'];
35
+}
36
+?>' />
22 37
   </div>
23 38
   <?php
24 39
   $form = new Ui\Form();
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/view.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,13 @@
 block discarded – undo
18 18
             <ul class="item-options">
19 19
               <?php
20 20
               foreach ($item->options as $param) {
21
-                  if (!$param->item_option_view || !$param->value)
22
-                      continue;
21
+                  if (!$param->item_option_view || !$param->value) {
22
+                                        continue;
23
+                  }
23 24
                   if ($param->item_option_type == 'select') {
24
-                      if (empty($param->option->items[$param->value]))
25
-                          continue;
25
+                      if (empty($param->option->items[$param->value])) {
26
+                                                continue;
27
+                      }
26 28
                       $value = $param->option->items[$param->value]->value;
27 29
                   } else {
28 30
                       $value = $param->value;
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/Cart/index.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@
 block discarded – undo
3 3
     <div class="cart-order_page">
4 4
       <h2>Быстрое оформление заказа</h2>
5 5
       <?php
6
-      if (!$cart || !$cart->cartItems)
7
-          echo "<h1>Ваша корзина пуста</h1>";
8
-      else {
6
+      if (!$cart || !$cart->cartItems) {
7
+                echo "<h1>Ваша корзина пуста</h1>";
8
+      } else {
9 9
           $sums = [];
10 10
           $cartDelivery = $cart->delivery;
11 11
           $deliveryPrice = 0;
Please login to merge, or discard this patch.
system/modules/Menu/widgets/menu.php 1 patch
Braces   +10 added lines, -8 removed lines patch added patch discarded remove patch
@@ -9,18 +9,20 @@
 block discarded – undo
9 9
 $menu = \Menu\Menu::get($code, 'code');
10 10
 if ($menu) {
11 11
     foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
12
-        if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
13
-            $active = ' class = "active" ';
14
-        else
15
-            $active = '';
12
+        if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
13
+                    $active = ' class = "active" ';
14
+        } else {
15
+                    $active = '';
16
+        }
16 17
         echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
17 18
         if ($item->childs(['order' => ['weight', 'asc']])) {
18 19
             echo "<ul>";
19 20
             foreach ($item->childs as $item) {
20
-                if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
21
-                    $active = ' class = "active" ';
22
-                else
23
-                    $active = '';
21
+                if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
22
+                                    $active = ' class = "active" ';
23
+                } else {
24
+                                    $active = '';
25
+                }
24 26
                 echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
25 27
             }
26 28
             echo "</ul>";
Please login to merge, or discard this patch.