From 4bf232569cf8c345c54c77db1f4ff049f068d4d0 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 31 Mar 2021 21:01:07 +0900
Subject: [PATCH] Fix #1663 add meta tag for author

---
 classes/display/HTMLDisplayHandler.php   | 7 +++++++
 common/defaults/config.php               | 1 +
 modules/admin/admin.admin.controller.php | 1 +
 modules/admin/admin.admin.view.php       | 1 +
 modules/admin/lang/en.php                | 1 +
 modules/admin/lang/ko.php                | 1 +
 modules/admin/tpl/config_seo.html        | 7 +++++++
 7 files changed, 19 insertions(+)

diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index df5b9f261..e03c5cadd 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -611,6 +611,13 @@ class HTMLDisplayHandler
 			}
 		}
 		
+		// Add author name for articles.
+		if ($page_type === 'article' && $permitted && config('seo.og_use_nick_name'))
+		{
+			Context::addMetaTag('author', $oDocument->getNickName());
+			Context::addOpenGraphData('og:article:author', $oDocument->getNickName());
+		}
+		
 		// Add datetime for articles.
 		if ($page_type === 'article' && $permitted && config('seo.og_use_timestamps'))
 		{
diff --git a/common/defaults/config.php b/common/defaults/config.php
index 0dfba2d14..4e6376c7e 100644
--- a/common/defaults/config.php
+++ b/common/defaults/config.php
@@ -112,6 +112,7 @@ return array(
 		'og_extract_description' => false,
 		'og_extract_images' => false,
 		'og_extract_hashtags' => false,
+		'og_use_nick_name' => false,
 		'og_use_timestamps' => false,
 	),
 	'mediafilter' => array(
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 2edd737de..cdecdb1ab 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -989,6 +989,7 @@ class adminAdminController extends admin
 		Rhymix\Framework\Config::set('seo.og_extract_description', $vars->og_extract_description === 'Y');
 		Rhymix\Framework\Config::set('seo.og_extract_images', $vars->og_extract_images === 'Y');
 		Rhymix\Framework\Config::set('seo.og_extract_hashtags', $vars->og_extract_hashtags === 'Y');
+		Rhymix\Framework\Config::set('seo.og_use_nick_name', $vars->og_use_nick_name === 'Y');
 		Rhymix\Framework\Config::set('seo.og_use_timestamps', $vars->og_use_timestamps === 'Y');
 		Rhymix\Framework\Config::set('seo.twitter_enabled', $vars->twitter_enabled === 'Y');
 		
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index d482b625f..125b818e9 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -661,6 +661,7 @@ class adminAdminView extends admin
 		Context::set('og_extract_description', Rhymix\Framework\Config::get('seo.og_extract_description'));
 		Context::set('og_extract_images', Rhymix\Framework\Config::get('seo.og_extract_images'));
 		Context::set('og_extract_hashtags', Rhymix\Framework\Config::get('seo.og_extract_hashtags'));
+		Context::set('og_use_nick_name', Rhymix\Framework\Config::get('seo.og_use_nick_name'));
 		Context::set('og_use_timestamps', Rhymix\Framework\Config::get('seo.og_use_timestamps'));
 		Context::set('twitter_enabled', Rhymix\Framework\Config::get('seo.twitter_enabled'));
 		
diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php
index 27a2715de..c7b4a3c28 100644
--- a/modules/admin/lang/en.php
+++ b/modules/admin/lang/en.php
@@ -249,6 +249,7 @@ $lang->og_extract_description_fallback = 'Use general description only';
 $lang->og_extract_images = 'Extract Images from Document';
 $lang->og_extract_images_fallback = 'Use site default image only';
 $lang->og_extract_hashtags = 'Extract Hashtags from Document';
+$lang->og_use_nick_name = 'Include Author Name';
 $lang->og_use_timestamps = 'Include Timestamps';
 $lang->autoinstall = 'EasyInstall';
 $lang->last_week = 'Last Week';
diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php
index 375460897..92145acb8 100644
--- a/modules/admin/lang/ko.php
+++ b/modules/admin/lang/ko.php
@@ -245,6 +245,7 @@ $lang->og_extract_description_fallback = '모듈 또는 사이트 전체 설명
 $lang->og_extract_images = '본문에서 이미지 추출';
 $lang->og_extract_images_fallback = '사이트 대표 이미지 사용';
 $lang->og_extract_hashtags = '본문에서 해시태그 추출';
+$lang->og_use_nick_name = '글 작성자 이름 표시';
 $lang->og_use_timestamps = '글 작성/수정 시각 표시';
 $lang->autoinstall = '쉬운 설치';
 $lang->last_week = '지난주';
diff --git a/modules/admin/tpl/config_seo.html b/modules/admin/tpl/config_seo.html
index 68640f101..460d426fe 100644
--- a/modules/admin/tpl/config_seo.html
+++ b/modules/admin/tpl/config_seo.html
@@ -80,6 +80,13 @@
 				<label for="og_extract_hashtags_n" class="x_inline"><input type="radio" name="og_extract_hashtags" id="og_extract_hashtags_n" value="N" checked="checked"|cond="!$og_extract_hashtags" /> {$lang->cmd_no}</label>
 			</div>
 		</div>
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->og_use_nick_name}</label>
+			<div class="x_controls">
+				<label for="og_use_nick_name_y" class="x_inline"><input type="radio" name="og_use_nick_name" id="og_use_nick_name_y" value="Y" checked="checked"|cond="$og_use_nick_name" /> {$lang->cmd_yes}</label>
+				<label for="og_use_nick_name_n" class="x_inline"><input type="radio" name="og_use_nick_name" id="og_use_nick_name_n" value="N" checked="checked"|cond="!$og_use_nick_name" /> {$lang->cmd_no}</label>
+			</div>
+		</div>
 		<div class="x_control-group">
 			<label class="x_control-label">{$lang->og_use_timestamps}</label>
 			<div class="x_controls">