@@ -16,7 +16,7 @@ |
||
16 | 16 | static $name = 'PickPoint - курьерская служба'; |
17 | 17 | |
18 | 18 | /** |
19 | - * @param \Ecommerce\Cart $cart |
|
19 | + * @param string $URL |
|
20 | 20 | * @return \Money\Sums |
21 | 21 | */ |
22 | 22 | static function curl_get_file_contents($URL, $data) { |
@@ -35,8 +35,11 @@ |
||
35 | 35 | $contents = curl_exec($c); |
36 | 36 | curl_close($c); |
37 | 37 | |
38 | - if ($contents) return $contents; |
|
39 | - else return FALSE; |
|
38 | + if ($contents) { |
|
39 | + return $contents; |
|
40 | + } else { |
|
41 | + return FALSE; |
|
42 | + } |
|
40 | 43 | } |
41 | 44 | |
42 | 45 | static function calcPrice($cart) { |
@@ -36,7 +36,7 @@ |
||
36 | 36 | curl_close($c); |
37 | 37 | |
38 | 38 | if ($contents) return $contents; |
39 | - else return FALSE; |
|
39 | + else return false; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | static function calcPrice($cart) { |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | public function activationAction($userId = 0, $hash = '') { |
115 | - $user = \Users\User::get((int)$userId); |
|
116 | - if (!$user || !$hash || $user->activation !== (string)$hash) { |
|
115 | + $user = \Users\User::get((int) $userId); |
|
116 | + if (!$user || !$hash || $user->activation !== (string) $hash) { |
|
117 | 117 | Tools::redirect('/', 'Во время активации произошли ошибки', 'danger'); |
118 | 118 | } |
119 | 119 | $user->activation = ''; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | public function resendActivationAction($userId = 0) { |
159 | - $user = \Users\User::get((int)$userId); |
|
159 | + $user = \Users\User::get((int) $userId); |
|
160 | 160 | if (!$user) { |
161 | 161 | Tools::redirect('/', 'Не указан пользователь', 'danger'); |
162 | 162 | } |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | } |
173 | 173 | |
174 | 174 | public function getPartnerInfoAction($userId = 0) { |
175 | - $userId = (int)$userId; |
|
175 | + $userId = (int) $userId; |
|
176 | 176 | $result = new \Server\Result(); |
177 | 177 | if (!$userId) { |
178 | 178 | $result->success = false; |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $pathinfo = pathinfo($filename); |
46 | 46 | if ($pathinfo['extension'] === 'zip') { |
47 | 47 | $zip = new \ZipArchive; |
48 | - if ($zip->open($dir . '/' . $filename) === TRUE) { |
|
48 | + if ($zip->open($dir . '/' . $filename) === true) { |
|
49 | 49 | $zip->extractTo($dir); |
50 | 50 | $zip->close(); |
51 | 51 | } else { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $query = \App::$cur->db->newQuery(); |
29 | 29 | $query->operation = 'select'; |
30 | 30 | $query->table = \Exchange1c\Exchange::table(); |
31 | - $query->cols = \Exchange1c\Exchange::index().','.\Exchange1c\Exchange::colPrefix() . 'path'; |
|
31 | + $query->cols = \Exchange1c\Exchange::index() . ',' . \Exchange1c\Exchange::colPrefix() . 'path'; |
|
32 | 32 | $queryArr = $query->buildQuery(); |
33 | 33 | $queryArr['query'] .= ' where `' . \Exchange1c\Exchange::colPrefix() . 'cleared` = 0 AND `' . \Exchange1c\Exchange::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval']; |
34 | 34 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | \Tools::delDir($exchangeArr[\Exchange1c\Exchange::colPrefix() . 'path']); |
38 | 38 | $query = \App::$cur->db->newQuery(); |
39 | 39 | $query->where([\Exchange1c\Exchange::index(), $exchangeArr[\Exchange1c\Exchange::index()]]); |
40 | - $query->update(\Exchange1c\Exchange::table(),[\Exchange1c\Exchange::colPrefix() . 'cleared' => 1]); |
|
40 | + $query->update(\Exchange1c\Exchange::table(), [\Exchange1c\Exchange::colPrefix() . 'cleared' => 1]); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | } |
@@ -13,11 +13,9 @@ |
||
13 | 13 | |
14 | 14 | use Exchange1c\Exchange; |
15 | 15 | |
16 | -class Init extends \Exchange1c\Mode |
|
17 | -{ |
|
16 | +class Init extends \Exchange1c\Mode { |
|
18 | 17 | |
19 | - public function process() |
|
20 | - { |
|
18 | + public function process() { |
|
21 | 19 | echo "zip=yes\n"; |
22 | 20 | echo 'file_limit=' . \Tools::toBytes(ini_get('post_max_size')); |
23 | 21 | $this->end(); |
@@ -38,25 +38,25 @@ |
||
38 | 38 | <span class="caption">Вид:</span> |
39 | 39 | <span class="group"> |
40 | 40 | <?php |
41 | - for ($i = 2; $i < 5; $i++) { |
|
42 | - $curLimit = $limit * $i; |
|
43 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
44 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
45 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
46 | - echo $curLimit; |
|
47 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
48 | - echo "</a> "; |
|
49 | - } |
|
50 | - if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
51 | - $curLimit = 'all'; |
|
52 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
53 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
54 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
55 | - echo 'Все'; |
|
56 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
57 | - echo "</a> "; |
|
58 | - } |
|
59 | - ?> |
|
41 | + for ($i = 2; $i < 5; $i++) { |
|
42 | + $curLimit = $limit * $i; |
|
43 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
44 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
45 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
46 | + echo $curLimit; |
|
47 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
48 | + echo "</a> "; |
|
49 | + } |
|
50 | + if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
51 | + $curLimit = 'all'; |
|
52 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
53 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
54 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
55 | + echo 'Все'; |
|
56 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
57 | + echo "</a> "; |
|
58 | + } |
|
59 | + ?> |
|
60 | 60 | </span> |
61 | 61 | <span class="group"> |
62 | 62 | <a rel="nofollow" href='#' onclick="inji.onLoad(function () { |