diff --git a/upload/admin/controller/blog/article.php b/upload/admin/controller/blog/article.php index 37bc2fd7..066231a9 100644 --- a/upload/admin/controller/blog/article.php +++ b/upload/admin/controller/blog/article.php @@ -582,6 +582,14 @@ protected function getForm() { $data['noindex'] = 1; } + if (isset($this->request->post['date_available'])) { + $data['date_available'] = $this->request->post['date_available']; + } elseif (!empty($article_info)) { + $data['date_available'] = ($article_info['date_available'] != '0000-00-00') ? $article_info['date_available'] : ''; + } else { + $data['date_available'] = date('Y-m-d'); + } + // Categories $this->load->model('blog/category'); diff --git a/upload/admin/controller/blog/category.php b/upload/admin/controller/blog/category.php index fc60e2d1..0a189e1d 100644 --- a/upload/admin/controller/blog/category.php +++ b/upload/admin/controller/blog/category.php @@ -660,5 +660,5 @@ private function getAllCategories($categories, $parent_id = 0, $parent_name = '' } } return $output; - } + } } \ No newline at end of file diff --git a/upload/admin/controller/blog/setting.php b/upload/admin/controller/blog/setting.php index cb90a02e..0edf681f 100644 --- a/upload/admin/controller/blog/setting.php +++ b/upload/admin/controller/blog/setting.php @@ -19,51 +19,7 @@ public function index() { $this->response->redirect($this->url->link('blog/setting', 'user_token=' . $this->session->data['user_token'], true)); } - - $data['heading_title'] = $this->language->get('heading_title'); - - $data['text_edit'] = $this->language->get('text_edit'); - $data['text_yes'] = $this->language->get('text_yes'); - $data['text_no'] = $this->language->get('text_no'); - $data['text_article'] = $this->language->get('text_article'); - $data['text_review'] = $this->language->get('text_review'); - $data['entry_article_limit'] = $this->language->get('entry_article_limit'); - $data['entry_article_description_length'] = $this->language->get('entry_article_description_length'); - $data['entry_limit_admin'] = $this->language->get('entry_limit_admin'); - $data['entry_article_count'] = $this->language->get('entry_article_count'); - $data['entry_blog_menu'] = $this->language->get('entry_blog_menu'); - $data['entry_article_download'] = $this->language->get('entry_article_download'); - $data['entry_review'] = $this->language->get('entry_review'); - $data['entry_review_guest'] = $this->language->get('entry_review_guest'); - $data['entry_review_mail'] = $this->language->get('entry_review_mail'); - $data['entry_image_category'] = $this->language->get('entry_image_category'); - $data['entry_image_article'] = $this->language->get('entry_image_article'); - $data['entry_image_related'] = $this->language->get('entry_image_related'); - $data['entry_width'] = $this->language->get('entry_width'); - $data['entry_height'] = $this->language->get('entry_height'); - $data['entry_name'] = $this->language->get('entry_name'); - $data['entry_html_h1'] = $this->language->get('entry_html_h1'); - $data['entry_meta_title'] = $this->language->get('entry_meta_title'); - $data['entry_meta_description'] = $this->language->get('entry_meta_description'); - $data['entry_meta_keyword'] = $this->language->get('entry_meta_keyword'); - - $data['help_comment'] = $this->language->get('help_comment'); - $data['help_article_limit'] = $this->language->get('help_article_limit'); - $data['help_article_description_length'] = $this->language->get('help_article_description_length'); - $data['help_limit_admin'] = $this->language->get('help_limit_admin'); - $data['help_article_count'] = $this->language->get('help_article_count'); - $data['help_blog_menu'] = $this->language->get('help_blog_menu'); - $data['help_review'] = $this->language->get('help_review'); - $data['help_review_guest'] = $this->language->get('help_review_guest'); - $data['help_review_mail'] = $this->language->get('help_review_mail'); - - $data['button_save'] = $this->language->get('button_save'); - $data['button_cancel'] = $this->language->get('button_cancel'); - - $data['tab_general'] = $this->language->get('tab_general'); - $data['tab_option'] = $this->language->get('tab_option'); - $data['tab_image'] = $this->language->get('tab_image'); - + if (isset($this->error['warning'])) { $data['error_warning'] = $this->error['warning']; } else { diff --git a/upload/admin/language/en-gb/blog/article.php b/upload/admin/language/en-gb/blog/article.php index 28d0abf3..c1138079 100644 --- a/upload/admin/language/en-gb/blog/article.php +++ b/upload/admin/language/en-gb/blog/article.php @@ -34,6 +34,7 @@ $_['entry_sort_order'] = 'Sort Order'; $_['entry_category'] = 'Categories'; $_['entry_main_category'] = 'Main Category'; +$_['entry_date_available'] = 'Date Available'; $_['entry_download'] = 'Downloads'; $_['entry_related'] = 'Related Article'; $_['entry_related_product'] = 'Related Products'; diff --git a/upload/admin/language/ru-ru/blog/article.php b/upload/admin/language/ru-ru/blog/article.php index b01e073a..ab361465 100644 --- a/upload/admin/language/ru-ru/blog/article.php +++ b/upload/admin/language/ru-ru/blog/article.php @@ -33,6 +33,7 @@ $_['entry_noindex'] = 'Индексация'; $_['entry_sort_order'] = 'Порядок сортировки'; $_['entry_category'] = 'Показывать в категориях'; +$_['entry_date_available'] = 'Дата доступности'; $_['entry_main_category'] = 'Главная категория'; $_['entry_download'] = 'Загрузки'; $_['entry_related'] = 'Рекомендуемые статьи'; diff --git a/upload/admin/model/blog/article.php b/upload/admin/model/blog/article.php index 4889e875..9d2526da 100644 --- a/upload/admin/model/blog/article.php +++ b/upload/admin/model/blog/article.php @@ -4,7 +4,7 @@ class ModelBlogArticle extends Model { public function addArticle($data) { - $this->db->query("INSERT INTO " . DB_PREFIX . "article SET status = '" . (int)$data['status'] . "', noindex = '" . (int)$data['noindex'] . "', sort_order = '" . (int)$data['sort_order'] . "', date_added = NOW()"); + $this->db->query("INSERT INTO " . DB_PREFIX . "article SET status = '" . (int)$data['status'] . "', noindex = '" . (int)$data['noindex'] . "', sort_order = '" . (int)$data['sort_order'] . "', date_available = '" . $this->db->escape($data['date_available']) . "', date_added = NOW()"); $article_id = $this->db->getLastId(); @@ -13,7 +13,7 @@ public function addArticle($data) { } foreach ($data['article_description'] as $language_id => $value) { - $this->db->query("INSERT INTO " . DB_PREFIX . "article_description SET article_id = '" . (int)$article_id . "', language_id = '" . (int)$language_id . "', name = '" . $this->db->escape($value['name']) . "', description = '" . $this->db->escape($value['description']) . "', meta_title = '" . $this->db->escape($value['meta_title']) . "', meta_h1 = '" . $this->db->escape($value['meta_h1']) . "', meta_description = '" . $this->db->escape($value['meta_description']) . "', meta_keyword = '" . $this->db->escape($value['meta_keyword']) . "'"); + $this->db->query("INSERT INTO " . DB_PREFIX . "article_description SET article_id = '" . (int)$article_id . "', language_id = '" . (int)$language_id . "', name = '" . $this->db->escape($value['name']) . "', description = '" . $this->db->escape($value['description']) . "', tag = '" . $this->db->escape($value['tag']) . "', meta_title = '" . $this->db->escape($value['meta_title']) . "', meta_h1 = '" . $this->db->escape($value['meta_h1']) . "', meta_description = '" . $this->db->escape($value['meta_description']) . "', meta_keyword = '" . $this->db->escape($value['meta_keyword']) . "'"); } if (isset($data['article_store'])) { @@ -90,8 +90,7 @@ public function addArticle($data) { } public function editArticle($article_id, $data) { - - $this->db->query("UPDATE " . DB_PREFIX . "article SET status = '" . (int)$data['status'] . "', noindex = '" . (int)$data['noindex'] . "', sort_order = '" . (int)$data['sort_order'] . "', date_modified = NOW() WHERE article_id = '" . (int)$article_id . "'"); + $this->db->query("UPDATE " . DB_PREFIX . "article SET status = '" . (int)$data['status'] . "', noindex = '" . (int)$data['noindex'] . "', sort_order = '" . (int)$data['sort_order'] . "', date_available = '" . $this->db->escape($data['date_available']) . "', date_modified = NOW() WHERE article_id = '" . (int)$article_id . "'"); if (isset($data['image'])) { $this->db->query("UPDATE " . DB_PREFIX . "article SET image = '" . $this->db->escape($data['image']) . "' WHERE article_id = '" . (int)$article_id . "'"); @@ -100,7 +99,7 @@ public function editArticle($article_id, $data) { $this->db->query("DELETE FROM " . DB_PREFIX . "article_description WHERE article_id = '" . (int)$article_id . "'"); foreach ($data['article_description'] as $language_id => $value) { - $this->db->query("INSERT INTO " . DB_PREFIX . "article_description SET article_id = '" . (int)$article_id . "', language_id = '" . (int)$language_id . "', name = '" . $this->db->escape($value['name']) . "', description = '" . $this->db->escape($value['description']) . "', meta_title = '" . $this->db->escape($value['meta_title']) . "', meta_h1 = '" . $this->db->escape($value['meta_h1']) . "', meta_description = '" . $this->db->escape($value['meta_description']) . "', meta_keyword = '" . $this->db->escape($value['meta_keyword']) . "'"); + $this->db->query("INSERT INTO " . DB_PREFIX . "article_description SET article_id = '" . (int)$article_id . "', language_id = '" . (int)$language_id . "', name = '" . $this->db->escape($value['name']) . "', description = '" . $this->db->escape($value['description']) . "', tag = '" . $this->db->escape($value['tag']) . "', meta_title = '" . $this->db->escape($value['meta_title']) . "', meta_h1 = '" . $this->db->escape($value['meta_h1']) . "', meta_description = '" . $this->db->escape($value['meta_description']) . "', meta_keyword = '" . $this->db->escape($value['meta_keyword']) . "'"); } $this->db->query("DELETE FROM " . DB_PREFIX . "article_to_store WHERE article_id = '" . (int)$article_id . "'"); @@ -318,7 +317,8 @@ public function getArticleDescriptions($article_id) { 'meta_title' => $result['meta_title'], 'meta_h1' => $result['meta_h1'], 'meta_description' => $result['meta_description'], - 'meta_keyword' => $result['meta_keyword'] + 'meta_keyword' => $result['meta_keyword'], + 'tag' => $result['tag'] ); } diff --git a/upload/admin/model/blog/category.php b/upload/admin/model/blog/category.php index e020380c..4951ae1c 100644 --- a/upload/admin/model/blog/category.php +++ b/upload/admin/model/blog/category.php @@ -256,16 +256,16 @@ public function getCategoriesByParentId($parent_id = 0) { } public function getAllCategories() { - $category_data = $this->cache->get('category.all.' . $this->config->get('config_language_id') . '.' . (int)$this->config->get('config_store_id')); + $category_data = $this->cache->get('blog_category.all.' . $this->config->get('config_language_id') . '.' . (int)$this->config->get('config_store_id')); if (!$category_data || !is_array($category_data)) { - - $query = $this->db->query("SELECT * FROM " . DB_PREFIX . "blog_category c LEFT JOIN " . DB_PREFIX . "blog_category_description cd ON (c.blog_category_id = cd.blog_category_id) LEFT JOIN " . DB_PREFIX . "blog_category_to_store c2s ON (c.blog_category_id = c2s.blog_category_id) WHERE cd.language_id = '" . (int)$this->config->get('config_language_id') . "' AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "' ORDER BY c.parent_id, c.sort_order, cd.name"); - $category_data = array(); - - foreach ($query->rows as $row) { - $category_data[$row['parent_id']][$row['blog_category_id']] = $row; - } - $this->cache->set('category.all.' . $this->config->get('config_language_id') . '.' . (int)$this->config->get('config_store_id'), $category_data); + + $query = $this->db->query("SELECT * FROM " . DB_PREFIX . "blog_category c LEFT JOIN " . DB_PREFIX . "blog_category_description cd ON (c.blog_category_id = cd.blog_category_id) LEFT JOIN " . DB_PREFIX . "blog_category_to_store c2s ON (c.blog_category_id = c2s.blog_category_id) WHERE cd.language_id = '" . (int)$this->config->get('config_language_id') . "' AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "' ORDER BY c.parent_id, c.sort_order, cd.name"); + $category_data = array(); + + foreach ($query->rows as $row) { + $category_data[$row['parent_id']][$row['blog_category_id']] = $row; + } + $this->cache->set('blog_category.all.' . $this->config->get('config_language_id') . '.' . (int)$this->config->get('config_store_id'), $category_data); } return $category_data; diff --git a/upload/admin/view/template/blog/article_form.twig b/upload/admin/view/template/blog/article_form.twig index d29eaa10..e9ee579a 100644 --- a/upload/admin/view/template/blog/article_form.twig +++ b/upload/admin/view/template/blog/article_form.twig @@ -49,17 +49,17 @@
{{ error_name[language.language_id] }}
{% endif %} -
+
-
-
+
+
-
+
@@ -73,12 +73,18 @@
-
+
+
+ +
+ +
+
{% endfor %} @@ -87,28 +93,25 @@
+
+ +
+
+ + +
+
+
@@ -128,21 +131,21 @@ {% endfor %}
-
- -
- -
-
+
+ +
+ +
+
diff --git a/upload/admin/view/template/blog/setting.twig b/upload/admin/view/template/blog/setting.twig index be55afd3..7276893b 100644 --- a/upload/admin/view/template/blog/setting.twig +++ b/upload/admin/view/template/blog/setting.twig @@ -31,43 +31,43 @@
-
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
+
+
{{ text_article }} @@ -121,7 +121,7 @@ {% endif %}
-
+
-
+