Completed
Push — master ( 9930d3...e136e6 )
by Alexey
05:19
created
system/modules/Money/widgets/cabinet/wallets.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <h3>Мои кошельки</h3>
2 2
 <div class="row">
3 3
   <?php
4
-  $blocked = App::$cur->money->getUserBlocks();
5
-  $wallets = App::$cur->money->getUserWallets();
6
-  $rates = Money\Currency\ExchangeRate::getList();
7
-  foreach ($wallets as $wallet) {
8
-      ?>
4
+    $blocked = App::$cur->money->getUserBlocks();
5
+    $wallets = App::$cur->money->getUserWallets();
6
+    $rates = Money\Currency\ExchangeRate::getList();
7
+    foreach ($wallets as $wallet) {
8
+        ?>
9 9
       <div class="col-sm-4">
10 10
         <h4><?= $wallet->currency->name(); ?></h4>
11 11
         <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
         ?>
31 31
       </div>
32 32
       <?php
33
-  }
34
-  ?>
33
+    }
34
+    ?>
35 35
 </div>
36 36
 <?php
37 37
 $transfers = Money\Transfer::getList(['where' => [
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
         <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />
12 12
         <?php
13 13
         if (!empty($blocked[$wallet->currency_id])) {
14
-            echo "Заблокировано: {$blocked[$wallet->currency_id]} " . $wallet->currency->acronym() . "<br />";
14
+            echo "Заблокировано: {$blocked[$wallet->currency_id]} ".$wallet->currency->acronym()."<br />";
15 15
         }
16 16
         if ($wallet->currency->refill) {
17 17
             echo "<a href = '/money/refill?currency_id={$wallet->currency_id}'>Пополнить</a> ";
Please login to merge, or discard this patch.
system/modules/Sliders/widgets/slider.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@
 block discarded – undo
27 27
         ?>
28 28
         <div class="item <?= !$i ? 'active' : ''; ?>">
29 29
           <?php
30
-          if ($item->link) {
31
-              echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
32
-          }
33
-          ?>
30
+            if ($item->link) {
31
+                echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
32
+            }
33
+            ?>
34 34
           <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
35 35
           <div class="carousel-caption">
36 36
             <?= $item->description; ?>
37 37
           </div>
38 38
           <?php
39
-          if ($item->link) {
40
-              echo "</a>";
41
-          }
42
-          ?>
39
+            if ($item->link) {
40
+                echo "</a>";
41
+            }
42
+            ?>
43 43
         </div>
44 44
         <?php
45 45
         $i++;
Please login to merge, or discard this patch.
system/modules/StaticLoader/StaticLoader.php 2 patches
Braces   +14 added lines, -12 removed lines patch added patch discarded remove patch
@@ -112,10 +112,11 @@  discard block
 block discarded – undo
112 112
 
113 113
                 $sizes = explode('x', $_GET['resize']);
114 114
                 $sizes[0] = intval($sizes[0]);
115
-                if (isset($sizes[1]))
116
-                    $sizes[1] = intval($sizes[1]);
117
-                else
118
-                    $sizes[1] = 0;
115
+                if (isset($sizes[1])) {
116
+                                    $sizes[1] = intval($sizes[1]);
117
+                } else {
118
+                                    $sizes[1] = 0;
119
+                }
119 120
 
120 121
                 if (!$sizes[0] || !$sizes[1]) {
121 122
                     header('HTTP/1.1 404 Not Found');
@@ -127,15 +128,16 @@  discard block
 block discarded – undo
127 128
                     $dir = App::$primary->path;
128 129
 
129 130
                     if (!empty($_GET['resize_crop'])) {
130
-                        if (in_array($_GET['resize_crop'], array('q', 'c')))
131
-                            $crop = $_GET['resize_crop'];
132
-                        else
133
-                            $crop = 'c';
131
+                        if (in_array($_GET['resize_crop'], array('q', 'c'))) {
132
+                                                    $crop = $_GET['resize_crop'];
133
+                        } else {
134
+                                                    $crop = 'c';
135
+                        }
136
+                    } elseif (!empty($_GET['resize_quadro'])) {
137
+                                            $crop = 'q';
138
+                    } else {
139
+                                            $crop = '';
134 140
                     }
135
-                    elseif (!empty($_GET['resize_quadro']))
136
-                        $crop = 'q';
137
-                    else
138
-                        $crop = '';
139 141
                     $pos = 'center';
140 142
                     if (!empty($_GET['resize_pos']) && in_array($_GET['resize_pos'], array('top', 'center'))) {
141 143
                         $pos = $_GET['resize_pos'];
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -25,16 +25,16 @@  discard block
 block discarded – undo
25 25
             $path = substr($path, 1);
26 26
         }
27 27
         $app = substr($path, 0, strpos($path, '/'));
28
-        if (file_exists(INJI_SYSTEM_DIR . '/program/' . $app)) {
28
+        if (file_exists(INJI_SYSTEM_DIR.'/program/'.$app)) {
29 29
             $path = substr($path, strpos($path, '/') + 1);
30 30
             if (\App::$cur->name != $app) {
31 31
                 $scriptApp = new App();
32 32
                 $scriptApp->name = $app;
33 33
                 $scriptApp->system = true;
34
-                $scriptApp->staticPath = "/" . $scriptApp->name . "/static";
35
-                $scriptApp->templatesPath = "/" . $scriptApp->name . "/static/templates";
36
-                $scriptApp->path = INJI_SYSTEM_DIR . '/program/' . $scriptApp->name;
37
-                $scriptApp->type = 'app' . ucfirst(strtolower($scriptApp->name));
34
+                $scriptApp->staticPath = "/".$scriptApp->name."/static";
35
+                $scriptApp->templatesPath = "/".$scriptApp->name."/static/templates";
36
+                $scriptApp->path = INJI_SYSTEM_DIR.'/program/'.$scriptApp->name;
37
+                $scriptApp->type = 'app'.ucfirst(strtolower($scriptApp->name));
38 38
                 $scriptApp->installed = true;
39 39
                 $scriptApp->params = [];
40 40
                 $scriptApp->config = Config::app($scriptApp);
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
         $type = substr($path, 0, strpos($path, '/'));
53 53
         switch ($type) {
54 54
             case 'libs':
55
-                return App::$cur->Libs->getPath(array_slice(explode('/', $path),2));
55
+                return App::$cur->Libs->getPath(array_slice(explode('/', $path), 2));
56 56
             case 'templates':
57 57
                 $path = substr($path, strpos($path, '/') + 1);
58
-                return $scriptApp->view->templatesPath . '/' . $path;
58
+                return $scriptApp->view->templatesPath.'/'.$path;
59 59
             case 'system':
60 60
                 $path = substr($path, strpos($path, '/') + 1);
61
-                return INJI_SYSTEM_DIR . '/static/' . $path;
61
+                return INJI_SYSTEM_DIR.'/static/'.$path;
62 62
             case 'moduleAsset':
63 63
                 $path = substr($path, strpos($path, '/') + 1);
64 64
                 if (!strpos($path, '/')) {
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
                 }
72 72
                 $path = substr($path, strpos($path, '/') + 1);
73 73
                 if (is_callable([$module, 'staticCalled'])) {
74
-                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path . '/static/');
74
+                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path.'/static/');
75 75
                 }
76
-                return $scriptApp->$module->path . '/static/' . $path;
76
+                return $scriptApp->$module->path.'/static/'.$path;
77 77
             default:
78
-                return $scriptApp->path . '/static/' . $path;
78
+                return $scriptApp->path.'/static/'.$path;
79 79
         }
80 80
     }
81 81
 
@@ -138,9 +138,9 @@  discard block
 block discarded – undo
138 138
                         $pos = $_GET['resize_pos'];
139 139
                     }
140 140
                     $dirnoslash = str_replace('/', '', substr($fileinfo['dirname'], strpos($fileinfo['dirname'], '/static')));
141
-                    $path = $dir . '/static/cache/' . $dirnoslash . $fileinfo['filename'] . '.' . $sizes[0] . 'x' . $sizes[1] . $crop . $pos . '.' . $fileinfo['extension'];
141
+                    $path = $dir.'/static/cache/'.$dirnoslash.$fileinfo['filename'].'.'.$sizes[0].'x'.$sizes[1].$crop.$pos.'.'.$fileinfo['extension'];
142 142
                     if (!file_exists($path)) {
143
-                        Tools::createDir($dir . '/static/cache/');
143
+                        Tools::createDir($dir.'/static/cache/');
144 144
                         copy($file, $path);
145 145
                         Tools::resizeImage($path, $sizes[0], $sizes[1], $crop, $pos);
146 146
                     }
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
         header("Cache-control: public");
166 166
         header("Accept-Ranges: bytes");
167 167
         header("Pragma: public");
168
-        header("Content-Length: " . filesize($file));
169
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($file)) . ' GMT');
170
-        header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256) . ' GMT');
168
+        header("Content-Length: ".filesize($file));
169
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($file)).' GMT');
170
+        header('Expires: '.gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256).' GMT');
171 171
         if (filemtime($file) <= $modifiedSince && (!isset($_SERVER['HTTP_CACHE_CONTROL']) || $_SERVER['HTTP_CACHE_CONTROL'] != 'no-cache')) {
172 172
             // Разгружаем канал передачи данных!
173 173
             header('HTTP/1.1 304 Not Modified');
@@ -178,19 +178,19 @@  discard block
 block discarded – undo
178 178
         header('Content-Description: File Transfer');
179 179
         //}
180 180
         if (isset($this->mimes[strtolower($fileinfo['extension'])])) {
181
-            header("Content-Type: " . $this->mimes[strtolower($fileinfo['extension'])]);
181
+            header("Content-Type: ".$this->mimes[strtolower($fileinfo['extension'])]);
182 182
         }
183 183
 
184 184
         if (isset($_GET['frustrate_dl']) || in_array($fileinfo['extension'], array('doc', 'docx', 'xls', 'xlsx'))) {
185 185
 
186
-            $fileName = $fileinfo['filename'] . '.' . $fileinfo['extension'];
186
+            $fileName = $fileinfo['filename'].'.'.$fileinfo['extension'];
187 187
             if (App::$cur->db->connect) {
188
-                $fileObj = Files\File::get([ 'path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
188
+                $fileObj = Files\File::get(['path', '%/'.$fileinfo['filename'].'.'.$fileinfo['extension'], 'LIKE']);
189 189
                 if ($fileObj) {
190 190
                     $fileName = $fileObj->original_name;
191 191
                 }
192 192
             }
193
-            header('Content-Disposition: attachment; filename="' . $fileName . '"');
193
+            header('Content-Disposition: attachment; filename="'.$fileName.'"');
194 194
         }
195 195
 
196 196
         header('Content-Transfer-Encoding: binary');
Please login to merge, or discard this patch.
system/modules/Ui/objects/Pages.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,10 +34,11 @@
 block discarded – undo
34 34
             $this->params['page'] = 1;
35 35
             if (!empty($this->data['page'])) {
36 36
                 $this->params['page'] = (int) $this->data['page'];
37
-                if ($this->params['page'] <= 0)
38
-                    $this->params['page'] = 1;
39
-                elseif ($this->params['page'] > ceil($this->options['count'] / $this->params['limit']))
40
-                    $this->params['page'] = ceil($this->options['count'] / $this->params['limit']);
37
+                if ($this->params['page'] <= 0) {
38
+                                    $this->params['page'] = 1;
39
+                } elseif ($this->params['page'] > ceil($this->options['count'] / $this->params['limit'])) {
40
+                                    $this->params['page'] = ceil($this->options['count'] / $this->params['limit']);
41
+                }
41 42
             }
42 43
 
43 44
             $this->params['start'] = $this->params['page'] * $this->params['limit'] - $this->params['limit'];
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/filters.php 2 patches
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -127,40 +127,40 @@
 block discarded – undo
127 127
                     ?>
128 128
                     <div class="filter_form_field filter_select">
129 129
                       <?php
130
-                      if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
131
-                          $value = 1;
132
-                      } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
133
-                          $value = 0;
134
-                      } else {
135
-                          $value = '';
136
-                      }
137
-                      $inputOptions = ['value' => $value, 'values' => [
138
-                              '' => 'Не важно',
139
-                              '1' => $colInfo['label'],
140
-                              '0' => 'Нет'
141
-                          ]
142
-                      ];
143
-                      if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
130
+                        if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
131
+                            $value = 1;
132
+                        } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
133
+                            $value = 0;
134
+                        } else {
135
+                            $value = '';
136
+                        }
137
+                        $inputOptions = ['value' => $value, 'values' => [
138
+                                '' => 'Не важно',
139
+                                '1' => $colInfo['label'],
140
+                                '0' => 'Нет'
141
+                            ]
142
+                        ];
143
+                        if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
144 144
 
145
-                          $inputOptions['disabled'] = true;
146
-                          $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
147
-                          if (!empty($colOptions['userCol'])) {
148
-                              if (strpos($colOptions['userCol'], ':')) {
149
-                                  $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
150
-                                  $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
145
+                            $inputOptions['disabled'] = true;
146
+                            $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
147
+                            if (!empty($colOptions['userCol'])) {
148
+                                if (strpos($colOptions['userCol'], ':')) {
149
+                                    $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
150
+                                    $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
151 151
 
152
-                                  $inputOptions['value'] = \Users\User::$cur->$rel->$param;
153
-                              } else {
154
-                                  $this->model->$col = \Users\User::$cur->{$preset['userCol']};
155
-                              }
156
-                          } elseif (!empty($colOptions['value'])) {
152
+                                    $inputOptions['value'] = \Users\User::$cur->$rel->$param;
153
+                                } else {
154
+                                    $this->model->$col = \Users\User::$cur->{$preset['userCol']};
155
+                                }
156
+                            } elseif (!empty($colOptions['value'])) {
157 157
 
158
-                              $inputOptions['value'] = $colOptions['value'];
159
-                          }
160
-                      }
161
-                      $inputOptions['class'] = 'input-sm';
162
-                      $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
163
-                      ?>
158
+                                $inputOptions['value'] = $colOptions['value'];
159
+                            }
160
+                        }
161
+                        $inputOptions['class'] = 'input-sm';
162
+                        $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
163
+                        ?>
164 164
                     </div>
165 165
 
166 166
                     <?php
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if (!$dataManager->checkAccess()) {
3
-    echo 'you not have access to "' . $dataManager->modelName . '" manager with name: "' . $dataManager->managerName . '"';
3
+    echo 'you not have access to "'.$dataManager->modelName.'" manager with name: "'.$dataManager->managerName.'"';
4 4
     return false;
5 5
 }
6 6
 ?>
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
                             $options = [
62 62
                                 'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : ''
63 63
                             ];
64
-                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) {
64
+                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix().'name'])) {
65 65
                                 $options['order'] = 'name';
66 66
                             }
67 67
                             $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options);
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Pages/pages.php 3 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@
 block discarded – undo
1 1
 <ul class="<?= $class; ?>"><?php
2
-  if ($pagesInstance->params['page'] > 1) {
3
-      $getArr['page'] = $pagesInstance->params['page'] - 1;
4
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
5
-  }
2
+    if ($pagesInstance->params['page'] > 1) {
3
+        $getArr['page'] = $pagesInstance->params['page'] - 1;
4
+        echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
5
+    }
6 6
 
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']) {
9
-          echo '<li ';
10
-          if ($pagesInstance->params['page'] == $i)
11
-              echo 'class = "active"';
12
-          echo ">";
13
-          $getArr['page'] = $i;
14
-          echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
15
-      }
16
-      elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
17
-          $getArr['page'] = round($pagesInstance->params['page'] / 2);
18
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
19
-      } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
20
-          $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
21
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
22
-      }
23
-  }
24
-  if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
25
-      $getArr['page'] = $pagesInstance->params['page'] + 1;
26
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
27
-  }
28
-  ?></ul>
29 7
\ No newline at end of file
8
+    for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
9
+        if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
10
+            echo '<li ';
11
+            if ($pagesInstance->params['page'] == $i)
12
+                echo 'class = "active"';
13
+            echo ">";
14
+            $getArr['page'] = $i;
15
+            echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
16
+        }
17
+        elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
18
+            $getArr['page'] = round($pagesInstance->params['page'] / 2);
19
+            echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
20
+        } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
21
+            $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
22
+            echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
23
+        }
24
+    }
25
+    if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
26
+        $getArr['page'] = $pagesInstance->params['page'] + 1;
27
+        echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
28
+    }
29
+    ?></ul>
30 30
\ No newline at end of file
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.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@
 block discarded – undo
1 1
 <ul class="<?= $class; ?>"><?php
2 2
   if ($pagesInstance->params['page'] > 1) {
3 3
       $getArr['page'] = $pagesInstance->params['page'] - 1;
4
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
4
+      echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>&larr;</a></li>";
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"';
12 12
           echo ">";
13 13
           $getArr['page'] = $i;
14
-          echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
14
+          echo "<a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>{$i}</a></li>";
15 15
       }
16 16
       elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
17 17
           $getArr['page'] = round($pagesInstance->params['page'] / 2);
18
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
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']) {
20 20
           $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
21
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
21
+          echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>...</a></li>";
22 22
       }
23 23
   }
24 24
   if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
25 25
       $getArr['page'] = $pagesInstance->params['page'] + 1;
26
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
26
+      echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>&rarr;</a></li>";
27 27
   }
28 28
   ?></ul>
29 29
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Table/body.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -5,19 +5,19 @@
 block discarded – undo
5 5
           <div class ='pull-right'>
6 6
             <div class="btn-group">
7 7
               <?php
8
-              $html = '';
9
-              foreach ($table->buttons as $button) {
10
-                  $html .= '<a class = "btn btn-primary btn-sm"';
11
-                  if (!empty($button['href'])) {
12
-                      $html .= " href = '{$button['href']}'";
13
-                  }
14
-                  if (!empty($button['onclick'])) {
15
-                      $html .= " onclick = '{$button['onclick']}'";
16
-                  }
17
-                  $html .= ">{$button['text']}</a> ";
18
-              }
19
-              echo $html;
20
-              ?>
8
+                $html = '';
9
+                foreach ($table->buttons as $button) {
10
+                    $html .= '<a class = "btn btn-primary btn-sm"';
11
+                    if (!empty($button['href'])) {
12
+                        $html .= " href = '{$button['href']}'";
13
+                    }
14
+                    if (!empty($button['onclick'])) {
15
+                        $html .= " onclick = '{$button['onclick']}'";
16
+                    }
17
+                    $html .= ">{$button['text']}</a> ";
18
+                }
19
+                echo $html;
20
+                ?>
21 21
             </div>
22 22
           </div>
23 23
       <?php } ?>
Please login to merge, or discard this patch.
system/modules/UserForms/UserForms.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@
 block discarded – undo
16 16
         if (!empty($_POST['UserForms'])) {
17 17
             foreach ($_POST['UserForms'] as $form_id => $inputs) {
18 18
                 $form = \UserForms\Form::get((int) $form_id);
19
-                if (!$form)
20
-                    continue;
19
+                if (!$form) {
20
+                                    continue;
21
+                }
21 22
                 $formRecive = new \UserForms\Recive();
22 23
                 $formRecive->user_id = (int) \Users\User::$cur->id;
23 24
                 $formRecive->form_id = (int) $form_id;
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@  discard block
 block discarded – undo
24 24
                 $data = [];
25 25
                 $error = false;
26 26
                 foreach ($form->inputs as $input) {
27
-                    if (isset($inputs['input' . $input->id])) {
28
-                        $data['input' . $input->id] = htmlspecialchars($inputs['input' . $input->id]);
27
+                    if (isset($inputs['input'.$input->id])) {
28
+                        $data['input'.$input->id] = htmlspecialchars($inputs['input'.$input->id]);
29 29
                     } elseif ($input->required) {
30 30
                         $error = true;
31
-                        Msg::add('Вы не заполнили поле: ' . $input->label);
31
+                        Msg::add('Вы не заполнили поле: '.$input->label);
32 32
                     } else {
33
-                        $data['input' . $input->id] = '';
33
+                        $data['input'.$input->id] = '';
34 34
                     }
35 35
                 }
36 36
                 if (!$error) {
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
             if (!$error && !empty(App::$cur->config['site']['email'])) {
43 43
                 $text = '';
44 44
                 foreach ($form->inputs as $input) {
45
-                    if (isset($inputs['input' . $input->id])) {
46
-                        $text .="<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />";
45
+                    if (isset($inputs['input'.$input->id])) {
46
+                        $text .= "<b>{$input->label}:</b> ".htmlspecialchars($inputs['input'.$input->id])."<br />";
47 47
                     }
48 48
                 }
49 49
                 if ($text) {
50
-                    $text = 'Дата получения по серверному времени: ' . date('Y-m-d H:i:s') . '<br />Заполненые поля:<br />' . $text;
51
-                    Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, App::$cur->config['site']['email'], $form->name, $text);
50
+                    $text = 'Дата получения по серверному времени: '.date('Y-m-d H:i:s').'<br />Заполненые поля:<br />'.$text;
51
+                    Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, App::$cur->config['site']['email'], $form->name, $text);
52 52
                 }
53 53
             }
54 54
             Tools::redirect($_SERVER['REQUEST_URI'], 'Ваша форма была успешно отправлена', 'success');
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
         $inputs = json_decode($item->data, true);
61 61
         $text = '';
62 62
         foreach ($item->form->inputs as $input) {
63
-            if (isset($inputs['input' . $input->id])) {
64
-                $text .= "{$input->label}: " . htmlspecialchars($inputs['input' . $input->id]) . "<br />";
63
+            if (isset($inputs['input'.$input->id])) {
64
+                $text .= "{$input->label}: ".htmlspecialchars($inputs['input'.$input->id])."<br />";
65 65
             }
66 66
         }
67 67
         return $text;
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.