fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1288 support meta keywords and description per domain

Browse source
This commit is contained in:
Kijin Sung 2020-05-17 21:38:37 +09:00
parent 94ae4ccebe
commit 12f603feee
3 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/module/ModuleHandler.class.php
View file

@ -300,7 +300,11 @@ class ModuleHandler extends Handler
{ {
Context::addMetaTag('keywords', $module_info->meta_keywords); Context::addMetaTag('keywords', $module_info->meta_keywords);
} }
elseif($module_config->meta_keywords) elseif ($site_module_info->settings->meta_keywords)
{
Context::addMetaTag('keywords', $site_module_info->settings->meta_keywords);
}
elseif ($module_config->meta_keywords)
{ {
Context::addMetaTag('keywords', $module_config->meta_keywords); Context::addMetaTag('keywords', $module_config->meta_keywords);
} }
@ -309,6 +313,10 @@ class ModuleHandler extends Handler
{ {
Context::addMetaTag('description', $module_info->meta_description); Context::addMetaTag('description', $module_info->meta_description);
} }
elseif ($site_module_info->settings->meta_description)
{
Context::addMetaTag('description', $site_module_info->settings->meta_description);
}
elseif($module_config->meta_description) elseif($module_config->meta_description)
{ {
Context::addMetaTag('description', $module_config->meta_description); Context::addMetaTag('description', $module_config->meta_description);

6
modules/admin/admin.admin.controller.php
View file

@ -1054,6 +1054,10 @@ class adminAdminController extends admin
throw new Rhymix\Framework\Exception('msg_invalid_timezone'); throw new Rhymix\Framework\Exception('msg_invalid_timezone');
} }
// Clean up the meta keywords and description.
$vars->meta_keywords = utf8_trim($vars->meta_keywords);
$vars->meta_description = utf8_trim($vars->meta_description);
// Clean up the header and footer scripts. // Clean up the header and footer scripts.
$vars->html_header = utf8_trim($vars->html_header); $vars->html_header = utf8_trim($vars->html_header);
$vars->html_footer = utf8_trim($vars->html_footer); $vars->html_footer = utf8_trim($vars->html_footer);
@ -1064,6 +1068,8 @@ class adminAdminController extends admin
'subtitle' => $vars->subtitle, 'subtitle' => $vars->subtitle,
'language' => $vars->default_lang, 'language' => $vars->default_lang,
'timezone' => $vars->default_timezone, 'timezone' => $vars->default_timezone,
'meta_keywords' => $vars->meta_keywords,
'meta_description' => $vars->meta_description,
'html_header' => $vars->html_header, 'html_header' => $vars->html_header,
'html_footer' => $vars->html_footer, 'html_footer' => $vars->html_footer,
); );

14
modules/admin/tpl/config_domains_edit.html
View file

@ -94,6 +94,20 @@
</div> </div>
</div> </div>
<div class="x_control-group">
<label class="x_control-label" for="meta_keywords">{$lang->site_meta_keywords}</label>
<div class="x_controls">
<input type="text" name="meta_keywords" id="meta_keywords" value="{$domain_info ? $domain_info->settings->meta_keywords : ''}" class="lang_code" />
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="meta_description">{$lang->site_meta_description}</label>
<div class="x_controls">
<input type="text" name="meta_description" id="meta_description" value="{$domain_info ? $domain_info->settings->meta_description : ''}" class="lang_code" />
</div>
</div>
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label" for="html_header">{$lang->input_header_script}</label> <label class="x_control-label" for="html_header">{$lang->input_header_script}</label>
<div class="x_controls" style="margin-right:14px"> <div class="x_controls" style="margin-right:14px">