@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return function ($step = NULL, $params = array()) { |
|
| 3 | +return function($step = NULL, $params = array()) { |
|
| 4 | 4 | $statuses = [ |
| 5 | 5 | [ |
| 6 | 6 | 'name' => 'Онлайн', |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | $widgetSize = !empty($section['size']) ? $section['size'] : 1; |
| 12 | - $rowSum+=$widgetSize; |
|
| 12 | + $rowSum += $widgetSize; |
|
| 13 | 13 | ?> |
| 14 | 14 | <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div> |
| 15 | 15 | <?php |
@@ -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,19 +2,31 @@ |
||
| 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>Контактный email</label> |
| 9 | - <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' /> |
|
| 12 | + <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) { |
|
| 13 | + echo \App::$primary->config['site']['email']; |
|
| 14 | +} |
|
| 15 | +?>' /> |
|
| 10 | 16 | </div> |
| 11 | 17 | <div class ="form-group"> |
| 12 | 18 | <label>Ключевые слова</label> |
| 13 | - <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' /> |
|
| 19 | + <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) { |
|
| 20 | + echo \App::$primary->config['site']['keywords']; |
|
| 21 | +} |
|
| 22 | +?>' /> |
|
| 14 | 23 | </div> |
| 15 | 24 | <div class ="form-group"> |
| 16 | 25 | <label>Краткое описание сайта</label> |
| 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']; ?>' /> |
|
| 26 | + <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) { |
|
| 27 | + echo \App::$primary->config['site']['description']; |
|
| 28 | +} |
|
| 29 | +?>' /> |
|
| 18 | 30 | </div> |
| 19 | 31 | <?php |
| 20 | 32 | $form = new Ui\Form(); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return function ($step = NULL, $params = array()) { |
|
| 3 | +return function($step = NULL, $params = array()) { |
|
| 4 | 4 | App::$cur->db->createTable('dashboard_comment', [ |
| 5 | 5 | 'comment_id' => 'pk', |
| 6 | 6 | 'comment_text' => 'text NOT NULL', |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | |
| 56 | 56 | 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; |
@@ -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 { |
@@ -13,11 +13,11 @@ |
||
| 13 | 13 | |
| 14 | 14 | class Mysql extends \Object |
| 15 | 15 | { |
| 16 | - public $config = array(); // настройки подключения выбраной базы |
|
| 17 | - public $connect = FALSE; // ярлык соединения с MySQL |
|
| 18 | - public $encoding = 'utf-8'; // установленная кодировка |
|
| 19 | - public $db_name = 'test'; // выбраная в данный момент база |
|
| 20 | - public $table_prefix = 'inji_'; // префикс названий таблиц |
|
| 16 | + public $config = array(); // настройки подключения выбраной базы |
|
| 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 = ''; |
@@ -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(); |
@@ -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 | |
@@ -3,13 +3,13 @@ |
||
| 3 | 3 | ?> |
| 4 | 4 | <ul class="nav nav-list-main"> |
| 5 | 5 | <?php |
| 6 | - $catalogs = Catalog::get_list(['order' => ['catalog_name', 'asc']]); |
|
| 7 | - foreach ($catalogs as $catalog) { |
|
| 8 | - if ($catalog->catalog_parent_id == 0) { |
|
| 9 | - showChildsCatalogs($catalog, $catalogs, $catalogIds); |
|
| 10 | - } |
|
| 11 | - } |
|
| 12 | - ?> |
|
| 6 | + $catalogs = Catalog::get_list(['order' => ['catalog_name', 'asc']]); |
|
| 7 | + foreach ($catalogs as $catalog) { |
|
| 8 | + if ($catalog->catalog_parent_id == 0) { |
|
| 9 | + showChildsCatalogs($catalog, $catalogs, $catalogIds); |
|
| 10 | + } |
|
| 11 | + } |
|
| 12 | + ?> |
|
| 13 | 13 | </ul> |
| 14 | 14 | <?php |
| 15 | 15 | function showChildsCatalogs($parent, $catalogs, $catalogIds) |
@@ -268,7 +268,7 @@ |
||
| 268 | 268 | $result->send(); |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | - $item->sales ++; |
|
| 271 | + $item->sales++; |
|
| 272 | 272 | $item->save(); |
| 273 | 273 | |
| 274 | 274 | if (empty($_GET['count'])) |
@@ -271,10 +271,11 @@ discard block |
||
| 271 | 271 | $item->sales ++; |
| 272 | 272 | $item->save(); |
| 273 | 273 | |
| 274 | - if (empty($_GET['count'])) |
|
| 275 | - $count = 1; |
|
| 276 | - else |
|
| 277 | - $count = (float) $_GET['count']; |
|
| 274 | + if (empty($_GET['count'])) { |
|
| 275 | + $count = 1; |
|
| 276 | + } else { |
|
| 277 | + $count = (float) $_GET['count']; |
|
| 278 | + } |
|
| 278 | 279 | |
| 279 | 280 | $cart = $this->ecommerce->getCurCart(); |
| 280 | 281 | |
@@ -313,8 +314,9 @@ discard block |
||
| 313 | 314 | |
| 314 | 315 | function delcartitemAction($cci_id = 0) |
| 315 | 316 | { |
| 316 | - if (empty($_SESSION['cart']['cart_id'])) |
|
| 317 | - exit('У вас нет корзины'); |
|
| 317 | + if (empty($_SESSION['cart']['cart_id'])) { |
|
| 318 | + exit('У вас нет корзины'); |
|
| 319 | + } |
|
| 318 | 320 | $cartItem = \Ecommerce\Cart\Item::get((int) $cci_id); |
| 319 | 321 | if (!$cartItem || $cartItem->cart_id != $_SESSION['cart']['cart_id']) { |
| 320 | 322 | exit('Этот элемент корзины не относится к вашей корзине'); |