Completed
Branch master (dd64f4)
by Alexey
04:20
created
system/modules/Modules/appAdminControllers/content/install.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
     $systemModules = array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2);
7 7
     foreach ($systemModules as $module) {
8 8
         $info = Module::getInfo($module);
9
-        if (!$info || isset($modules[$module]))
10
-            continue;
9
+        if (!$info || isset($modules[$module])) {
10
+                    continue;
11
+        }
11 12
         ?>
12 13
         <div class ="form-group">
13 14
             <div class="checkbox">
Please login to merge, or discard this patch.
system/modules/Users/appAdminControllers/content/edit.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,10 +42,11 @@
 block discarded – undo
42 42
                             <select class="form-control" name = 'user_role_id'>
43 43
                                 <?php
44 44
                                 foreach ($roles as $role) {
45
-                                    if ($role['role_id'] == $user->user_role_id)
46
-                                        $selected = 'selected = "selected"';
47
-                                    else
48
-                                        $selected = '';
45
+                                    if ($role['role_id'] == $user->user_role_id) {
46
+                                                                            $selected = 'selected = "selected"';
47
+                                    } else {
48
+                                                                            $selected = '';
49
+                                    }
49 50
                                     echo "<option {$selected} value = '{$role['role_id']}'>{$role['role_name']}</option>";
50 51
                                 }
51 52
                                 ?>
Please login to merge, or discard this patch.
system/modules/Dashboard/appAdminControllers/content/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
             }
10 10
 
11 11
             $widgetSize = !empty($section['size']) ? $section['size'] : 1;
12
-            $rowSum+=$widgetSize;
12
+            $rowSum += $widgetSize;
13 13
             ?>
14 14
             <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div>
15 15
             <?php
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/Money/objects/MerchantHelper/WalletOne.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,9 @@
 block discarded – undo
88 88
         $config = static::getConfig();
89 89
         $merchantCurrency = static::getMerchantCurrency($currency);
90 90
 
91
-        if (!$description)
92
-            $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
91
+        if (!$description) {
92
+                    $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
93
+        }
93 94
 
94 95
         //Секретный ключ интернет-магазина
95 96
         $key = $config['secret'];
Please login to merge, or discard this patch.
system/modules/Money/Money.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@
 block discarded – undo
164 164
             return false;
165 165
         }
166 166
         $reward->checkBlocked();
167
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]);
167
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
168 168
         if ($reward_count >= $reward->quantity && $reward->quantity) {
169 169
             return false;
170 170
         }
Please login to merge, or discard this patch.
system/modules/Notifications/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
     App::$cur->db->createTable('notifications_notification', [
5 5
         'notification_id' => 'pk',
6 6
         'notification_chanel_id' => 'int(11) UNSIGNED NOT NULL',
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Pages/pages.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
     }
6 6
 
7 7
     for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
8
-        if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
8
+        if (($i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
9 9
             echo '<li ';
10 10
             if ($pagesInstance->params['page'] == $i)
11 11
                 echo 'class = "active"';
Please login to merge, or discard this patch.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@
 block discarded – undo
7 7
     for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
8 8
         if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
9 9
             echo '<li ';
10
-            if ($pagesInstance->params['page'] == $i)
11
-                echo 'class = "active"';
10
+            if ($pagesInstance->params['page'] == $i) {
11
+                            echo 'class = "active"';
12
+            }
12 13
             echo ">";
13 14
             $getArr['page'] = $i;
14 15
             echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
15
-        }
16
-        elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
16
+        } elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
17 17
             $getArr['page'] = round($pagesInstance->params['page'] / 2);
18 18
             echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
19 19
         } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
Please login to merge, or discard this patch.