Skip to content

fix blog #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Serbulenko wants to merge 2 commits into
base: 3.0.4.5
Choose a base branch
from
Open

fix blog #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
824125d
fix blog
Serbulenko Jun 5, 2026
d988dae
remove var text
Serbulenko Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions upload/admin/controller/blog/article.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/blog/category.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,5 +660,5 @@ private function getAllCategories($categories, $parent_id = 0, $parent_name = ''
}
}
return $output;
}
}
}
46 changes: 1 addition & 45 deletions upload/admin/controller/blog/setting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions upload/admin/language/en-gb/blog/article.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 1 addition & 0 deletions upload/admin/language/ru-ru/blog/article.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
$_['entry_noindex'] = 'Индексация';
$_['entry_sort_order'] = 'Порядок сортировки';
$_['entry_category'] = 'Показывать в категориях';
$_['entry_date_available'] = 'Дата доступности';
$_['entry_main_category'] = 'Главная категория';
$_['entry_download'] = 'Загрузки';
$_['entry_related'] = 'Рекомендуемые статьи';
Expand Down
12 changes: 6 additions & 6 deletions upload/admin/model/blog/article.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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'])) {
Expand Down Expand Up @@ -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 . "'");
Expand All @@ -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 . "'");
Expand Down Expand Up @@ -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']
);
}

Expand Down
18 changes: 9 additions & 9 deletions upload/admin/model/blog/category.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
67 changes: 35 additions & 32 deletions upload/admin/view/template/blog/article_form.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@
<div class="text-danger">{{ error_name[language.language_id] }}</div>
{% endif %} </div>
</div>
<div class="form-group">
<div class="form-group">
<label class="col-sm-2 control-label" for="input-meta-h1{{ language.language_id }}">{{ entry_meta_h1 }}</label>
<div class="col-sm-10">
<input type="text" name="article_description[{{ language.language_id }}][meta_h1]" value="{{ article_description[language.language_id] ? article_description[language.language_id].meta_h1 }}" placeholder="{{ entry_meta_h1 }}" id="input-meta-h1{{ language.language_id }}" class="form-control" />
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-meta-title{{ language.language_id }}">{{ entry_meta_title }}</label>
<div class="col-sm-10">
<input type="text" name="article_description[{{ language.language_id }}][meta_title]" value="{{ article_description[language.language_id] ? article_description[language.language_id].meta_title }}" placeholder="{{ entry_meta_title }}" id="input-meta-title{{ language.language_id }}" class="form-control" />
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-meta-description{{ language.language_id }}">{{ entry_meta_description }}</label>
Expand All @@ -73,12 +73,18 @@
<textarea name="article_description[{{ language.language_id }}][meta_keyword]" rows="5" placeholder="{{ entry_meta_keyword }}" id="input-meta-keyword{{ language.language_id }}" class="form-control">{{ article_description[language.language_id] ? article_description[language.language_id].meta_keyword }}</textarea>
</div>
</div>
<div class="form-group">
<div class="form-group">
<label class="col-sm-2 control-label" for="input-description{{ language.language_id }}">{{ entry_description }}</label>
<div class="col-sm-10">
<textarea name="article_description[{{ language.language_id }}][description]" placeholder="{{ entry_description }}" id="input-description{{ language.language_id }}" data-toggle="summernote" data-lang="{{ summernote }}" class="form-control">{{ article_description[language.language_id] ? article_description[language.language_id].description }}</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-tag{{ language.language_id }}"><span data-toggle="tooltip" title="{{ help_tag }}">{{ entry_tag }}</span></label>
<div class="col-sm-10">
<input type="text" name="article_description[{{ language.language_id }}][tag]" value="{{ article_description[language.language_id] ? article_description[language.language_id].tag }}" placeholder="{{ entry_tag }}" id="input-tag{{ language.language_id }}" class="form-control" />
</div>
</div>
</div>
{% endfor %}</div>
</div>
Expand All @@ -87,28 +93,25 @@
<label class="col-sm-2 control-label" for="input-status">{{ entry_status }}</label>
<div class="col-sm-10">
<select name="status" id="input-status" class="form-control">


{% if status %}


<option value="1" selected="selected">{{ text_enabled }}</option>
<option value="0">{{ text_disabled }}</option>


{% else %}


<option value="1">{{ text_enabled }}</option>
<option value="0" selected="selected">{{ text_disabled }}</option>


{% endif %}


</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-date-available">{{ entry_date_available }}</label>
<div class="col-sm-3">
<div class="input-group date">
<input type="text" name="date_available" value="{{ date_available }}" placeholder="{{ entry_date_available }}" data-date-format="YYYY-MM-DD" id="input-date-available" class="form-control"/> <span class="input-group-btn">
<button class="btn btn-default" type="button"><i class="fa fa-calendar"></i></button>
</span></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-sort-order">{{ entry_sort_order }}</label>
<div class="col-sm-10">
Expand All @@ -128,21 +131,21 @@
{% endfor %}</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="select-main_category_id"><span data-toggle="tooltip" title="{{ help_main_category }}">{{ entry_main_category }}</span></label>
<div class="col-sm-10">
<select name="main_blog_category_id" class="form-control">
<option value="0" selected="selected">{{ text_none }}</option>
{% for category in categories %}
{% if category.blog_category_id == main_blog_category_id %}
<option value="{{ category.blog_category_id }}" selected="selected">{{ category.name }}</option>
{% else %}
<option value="{{ category.blog_category_id }}">{{ category.name }}</option>
{% endif %}
{% endfor %}
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="select-main_category_id"><span data-toggle="tooltip" title="{{ help_main_category }}">{{ entry_main_category }}</span></label>
<div class="col-sm-10">
<select name="main_blog_category_id" class="form-control">
<option value="0" selected="selected">{{ text_none }}</option>
{% for category in categories %}
{% if category.blog_category_id == main_blog_category_id %}
<option value="{{ category.blog_category_id }}" selected="selected">{{ category.name }}</option>
{% else %}
<option value="{{ category.blog_category_id }}">{{ category.name }}</option>
{% endif %}
{% endfor %}
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{ entry_store }}</label>
<div class="col-sm-10">
Expand Down
Loading