@@ -25,7 +25,7 @@ |
||
25 | 25 | $this->loadLib($rLib); |
26 | 26 | } |
27 | 27 | } |
28 | - if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) { |
|
28 | + if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) { |
|
29 | 29 | foreach ($className::$files['css'] as $file) { |
30 | 30 | if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) { |
31 | 31 | App::$cur->view->customAsset('css', $file, $libName); |
@@ -25,8 +25,9 @@ |
||
25 | 25 | |
26 | 26 | $result['payId'] = $data["InvId"]; |
27 | 27 | |
28 | - if (strtolower($data['SignatureValue']) == $hashGenerated) |
|
29 | - $result['status'] = 'success'; |
|
28 | + if (strtolower($data['SignatureValue']) == $hashGenerated) { |
|
29 | + $result['status'] = 'success'; |
|
30 | + } |
|
30 | 31 | |
31 | 32 | return $result; |
32 | 33 | } |
@@ -28,20 +28,24 @@ discard block |
||
28 | 28 | |
29 | 29 | // Проверка наличия необходимых параметров в POST-запросе |
30 | 30 | |
31 | - if (!isset($data["WMI_SIGNATURE"])) |
|
32 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE"); |
|
31 | + if (!isset($data["WMI_SIGNATURE"])) { |
|
32 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE"); |
|
33 | + } |
|
33 | 34 | |
34 | - if (!isset($data["WMI_PAYMENT_NO"])) |
|
35 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO"); |
|
35 | + if (!isset($data["WMI_PAYMENT_NO"])) { |
|
36 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO"); |
|
37 | + } |
|
36 | 38 | |
37 | - if (!isset($data["WMI_ORDER_STATE"])) |
|
38 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE"); |
|
39 | + if (!isset($data["WMI_ORDER_STATE"])) { |
|
40 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE"); |
|
41 | + } |
|
39 | 42 | |
40 | 43 | // Извлечение всех параметров POST-запроса, кроме WMI_SIGNATURE |
41 | 44 | $params = []; |
42 | 45 | foreach ($data as $name => $value) { |
43 | - if ($name !== "WMI_SIGNATURE") |
|
44 | - $params[$name] = $value; |
|
46 | + if ($name !== "WMI_SIGNATURE") { |
|
47 | + $params[$name] = $value; |
|
48 | + } |
|
45 | 49 | } |
46 | 50 | |
47 | 51 | // Сортировка массива по именам ключей в порядке возрастания |
@@ -86,8 +90,9 @@ discard block |
||
86 | 90 | $config = static::getConfig(); |
87 | 91 | $merchantCurrency = static::getMerchantCurrency($currency); |
88 | 92 | |
89 | - if (!$description) |
|
90 | - $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
93 | + if (!$description) { |
|
94 | + $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
95 | + } |
|
91 | 96 | |
92 | 97 | //Секретный ключ интернет-магазина |
93 | 98 | $key = $config['secret']; |
@@ -117,11 +122,12 @@ discard block |
||
117 | 122 | $fieldValues = ""; |
118 | 123 | |
119 | 124 | foreach ($fields as $value) { |
120 | - if (is_array($value)) |
|
121 | - foreach ($value as $v) { |
|
125 | + if (is_array($value)) { |
|
126 | + foreach ($value as $v) { |
|
122 | 127 | //Конвертация из текущей кодировки (UTF-8) |
123 | 128 | //необходима только если кодировка магазина отлична от Windows-1251 |
124 | 129 | $v = iconv("utf-8", "windows-1251", $v); |
130 | + } |
|
125 | 131 | $fieldValues .= $v; |
126 | 132 | } else { |
127 | 133 | //Конвертация из текущей кодировки (UTF-8) |
@@ -112,10 +112,11 @@ discard block |
||
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 |
||
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']; |
@@ -183,7 +183,7 @@ |
||
183 | 183 | |
184 | 184 | $fileName = $fileinfo['filename'] . '.' . $fileinfo['extension']; |
185 | 185 | if (App::$cur->db->connect) { |
186 | - $fileObj = Files\File::get([ 'path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']); |
|
186 | + $fileObj = Files\File::get(['path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']); |
|
187 | 187 | if ($fileObj) { |
188 | 188 | $fileName = $fileObj->original_name; |
189 | 189 | } |
@@ -73,7 +73,7 @@ |
||
73 | 73 | $this->model->_params[$modelName::index()] = 0; |
74 | 74 | } |
75 | 75 | $relOptions['model']::fixPrefix($relOptions['col']); |
76 | - $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]); |
|
76 | + $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]); |
|
77 | 77 | } |
78 | 78 | $inputs[$col]->parent = $this; |
79 | 79 | } elseif (!empty($modelName::$cols[$col])) { |
@@ -34,10 +34,11 @@ |
||
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']; |
@@ -22,7 +22,7 @@ |
||
22 | 22 | 'style' => '' |
23 | 23 | ]; |
24 | 24 | if (!empty($dataManager->managerOptions['categorys'])) { |
25 | - $mainCol['style'].='margin-left:260px;'; |
|
25 | + $mainCol['style'] .= 'margin-left:260px;'; |
|
26 | 26 | echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">'; |
27 | 27 | $this->widget('Ui\DataManager/categorys', compact('dataManager')); |
28 | 28 | echo '</div>'; |
@@ -1,28 +1,28 @@ |
||
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) . "'>←</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) . "'>←</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) . "'>→</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) . "'>→</a></li>"; |
|
28 | + } |
|
29 | + ?></ul> |
|
30 | 30 | \ No newline at end of file |
@@ -5,7 +5,7 @@ |
||
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"'; |
@@ -7,13 +7,13 @@ |
||
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']) { |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $text = ''; |
44 | 44 | foreach ($form->inputs as $input) { |
45 | 45 | if (isset($inputs['input' . $input->id])) { |
46 | - $text .="<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />"; |
|
46 | + $text .= "<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />"; |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | if ($text) { |
@@ -16,8 +16,9 @@ |
||
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; |