@@ -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> |
@@ -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) { |
@@ -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; |
@@ -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 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | if ($data) { |
| 23 | - $address = $data['Name'] . ' ' . $data['Number'] . '<br />' . $data['PostCode'] . ', ' . $data['Region'] . ', ' . $data['CitiName'] . ', ' . $data['Address'];// . '<br /><small>' . $data['OutDescription'].'</small>'; |
|
| 23 | + $address = $data['Name'] . ' ' . $data['Number'] . '<br />' . $data['PostCode'] . ', ' . $data['Region'] . ', ' . $data['CitiName'] . ', ' . $data['Address']; // . '<br /><small>' . $data['OutDescription'].'</small>'; |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | ?> |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | function my_function(result) { |
| 33 | 33 | console.log(result); |
| 34 | 34 | // устанавливаем в скрытое поле ID терминала |
| 35 | - document.getElementById('<?=$id;?>').value = result.id; |
|
| 35 | + document.getElementById('<?=$id; ?>').value = result.id; |
|
| 36 | 36 | // показываем пользователю название точки и адрес доствки |
| 37 | 37 | document.getElementById('address').innerHTML = result['name'] + '<br />' + result['address']; |
| 38 | 38 | inji.onLoad(function () { |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | ob_end_clean(); |
| 197 | 197 | |
| 198 | 198 | $cols = []; |
| 199 | - if($actions) { |
|
| 199 | + if ($actions) { |
|
| 200 | 200 | $cols[] = ['label' => $dropdown]; |
| 201 | 201 | } |
| 202 | 202 | $cols['id'] = ['label' => '№', 'sortable' => true]; |
@@ -244,10 +244,10 @@ discard block |
||
| 244 | 244 | $queryParams = []; |
| 245 | 245 | if (empty($params['all'])) { |
| 246 | 246 | if (!empty($params['limit'])) { |
| 247 | - $this->limit = (int)$params['limit']; |
|
| 247 | + $this->limit = (int) $params['limit']; |
|
| 248 | 248 | } |
| 249 | 249 | if (!empty($params['page'])) { |
| 250 | - $this->page = (int)$params['page']; |
|
| 250 | + $this->page = (int) $params['page']; |
|
| 251 | 251 | } |
| 252 | 252 | $queryParams['limit'] = $this->limit; |
| 253 | 253 | $queryParams['start'] = $this->page * $this->limit - $this->limit; |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | } elseif (\App::$cur->name == 'admin' && $colName == 'name') { |
| 493 | 493 | $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem)); |
| 494 | 494 | return "<a href ='/admin/{$item->genViewLink()}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>"; |
| 495 | - } elseif ($modelName::$cols[$colName]['type'] == 'html' || $modelName::$cols[$colName]['type']=='textarea') { |
|
| 495 | + } elseif ($modelName::$cols[$colName]['type'] == 'html' || $modelName::$cols[$colName]['type'] == 'textarea') { |
|
| 496 | 496 | $uid = \Tools::randomString(); |
| 497 | 497 | $script = "<script>inji.onLoad(function(){ |
| 498 | 498 | var el{$uid}=$('#{$uid}'); |
@@ -557,10 +557,10 @@ discard block |
||
| 557 | 557 | return []; |
| 558 | 558 | } |
| 559 | 559 | if (!empty($params['limit'])) { |
| 560 | - $this->limit = (int)$params['limit']; |
|
| 560 | + $this->limit = (int) $params['limit']; |
|
| 561 | 561 | } |
| 562 | 562 | if (!empty($params['page'])) { |
| 563 | - $this->page = (int)$params['page']; |
|
| 563 | + $this->page = (int) $params['page']; |
|
| 564 | 564 | } |
| 565 | 565 | $queryParams = [ |
| 566 | 566 | 'count' => true |