From 12f603feee0ccfa39c2d5697811b28194764dff8 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 17 May 2020 21:38:37 +0900
Subject: [PATCH] Fix #1288 support meta keywords and description per domain

---
 classes/module/ModuleHandler.class.php     | 10 +++++++++-
 modules/admin/admin.admin.controller.php   |  6 ++++++
 modules/admin/tpl/config_domains_edit.html | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index de36828c0..a38e065df 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -300,7 +300,11 @@ class ModuleHandler extends Handler
 			{
 				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);
 			}
@@ -309,6 +313,10 @@ class ModuleHandler extends Handler
 			{
 				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)
 			{
 				Context::addMetaTag('description', $module_config->meta_description);
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 92844a274..7ae1e22cd 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -1054,6 +1054,10 @@ class adminAdminController extends admin
 			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.
 		$vars->html_header = utf8_trim($vars->html_header);
 		$vars->html_footer = utf8_trim($vars->html_footer);
@@ -1064,6 +1068,8 @@ class adminAdminController extends admin
 			'subtitle' => $vars->subtitle,
 			'language' => $vars->default_lang,
 			'timezone' => $vars->default_timezone,
+			'meta_keywords' => $vars->meta_keywords,
+			'meta_description' => $vars->meta_description,
 			'html_header' => $vars->html_header,
 			'html_footer' => $vars->html_footer,
 		);
diff --git a/modules/admin/tpl/config_domains_edit.html b/modules/admin/tpl/config_domains_edit.html
index 60111ab3f..965eb2c1f 100644
--- a/modules/admin/tpl/config_domains_edit.html
+++ b/modules/admin/tpl/config_domains_edit.html
@@ -94,6 +94,20 @@
 			</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">
 			<label class="x_control-label" for="html_header">{$lang->input_header_script}</label>
 			<div class="x_controls" style="margin-right:14px">