@@ -236,17 +236,20 @@ |
||
236 | 236 | * @return boolean|\Users\User |
237 | 237 | */ |
238 | 238 | public function get($idn, $ltype = 'id') { |
239 | - if (!$idn) |
|
240 | - return false; |
|
239 | + if (!$idn) { |
|
240 | + return false; |
|
241 | + } |
|
241 | 242 | |
242 | - if (is_numeric($idn) && $ltype != 'login') |
|
243 | - $user = Users\User::get($idn, 'id'); |
|
244 | - elseif ($ltype == 'login') |
|
245 | - $user = Users\User::get($idn, 'login'); |
|
246 | - else |
|
247 | - $user = Users\User::get($idn, 'mail'); |
|
248 | - if (!$user) |
|
249 | - return []; |
|
243 | + if (is_numeric($idn) && $ltype != 'login') { |
|
244 | + $user = Users\User::get($idn, 'id'); |
|
245 | + } elseif ($ltype == 'login') { |
|
246 | + $user = Users\User::get($idn, 'login'); |
|
247 | + } else { |
|
248 | + $user = Users\User::get($idn, 'mail'); |
|
249 | + } |
|
250 | + if (!$user) { |
|
251 | + return []; |
|
252 | + } |
|
250 | 253 | |
251 | 254 | return $user; |
252 | 255 | } |
@@ -258,6 +258,10 @@ |
||
258 | 258 | return $user; |
259 | 259 | } |
260 | 260 | |
261 | + /** |
|
262 | + * @param string $err |
|
263 | + * @param boolean $msg |
|
264 | + */ |
|
261 | 265 | private function msgOrErr($err, $msg) { |
262 | 266 | if ($msg) { |
263 | 267 | Msg::add($err, 'danger'); |
@@ -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 = [ |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | <div class="form-search-results"></div> |
39 | 39 | <script> |
40 | - window.autocomplete<?=$id;?> = function (element, snippet, snippetParams) { |
|
40 | + window.autocomplete<?=$id; ?> = function (element, snippet, snippetParams) { |
|
41 | 41 | element.element.onkeyup = function () { |
42 | 42 | var inputContainer = element.element.parentNode; |
43 | 43 | var selectedDiv = inputContainer.querySelector('.form-search-cur'); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | }; |
91 | 91 | inji.onLoad(function () { |
92 | 92 | setTimeout(function () { |
93 | - new window.autocomplete<?=$id;?>(inji.get('#<?=$id;?>'), '<?=$options['snippet'];?>', <?=json_encode($options['snippetParams']);?>); |
|
93 | + new window.autocomplete<?=$id; ?>(inji.get('#<?=$id; ?>'), '<?=$options['snippet']; ?>', <?=json_encode($options['snippetParams']); ?>); |
|
94 | 94 | },100); |
95 | 95 | }); |
96 | 96 | </script> |
@@ -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 { |
@@ -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 | } |
@@ -9,7 +9,7 @@ |
||
9 | 9 | $primaryValue = isset($options['value']) ? $options['value'] : null; |
10 | 10 | $primaryValue = is_array($primaryValue) && isset($primaryValue['primary']) ? $primaryValue['primary'] : $primaryValue; |
11 | 11 | if (is_numeric($key) && !is_array($primaryValue) && $primaryValue !== '') { |
12 | - $primaryValue = (int)$primaryValue; |
|
12 | + $primaryValue = (int) $primaryValue; |
|
13 | 13 | } |
14 | 14 | if ( |
15 | 15 | (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) || |
@@ -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) { |
@@ -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) { |