Skip to content

sitemap and meta tags for public faq questions #2

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
alexmuz wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

sitemap and meta tags for public faq questions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion lib/actions/faq/helpdeskFaqSave.controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,11 @@ public function getData()
$data['is_backend'] = waRequest::request('is_backend', 0, waRequest::TYPE_INT);
$data['comment'] = waRequest::request('comment', null, waRequest::TYPE_STRING_TRIM);
$data['url'] = waRequest::request('faq_url', '', waRequest::TYPE_STRING_TRIM);
$data['title'] = waRequest::post('title', '', waRequest::TYPE_STRING_TRIM);
$data['keywords'] = waRequest::post('keywords', '', waRequest::TYPE_STRING_TRIM);
$data['description'] = waRequest::post('description', '', waRequest::TYPE_STRING_TRIM);
return $data;
}
}

// EOF
// EOF
8 changes: 8 additions & 0 deletions lib/actions/frontend/helpdeskFrontendFaqCategoryQuestion.action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ public function execute()

$this->setThemeTemplate('faq.category.question.html');
$this->getResponse()->setTitle($faq['question']);
if (!empty($faq['title'])) {
$this->getResponse()->setTitle($faq['title']);
}
$meta = array('keywords', 'description');
foreach ($meta as $meta_field)
if (!empty($faq[$meta_field])) {
$this->getResponse()->setMeta($meta_field, $faq[$meta_field]);
}
$this->view->assign('category', $category);
$this->view->assign('faq', $faq);

Expand Down
4 changes: 4 additions & 0 deletions lib/config/db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
'is_backend' => array('tinyint', 1, 'null' => 0, 'default' => '0'),
'url' => array('varchar', 255),
'comment' => array('text'),
'title' => array('varchar', 255, 'null' => 0),
'description' => array('varchar', 255, 'null' => 0),
'keywords' => array('varchar', 255, 'null' => 0),
'update_datetime' => array('datetime'),
':keys' => array(
'PRIMARY' => 'id',
),
Expand Down
47 changes: 47 additions & 0 deletions lib/config/helpdeskSitemapConfig.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

class helpdeskSitemapConfig extends waSitemapConfig
{
public function execute()
{
$routes = $this->getRoutes();

$fcm = new helpdeskFaqCategoryModel();
$page_model = new helpdeskPageModel();

foreach ($routes as $route) {
$this->routing->setRoute($route);
$u = $this->getUrlByRoute($route);
$domain = $this->routing->getDomain(null, true);
$route_url = $domain.'/'.$this->routing->getRoute('url');
$route_url = trim(rtrim($route_url, '*/'));

$categories = $fcm->getList('', array(
'is_public' => true,
'routes' => array($route_url)
));
foreach ($categories as $c) {
$c_url = $u . 'faq/';
if (!empty($c['url'])) {
$c_url .= $c['url'] . '/';
}
$fm = new helpdeskFaqModel();
$faq_list = $fm->getByFaqCategory($c['id'], true);
$lastmod = 0;
foreach ($faq_list as $row) {
$faq_lastmod = strtotime(!empty($row['update_datetime']) ? $row['update_datetime'] : $row['create_datetime']);
if ($faq_lastmod > $lastmod) {
$lastmod = $faq_lastmod;
}
$this->addUrl($c_url.$row['url'].'/', $faq_lastmod, self::CHANGE_MONTHLY, 0.8);
}
if (!$lastmod) {
$lastmod = date('Y-m-d H:i:s');
}
$this->addUrl($c_url, $lastmod, self::CHANGE_WEEKLY, 0.2);
}
// pages
$this->addPages($page_model, $route);
}
}
}
2 changes: 2 additions & 0 deletions lib/model/helpdeskFaq.model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class helpdeskFaqModel extends waModel
public function add($data)
{
$data['create_datetime'] = date('Y-m-d H:i:s');
$data['update_datetime'] = date('Y-m-d H:i:s');
$data['contact_id'] = wa()->getUser()->getId();

if (empty($data['faq_category_id'])) {
Expand Down Expand Up @@ -51,6 +52,7 @@ public function update($id, $data) {
if (!$item) {
return false;
}
$data['update_datetime'] = date('Y-m-d H:i:s');
$this->updateById($id, $data);
$this->copyAnswerFiles($id);
if ($item['faq_category_id'] != $data['faq_category_id']) {
Expand Down
18 changes: 18 additions & 0 deletions lib/updates/1.2/1552280450.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

$m = new waModel();

$columns = array('title', 'description', 'keywords');
foreach ($columns as $column) {
try {
$m->query('SELECT '.$column.' FROM `helpdesk_faq` WHERE 0');
} catch (waDbException $e) {
$m->exec('ALTER TABLE `helpdesk_faq` ADD COLUMN `'.$column.'` VARCHAR(255) NOT NULL');
}
}

try {
$m->query('SELECT `update_datetime` FROM `helpdesk_faq` WHERE 0');
} catch (waDbException $e) {
$m->exec('ALTER TABLE `helpdesk_faq` ADD COLUMN `update_datetime` DATETIME NULL DEFAULT NULL');
}
13 changes: 13 additions & 0 deletions templates/actions/faq/Faq.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,19 @@
</div>
</div>
</div>

<div class="field h-frontend-url {if !$faq.is_public}hidden{/if}">
<div class="name">[s`<strong class="title">Title</strong>`] <span class="hint">&lt;title&gt;</span></div>
<div class="value"><input type="text" name="title" value="" class="bold long"></div>
</div>
<div class="field h-frontend-url {if !$faq.is_public}hidden{/if}">
<div class="name">[s`META Keywords`]</div>
<div class="value"><input type="text" name="keywords" value=""></div>
</div>
<div class="field h-frontend-url {if !$faq.is_public}hidden{/if}">
<div class="name">[s`META Description`]</div>
<div class="value"><textarea name="description"></textarea></div>
</div>
{/if}

</div>
Expand Down