From 254b83dfd7a7525db22eea9b77246918071b51ff Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 10 Oct 2018 13:12:32 +0900
Subject: [PATCH] Explicitly declare noescape

---
 modules/document/tpl/preview_page.html             | 2 +-
 modules/document/tpl/print_page.html               | 2 +-
 modules/layout/faceoff/layout.html                 | 2 +-
 modules/layout/tpl/faceoff_layout_edit.html        | 2 +-
 modules/member/m.skins/default/modify_info.html    | 2 +-
 modules/member/m.skins/rx_prn/modify_info.html     | 2 +-
 modules/member/m.skins/rx_prn/signup_form.html     | 2 +-
 modules/member/skins/default/modify_info.html      | 2 +-
 modules/member/skins/default/signup_form.html      | 2 +-
 modules/member/skins/simple_world/modify_info.html | 2 +-
 modules/member/skins/simple_world/signup_form.html | 2 +-
 modules/member/tpl/insert_member.html              | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/document/tpl/preview_page.html b/modules/document/tpl/preview_page.html
index eb1e0f8a3..d1eb515af 100644
--- a/modules/document/tpl/preview_page.html
+++ b/modules/document/tpl/preview_page.html
@@ -1,5 +1,5 @@
 <load target="./js/document_admin.js" />
-{$content}
+{$content|noescape}
 <div class="btnArea">
 	<button class="btn" type="button" onclick="window.close();return false;">{$lang->cmd_close}</button>
 </div>
diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html
index 56961e537..89bd0643e 100644
--- a/modules/document/tpl/print_page.html
+++ b/modules/document/tpl/print_page.html
@@ -7,7 +7,7 @@
 {$val->name}: {$val->getValueHtml()}
 <!--@end-->
 <!--@end-->    
-{$oDocument->getContent(false, false)} 
+{$oDocument->getContent(false, false)|noescape} 
 <script>
 jQuery(window).load(function() { window.print(); } );
 </script>
diff --git a/modules/layout/faceoff/layout.html b/modules/layout/faceoff/layout.html
index 884812871..c134b0cdd 100644
--- a/modules/layout/faceoff/layout.html
+++ b/modules/layout/faceoff/layout.html
@@ -18,7 +18,7 @@
 
         <div id="body">
             <div id="content">
-            {$content}
+            {$content|noescape}
             </div>
             <hr />
             <div class="extension e1">
diff --git a/modules/layout/tpl/faceoff_layout_edit.html b/modules/layout/tpl/faceoff_layout_edit.html
index d9f1e44a0..77817d406 100644
--- a/modules/layout/tpl/faceoff_layout_edit.html
+++ b/modules/layout/tpl/faceoff_layout_edit.html
@@ -1 +1 @@
-{$content}
+{$content|noescape}
diff --git a/modules/member/m.skins/default/modify_info.html b/modules/member/m.skins/default/modify_info.html
index e0dafbd1d..ff229b40f 100644
--- a/modules/member/m.skins/default/modify_info.html
+++ b/modules/member/m.skins/default/modify_info.html
@@ -35,7 +35,7 @@
 				<label for="{$formTag->name}">{$formTag->title}</label>
 				<div cond="$formTag->name != 'signature'">{$formTag->inputTag}</div>
 				<div cond="$formTag->name =='signature'">
-					{$editor}
+					{$editor|noescape}
 				</div>
 			</li>
 			<li><label for="mailing" class="db fb al">{$lang->allow_mailing}</label><input id="mailing" type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p style="color:#666">{$lang->about_allow_mailing}</p></li>
diff --git a/modules/member/m.skins/rx_prn/modify_info.html b/modules/member/m.skins/rx_prn/modify_info.html
index ff1ead74a..db5e44f51 100644
--- a/modules/member/m.skins/rx_prn/modify_info.html
+++ b/modules/member/m.skins/rx_prn/modify_info.html
@@ -31,7 +31,7 @@
 				<block loop="$formTags=>$formTag" cond="$formTag->name !== 'profile_image'">
 					<label for="{$formTag->name}" class="control-label">{trim(str_replace('*','',strip_tags($formTag->title)))}<!--@if(strpos($formTag->title,'<em style="color:red">*</em>') !== false)--><sup style="color:red">*</sup><!--@endif--></label>
 					<block cond="$formTag->name != 'signature'">{$formTag->inputTag}</block>
-					<block cond="$formTag->name =='signature'">{$editor}</block>
+					<block cond="$formTag->name =='signature'">{$editor|noescape}</block>
 				</block>
 				<label class="control-label">{$lang->allow_mailing}</label>
 				<div class="controls">
diff --git a/modules/member/m.skins/rx_prn/signup_form.html b/modules/member/m.skins/rx_prn/signup_form.html
index d945dc5bc..a2f6a8a42 100644
--- a/modules/member/m.skins/rx_prn/signup_form.html
+++ b/modules/member/m.skins/rx_prn/signup_form.html
@@ -59,7 +59,7 @@
 					</block>
 					<block cond="$formTag->name == 'signature'">
 						 <input type="hidden" name="signature" value="" />
-						{$editor}
+						{$editor|noescape}
 					</block>
 				</block>
 				<div class="control-label">{$lang->allow_mailing}</div>
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 52d254b1f..2eea04fbd 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -30,7 +30,7 @@
 		<label for="{$formTag->name}" class="control-label">{$formTag->title}</label>
 		<div class="controls" cond="$formTag->name != 'signature'">{$formTag->inputTag}</div>
 		<div class="controls" cond="$formTag->name =='signature'">
-			{$editor}
+			{$editor|noescape}
 <style scoped>
 .xpress-editor>#smart_content,
 .xpress-editor>#smart_content>.tool{clear:none}
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index cddccbb3e..6f23fe44f 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -59,7 +59,7 @@
 			</div>
 			<div class="controls" cond="$formTag->name == 'signature'">
 				<input type="hidden" name="signature" value="" />
-				{$editor}
+				{$editor|noescape}
 				<style scoped>
 				.xpress-editor>#smart_content,
 				.xpress-editor>#smart_content>.tool{clear:none}
diff --git a/modules/member/skins/simple_world/modify_info.html b/modules/member/skins/simple_world/modify_info.html
index de74b3c33..4c8469d50 100644
--- a/modules/member/skins/simple_world/modify_info.html
+++ b/modules/member/skins/simple_world/modify_info.html
@@ -25,7 +25,7 @@
 			<block loop="$formTags=>$formTag">
 				<label for="{$formTag->name}" class="control-label">{trim(str_replace('*','',strip_tags($formTag->title)))}<!--@if(strpos($formTag->title,'<em style="color:red">*</em>') !== false)--><sup style="color:red">*</sup><!--@endif--></label>
 				<block cond="$formTag->name != 'signature'">{$formTag->inputTag}</block>
-				<block cond="$formTag->name =='signature'">{$editor}</block>
+				<block cond="$formTag->name =='signature'">{$editor|noescape}</block>
 			</block>
 			<label class="control-label">{$lang->allow_mailing}</label>
 			<div class="controls">
diff --git a/modules/member/skins/simple_world/signup_form.html b/modules/member/skins/simple_world/signup_form.html
index 8b01c48db..6487cc246 100644
--- a/modules/member/skins/simple_world/signup_form.html
+++ b/modules/member/skins/simple_world/signup_form.html
@@ -53,7 +53,7 @@
 				</block>
 				<block cond="$formTag->name == 'signature'">
 					 <input type="hidden" name="signature" value="" />
-					{$editor}
+					{$editor|noescape}
 				</block>
 			</block>
 			<div class="control-label">{$lang->allow_mailing}</div>
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index f5b360041..01c3ed8b9 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -48,7 +48,7 @@
 	<div loop="$formTags=>$formTag" class="x_control-group">
 		<label class="x_control-label" for="{$formTag->name}">{$formTag->title}</label>
 		<div class="x_controls" cond="$formTag->name != 'signature'">{$formTag->inputTag}</div>
-		<div class="x_controls" cond="$formTag->name =='signature'">{$editor}</div>
+		<div class="x_controls" cond="$formTag->name =='signature'">{$editor|noescape}</div>
 	</div>
 <style scoped>
 .xpress-editor>#smart_content,