Merge branch 'hotfix/1.8.28'

bnu · bnu · commit 0f0c5734afc3 · 2017-01-12T14:34:58.000+09:00
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
@@ -1403,6 +1403,10 @@ function _filterRequestVar($key, $val, $do_stripslashes = 1)
 			{
 				$result[$k] = urlencode($v);
 			}
+			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			{
+				unset($result[$k]);
+			}
 			else
 			{
 				$result[$k] = $v;
diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php
@@ -482,6 +482,7 @@ function dispAutoinstallAdminIndex()
 
 		$security = new Security();
 		$security->encodeHTML('package.', 'package.depends..', 'item_list..');
+		$security->encodeHTML('search_target', 'search_keyword');
 	}
 
 	/**
diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php
@@ -91,6 +91,9 @@ function dispCommentAdminList()
 		}
 		Context::set('module_list', $module_list);
 
+		$security = new Security();
+		$security->encodeHTML('search_target', 'search_keyword');
+
 		// set the template 
 		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('comment_list');
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
@@ -96,6 +96,9 @@ function dispDocumentAdminList()
 		}
 		Context::set('module_list', $module_list);
 
+		$security = new Security();
+		$security->encodeHTML('search_target', 'search_keyword');
+
 		// Specify a template
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('document_list');
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
@@ -202,6 +202,7 @@ function dispFileAdminList()
 		$security = new Security();
 		$security->encodeHTML('file_list..');
 		$security->encodeHTML('module_list..');
+		$security->encodeHTML('search_target', 'search_keyword');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('file_list');
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
@@ -118,6 +118,7 @@ function dispMemberAdminList()
 
 		$security = new Security();
 		$security->encodeHTML('member_list..user_name', 'member_list..nick_name', 'member_list..group_list..');
+		$security->encodeHTML('search_target', 'search_keyword');
 
 		$this->setTemplateFile('member_list');
 	}
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
@@ -1469,9 +1469,8 @@ function putSignature($member_srl, $signature)
 	{
 		$signature = trim(removeHackTag($signature));
 		$signature = preg_replace('/<(\/?)(embed|object|param)/is', '&lt;$1$2', $signature);
-		$signature = removeHackTag($signature);
 
-		$check_signature = trim(str_replace(array('&nbsp;',"\n","\r"),'',strip_tags($signature,'<img><object>')));
+		$check_signature = trim(str_replace(array('&nbsp;',"\n","\r"), '', strip_tags($signature, '<img><object>')));
 		$path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));
 		$filename = sprintf('%s%d.signature.php', $path, $member_srl);
 
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
@@ -1005,8 +1005,8 @@ function getSignature($member_srl)
 			if(file_exists($filename))
 			{
 				$buff = FileHandler::readFile($filename);
-				$signature = preg_replace('/<\?.*\?>/', '', $buff);
-				$GLOBALS['__member_info__']['signature'][$member_srl] = removeHackTag($signature);
+				$signature = preg_replace('/<\?.*?\?>/', '', $buff);
+				$GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
 			}
 			else $GLOBALS['__member_info__']['signature'][$member_srl] = null;
 		}
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
@@ -1979,20 +1979,23 @@ function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 			// Get data from child nodes if exist.
 			if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
 			else $child_output = array("buff"=>"", "url_list"=>array());
+
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
 			unset($name_arr_str);
 			foreach($names as $key => $val)
 			{
-				$name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace(array('\\','"'),array('\\\\','&quot;'),$val));
+				$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\','\''), array('\\\\','\\\''), strip_tags($val)));
 			}
 			$name_str = sprintf('$_menu_names[%d] = array(%s); %s', $node->menu_item_srl, $name_arr_str, $child_output['name']);
+
 			// If url value is not empty in the current node, put the value into an array url_list
 			if($node->url) $child_output['url_list'][] = $node->url;
 			$output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
 			// If node->group_srls value exists
 			if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
 			else $group_check_code = "true";
+
 			// List variables
 			$href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
 			$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
@@ -2046,10 +2049,10 @@ function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 			}
 			// Create properties (check if it belongs to the menu node by url_list. It looks a trick but fast and powerful)
 			$attribute = sprintf(
-				'"node_srl"=>"%s","parent_srl"=>"%s","menu_name_key"=>\'%s\',"isShow"=>(%s?true:false),"text"=>(%s?$_menu_names[%d][$lang_type]:""),"href"=>(%s?%s:""),"url"=>(%s?"%s":""),"is_shortcut"=>"%s","desc"=>\'%s\',"open_window"=>"%s","normal_btn"=>"%s","hover_btn"=>"%s","active_btn"=>"%s","selected"=>(array(%s)&&in_array(Context::get("mid"),array(%s))?1:0),"expand"=>"%s", "list"=>array(%s),  "link"=>(%s? ( array(%s)&&in_array(Context::get("mid"),array(%s)) ?%s:%s):""),',
+				'"node_srl" => %d, "parent_srl" => %d, "menu_name_key" => \'%s\', "isShow" => (%s ? true : false), "text" => (%s ? $_menu_names[%d][$lang_type] : ""), "href" => (%s ? %s : ""), "url" => (%s ? "%s" : ""), "is_shortcut" => "%s", "desc" => \'%s\', "open_window" => "%s", "normal_btn" => "%s", "hover_btn" => "%s", "active_btn" => "%s", "selected" => (array(%s) && in_array(Context::get("mid"), array(%s)) ? 1 : 0), "expand" => \'%s\', "list" => array(%s), "link" => (%s ? (array(%s) && in_array(Context::get("mid"), array(%s)) ? %s : %s) : ""),',
 				$node->menu_item_srl,
 				$node->parent_srl,
-				addslashes($node->name),
+				strip_tags(addslashes($node->name)),
 				$group_check_code,
 				$group_check_code,
 				$node->menu_item_srl,
diff --git a/modules/point/point.admin.view.php b/modules/point/point.admin.view.php
@@ -114,9 +114,10 @@ function dispPointAdminPointList()
 		$this->group_list = $oMemberModel->getGroups();
 		Context::set('group_list', $this->group_list);
 		//Security
-		$security = new Security();			
+		$security = new Security();
 		$security->encodeHTML('group_list..title','group_list..description');
 		$security->encodeHTML('member_list..');
+		$security->encodeHTML('search_target', 'search_keyword');
 
 		// Set the template
 		$this->setTemplateFile('member_list');
diff --git a/modules/poll/poll.admin.view.php b/modules/poll/poll.admin.view.php
@@ -92,6 +92,8 @@ function dispPollAdminList()
 
 		$security = new Security();
 		$security->encodeHTML('poll_list..title', 'poll_list..nick_name');
+		$security->encodeHTML('search_target', 'search_keyword');
+
 		// Set a template
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('poll_list');

Original file line number	Diff line number	Diff line change
`@@ -1403,6 +1403,10 @@ function _filterRequestVar($key, $val, $do_stripslashes = 1)`
`1403`	`1403`	`{`
`1404`	`1404`	`$result[$k] = urlencode($v);`
`1405`	`1405`	`}`
	`1406`	`+ elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)`
	`1407`	`+ {`
	`1408`	`+ unset($result[$k]);`
	`1409`	`+ }`
`1406`	`1410`	`else`
`1407`	`1411`	`{`
`1408`	`1412`	`$result[$k] = $v;`
Original file line number	Diff line number	Diff line change
`@@ -482,6 +482,7 @@ function dispAutoinstallAdminIndex()`
`482`	`482`
`483`	`483`	`$security = new Security();`
`484`	`484`	`$security->encodeHTML('package.', 'package.depends..', 'item_list..');`
	`485`	`+ $security->encodeHTML('search_target', 'search_keyword');`
`485`	`486`	`}`
`486`	`487`
`487`	`488`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,9 @@ function dispCommentAdminList()`
`91`	`91`	`}`
`92`	`92`	`Context::set('module_list', $module_list);`
`93`	`93`
	`94`	`+ $security = new Security();`
	`95`	`+ $security->encodeHTML('search_target', 'search_keyword');`
	`96`	`+`
`94`	`97`	`// set the template`
`95`	`98`	`$this->setTemplatePath($this->module_path . 'tpl');`
`96`	`99`	`$this->setTemplateFile('comment_list');`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,9 @@ function dispDocumentAdminList()`
`96`	`96`	`}`
`97`	`97`	`Context::set('module_list', $module_list);`
`98`	`98`
	`99`	`+ $security = new Security();`
	`100`	`+ $security->encodeHTML('search_target', 'search_keyword');`
	`101`	`+`
`99`	`102`	`// Specify a template`
`100`	`103`	`$this->setTemplatePath($this->module_path.'tpl');`
`101`	`104`	`$this->setTemplateFile('document_list');`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ function dispMemberAdminList()`
`118`	`118`
`119`	`119`	`$security = new Security();`
`120`	`120`	`$security->encodeHTML('member_list..user_name', 'member_list..nick_name', 'member_list..group_list..');`
	`121`	`+ $security->encodeHTML('search_target', 'search_keyword');`
`121`	`122`
`122`	`123`	`$this->setTemplateFile('member_list');`
`123`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1469,9 +1469,8 @@ function putSignature($member_srl, $signature)`
`1469`	`1469`	`{`
`1470`	`1470`	`$signature = trim(removeHackTag($signature));`
`1471`	`1471`	`$signature = preg_replace('/<(\/?)(embed\|object\|param)/is', '<$1$2', $signature);`
`1472`		`- $signature = removeHackTag($signature);`
`1473`	`1472`
`1474`		`- $check_signature = trim(str_replace(array(' ',"\n","\r"),'',strip_tags($signature,'<img><object>')));`
	`1473`	`+ $check_signature = trim(str_replace(array(' ',"\n","\r"), '', strip_tags($signature, '<img><object>')));`
`1475`	`1474`	`$path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));`
`1476`	`1475`	`$filename = sprintf('%s%d.signature.php', $path, $member_srl);`
`1477`	`1476`
Original file line number	Diff line number	Diff line change
`@@ -1005,8 +1005,8 @@ function getSignature($member_srl)`
`1005`	`1005`	`if(file_exists($filename))`
`1006`	`1006`	`{`
`1007`	`1007`	`$buff = FileHandler::readFile($filename);`
`1008`		`- $signature = preg_replace('/<\?.*\?>/', '', $buff);`
`1009`		`- $GLOBALS['__member_info__']['signature'][$member_srl] = removeHackTag($signature);`
	`1008`	`+ $signature = preg_replace('/<\?.*?\?>/', '', $buff);`
	`1009`	`+ $GLOBALS['__member_info__']['signature'][$member_srl] = $signature;`
`1010`	`1010`	`}`
`1011`	`1011`	`else $GLOBALS['__member_info__']['signature'][$member_srl] = null;`
`1012`	`1012`	`}`