From 71651c0542e695fe29a6d46233cdaff7143ef0dc Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 31 Aug 2018 12:27:03 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=EC=97=94=EC=A7=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A7=91=EC=9D=B4=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=20=EB=8C=80?=
 =?UTF-8?q?=ED=95=9C=20robots=20=EB=A9=94=ED=83=80=20=ED=83=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

xpressengine/xe-core#2293 patch by @bnu
---
 classes/module/ModuleHandler.class.php     | 15 ++++++++++
 modules/board/conf/module.xml              | 14 ++++-----
 modules/communication/conf/module.xml      | 14 ++++-----
 modules/document/conf/module.xml           | 10 +++----
 modules/editor/conf/module.xml             | 12 ++++----
 modules/install/conf/module.xml            |  8 ++---
 modules/integration_search/conf/module.xml |  2 +-
 modules/krzip/conf/module.xml              |  2 +-
 modules/layout/conf/module.xml             |  4 +--
 modules/member/conf/module.xml             | 34 +++++++++++-----------
 modules/message/conf/module.xml            |  2 +-
 modules/module/conf/module.xml             |  8 ++---
 modules/module/module.model.php            |  3 ++
 modules/widget/conf/module.xml             |  8 ++---
 14 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 757c2576c..9c40644cc 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -442,7 +442,13 @@ class ModuleHandler extends Handler
 		// get type, kind
 		$type = $xml_info->action->{$this->act}->type;
 		$ruleset = $xml_info->action->{$this->act}->ruleset;
+		$meta_noindex = $xml_info->action->{$this->act}->meta_noindex;
 		$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
+		if ($meta_noindex === 'true')
+		{
+			Context::addMetaTag('robots', 'noindex');
+		}
+
 		if(!$kind && $this->module == 'admin')
 		{
 			$kind = 'admin';
@@ -559,6 +565,7 @@ class ModuleHandler extends Handler
 					$forward->module = $module;
 					$forward->type = $xml_info->action->{$this->act}->type;
 					$forward->ruleset = $xml_info->action->{$this->act}->ruleset;
+					$forward->meta_noindex = $xml_info->action->{$this->act}->meta_noindex;
 					$forward->act = $this->act;
 				}
 				else
@@ -585,6 +592,10 @@ class ModuleHandler extends Handler
 				$ruleset = $forward->ruleset;
 				$tpl_path = $oModule->getTemplatePath();
 				$orig_module = $oModule;
+				if($forward->meta_noindex === 'true')
+				{
+					Context::addMetaTag('robots', 'noindex');
+				}
 				
 				$xml_info = $oModuleModel->getModuleActionXml($forward->module);
 				
@@ -781,6 +792,10 @@ class ModuleHandler extends Handler
 			}
 		}
 
+		if ($kind === 'admin') {
+			Context::addMetaTag('robots', 'noindex');
+		}
+
 		// if failed message exists in session, set context
 		self::_setInputErrorToContext();
 
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index e8850f127..8bd36c9cd 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -57,13 +57,13 @@
 	</grants>
 	<actions>
 		<action name="dispBoardContent" type="view" permission="list" standalone="false" index="true" />
-		<action name="dispBoardWrite" type="view" permission="write_document" standalone="false" />
-		<action name="dispBoardDelete" type="view" permission="write_document" standalone="false" />
-		<action name="dispBoardWriteComment" type="view" permission="write_comment" standalone="false" />
-		<action name="dispBoardReplyComment" type="view" permission="write_comment" standalone="false" />
-		<action name="dispBoardModifyComment" type="view" permission="write_comment" standalone="false" />
-		<action name="dispBoardDeleteComment" type="view" permission="write_comment" standalone="false" />
-		<action name="dispBoardDeleteTrackback" type="view" permission="list,view" standalone="false" />
+		<action name="dispBoardWrite" type="view" permission="write_document" standalone="false" meta-noindex="true" />
+		<action name="dispBoardDelete" type="view" permission="write_document" standalone="false" meta-noindex="true" />
+		<action name="dispBoardWriteComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" />
+		<action name="dispBoardReplyComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" />
+		<action name="dispBoardModifyComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" />
+		<action name="dispBoardDeleteComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" />
+		<action name="dispBoardDeleteTrackback" type="view" permission="list,view" standalone="false" meta-noindex="true" />
 		<action name="dispBoardContentList" type="view" permission="list" standalone="false" />
 		<action name="dispBoardContentView" type="view" permission="view" standalone="false" />
 		<action name="dispBoardUpdateLog" type="view" permission="update_view" standalone="false" />
diff --git a/modules/communication/conf/module.xml b/modules/communication/conf/module.xml
index aa4d13f61..51fe0c009 100644
--- a/modules/communication/conf/module.xml
+++ b/modules/communication/conf/module.xml
@@ -2,13 +2,13 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispCommunicationMessages" type="view" permission="member" />
-		<action name="dispCommunicationSendMessage" type="view" permission="member" />
-		<action name="dispCommunicationNewMessage" type="view" permission="member" />
-		<action name="dispCommunicationFriend" type="view" permission="member" />
-		<action name="dispCommunicationAddFriend" type="view" permission="member" />
-		<action name="dispCommunicationAddFriendGroup" type="view" permission="member" />
-		<action name="dispCommunicationMessageBoxList" type="mobile" permission="member" />
+		<action name="dispCommunicationMessages" type="view" permission="member" meta-noindex="true" />
+		<action name="dispCommunicationSendMessage" type="view" permission="member" meta-noindex="true" />
+		<action name="dispCommunicationNewMessage" type="view" permission="member" meta-noindex="true" />
+		<action name="dispCommunicationFriend" type="view" permission="member" meta-noindex="true" />
+		<action name="dispCommunicationAddFriend" type="view" permission="member" meta-noindex="true" />
+		<action name="dispCommunicationAddFriendGroup" type="view" permission="member" meta-noindex="true" />
+		<action name="dispCommunicationMessageBoxList" type="mobile" permission="member" meta-noindex="true" />
 		
 		<action name="procCommunicationUpdateAllowMessage" type="controller" permission="member" />
 		<action name="procCommunicationSendMessage" type="controller" permission="member" ruleset="sendMessage" />
diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index 8f6938d8e..daa47a554 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -2,11 +2,11 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispDocumentPrint" type="view" />
-		<action name="dispDocumentPreview" type="view" />
-		<action name="dispTempSavedList" type="view" permission="member" />
-		<action name="dispDocumentDeclare" type="view" permission="member" />
-		<action name="dispDocumentManageDocument" type="view" permission="all-managers" />
+		<action name="dispDocumentPrint" type="view" meta-noindex="true"/>
+		<action name="dispDocumentPreview" type="view" meta-noindex="true"/>
+		<action name="dispTempSavedList" type="view" permission="member" meta-noindex="true"/>
+		<action name="dispDocumentDeclare" type="view" permission="member" meta-noindex="true" />
+		<action name="dispDocumentManageDocument" type="view" permission="all-managers" meta-noindex="true" />
 		
 		<action name="getDocumentMenu" type="model" />
 		<action name="getDocumentCategories" type="model" permission="all-managers" />
diff --git a/modules/editor/conf/module.xml b/modules/editor/conf/module.xml
index 7a65b3342..2e6f733a0 100644
--- a/modules/editor/conf/module.xml
+++ b/modules/editor/conf/module.xml
@@ -2,12 +2,12 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispEditorComponentInfo" type="view" />
-		<action name="dispEditorFrame" type="view" />
-		<action name="dispEditorPopup" type="view" />
-		<action name="dispEditorPreview" type="view" />
-		<action name="dispEditorSkinColorset" type="view" permission="all-managers" />
-		<action name="dispEditorConfigPreview" type="view" permission="root" />
+		<action name="dispEditorComponentInfo" type="view" meta-noindex="true" />
+		<action name="dispEditorFrame" type="view" meta-noindex="true" />
+		<action name="dispEditorPopup" type="view" meta-noindex="true" />
+		<action name="dispEditorPreview" type="view" meta-noindex="true" />
+		<action name="dispEditorSkinColorset" type="view" permission="all-managers" meta-noindex="true" />
+		<action name="dispEditorConfigPreview" type="view" permission="root" meta-noindex="true" />
 		
 		<action name="procEditorCall" type="controller" />
 		<action name="procEditorSaveDoc" type="controller" />
diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml
index 3e754457f..0ec77e232 100644
--- a/modules/install/conf/module.xml
+++ b/modules/install/conf/module.xml
@@ -2,10 +2,10 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispInstallIndex" type="view" index="true" />
-		<action name="dispInstallCheckEnv" type="view" />
-		<action name="dispInstallDBConfig" type="view" />
-		<action name="dispInstallOtherConfig" type="view" />
+		<action name="dispInstallIndex" type="view" index="true" meta-noindex="true" />
+		<action name="dispInstallCheckEnv" type="view" meta-noindex="true" />
+		<action name="dispInstallDBConfig" type="view" meta-noindex="true" />
+		<action name="dispInstallOtherConfig" type="view" meta-noindex="true" />
 		
 		<action name="getInstallFTPList" type="model" permission="root" />
 		
diff --git a/modules/integration_search/conf/module.xml b/modules/integration_search/conf/module.xml
index c4df18f19..89e20d10a 100644
--- a/modules/integration_search/conf/module.xml
+++ b/modules/integration_search/conf/module.xml
@@ -2,7 +2,7 @@
 <module>
 	<grants />
 	<actions>
-		<action name="IS" type="view" />
+		<action name="IS" type="view" meta-noindex="true" />
 		
 		<action name="dispIntegration_searchAdminContent" type="view" admin_index="true" />
 		<action name="dispIntegration_searchAdminSkinInfo" type="view" />
diff --git a/modules/krzip/conf/module.xml b/modules/krzip/conf/module.xml
index 8b783749b..b773637a0 100644
--- a/modules/krzip/conf/module.xml
+++ b/modules/krzip/conf/module.xml
@@ -2,7 +2,7 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispKrzipSearchForm" type="view" />
+		<action name="dispKrzipSearchForm" type="view" meta-noindex="true" />
 		<action name="getKrzipCodeList" type="model" />
 		
 		<action name="dispKrzipAdminConfig" type="view" menu_name="krzip" menu_index="true" admin_index="true" />
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index b6240195a..60b2ea8f3 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -2,8 +2,8 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispLayoutPreview" type="view" permission="root" />
-		<action name="dispLayoutPreviewWithModule" type="view" permission="root" />
+		<action name="dispLayoutPreview" type="view" permission="root" meta-noindex="true" />
+		<action name="dispLayoutPreviewWithModule" type="view" permission="root" meta-noindex="true" />
 		<action name="getLayoutInstanceListForJSONP" type="model" permission="root" />
 		
 		<action name="dispLayoutAdminInstalledList" type="view" admin_index="true" menu_name="installedLayout" menu_index="true" />
diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index fc326f3b6..a09502bc5 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -2,23 +2,23 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispMemberSignUpForm" type="view" />
-		<action name="dispMemberLoginForm" type="view" />
-		<action name="dispMemberFindAccount" type="view" />
-		<action name="dispMemberResendAuthMail" type="view" />
-		<action name="dispMemberInfo" type="view" permission="member" />
-		<action name="dispMemberModifyInfo" type="view" permission="member" />
-		<action name="dispMemberModifyPassword" type="view" permission="member" />
-		<action name="dispMemberModifyEmailAddress" type="view" permission="member" />
-		<action name="dispMemberLeave" type="view" permission="member" />
-		<action name="dispMemberScrappedDocument" type="view" permission="member" />
-		<action name="dispMemberSavedDocument" type="view" permission="member" />
-		<action name="dispMemberOwnDocument" type="view" permission="member" />
-		<action name="dispMemberOwnComment" type="view" permission="member" />
-		<action name="dispMemberActiveLogins" type="view" permission="member" />
-		<action name="dispMemberModifyNicknameLog" type="view" permission="member" />
-		<action name="dispMemberLogout" type="view" permission="member" />
-		<action name="dispMemberSpammer" type="view" permission="manager" check_var="module_srl" />
+		<action name="dispMemberSignUpForm" type="view" meta-noindex="true" />
+		<action name="dispMemberLoginForm" type="view" meta-noindex="true" />
+		<action name="dispMemberFindAccount" type="view" meta-noindex="true" />
+		<action name="dispMemberResendAuthMail" type="view" meta-noindex="true" />
+		<action name="dispMemberInfo" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberModifyInfo" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberModifyPassword" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberModifyEmailAddress" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberLeave" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberScrappedDocument" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberSavedDocument" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberOwnDocument" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberOwnComment" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberActiveLogins" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberModifyNicknameLog" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberLogout" type="view" permission="member" meta-noindex="true" />
+		<action name="dispMemberSpammer" type="view" permission="manager" check_var="module_srl" meta-noindex="true" />
 		
 		<action name="getMemberMenu" type="model" />
 		<action name="getApiGroups" type="model" permission="root" />
diff --git a/modules/message/conf/module.xml b/modules/message/conf/module.xml
index 4c9a34a30..5f714cb0c 100644
--- a/modules/message/conf/module.xml
+++ b/modules/message/conf/module.xml
@@ -2,7 +2,7 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispMessage" type="view" index="true" />
+		<action name="dispMessage" type="view" index="true" meta-noindex="true" />
 		
 		<action name="dispMessageAdminConfig" type="view" admin_index="true" />
 		<action name="procMessageAdminInsertConfig" type="controller" />
diff --git a/modules/module/conf/module.xml b/modules/module/conf/module.xml
index cb51d153e..4a4e15ac9 100644
--- a/modules/module/conf/module.xml
+++ b/modules/module/conf/module.xml
@@ -2,10 +2,10 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispModuleSelectList" type="view" permission="all-managers" />
-		<action name="dispModuleSkinInfo" type="view" permission="all-managers" />
-		<action name="dispModuleFileBox" type="view" permission="root" />
-		<action name="dispModuleFileBoxAdd" type="view" permission="root" />
+		<action name="dispModuleSelectList" type="view" permission="all-managers" meta-noindex="true" />
+		<action name="dispModuleSkinInfo" type="view" permission="all-managers" meta-noindex="true" />
+		<action name="dispModuleFileBox" type="view" permission="root" meta-noindex="true" />
+		<action name="dispModuleFileBoxAdd" type="view" permission="root" meta-noindex="true" />
 		<action name="dispModuleChangeLang" type="mobile" />
 		
 		<action name="getModuleSkinInfoList" type="model" permission="root" />
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index f6ca24970..0762cc38f 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -949,6 +949,7 @@ class moduleModel extends module
 					$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
 					$method = $action->attrs->method?$action->attrs->method:'';
 					$check_csrf = $action->attrs->check_csrf=='false'?'false':'true';
+					$meta_noindex = $action->attrs->{'meta-noindex'} === 'true' ? 'true' : 'false';
 					
 					$index = $action->attrs->index;
 					$admin_index = $action->attrs->admin_index;
@@ -963,6 +964,7 @@ class moduleModel extends module
 					$info->action->{$name}->ruleset = $ruleset;
 					$info->action->{$name}->method = $method;
 					$info->action->{$name}->check_csrf = $check_csrf;
+					$info->action->{$name}->meta_noindex = $meta_noindex;
 					if($action->attrs->menu_name)
 					{
 						$info->menu->{$action->attrs->menu_name} = new stdClass();
@@ -987,6 +989,7 @@ class moduleModel extends module
 					$buff[] = sprintf('$info->action->%s->ruleset=\'%s\';', $name, $ruleset);
 					$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
 					$buff[] = sprintf('$info->action->%s->check_csrf=\'%s\';', $name, $check_csrf);
+					$buff[] = sprintf('$info->action->%s->meta_noindex=\'%s\';', $name, $meta_noindex);
 
 					if($index=='true')
 					{
diff --git a/modules/widget/conf/module.xml b/modules/widget/conf/module.xml
index d7985a382..08a43a33f 100644
--- a/modules/widget/conf/module.xml
+++ b/modules/widget/conf/module.xml
@@ -2,10 +2,10 @@
 <module>
 	<grants />
 	<actions>
-		<action name="dispWidgetInfo" type="view" permission="all-managers" />
-		<action name="dispWidgetGenerateCode" type="view" permission="root" />
-		<action name="dispWidgetGenerateCodeInPage" type="view" permission="all-managers" />
-		<action name="dispWidgetStyleGenerateCodeInPage" type="view" permission="all-managers" />
+		<action name="dispWidgetInfo" type="view" permission="all-managers" meta-noindex="true" />
+		<action name="dispWidgetGenerateCode" type="view" permission="root" meta-noindex="true" />
+		<action name="dispWidgetGenerateCodeInPage" type="view" permission="all-managers" meta-noindex="true" />
+		<action name="dispWidgetStyleGenerateCodeInPage" type="view" permission="all-managers" meta-noindex="true" />
 		
 		<action name="procWidgetGenerateCode" type="controller" permission="root" />
 		<action name="procWidgetGenerateCodeInPage" type="controller" permission="all-managers" ruleset="generateCodeInPage" />