@@ -16,11 +16,11 @@ |
||
16 | 16 | public static $cols = [ |
17 | 17 | 'name' => ['type' => 'text'], |
18 | 18 | 'code' => ['type' => 'text'], |
19 | - 'message' => ['type' => 'dataManager','relation'=>'messages'], |
|
19 | + 'message' => ['type' => 'dataManager', 'relation'=>'messages'], |
|
20 | 20 | ]; |
21 | 21 | public static $dataManagers = [ |
22 | 22 | 'manager' => [ |
23 | - 'cols' => ['name', 'code','message'] |
|
23 | + 'cols' => ['name', 'code', 'message'] |
|
24 | 24 | ] |
25 | 25 | ]; |
26 | 26 | public static $forms = [ |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public function getGoodslist() { |
187 | 187 | if (!isset($this->goodsList)) { |
188 | - return NULL; |
|
188 | + return null; |
|
189 | 189 | } |
190 | 190 | return $this->goodsList; |
191 | 191 | } |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | */ |
214 | 214 | private function _getTariffList() { |
215 | 215 | if (!isset($this->tariffList)) { |
216 | - return NULL; |
|
216 | + return null; |
|
217 | 217 | } |
218 | 218 | return $this->tariffList; |
219 | 219 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $handle = fopen(__DIR__ . '/../vendor/CdekCity_RUS_20170729.csv', 'r'); |
24 | 24 | $row = 1; |
25 | 25 | $cols = []; |
26 | - while (($data = fgetcsv($handle, 10000, ";")) !== FALSE) { |
|
26 | + while (($data = fgetcsv($handle, 10000, ";")) !== false) { |
|
27 | 27 | if ($row === 1) { |
28 | 28 | $cols = $data; |
29 | 29 | } else { |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | 'up' => function () { |
5 | - \Ecommerce\Delivery\Field\Item::get(1,'data'); |
|
5 | + \Ecommerce\Delivery\Field\Item::get(1, 'data'); |
|
6 | 6 | $field = new \Ecommerce\Delivery\Field( |
7 | 7 | [ |
8 | 8 | 'name' => 'Город', |
@@ -8,7 +8,7 @@ |
||
8 | 8 | if (!empty($alias)) { |
9 | 9 | $slider = Sliders\Slider::get($alias, 'alias'); |
10 | 10 | } |
11 | -if(empty($slider)){ |
|
11 | +if (empty($slider)) { |
|
12 | 12 | echo 'Slider not found'; |
13 | 13 | return; |
14 | 14 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | if (!empty($alias)) { |
9 | 9 | $slider = Sliders\Slider::get($alias, 'alias'); |
10 | 10 | } |
11 | -if(empty($slider)){ |
|
11 | +if(empty($slider)) { |
|
12 | 12 | echo 'Slider not found'; |
13 | 13 | return; |
14 | 14 | } |
@@ -14,13 +14,13 @@ |
||
14 | 14 | \App::$cur->view->customAsset('js', '/static/moduleAsset/UserForms/js/formCatcher.js'); |
15 | 15 | if (!empty($_POST['UserForms'])) { |
16 | 16 | foreach ($_POST['UserForms'] as $form_id => $inputs) { |
17 | - $form = \UserForms\Form::get((int)$form_id); |
|
17 | + $form = \UserForms\Form::get((int) $form_id); |
|
18 | 18 | if (!$form) { |
19 | 19 | continue; |
20 | 20 | } |
21 | 21 | $formRecive = new \UserForms\Recive(); |
22 | - $formRecive->user_id = (int)\Users\User::$cur->id; |
|
23 | - $formRecive->form_id = (int)$form_id; |
|
22 | + $formRecive->user_id = (int) \Users\User::$cur->id; |
|
23 | + $formRecive->form_id = (int) $form_id; |
|
24 | 24 | $data = []; |
25 | 25 | $error = false; |
26 | 26 | foreach ($form->inputs as $input) { |
@@ -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) { |
@@ -36,8 +36,11 @@ |
||
36 | 36 | $contents = curl_exec($c); |
37 | 37 | curl_close($c); |
38 | 38 | |
39 | - if ($contents) return $contents; |
|
40 | - else return FALSE; |
|
39 | + if ($contents) { |
|
40 | + return $contents; |
|
41 | + } else { |
|
42 | + return FALSE; |
|
43 | + } |
|
41 | 44 | } |
42 | 45 | |
43 | 46 | /** |
@@ -37,7 +37,7 @@ |
||
37 | 37 | curl_close($c); |
38 | 38 | |
39 | 39 | if ($contents) return $contents; |
40 | - else return FALSE; |
|
40 | + else return false; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -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('upload_max_filesize')); |
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 () { |