Merge branch 'release/1.8.10'

bnu · bnu · commit d7a8b1bab82b · 2015-09-14T14:46:28.000+09:00
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -29,7 +29,7 @@
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.8.9');
+define('__XE_VERSION__', '1.8.10');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));
diff --git a/modules/editor/components/image_gallery/image_gallery.class.php b/modules/editor/components/image_gallery/image_gallery.class.php
@@ -43,18 +43,24 @@ function getPopupContent()
 	 */
 	function transHTML($xml_obj)
 	{
-		$gallery_info = new stdClass;
-		$gallery_info->srl = rand(111111,999999);
-		$gallery_info->border_thickness = $xml_obj->attrs->border_thickness;
+		$gallery_info = new stdClass();
+		$gallery_info->srl = rand(111111, 999999);
+		$gallery_info->border_thickness = (int)$xml_obj->attrs->border_thickness;
 		$gallery_info->gallery_style = $xml_obj->attrs->gallery_style;
 		$color_preg = "/^([a-fA-F0-9]{6})/";
 		$gallery_info->border_color = preg_replace($color_preg,"#$1",$xml_obj->attrs->border_color);
 		$gallery_info->bg_color = preg_replace($color_preg,"#$1",$xml_obj->attrs->bg_color);
 		$gallery_info->gallery_align = $xml_obj->attrs->gallery_align;
 
+		if(!in_array($gallery_info->gallery_align, array('left', 'center', 'right'))) {
+			$gallery_info->gallery_align = 'center';
+		}
+
 		$images_list = $xml_obj->attrs->images_list;
-		$images_list = preg_replace('/\.(gif|jpg|jpeg|png) /i',".\\1\n",$images_list);
-		$gallery_info->images_list = explode("\n",trim($images_list));
+		$images_list = preg_replace('/\.(gif|jpe?g|png) /i', ".\\1\n", $images_list);
+		$images_list = explode("\n", trim($images_list));
+		$gallery_info->images_list = preg_grep("/^[a-z0-9\/]+\.(gif|jpe?g|png)+$/", $images_list);
+
 		// If you set the output to output the XML code generated a list of the image
 		if(Context::getResponseMethod() == 'XMLRPC')
 		{
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
@@ -103,7 +103,7 @@ public function addMenu($title, $siteSrl = 0)
 		$output->add('menuSrl', $args->menu_srl);
 		return $output;
 	}
-	
+
 	function linkAllModuleInstancesToSitemap()
 	{
 		$unlinked_modules = false;
@@ -114,15 +114,15 @@ function linkAllModuleInstancesToSitemap()
 		{
 			$unlinked_modules = $output->data;
 		}
-		
+
 		if($unlinked_modules)
 		{
 			$unlinked_menu_srl = $this->getUnlinkedMenu();
 			$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
 		}
 
 	}
-	
+
 	function getUnlinkedMenu()
 	{
 		// 'unlinked' menu 존재여부 확인
@@ -139,7 +139,7 @@ function getUnlinkedMenu()
 				unset($moduleConfig->unlinked_menu_srl);
 			}
 		}
-		
+
 		if(!$moduleConfig->unlinked_menu_srl)
 		{
 			$output = $this->addMenu('unlinked', 0);
@@ -154,10 +154,10 @@ function getUnlinkedMenu()
 				return false;
 			}
 		}
-		
+
 		return $moduleConfig->unlinked_menu_srl;
 	}
-	
+
 	/**
 	 * insert menu when not linked module.
 	 *
@@ -172,17 +172,17 @@ function updateLinkModule($moduleInfos, $menuSrl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
-	
+
 		foreach($moduleInfos as $moduleInfo)
 		{
 			// search menu.
 			$args = new stdClass;
 			$args->url = $moduleInfo->mid;
 			$args->site_srl = $moduleInfo->site_srl;
 			$args->is_shortcut = 'N';
-	
+
 			$output = executeQuery('menu.getMenuItemByUrl', $args);
-	
+
 			if($output->toBool() && $output->data)
 			{
 				$moduleInfo->menu_srl = $output->data->menu_srl;
@@ -195,17 +195,17 @@ function updateLinkModule($moduleInfos, $menuSrl)
 				$item_args->name = $moduleInfo->mid;
 				$item_args->menu_item_srl = getNextSequence();
 				$item_args->listorder = -1*$item_args->menu_item_srl;
-	
+
 				$output = executeQuery('menu.insertMenuItem', $item_args);
 				if(!$output->toBool())
 				{
 					return $output;
 				}
 				$moduleInfo->menu_srl = $menuSrl;
 			}
-	
+
 			$output = executeQuery('module.updateModule', $moduleInfo);
-			
+
 			return $output;
 		}
 
@@ -214,14 +214,14 @@ function updateLinkModule($moduleInfos, $menuSrl)
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
-		
+
 		$oMenuAdminController = getAdminController('menu');
 		$oMenuAdminController->makeXmlFile($menuSrl);
-	
+
 		return new Object();
 	}
-	
-	
+
+
 
 	/**
 	 * Change the menu title
@@ -418,7 +418,7 @@ public function procMenuAdminInsertItem($request = NULL)
 
 		// recreate menu cache file
 		$this->makeXmlFile($request->menu_srl);
-		
+
 		if(!$isProc)
 		{
 			return $this->get('menu_item_srl');
@@ -504,7 +504,7 @@ private function _insertShortcut(&$request)
 			$args->is_shortcut = $request->is_shortcut;
 			$args->url = '#';
 		}
-		
+
 		if($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
@@ -539,10 +539,13 @@ private function _insertMenu(&$request, $isProc)
 
 		if($request->menu_name_key) $args->name = $request->menu_name_key;
 		else $args->name = $request->menu_name;
-		
+
 		if($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
+		$args->name = strip_tags(removeHackTag($args->name));
+		$args->desc = strip_tags(removeHackTag($args->desc));
+debugPrint($args);
 		if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
 		{
 			return new Object(-1, 'msg_invalid_request');
@@ -616,7 +619,7 @@ private function _insertModule(&$request, &$args)
 		{
 			$cmArgs->use_mobile = 'Y';
 		}
-		
+
 		// if mid is empty, auto create mid
 		if(!$request->module_id)
 		{
@@ -646,7 +649,7 @@ private function _insertModule(&$request, &$args)
 	public function procMenuAdminUpdateItem()
 	{
 		$request = Context::getRequestVars();
-
+debugPrint($request);
 		if(!$request->menu_item_srl || !$request->menu_name)
 		{
 			return new Object(-1, 'msg_invalid_request');
@@ -725,14 +728,17 @@ public function procMenuAdminUpdateItem()
 		{
 			$args->name = $request->menu_name;
 		}
-		
+
 		if($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
-		
+
+		$args->name = removeHackTag($args->name);
+		$args->desc = removeHackTag($args->desc);
+
 		unset($args->group_srls);
 		$args->open_window = $request->menu_open_window;
 		$args->expand = $request->menu_expand;
-		$output = executeQuery('menu.updateMenuItem', $args);
+		$output = $this->_updateMenuItem($args);
 
 		$this->makeXmlFile($args->menu_srl);
 
@@ -790,21 +796,31 @@ public function procMenuAdminButtonUpload()
 			$item_info->active_btn = '';
 		}
 
-		$output = executeQuery('menu.updateMenuItem', $item_info);
+		$output = $this->_updateMenuItem($item_info);
 
 		// recreate menu cache file
 		$this->makeXmlFile($args->menu_srl);
 	}
 
 	public function updateMenuItem($itemInfo)
 	{
-		$output = executeQuery('menu.updateMenuItem', $itemInfo);
+		$output = $this->_updateMenuItem($itemInfo);
 
 		// recreate menu cache file
 		$this->makeXmlFile($itemInfo->menu_srl);
 		return $output;
 	}
 
+	public function _updateMenuItem($itemInfo)
+	{
+		$itemInfo->name = removeHackTag($itemInfo->name);
+		$itemInfo->desc = removeHackTag($itemInfo->desc);
+
+		$output = executeQuery('menu.updateMenuItem', $itemInfo);
+
+		return $output;
+	}
+
 	/**
 	 * Delete menu item(menu of the menu)
 	 * @return void|Object
@@ -961,7 +977,7 @@ private function _deleteMenuItem(&$oDB, &$menuInfo, $node)
 			{
 				$output->data->url = '';
 				$referenceItem = $output->data;
-				$output = executeQuery('menu.updateMenuItem', $referenceItem);
+				$output = $this->_updateMenuItem($referenceItem);
 				if(!$output->toBool())
 				{
 					$oDB->rollback();
@@ -1085,7 +1101,7 @@ private function _recursiveUpdateMenuItem($node, $menu_srl)
 				$args = new stdClass();
 				$args->menu_srl = $menu_srl;
 				$args->menu_item_srl = $node['node_srl'];
-				$output = executeQuery('menu.updateMenuItemNode', $args);
+				$output = $this->_updateMenuItem($args);
 
 				//module's menu_srl move also
 				if($node['is_shortcut'] == 'N' && !empty($node['url']))
@@ -1249,7 +1265,7 @@ private function _copyMenu($menuSrl, $parentSrl, &$originMenu)
 				$update_item_info->normal_btn = $copied_info['normal_btn'];
 				$update_item_info->hover_btn = $copied_info['hover_btn'];
 				$update_item_info->active_btn = $copied_info['active_btn'];
-				executeQuery('menu.updateMenuItem', $update_item_info);
+				$output = $this->_updateMenuItem($update_item_info);
 			}
 			$this->insertedMenuItemSrlList[] = $insertedMenuItemSrl;
 		}
@@ -1629,7 +1645,7 @@ function procMenuAdminInsertItemForAdminMenu()
 		// Update if exists
 		if($item_info->menu_item_srl == $args->menu_item_srl)
 		{
-			$output = executeQuery('menu.updateMenuItem', $args);
+			$output = $this->_updateMenuItem($args);
 			if(!$output->toBool()) return $output;
 		}
 		// Insert if not exist
@@ -1680,7 +1696,7 @@ public function procMenuAdminUpdateAuth()
 			if($exposure) $args->group_srls = implode(',', $exposure);
 		}
 
-		$output = executeQuery('menu.updateMenuItem', $args);
+		$output = $this->_updateMenuItem($args);
 		if(!$output->toBool())
 		{
 			return $output;
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
@@ -462,7 +462,7 @@ function insertModule($args)
 				$menuArgs->url = $args->mid;
 				$menuArgs->expand = 'N';
 				$menuArgs->is_shortcut = 'N';
-				$menuArgs->name = $args->browser_title;
+				$menuArgs->name = removeHackTag($args->browser_title);
 				$menuArgs->listorder = $args->menu_item_srl * -1;
 
 				$menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs);
@@ -476,8 +476,9 @@ function insertModule($args)
 			}
 		}
 
-		$args->menu_srl = $menuArgs->menu_srl;
 		// Insert a module
+		$args->menu_srl = $menuArgs->menu_srl;
+		$args->browser_title = removeHackTag($args->browser_title);
 		$output = executeQuery('module.insertModule', $args);
 		if(!$output->toBool())
 		{
@@ -520,6 +521,7 @@ function updateModule($args)
 			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
 			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
 		}
+		$args->browser_title = removeHackTag($args->browser_title);
 
 		$output = executeQuery('module.isExistsModuleName', $args);
 		if(!$output->toBool() || $output->data->count)

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function addMenu($title, $siteSrl = 0)`
`103`	`103`	`$output->add('menuSrl', $args->menu_srl);`
`104`	`104`	`return $output;`
`105`	`105`	`}`
`106`		`-`
	`106`	`+`
`107`	`107`	`function linkAllModuleInstancesToSitemap()`
`108`	`108`	`{`
`109`	`109`	`$unlinked_modules = false;`
`@@ -114,15 +114,15 @@ function linkAllModuleInstancesToSitemap()`
`114`	`114`	`{`
`115`	`115`	`$unlinked_modules = $output->data;`
`116`	`116`	`}`
`117`		`-`
	`117`	`+`
`118`	`118`	`if($unlinked_modules)`
`119`	`119`	`{`
`120`	`120`	`$unlinked_menu_srl = $this->getUnlinkedMenu();`
`121`	`121`	`$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`}`
`125`		`-`
	`125`	`+`
`126`	`126`	`function getUnlinkedMenu()`
`127`	`127`	`{`
`128`	`128`	`// 'unlinked' menu 존재여부 확인`
`@@ -139,7 +139,7 @@ function getUnlinkedMenu()`
`139`	`139`	`unset($moduleConfig->unlinked_menu_srl);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`		`-`
	`142`	`+`
`143`	`143`	`if(!$moduleConfig->unlinked_menu_srl)`
`144`	`144`	`{`
`145`	`145`	`$output = $this->addMenu('unlinked', 0);`
`@@ -154,10 +154,10 @@ function getUnlinkedMenu()`
`154`	`154`	`return false;`
`155`	`155`	`}`
`156`	`156`	`}`
`157`		`-`
	`157`	`+`
`158`	`158`	`return $moduleConfig->unlinked_menu_srl;`
`159`	`159`	`}`
`160`		`-`
	`160`	`+`
`161`	`161`	`/**`
`162`	`162`	`* insert menu when not linked module.`
`163`	`163`	`*`
`@@ -172,17 +172,17 @@ function updateLinkModule($moduleInfos, $menuSrl)`
`172`	`172`	`{`
`173`	`173`	`return new Object(-1, 'msg_invalid_request');`
`174`	`174`	`}`
`175`		`-`
	`175`	`+`
`176`	`176`	`foreach($moduleInfos as $moduleInfo)`
`177`	`177`	`{`
`178`	`178`	`// search menu.`
`179`	`179`	`$args = new stdClass;`
`180`	`180`	`$args->url = $moduleInfo->mid;`
`181`	`181`	`$args->site_srl = $moduleInfo->site_srl;`
`182`	`182`	`$args->is_shortcut = 'N';`
`183`		`-`
	`183`	`+`
`184`	`184`	`$output = executeQuery('menu.getMenuItemByUrl', $args);`
`185`		`-`
	`185`	`+`
`186`	`186`	`if($output->toBool() && $output->data)`
`187`	`187`	`{`
`188`	`188`	`$moduleInfo->menu_srl = $output->data->menu_srl;`
`@@ -195,17 +195,17 @@ function updateLinkModule($moduleInfos, $menuSrl)`
`195`	`195`	`$item_args->name = $moduleInfo->mid;`
`196`	`196`	`$item_args->menu_item_srl = getNextSequence();`
`197`	`197`	`$item_args->listorder = -1*$item_args->menu_item_srl;`
`198`		`-`
	`198`	`+`
`199`	`199`	`$output = executeQuery('menu.insertMenuItem', $item_args);`
`200`	`200`	`if(!$output->toBool())`
`201`	`201`	`{`
`202`	`202`	`return $output;`
`203`	`203`	`}`
`204`	`204`	`$moduleInfo->menu_srl = $menuSrl;`
`205`	`205`	`}`
`206`		`-`
	`206`	`+`
`207`	`207`	`$output = executeQuery('module.updateModule', $moduleInfo);`
`208`		`-`
	`208`	`+`
`209`	`209`	`return $output;`
`210`	`210`	`}`
`211`	`211`
`@@ -214,14 +214,14 @@ function updateLinkModule($moduleInfos, $menuSrl)`
`214`	`214`	`{`
`215`	`215`	`$oCacheHandler->invalidateGroupKey('site_and_module');`
`216`	`216`	`}`
`217`		`-`
	`217`	`+`
`218`	`218`	`$oMenuAdminController = getAdminController('menu');`
`219`	`219`	`$oMenuAdminController->makeXmlFile($menuSrl);`
`220`		`-`
	`220`	`+`
`221`	`221`	`return new Object();`
`222`	`222`	`}`
`223`		`-`
`224`		`-`
	`223`	`+`
	`224`	`+`
`225`	`225`
`226`	`226`	`/**`
`227`	`227`	`* Change the menu title`
`@@ -418,7 +418,7 @@ public function procMenuAdminInsertItem($request = NULL)`
`418`	`418`
`419`	`419`	`// recreate menu cache file`
`420`	`420`	`$this->makeXmlFile($request->menu_srl);`
`421`		`-`
	`421`	`+`
`422`	`422`	`if(!$isProc)`
`423`	`423`	`{`
`424`	`424`	`return $this->get('menu_item_srl');`
`@@ -504,7 +504,7 @@ private function _insertShortcut(&$request)`
`504`	`504`	`$args->is_shortcut = $request->is_shortcut;`
`505`	`505`	`$args->url = '#';`
`506`	`506`	`}`
`507`		`-`
	`507`	`+`
`508`	`508`	`if($request->menu_desc) $args->desc = $request->menu_desc;`
`509`	`509`	`else $args->desc = '';`
`510`	`510`
`@@ -539,10 +539,13 @@ private function _insertMenu(&$request, $isProc)`
`539`	`539`
`540`	`540`	`if($request->menu_name_key) $args->name = $request->menu_name_key;`
`541`	`541`	`else $args->name = $request->menu_name;`
`542`		`-`
	`542`	`+`
`543`	`543`	`if($request->menu_desc) $args->desc = $request->menu_desc;`
`544`	`544`	`else $args->desc = '';`
`545`	`545`
	`546`	`+ $args->name = strip_tags(removeHackTag($args->name));`
	`547`	`+ $args->desc = strip_tags(removeHackTag($args->desc));`
	`548`	`+debugPrint($args);`
`546`	`549`	`if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)`
`547`	`550`	`{`
`548`	`551`	`return new Object(-1, 'msg_invalid_request');`
`@@ -616,7 +619,7 @@ private function _insertModule(&$request, &$args)`
`616`	`619`	`{`
`617`	`620`	`$cmArgs->use_mobile = 'Y';`
`618`	`621`	`}`
`619`		`-`
	`622`	`+`
`620`	`623`	`// if mid is empty, auto create mid`
`621`	`624`	`if(!$request->module_id)`
`622`	`625`	`{`
`@@ -646,7 +649,7 @@ private function _insertModule(&$request, &$args)`
`646`	`649`	`public function procMenuAdminUpdateItem()`
`647`	`650`	`{`
`648`	`651`	`$request = Context::getRequestVars();`
`649`		`-`
	`652`	`+debugPrint($request);`
`650`	`653`	`if(!$request->menu_item_srl \|\| !$request->menu_name)`
`651`	`654`	`{`
`652`	`655`	`return new Object(-1, 'msg_invalid_request');`
`@@ -725,14 +728,17 @@ public function procMenuAdminUpdateItem()`
`725`	`728`	`{`
`726`	`729`	`$args->name = $request->menu_name;`
`727`	`730`	`}`
`728`		`-`
	`731`	`+`
`729`	`732`	`if($request->menu_desc) $args->desc = $request->menu_desc;`
`730`	`733`	`else $args->desc = '';`
`731`		`-`
	`734`	`+`
	`735`	`+ $args->name = removeHackTag($args->name);`
	`736`	`+ $args->desc = removeHackTag($args->desc);`
	`737`	`+`
`732`	`738`	`unset($args->group_srls);`
`733`	`739`	`$args->open_window = $request->menu_open_window;`
`734`	`740`	`$args->expand = $request->menu_expand;`
`735`		`- $output = executeQuery('menu.updateMenuItem', $args);`
	`741`	`+ $output = $this->_updateMenuItem($args);`
`736`	`742`
`737`	`743`	`$this->makeXmlFile($args->menu_srl);`
`738`	`744`
`@@ -790,21 +796,31 @@ public function procMenuAdminButtonUpload()`
`790`	`796`	`$item_info->active_btn = '';`
`791`	`797`	`}`
`792`	`798`
`793`		`- $output = executeQuery('menu.updateMenuItem', $item_info);`
	`799`	`+ $output = $this->_updateMenuItem($item_info);`
`794`	`800`
`795`	`801`	`// recreate menu cache file`
`796`	`802`	`$this->makeXmlFile($args->menu_srl);`
`797`	`803`	`}`
`798`	`804`
`799`	`805`	`public function updateMenuItem($itemInfo)`
`800`	`806`	`{`
`801`		`- $output = executeQuery('menu.updateMenuItem', $itemInfo);`
	`807`	`+ $output = $this->_updateMenuItem($itemInfo);`
`802`	`808`
`803`	`809`	`// recreate menu cache file`
`804`	`810`	`$this->makeXmlFile($itemInfo->menu_srl);`
`805`	`811`	`return $output;`
`806`	`812`	`}`
`807`	`813`
	`814`	`+ public function _updateMenuItem($itemInfo)`
	`815`	`+ {`
	`816`	`+ $itemInfo->name = removeHackTag($itemInfo->name);`
	`817`	`+ $itemInfo->desc = removeHackTag($itemInfo->desc);`
	`818`	`+`
	`819`	`+ $output = executeQuery('menu.updateMenuItem', $itemInfo);`
	`820`	`+`
	`821`	`+ return $output;`
	`822`	`+ }`
	`823`	`+`
`808`	`824`	`/**`
`809`	`825`	`* Delete menu item(menu of the menu)`
`810`	`826`	`* @return void\|Object`
`@@ -961,7 +977,7 @@ private function _deleteMenuItem(&$oDB, &$menuInfo, $node)`
`961`	`977`	`{`
`962`	`978`	`$output->data->url = '';`
`963`	`979`	`$referenceItem = $output->data;`
`964`		`- $output = executeQuery('menu.updateMenuItem', $referenceItem);`
	`980`	`+ $output = $this->_updateMenuItem($referenceItem);`
`965`	`981`	`if(!$output->toBool())`
`966`	`982`	`{`
`967`	`983`	`$oDB->rollback();`
`@@ -1085,7 +1101,7 @@ private function _recursiveUpdateMenuItem($node, $menu_srl)`
`1085`	`1101`	`$args = new stdClass();`
`1086`	`1102`	`$args->menu_srl = $menu_srl;`
`1087`	`1103`	`$args->menu_item_srl = $node['node_srl'];`
`1088`		`- $output = executeQuery('menu.updateMenuItemNode', $args);`
	`1104`	`+ $output = $this->_updateMenuItem($args);`
`1089`	`1105`
`1090`	`1106`	`//module's menu_srl move also`
`1091`	`1107`	`if($node['is_shortcut'] == 'N' && !empty($node['url']))`
`@@ -1249,7 +1265,7 @@ private function _copyMenu($menuSrl, $parentSrl, &$originMenu)`
`1249`	`1265`	`$update_item_info->normal_btn = $copied_info['normal_btn'];`
`1250`	`1266`	`$update_item_info->hover_btn = $copied_info['hover_btn'];`
`1251`	`1267`	`$update_item_info->active_btn = $copied_info['active_btn'];`
`1252`		`- executeQuery('menu.updateMenuItem', $update_item_info);`
	`1268`	`+ $output = $this->_updateMenuItem($update_item_info);`
`1253`	`1269`	`}`
`1254`	`1270`	`$this->insertedMenuItemSrlList[] = $insertedMenuItemSrl;`
`1255`	`1271`	`}`
`@@ -1629,7 +1645,7 @@ function procMenuAdminInsertItemForAdminMenu()`
`1629`	`1645`	`// Update if exists`
`1630`	`1646`	`if($item_info->menu_item_srl == $args->menu_item_srl)`
`1631`	`1647`	`{`
`1632`		`- $output = executeQuery('menu.updateMenuItem', $args);`
	`1648`	`+ $output = $this->_updateMenuItem($args);`
`1633`	`1649`	`if(!$output->toBool()) return $output;`
`1634`	`1650`	`}`
`1635`	`1651`	`// Insert if not exist`
`@@ -1680,7 +1696,7 @@ public function procMenuAdminUpdateAuth()`
`1680`	`1696`	`if($exposure) $args->group_srls = implode(',', $exposure);`
`1681`	`1697`	`}`
`1682`	`1698`
`1683`		`- $output = executeQuery('menu.updateMenuItem', $args);`
	`1699`	`+ $output = $this->_updateMenuItem($args);`
`1684`	`1700`	`if(!$output->toBool())`
`1685`	`1701`	`{`
`1686`	`1702`	`return $output;`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ function insertModule($args)`
`462`	`462`	`$menuArgs->url = $args->mid;`
`463`	`463`	`$menuArgs->expand = 'N';`
`464`	`464`	`$menuArgs->is_shortcut = 'N';`
`465`		`- $menuArgs->name = $args->browser_title;`
	`465`	`+ $menuArgs->name = removeHackTag($args->browser_title);`
`466`	`466`	`$menuArgs->listorder = $args->menu_item_srl * -1;`
`467`	`467`
`468`	`468`	`$menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs);`
`@@ -476,8 +476,9 @@ function insertModule($args)`
`476`	`476`	`}`
`477`	`477`	`}`
`478`	`478`
`479`		`- $args->menu_srl = $menuArgs->menu_srl;`
`480`	`479`	`// Insert a module`
	`480`	`+ $args->menu_srl = $menuArgs->menu_srl;`
	`481`	`+ $args->browser_title = removeHackTag($args->browser_title);`
`481`	`482`	`$output = executeQuery('module.insertModule', $args);`
`482`	`483`	`if(!$output->toBool())`
`483`	`484`	`{`
`@@ -520,6 +521,7 @@ function updateModule($args)`
`520`	`521`	`if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;`
`521`	`522`	`if(!$args->browser_title) $args->browser_title = $module_info->browser_title;`
`522`	`523`	`}`
	`524`	`+ $args->browser_title = removeHackTag($args->browser_title);`
`523`	`525`
`524`	`526`	`$output = executeQuery('module.isExistsModuleName', $args);`
`525`	`527`	`if(!$output->toBool() \|\| $output->data->count)`