@@ -15,8 +15,9 @@ discard block |
||
15 | 15 | if (!$app) { |
16 | 16 | $app = $this->app->type; |
17 | 17 | } |
18 | - if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) |
|
19 | - return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
18 | + if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) { |
|
19 | + return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
20 | + } |
|
20 | 21 | |
21 | 22 | return '/'; |
22 | 23 | } |
@@ -50,8 +51,9 @@ discard block |
||
50 | 51 | return true; |
51 | 52 | } |
52 | 53 | |
53 | - if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) |
|
54 | - return false; |
|
54 | + if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) { |
|
55 | + return false; |
|
56 | + } |
|
55 | 57 | |
56 | 58 | return true; |
57 | 59 | } |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <div class = 'callbacks'> |
2 | 2 | <h1>Отзывы</h1> |
3 | 3 | <?php |
4 | - $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]); |
|
5 | - foreach ($callbacks as $callback) { |
|
6 | - echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>"; |
|
7 | - echo "<p>" . nl2br($callback->text) . "</p>"; |
|
8 | - } |
|
9 | - ?> |
|
4 | + $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]); |
|
5 | + foreach ($callbacks as $callback) { |
|
6 | + echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>"; |
|
7 | + echo "<p>" . nl2br($callback->text) . "</p>"; |
|
8 | + } |
|
9 | + ?> |
|
10 | 10 | </div> |
11 | 11 | <h3>Можете и вы в свободной форме оставить свой отзыв</h3> |
12 | 12 | <?php |
@@ -4,7 +4,7 @@ |
||
4 | 4 | $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]); |
5 | 5 | foreach ($callbacks as $callback) { |
6 | 6 | echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>"; |
7 | - echo "<p>" . nl2br($callback->text) . "</p>"; |
|
7 | + echo "<p>".nl2br($callback->text)."</p>"; |
|
8 | 8 | } |
9 | 9 | ?> |
10 | 10 | </div> |
@@ -17,9 +17,9 @@ |
||
17 | 17 | <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' /> |
18 | 18 | </div> |
19 | 19 | <?php |
20 | - $form = new Ui\Form(); |
|
21 | - $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']); |
|
22 | - ?> |
|
20 | + $form = new Ui\Form(); |
|
21 | + $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']); |
|
22 | + ?> |
|
23 | 23 | <h2>Дополнительные мета теги</h2> |
24 | 24 | <div class ="form-group"> |
25 | 25 | <button type = 'button' class = 'btn btn-primary ' onclick = 'addMeta()'>Добавить <i class = 'glyphicon glyphicon-plus'></i></button> |
@@ -2,27 +2,45 @@ |
||
2 | 2 | <form action = '' method = 'POST' enctype="multipart/form-data"> |
3 | 3 | <div class ="form-group"> |
4 | 4 | <label>Название сайта</label> |
5 | - <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) echo \App::$primary->config['site']['name']; ?>' /> |
|
5 | + <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) { |
|
6 | + echo \App::$primary->config['site']['name']; |
|
7 | +} |
|
8 | +?>' /> |
|
6 | 9 | </div> |
7 | 10 | <div class ="form-group"> |
8 | 11 | <label>Название компании</label> |
9 | - <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) echo \App::$primary->config['site']['company_name']; ?>' /> |
|
12 | + <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) { |
|
13 | + echo \App::$primary->config['site']['company_name']; |
|
14 | +} |
|
15 | +?>' /> |
|
10 | 16 | </div> |
11 | 17 | <div class ="form-group"> |
12 | 18 | <label>Основной домен</label> |
13 | - <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) echo \App::$primary->config['site']['domain']; ?>' /> |
|
19 | + <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) { |
|
20 | + echo \App::$primary->config['site']['domain']; |
|
21 | +} |
|
22 | +?>' /> |
|
14 | 23 | </div> |
15 | 24 | <div class ="form-group"> |
16 | 25 | <label>Контактный email</label> |
17 | - <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' /> |
|
26 | + <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) { |
|
27 | + echo \App::$primary->config['site']['email']; |
|
28 | +} |
|
29 | +?>' /> |
|
18 | 30 | </div> |
19 | 31 | <div class ="form-group"> |
20 | 32 | <label>Ключевые слова</label> |
21 | - <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' /> |
|
33 | + <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) { |
|
34 | + echo \App::$primary->config['site']['keywords']; |
|
35 | +} |
|
36 | +?>' /> |
|
22 | 37 | </div> |
23 | 38 | <div class ="form-group"> |
24 | 39 | <label>Краткое описание сайта</label> |
25 | - <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' /> |
|
40 | + <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) { |
|
41 | + echo \App::$primary->config['site']['description']; |
|
42 | +} |
|
43 | +?>' /> |
|
26 | 44 | </div> |
27 | 45 | <?php |
28 | 46 | $form = new Ui\Form(); |
@@ -16,8 +16,9 @@ |
||
16 | 16 | $param = isset($this->config['default']) ? $this->config['default'] : 'local'; |
17 | 17 | } |
18 | 18 | if (!is_array($param)) { |
19 | - if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) |
|
20 | - return false; |
|
19 | + if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) { |
|
20 | + return false; |
|
21 | + } |
|
21 | 22 | |
22 | 23 | $db = $dbOption; |
23 | 24 | } else { |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | } else { |
24 | 24 | $db = $param; |
25 | 25 | } |
26 | - $className = 'Db\\' . $db['driver']; |
|
26 | + $className = 'Db\\'.$db['driver']; |
|
27 | 27 | $this->connection = new $className(); |
28 | 28 | $this->connection->init($db); |
29 | 29 | $this->connection->dbInstance = $this; |
30 | 30 | $this->connect = $this->connection->connect; |
31 | 31 | $this->dbConfig = $db; |
32 | 32 | |
33 | - $this->className = 'Db\\' . $this->dbConfig['driver']; |
|
34 | - $this->QueryClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Query'; |
|
35 | - $this->ResultClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Result'; |
|
33 | + $this->className = 'Db\\'.$this->dbConfig['driver']; |
|
34 | + $this->QueryClassName = 'Db\\'.$this->dbConfig['driver'].'\\Query'; |
|
35 | + $this->ResultClassName = 'Db\\'.$this->dbConfig['driver'].'\\Result'; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function __call($name, $params) |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public function newQuery() |
57 | 57 | { |
58 | - if($this->QueryClassName) { |
|
58 | + if ($this->QueryClassName) { |
|
59 | 59 | return new $this->QueryClassName($this->connection); |
60 | 60 | } |
61 | 61 | return false; |
@@ -30,14 +30,18 @@ |
||
30 | 30 | public function init($connect_options) |
31 | 31 | { |
32 | 32 | extract($connect_options); |
33 | - if (isset($db_name)) |
|
34 | - $this->db_name = $db_name; |
|
35 | - if (isset($encoding)) |
|
36 | - $this->encoding = $encoding; |
|
37 | - if (isset($table_prefix)) |
|
38 | - $this->table_prefix = $table_prefix; |
|
39 | - if (isset($noConnectAbort)) |
|
40 | - $this->noConnectAbort = $noConnectAbort; |
|
33 | + if (isset($db_name)) { |
|
34 | + $this->db_name = $db_name; |
|
35 | + } |
|
36 | + if (isset($encoding)) { |
|
37 | + $this->encoding = $encoding; |
|
38 | + } |
|
39 | + if (isset($table_prefix)) { |
|
40 | + $this->table_prefix = $table_prefix; |
|
41 | + } |
|
42 | + if (isset($noConnectAbort)) { |
|
43 | + $this->noConnectAbort = $noConnectAbort; |
|
44 | + } |
|
41 | 45 | |
42 | 46 | $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding"; |
43 | 47 | $dt = new \DateTime(); |
@@ -13,11 +13,11 @@ discard block |
||
13 | 13 | |
14 | 14 | class Mysql extends \Object |
15 | 15 | { |
16 | - public $config = []; // настройки подключения выбраной базы |
|
17 | - public $connect = FALSE; // ярлык соединения с MySQL |
|
18 | - public $encoding = 'utf-8'; // установленная кодировка |
|
19 | - public $db_name = 'test'; // выбраная в данный момент база |
|
20 | - public $table_prefix = 'inji_'; // префикс названий таблиц |
|
16 | + public $config = []; // настройки подключения выбраной базы |
|
17 | + public $connect = FALSE; // ярлык соединения с MySQL |
|
18 | + public $encoding = 'utf-8'; // установленная кодировка |
|
19 | + public $db_name = 'test'; // выбраная в данный момент база |
|
20 | + public $table_prefix = 'inji_'; // префикс названий таблиц |
|
21 | 21 | public $pdo = NULL; |
22 | 22 | public $lastQuery = ''; |
23 | 23 | public $last_error = ''; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $this->table_prefix = ''; |
72 | 72 | |
73 | 73 | $query->where('TABLE_SCHEMA', $old_db); |
74 | - $query->where('TABLE_NAME', $old_prefix . $table_name); |
|
74 | + $query->where('TABLE_NAME', $old_prefix.$table_name); |
|
75 | 75 | $result = $query->select('COLUMNS'); |
76 | 76 | $this->db_name = $old_db; |
77 | 77 | $this->table_prefix = $old_prefix; |
@@ -3,14 +3,14 @@ discard block |
||
3 | 3 | <ul class="nav nav-tabs" role="tablist"> |
4 | 4 | <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Настройки</a></li> |
5 | 5 | <?php |
6 | - $dataManagers = []; |
|
7 | - foreach ($managers as $manager) { |
|
8 | - $dataManager = new Ui\DataManager($manager); |
|
9 | - $dataManagers[$manager] = $dataManager; |
|
10 | - $code = 'tab_' . str_replace('\\', '_', $manager); |
|
11 | - echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>"; |
|
12 | - } |
|
13 | - ?> |
|
6 | + $dataManagers = []; |
|
7 | + foreach ($managers as $manager) { |
|
8 | + $dataManager = new Ui\DataManager($manager); |
|
9 | + $dataManagers[$manager] = $dataManager; |
|
10 | + $code = 'tab_' . str_replace('\\', '_', $manager); |
|
11 | + echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>"; |
|
12 | + } |
|
13 | + ?> |
|
14 | 14 | </ul> |
15 | 15 | <div class="tab-content"> |
16 | 16 | <div role="tabpanel" class="tab-pane fade in active" id="home"> |
@@ -52,17 +52,17 @@ discard block |
||
52 | 52 | </script> |
53 | 53 | </div> |
54 | 54 | <?php |
55 | - foreach ($dataManagers as $manager => $dataManager) { |
|
56 | - $code = 'tab_' . str_replace('\\', '_', $manager); |
|
57 | - ?> |
|
55 | + foreach ($dataManagers as $manager => $dataManager) { |
|
56 | + $code = 'tab_' . str_replace('\\', '_', $manager); |
|
57 | + ?> |
|
58 | 58 | <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>"> |
59 | 59 | <?php |
60 | 60 | $dataManager->draw(); |
61 | 61 | ?> |
62 | 62 | </div> |
63 | 63 | <?php |
64 | - } |
|
65 | - ?> |
|
64 | + } |
|
65 | + ?> |
|
66 | 66 | </div> |
67 | 67 | |
68 | 68 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | foreach ($managers as $manager) { |
8 | 8 | $dataManager = new Ui\DataManager($manager); |
9 | 9 | $dataManagers[$manager] = $dataManager; |
10 | - $code = 'tab_' . str_replace('\\', '_', $manager); |
|
10 | + $code = 'tab_'.str_replace('\\', '_', $manager); |
|
11 | 11 | echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>"; |
12 | 12 | } |
13 | 13 | ?> |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | </div> |
55 | 55 | <?php |
56 | 56 | foreach ($dataManagers as $manager => $dataManager) { |
57 | - $code = 'tab_' . str_replace('\\', '_', $manager); |
|
57 | + $code = 'tab_'.str_replace('\\', '_', $manager); |
|
58 | 58 | ?> |
59 | 59 | <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>"> |
60 | 60 | <?php |
@@ -50,12 +50,12 @@ |
||
50 | 50 | <td> |
51 | 51 | <ul> |
52 | 52 | <?php |
53 | - foreach ($card->levels as $level) { |
|
54 | - ?> |
|
53 | + foreach ($card->levels as $level) { |
|
54 | + ?> |
|
55 | 55 | <li><?= $level->name; ?> - <?= $level->discount->name; ?></li> |
56 | 56 | <?php |
57 | - } |
|
58 | - ?> |
|
57 | + } |
|
58 | + ?> |
|
59 | 59 | </ul> |
60 | 60 | </td> |
61 | 61 | <td> |
@@ -46,7 +46,7 @@ |
||
46 | 46 | static $forms = [ |
47 | 47 | 'manager' => [ |
48 | 48 | 'map' => [ |
49 | - ['name',], |
|
49 | + ['name', ], |
|
50 | 50 | ['price', 'currency_id'], |
51 | 51 | ['max_cart_price', 'icon_file_id'], |
52 | 52 | ['info'] |
@@ -39,7 +39,7 @@ |
||
39 | 39 | static $forms = [ |
40 | 40 | 'manager' => [ |
41 | 41 | 'map' => [ |
42 | - ['price', 'currency_id',], |
|
42 | + ['price', 'currency_id', ], |
|
43 | 43 | ['item_offer_price_type_id', 'item_offer_id'] |
44 | 44 | ] |
45 | 45 | ]]; |