xpressengine / xe-core

modules/menu/menu.admin.controller.php

Spacing +304 added lines, -304 removed lines

@@ -56,7 +56,7 @@ 
 	}
 
 	function __construct() {
-		$this->homeMenuCacheFile = _XE_PATH_ . $this->homeMenuCacheFile;
+		$this->homeMenuCacheFile = _XE_PATH_.$this->homeMenuCacheFile;
 	}
 
 	/**
@@ -68,8 +68,8 @@ 
 		// List variables
 		$site_module_info = Context::get('site_module_info');
 
-		$output = $this->addMenu(Context::get('title'), (int)$site_module_info->site_srl);
-		if(!$output->toBool()) return $output;
+		$output = $this->addMenu(Context::get('title'), (int) $site_module_info->site_srl);
+		if (!$output->toBool()) return $output;
 
 		$this->add('menu_srl', $output->get('menuSrl'));
 		$this->setMessage('success_registed');
@@ -95,7 +95,7 @@ 
 		$args->listorder = $args->menu_srl * -1;
 
 		$output = executeQuery('menu.insertMenu', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -109,13 +109,13 @@ 
 		$unlinked_modules = false;
 		$args = new stdClass;
 		$args->site_srl = 0;
-		$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl',$args);
-		if($output->toBool() && $output->data && count($output->data) > 0)
+		$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl', $args);
+		if ($output->toBool() && $output->data && count($output->data) > 0)
 		{
 			$unlinked_modules = $output->data;
 		}
 
-		if($unlinked_modules)
+		if ($unlinked_modules)
 		{
 			$unlinked_menu_srl = $this->getUnlinkedMenu();
 			$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
@@ -129,21 +129,21 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('menu');
 
-		if($moduleConfig->unlinked_menu_srl)
+		if ($moduleConfig->unlinked_menu_srl)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->menu_srl = $moduleConfig->unlinked_menu_srl;
 			$menuOutput = executeQuery('menu.getMenu', $menuArgs);
-			if(!$menuOutput->data)
+			if (!$menuOutput->data)
 			{
 				unset($moduleConfig->unlinked_menu_srl);
 			}
 		}
 
-		if(!$moduleConfig->unlinked_menu_srl)
+		if (!$moduleConfig->unlinked_menu_srl)
 		{
 			$output = $this->addMenu('unlinked', 0);
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$moduleConfig->unlinked_menu_srl = $output->get('menuSrl');
 				$oModuleController = getController('module');
@@ -168,12 +168,12 @@ 
 	 */
 	function updateLinkModule($moduleInfos, $menuSrl)
 	{
-		if(!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0)
+		if (!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		foreach($moduleInfos as $moduleInfo)
+		foreach ($moduleInfos as $moduleInfo)
 		{
 			// search menu.
 			$args = new stdClass;
@@ -183,7 +183,7 @@ 
 
 			$output = executeQuery('menu.getMenuItemByUrl', $args);
 
-			if($output->toBool() && $output->data)
+			if ($output->toBool() && $output->data)
 			{
 				$moduleInfo->menu_srl = $output->data->menu_srl;
 			}
@@ -194,10 +194,10 @@ 
 				$item_args->url = $moduleInfo->mid;
 				$item_args->name = $moduleInfo->mid;
 				$item_args->menu_item_srl = getNextSequence();
-				$item_args->listorder = -1*$item_args->menu_item_srl;
+				$item_args->listorder = -1 * $item_args->menu_item_srl;
 
 				$output = executeQuery('menu.insertMenuItem', $item_args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -210,7 +210,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -235,7 +235,7 @@ 
 		$args->menu_srl = Context::get('menu_srl');
 
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_registed');
 
@@ -255,14 +255,14 @@ 
 		$menuInfo = $oMenuAdminModel->getMenu($menu_srl);
 
 		$oAdmin = getClass('admin');
-		if($menuInfo->title == $oAdmin->getAdminMenuName())
+		if ($menuInfo->title == $oAdmin->getAdminMenuName())
 			return new BaseObject(-1, 'msg_adminmenu_cannot_delete');
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 		}
@@ -273,25 +273,25 @@ 
 
 		$isStartmenuInclude = false;
 
-		if(is_array($menu->list))
+		if (is_array($menu->list))
 		{
-			foreach($menu->list AS $key=>$value)
+			foreach ($menu->list AS $key=>$value)
 			{
 				$originMenu = $value;
 				$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
 
-				if($isStartmenuInclude)
+				if ($isStartmenuInclude)
 					break;
 			}
 		}
 
-		if($isStartmenuInclude)
+		if ($isStartmenuInclude)
 		{
 			return new BaseObject(-1, 'msg_cannot_delete_homemenu');
 		}
 
 		$output = $this->deleteMenu($menu_srl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return new BaseObject(-1, $output->message);
 		}
@@ -319,7 +319,7 @@ 
 
 		// Delete modules
 		$output = executeQueryArray('menu.getMenuItems', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -327,15 +327,15 @@ 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
 
-		foreach($output->data as $itemInfo)
+		foreach ($output->data as $itemInfo)
 		{
-			if($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0)
+			if ($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl);
-				if($moduleInfo->module_srl)
+				if ($moduleInfo->module_srl)
 				{
 					$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
-					if(!$output->toBool())
+					if (!$output->toBool())
 					{
 						$oDB->rollback();
 						return $output;
@@ -346,27 +346,27 @@ 
 
 		// Delete menu items
 		$output = executeQuery("menu.deleteMenuItems", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Delete the menu
 		$output = executeQuery("menu.deleteMenu", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		// Delete cache files
-		$cache_list = FileHandler::readDir("./files/cache/menu","",false,true);
-		if(count($cache_list))
+		$cache_list = FileHandler::readDir("./files/cache/menu", "", false, true);
+		if (count($cache_list))
 		{
-			foreach($cache_list as $cache_file)
+			foreach ($cache_list as $cache_file)
 			{
 				$pos = strpos($cache_file, $menu_srl.'.');
-				if($pos>0)FileHandler::removeFile($cache_file);
+				if ($pos > 0)FileHandler::removeFile($cache_file);
 			}
 		}
 		// Delete images of menu buttons
@@ -375,7 +375,7 @@ 
 
 		$oDB->commit();
 
-		return new BaseObject(0,'success_deleted');
+		return new BaseObject(0, 'success_deleted');
 	}
 
 	/**
@@ -385,24 +385,24 @@ 
 	public function procMenuAdminInsertItem($request = NULL)
 	{
 		$isProc = false;
-		if(!$request)
+		if (!$request)
 		{
 			$isProc = true;
 			$request = Context::getRequestVars();
 		}
 
-		if(!$request->parent_srl || !$request->menu_name)
+		if (!$request->parent_srl || !$request->menu_name)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$this->_setMenuSrl($request->parent_srl, $request->menu_srl);
-		if(!$request->menu_srl)
+		if (!$request->menu_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if($request->is_shortcut == 'Y')
+		if ($request->is_shortcut == 'Y')
 		{
 			$result = $this->_insertShortcut($request);
 		}
@@ -411,7 +411,7 @@ 
 			$result = $this->_insertMenu($request, $isProc);
 		}
 
-		if($result->error < 0)
+		if ($result->error < 0)
 		{
 			return new BaseObject($result->error, $result->message);
 		}
@@ -419,7 +419,7 @@ 
 		// recreate menu cache file
 		$this->makeXmlFile($request->menu_srl);
 
-		if(!$isProc)
+		if (!$isProc)
 		{
 			return $this->get('menu_item_srl');
 		}
@@ -431,7 +431,7 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 		$itemInfo = $oMenuAdminModel->getMenuItemInfo($parent_srl);
 		// parent_srl is parent menu item's srl
-		if($itemInfo->menu_srl)
+		if ($itemInfo->menu_srl)
 		{
 			$menu_srl = $itemInfo->menu_srl;
 		}
@@ -439,7 +439,7 @@ 
 		else
 		{
 			$output = $oMenuAdminModel->getMenu($parent_srl);
-			if($output->menu_srl == $parent_srl)
+			if ($output->menu_srl == $parent_srl)
 			{
 				$menu_srl = $output->menu_srl;
 				$parent_srl = 0;
@@ -453,7 +453,7 @@ 
 		$oDB->begin();
 
 		// type is url
-		if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
+		if (strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
 		{
 			// set menu variable
 			$args = new stdClass();
@@ -464,27 +464,27 @@ 
 			$args->is_shortcut = $request->is_shortcut;
 			$args->url = $request->shortcut_target;
 
-			if(!$args->open_window) $args->open_window = 'N';
-			if(!$args->expand) $args->expand = 'N';
-			if(!$args->is_shortcut) $args->is_shortcut = 'Y';
+			if (!$args->open_window) $args->open_window = 'N';
+			if (!$args->expand) $args->expand = 'N';
+			if (!$args->is_shortcut) $args->is_shortcut = 'Y';
 
-			if($request->menu_name_key) $args->name = $request->menu_name_key;
+			if ($request->menu_name_key) $args->name = $request->menu_name_key;
 			else $args->name = $request->menu_name;
 		}
 		// type is module short cut
-		else if(is_numeric($request->shortcut_target))
+		else if (is_numeric($request->shortcut_target))
 		{
 			// Get original information
 			$oMenuAdminModel = getAdminModel('menu');
 			$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
-			if(!$itemInfo->menu_item_srl)
+			if (!$itemInfo->menu_item_srl)
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 			unset($itemInfo->normal_btn, $itemInfo->hover_btn, $itemInfo->active_btn);
 
 			$args = $itemInfo;
-			if(count($args->group_srls) == 0)
+			if (count($args->group_srls) == 0)
 			{
 				unset($args->group_srls);
 			}
@@ -504,13 +504,13 @@ 
 			$args->url = '#';
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
 		$args->menu_item_srl = getNextSequence();
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oDB->commit();
 
@@ -532,46 +532,46 @@ 
 		$args->expand = $request->menu_expand;
 		$args->is_shortcut = $request->is_shortcut;
 
-		if(!$args->open_window) $args->open_window = 'N';
-		if(!$args->expand) $args->expand = 'N';
-		if(!$args->is_shortcut) $args->is_shortcut = 'N';
+		if (!$args->open_window) $args->open_window = 'N';
+		if (!$args->expand) $args->expand = 'N';
+		if (!$args->is_shortcut) $args->is_shortcut = 'N';
 
-		if($request->menu_name_key) $args->name = $request->menu_name_key;
+		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;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
-		if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
+		if ($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		// when menu copy, module already copied
-		if($isProc)
+		if ($isProc)
 		{
 			$result = $this->_insertModule($request, $args);
-			if(!$result->toBool())
+			if (!$result->toBool())
 			{
 				return new BaseObject(-1, $result->message);
 			}
 		}
 
 		// if setting button variables, set argument button variables for db insert. but not upload in this method
-		if($request->normal_btn) $args->normal_btn = $request->normal_btn;
-		if($request->hover_btn) $args->hover_btn = $request->hover_btn;
-		if($request->active_btn) $args->active_btn = $request->active_btn;
+		if ($request->normal_btn) $args->normal_btn = $request->normal_btn;
+		if ($request->hover_btn) $args->hover_btn = $request->hover_btn;
+		if ($request->active_btn) $args->active_btn = $request->active_btn;
 
-		if(!$request->module_id)
+		if (!$request->module_id)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$args->url = $request->module_id;
 		$args->menu_item_srl = getNextSequence();
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oDB->commit();
 
@@ -603,7 +603,7 @@ 
 
 		//module create
 		$site_module_info = Context::get('site_module_info');
-		$cmArgs->site_srl = (int)$site_module_info->site_srl;
+		$cmArgs->site_srl = (int) $site_module_info->site_srl;
 		$cmArgs->browser_title = $args->name;
 		$cmArgs->menu_srl = $request->menu_srl;
 		$cmArgs->layout_srl = -1;
@@ -611,13 +611,13 @@ 
 		$cmArgs->is_skin_fix = 'N';
 		$cmArgs->is_mskin_fix = 'N';
 
-		if(Mobile::isMobileEnabled() === true)
+		if (Mobile::isMobileEnabled() === true)
 		{
 			$cmArgs->use_mobile = 'Y';
 		}
 
 		// if mid is empty, auto create mid
-		if(!$request->module_id)
+		if (!$request->module_id)
 		{
 			$randomMid = $this->_makeRandomMid();
 			$request->module_id = $cmArgs->module.'_'.$randomMid;
@@ -627,7 +627,7 @@ 
 		// check already created module instance
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getModuleInfoByMid($request->module_id);
-		if($output->module_srl)
+		if ($output->module_srl)
 		{
 			return new BaseObject(-1, 'msg_module_name_exists');
 		}
@@ -646,14 +646,14 @@ 
 	{
 		$request = Context::getRequestVars();
 
-		if(!$request->menu_item_srl || !$request->menu_name)
+		if (!$request->menu_item_srl || !$request->menu_name)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		// variables set
-		if($request->menu_open_window != "Y") $request->menu_open_window = "N";
-		if($request->menu_expand != "Y") $request->menu_expand = "N";
+		if ($request->menu_open_window != "Y") $request->menu_open_window = "N";
+		if ($request->menu_expand != "Y") $request->menu_expand = "N";
 
 		// Get original information
 		$oMenuAdminModel = getAdminModel('menu');
@@ -661,19 +661,19 @@ 
 		$args = $itemInfo;
 
 		// if menu type is module, check exists module and update
-		if($itemInfo->is_shortcut == 'Y')
+		if ($itemInfo->is_shortcut == 'Y')
 		{
 			// type is url
-			if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
+			if (strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
 			{
 				$args->url = $request->shortcut_target;
 			}
 			// type is module short cut
-			else if(is_numeric($request->shortcut_target))
+			else if (is_numeric($request->shortcut_target))
 			{
 				// Get new original information
 				$newItemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
-				if(!$newItemInfo->menu_item_srl)
+				if (!$newItemInfo->menu_item_srl)
 				{
 					return new BaseObject(-1, 'msg_invalid_request');
 				}
@@ -690,10 +690,10 @@ 
 		{
 			// check already created module instance
 			$oModuleModel = getModel('module');
-			if($request->module_id != $itemInfo->url)
+			if ($request->module_id != $itemInfo->url)
 			{
 				$output = $oModuleModel->getModuleInfoByMid($request->module_id);
-				if($output->module_srl)
+				if ($output->module_srl)
 				{
 					return new BaseObject(-1, 'msg_module_name_exists');
 				}
@@ -701,13 +701,13 @@ 
 
 			// if not exist module, return error
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url);
-			if(!$moduleInfo)
+			if (!$moduleInfo)
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			$moduleInfo->mid = $request->module_id;
-			if($request->browser_title)
+			if ($request->browser_title)
 			{
 				$moduleInfo->browser_title = $request->browser_title;
 			}
@@ -716,7 +716,7 @@ 
 			$args->url = $request->module_id;
 		}
 
-		if($request->menu_name_key)
+		if ($request->menu_name_key)
 		{
 			$args->name = $request->menu_name_key;
 		}
@@ -725,7 +725,7 @@ 
 			$args->name = $request->menu_name;
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
 		unset($args->group_srls);
@@ -753,38 +753,38 @@ 
 
 		$btnOutput = $this->_uploadButton($args);
 
-		if($btnOutput['normal_btn'])
+		if ($btnOutput['normal_btn'])
 		{
 			$this->add('normal_btn', $btnOutput['normal_btn']);
 			$item_info->normal_btn = $btnOutput['normal_btn'];
 		}
-		if($btnOutput['hover_btn'])
+		if ($btnOutput['hover_btn'])
 		{
 			$this->add('hover_btn', $btnOutput['hover_btn']);
 			$item_info->hover_btn = $btnOutput['hover_btn'];
 		}
-		if($btnOutput['active_btn'])
+		if ($btnOutput['active_btn'])
 		{
 			$this->add('active_btn', $btnOutput['active_btn']);
 			$item_info->active_btn = $btnOutput['active_btn'];
 		}
 
 		// group_srls check
-		if(count($item_info->group_srls) == 0)
+		if (count($item_info->group_srls) == 0)
 		{
 			unset($item_info->group_srls);
 		}
 
 		// Button delete check
-		if(!$btnOutput['normal_btn'] && $args->isNormalDelete == 'Y')
+		if (!$btnOutput['normal_btn'] && $args->isNormalDelete == 'Y')
 		{
 			$item_info->normal_btn = '';
 		}
-		if(!$btnOutput['hover_btn'] && $args->isHoverDelete == 'Y')
+		if (!$btnOutput['hover_btn'] && $args->isHoverDelete == 'Y')
 		{
 			$item_info->hover_btn = '';
 		}
-		if(!$btnOutput['active_btn'] && $args->isActiveDelete == 'Y')
+		if (!$btnOutput['active_btn'] && $args->isActiveDelete == 'Y')
 		{
 			$item_info->active_btn = '';
 		}
@@ -824,7 +824,7 @@ 
 		$args->is_force = Context::get('is_force');
 
 		$returnObj = $this->deleteItem($args);
-		if(is_object($returnObj))
+		if (is_object($returnObj))
 		{
 			$this->setError($returnObj->error);
 			$this->setMessage($returnObj->message);
@@ -853,11 +853,11 @@ 
 		$args->menu_srl = $itemInfo->menu_srl;
 
 		// Display an error that the category cannot be deleted if it has a child node	603
-		if($args->is_force != 'Y')
+		if ($args->is_force != 'Y')
 		{
 			$output = executeQuery('menu.getChildMenuCount', $args);
-			if(!$output->toBool()) return $output;
-			if($output->data->count > 0)
+			if (!$output->toBool()) return $output;
+			if ($output->data->count > 0)
 			{
 				return new BaseObject(-1001, 'msg_cannot_delete_for_child');
 			}
@@ -869,22 +869,22 @@ 
 
 		// check admin menu delete
 		$oAdmin = getClass('admin');
-		if($menu_title == $oAdmin->getAdminMenuName() && $itemInfo->parent_srl == 0)
+		if ($menu_title == $oAdmin->getAdminMenuName() && $itemInfo->parent_srl == 0)
 		{
 			return $this->stop('msg_cannot_delete_for_admin_topmenu');
 		}
 
-		if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
+		if ($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $args->menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $args->menu_item_srl, $originMenu);
 			}
@@ -894,7 +894,7 @@ 
 		$siteInfo = $oModuleModel->getSiteInfo($menuInfo->site_srl);
 		$isStartmenuInclude = false;
 		$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
-		if($isStartmenuInclude)
+		if ($isStartmenuInclude)
 		{
 			return new BaseObject(-1, 'msg_cannot_delete_homemenu');
 		}
@@ -918,14 +918,14 @@ 
 
 	private function _checkHomeMenuInOriginMenu($originMenu, $startMid, &$isStartmenuInclude)
 	{
-		if($originMenu['is_shortcut'] != 'Y' && $originMenu['url'] == $startMid)
+		if ($originMenu['is_shortcut'] != 'Y' && $originMenu['url'] == $startMid)
 		{
 			$isStartmenuInclude = true;
 		}
 
-		if(!$isStartmenuInclude && is_array($originMenu['list']))
+		if (!$isStartmenuInclude && is_array($originMenu['list']))
 		{
-			foreach($originMenu['list'] AS $key=>$value)
+			foreach ($originMenu['list'] AS $key=>$value)
 			{
 				$this->_checkHomeMenuInOriginMenu($value, $startMid, $isStartmenuInclude);
 			}
@@ -939,7 +939,7 @@ 
 		$args->menu_srl = $menuSrl;
 		$args->menu_item_srl = $node['node_srl'];
 		$output = executeQuery("menu.deleteMenuItem", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -948,12 +948,12 @@ 
 		// Update the xml file and get its location
 		$xml_file = $this->makeXmlFile($args->menu_srl);
 		// Delete all of image buttons
-		if($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
-		if($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
-		if($node['active_btn']) FileHandler::removeFile($node['active_btn']);
+		if ($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
+		if ($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
+		if ($node['active_btn']) FileHandler::removeFile($node['active_btn']);
 
 		// Delete module
-		if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
+		if ($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
 		{
 			$oModuleController = getController('module');
 			$oModuleModel = getModel('module');
@@ -963,12 +963,12 @@ 
 			$args->site_srl = $menuInfo->site_srl;
 			$args->is_shortcut = 'Y';
 			$output = executeQuery('menu.getMenuItemByUrl', $args);
-			if($output->data->menu_item_srl)
+			if ($output->data->menu_item_srl)
 			{
 				$output->data->url = '';
 				$referenceItem = $output->data;
 				$output = $this->_updateMenuItem($referenceItem);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -976,10 +976,10 @@ 
 			}
 
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($node['url'], $menuInfo->site_srl);
-			if($moduleInfo->module_srl)
+			if ($moduleInfo->module_srl)
 			{
 				$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -992,14 +992,14 @@ 
 	private function _recursiveDeleteMenuItem(&$oDB, &$menuInfo, $node)
 	{
 		$output = $this->_deleteMenuItem($oDB, $menuInfo, $node);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return new BaseObject(-1, $output->message);
 		}
 
-		if(is_array($node['list']))
+		if (is_array($node['list']))
 		{
-			foreach($node['list'] AS $key=>$value)
+			foreach ($node['list'] AS $key=>$value)
 			{
 				$this->_recursiveDeleteMenuItem($oDB, $menuInfo, $value);
 			}
@@ -1012,31 +1012,31 @@ 
 	 */
 	function procMenuAdminMoveItem()
 	{
-		$mode = Context::get('mode');	//move
-		$parent_srl = Context::get('parent_srl');	// Parent menu item serial number
-		$source_srl = Context::get('source_srl');	// Same hierarchy's menu item serial number
-		$target_srl = Context::get('target_srl');	// Self menu item serial number
+		$mode = Context::get('mode'); //move
+		$parent_srl = Context::get('parent_srl'); // Parent menu item serial number
+		$source_srl = Context::get('source_srl'); // Same hierarchy's menu item serial number
+		$target_srl = Context::get('target_srl'); // Self menu item serial number
 
-		if(!$mode || !$parent_srl || !$target_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$mode || !$parent_srl || !$target_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		// get original menu item info for cache file recreate
 		$originalItemInfo = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if(!$originalItemInfo->menu_item_srl)
+		if (!$originalItemInfo->menu_item_srl)
 		{
 			return new BaseObject(-1, 'msg_empty_menu_item');
 		}
 
 		// get menu properies with child menu
-		$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $originalItemInfo->menu_srl);
+		$phpFile = sprintf(_XE_PATH_."files/cache/menu/%s.php", $originalItemInfo->menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $originalItemInfo->menu_item_srl, $originMenu);
 			}
@@ -1045,7 +1045,7 @@ 
 		// get target menu info for move
 		$targetMenuItemInfo = $oMenuAdminModel->getMenuItemInfo($parent_srl);
 		// if move in same sitemap
-		if($targetMenuItemInfo->menu_item_srl)
+		if ($targetMenuItemInfo->menu_item_srl)
 		{
 			$menu_srl = $targetMenuItemInfo->menu_srl;
 		}
@@ -1057,20 +1057,20 @@ 
 			$parent_srl = 0;
 		}
 
-		if(!$this->homeModuleMid)
+		if (!$this->homeModuleMid)
 		{
 			$oModuleModel = getModel('module');
 			$oMenuAdminController = getAdminController('menu');
 			$columnList = array('modules.mid',);
 			$output = $oModuleModel->getSiteInfo(0, $columnList);
-			if($output->mid)
+			if ($output->mid)
 			{
 				$this->homeModuleMid = $output->mid;
 			}
 		}
 
 		$this->moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $originMenu['is_shortcut'], $originMenu['url']);
-		if(count($originMenu['list']) > 0)
+		if (count($originMenu['list']) > 0)
 		{
 			$this->_recursiveUpdateMenuItem($originMenu['list'], $menu_srl);
 		}
@@ -1084,9 +1084,9 @@ 
 
 	private function _recursiveUpdateMenuItem($node, $menu_srl)
 	{
-		if(is_array($node))
+		if (is_array($node))
 		{
-			foreach($node AS $key=>$node)
+			foreach ($node AS $key=>$node)
 			{
 				$args = new stdClass();
 				$args->menu_srl = $menu_srl;
@@ -1094,11 +1094,11 @@ 
 				$output = $this->_updateMenuItem($args);
 
 				//module's menu_srl move also
-				if($node['is_shortcut'] == 'N' && !empty($node['url']))
+				if ($node['is_shortcut'] == 'N' && !empty($node['url']))
 				{
 					$oModuleModel = getModel('module');
 					$moduleInfo = $oModuleModel->getModuleInfoByMid($node['url']);
-					if($menu_srl != $moduleInfo->menu_srl)
+					if ($menu_srl != $moduleInfo->menu_srl)
 					{
 						$moduleInfo->menu_srl = $menu_srl;
 						$oModuleController = getController('module');
@@ -1106,7 +1106,7 @@ 
 					}
 				}
 
-				if(count($node['list']) > 0)
+				if (count($node['list']) > 0)
 				{
 					$this->_recursiveUpdateMenuItem($node['list'], $menu_srl);
 				}
@@ -1128,21 +1128,21 @@ 
 		$menuSrl = $itemInfo->menu_srl;
 
 		// get menu properies with child menu
-		$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menuSrl);
+		$phpFile = sprintf(_XE_PATH_."files/cache/menu/%s.php", $menuSrl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $menuItemSrl, $originMenu);
 			}
 		}
 
 		// copy the menu item with recursively
-		if(is_array($originMenu))
+		if (is_array($originMenu))
 		{
 			$this->_copyMenu($menuSrl, $parentSrl, $originMenu);
 		}
@@ -1158,15 +1158,15 @@ 
 	 */
 	private function _searchMenu(&$menuList, $menuItemSrl, &$originMenu)
 	{
-		if(array_key_exists($menuItemSrl, $menuList))
+		if (array_key_exists($menuItemSrl, $menuList))
 		{
 			$originMenu = $menuList[$menuItemSrl];
 			return;
 		}
 
-		foreach($menuList AS $key=>$value)
+		foreach ($menuList AS $key=>$value)
 		{
-			if(count($value['list']) > 0)
+			if (count($value['list']) > 0)
 			{
 				$this->_searchMenu($value['list'], $menuItemSrl, $originMenu);
 			}
@@ -1181,7 +1181,7 @@ 
 		// default argument setting
 		$args = new stdClass();
 		$args->menu_srl = $menuSrl;
-		if($parentSrl == 0) $args->parent_srl = $menuSrl;
+		if ($parentSrl == 0) $args->parent_srl = $menuSrl;
 		else $args->parent_srl = $parentSrl;
 		$args->menu_name_key = $originMenu['text'];
 		$args->menu_name = $originMenu['text'];
@@ -1194,7 +1194,7 @@ 
 
 		$isModuleCopySuccess = false;
 		// if menu have a reference of module instance
-		if($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0 )
+		if ($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($originMenu['url']);
@@ -1214,22 +1214,22 @@ 
 
 			$args->module_srl = $copiedModuleSrl;
 
-			if($copiedModuleSrl)
+			if ($copiedModuleSrl)
 			{
 				$isModuleCopySuccess = true;
 			}
 		}
 		// if menu type is shortcut
-		else if($menuItemInfo->is_shortcut == 'Y')
+		else if ($menuItemInfo->is_shortcut == 'Y')
 		{
 			$args->shortcut_target = $originMenu['url'];
 			$isModuleCopySuccess = true;
 		}
 
-		if($isModuleCopySuccess)
+		if ($isModuleCopySuccess)
 		{
 			// if have a group permission
-			if($menuItemInfo->group_srls)
+			if ($menuItemInfo->group_srls)
 			{
 				$args->group_srls = $menuItemInfo->group_srls;
 			}
@@ -1243,12 +1243,12 @@ 
 
 			// if have a button, copy a button image also
 			$insertedMenuItemSrl = $this->get('menu_item_srl');
-			if($menuItemInfo->normal_btn || $menuItemInfo->hover_btn || $menuItemInfo->active_btn)
+			if ($menuItemInfo->normal_btn || $menuItemInfo->hover_btn || $menuItemInfo->active_btn)
 			{
 				// copy & upate
 				$update_item_info = $oMenuAdminModel->getMenuItemInfo($insertedMenuItemSrl);
-				$copied_info = $this->_copyButton($insertedMenuItemSrl,$update_item_info->menu_srl, $menuItemInfo);
-				if(count($update_item_info->group_srls) == 0)
+				$copied_info = $this->_copyButton($insertedMenuItemSrl, $update_item_info->menu_srl, $menuItemInfo);
+				if (count($update_item_info->group_srls) == 0)
 				{
 					unset($update_item_info->group_srls);
 				}
@@ -1262,7 +1262,7 @@ 
 
 		// if have a child menu, copy child menu also
 		$childMenu = array_shift($originMenu['list']);
-		if(count($childMenu) > 0)
+		if (count($childMenu) > 0)
 		{
 			$this->_copyMenu($menuSrl, $insertedMenuItemSrl, $childMenu);
 		}
@@ -1272,10 +1272,10 @@ 
 	{
 		$time = $_SERVER['REQUEST_TIME'];
 		$randomString = "";
-		for($i=0;$i<4;$i++)
+		for ($i = 0; $i < 4; $i++)
 		{
 			$case = rand(0, 1);
-			if($case) $doc = rand(65, 90);
+			if ($case) $doc = rand(65, 90);
 			else $doc = rand(97, 122);
 
 			$randomString .= chr($doc);
@@ -1299,32 +1299,32 @@ 
 		// menu name update
 		$args->menu_srl = $this->menuSrl;
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->map = array();
-		if(is_array($parentKeyList))
+		if (is_array($parentKeyList))
 		{
-			foreach($parentKeyList as $no=>$srl)
+			foreach ($parentKeyList as $no=>$srl)
 			{
-				if($srl === 0) continue;
-				if(!is_array($this->map[$srl]))$this->map[$srl] = array();
+				if ($srl === 0) continue;
+				if (!is_array($this->map[$srl]))$this->map[$srl] = array();
 				$this->map[$srl][] = $no;
 			}
 		}
 
 		$result = array();
-		if(is_array($this->itemKeyList))
+		if (is_array($this->itemKeyList))
 		{
-			foreach($this->itemKeyList as $srl)
+			foreach ($this->itemKeyList as $srl)
 			{
-				if(!$this->checked[$srl])
+				if (!$this->checked[$srl])
 				{
 					$target = new stdClass();
 					$this->checked[$srl] = 1;
 					$target->node = $srl;
-					$target->child= array();
+					$target->child = array();
 
-					while(count($this->map[$srl]))
+					while (count($this->map[$srl]))
 					{
 						$this->_setParent($srl, array_shift($this->map[$srl]), $target);
 					}
@@ -1333,13 +1333,13 @@ 
 			}
 		}
 
-		if(is_array($result))
+		if (is_array($result))
 		{
 			$i = 0;
-			foreach($result AS $key=>$node)
+			foreach ($result AS $key=>$node)
 			{
-				$this->moveMenuItem($this->menuSrl, 0, $i, $node->node, 'move');	//move parent node
-				$this->_recursiveMoveMenuItem($node);	//move child node
+				$this->moveMenuItem($this->menuSrl, 0, $i, $node->node, 'move'); //move parent node
+				$this->_recursiveMoveMenuItem($node); //move child node
 				$i = $node->node;
 			}
 		}
@@ -1368,7 +1368,7 @@ 
 		$child_node->child = array();
 		$target->child[] = $child_node;
 
-		while(count($this->map[$child_srl]))
+		while (count($this->map[$child_srl]))
 		{
 			$this->_setParent($child_srl, array_shift($this->map[$child_srl]), $child_node);
 		}
@@ -1383,7 +1383,7 @@ 
 	function _recursiveMoveMenuItem($result)
 	{
 		$i = 0;
-		while(count($result->child))
+		while (count($result->child))
 		{
 			unset($node);
 			$node = array_shift($result->child);
@@ -1403,48 +1403,48 @@ 
 	 * @param string $mode 'move' or 'insert'
 	 * @return void
 	 */
-	function moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $isShortcut='Y', $url=NULL)
+	function moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $isShortcut = 'Y', $url = NULL)
 	{
 		// Get the original menus
 		$oMenuAdminModel = getAdminModel('menu');
 
 		$target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if($target_item->menu_item_srl != $target_srl) return new BaseObject(-1,'msg_invalid_request');
+		if ($target_item->menu_item_srl != $target_srl) return new BaseObject(-1, 'msg_invalid_request');
 		// Move the menu location(change the order menu appears)
-		if($mode == 'move')
+		if ($mode == 'move')
 		{
 			$args = new stdClass();
 			$args->parent_srl = $parent_srl;
 			$args->menu_srl = $menu_srl;
 
-			if($source_srl)
+			if ($source_srl)
 			{
 				$source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
-				if($source_item->menu_item_srl != $source_srl) return new BaseObject(-1,'msg_invalid_request');
-				$args->listorder = $source_item->listorder-1;
+				if ($source_item->menu_item_srl != $source_srl) return new BaseObject(-1, 'msg_invalid_request');
+				$args->listorder = $source_item->listorder - 1;
 			}
 			else
 			{
 				$output = executeQuery('menu.getMaxListorder', $args);
-				if(!$output->toBool()) return $output;
-				$args->listorder = (int)$output->data->listorder;
-				if(!$args->listorder) $args->listorder= 0;
+				if (!$output->toBool()) return $output;
+				$args->listorder = (int) $output->data->listorder;
+				if (!$args->listorder) $args->listorder = 0;
 			}
 			$args->parent_srl = $parent_srl;
 			$output = executeQuery('menu.updateMenuItemListorder', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->parent_srl = $parent_srl;
 			$args->menu_item_srl = $target_srl;
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			//module's menu_srl move also
-			if($isShortcut == 'N' && !empty($url))
+			if ($isShortcut == 'N' && !empty($url))
 			{
 				$oModuleModel = getModel('module');
 				$moduleInfo = $oModuleModel->getModuleInfoByMid($url);
-				if($menu_srl != $moduleInfo->menu_srl)
+				if ($menu_srl != $moduleInfo->menu_srl)
 				{
 					$moduleInfo->menu_srl = $menu_srl;
 					$oModuleController = getController('module');
@@ -1452,13 +1452,13 @@ 
 				}
 
 				// change home menu cache file
-				if($url == $this->homeModuleMid)
+				if ($url == $this->homeModuleMid)
 				{
-					if(file_exists($this->homeMenuCacheFile))
+					if (file_exists($this->homeMenuCacheFile))
 					{
 						include($this->homeMenuCacheFile);
 					}
-					if(!$homeMenuSrl || $homeMenuSrl != $menu_srl)
+					if (!$homeMenuSrl || $homeMenuSrl != $menu_srl)
 					{
 						$this->makeHomemenuCacheFile($menu_srl);
 					}
@@ -1466,13 +1466,13 @@ 
 			}
 			// Add a child
 		}
-		elseif($mode == 'insert')
+		elseif ($mode == 'insert')
 		{
 			$args->menu_item_srl = $target_srl;
 			$args->parent_srl = $parent_srl;
-			$args->listorder = -1*getNextSequence();
+			$args->listorder = -1 * getNextSequence();
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$xml_file = $this->makeXmlFile($menu_srl);
@@ -1497,8 +1497,8 @@ 
 		// Re-generate the xml file
 		$xml_file = $this->makeXmlFile($menu_srl);
 		// Set return value
-		$this->add('menu_title',$menu_title);
-		$this->add('xml_file',$xml_file);
+		$this->add('menu_title', $menu_title);
+		$this->add('xml_file', $xml_file);
 	}
 
 	/**
@@ -1512,12 +1512,12 @@ 
 		$target = Context::get('target');
 		$target_file = Context::get($target);
 		// Error occurs when the target is neither a uploaded file nor a valid file
-		if(!$menu_srl || !$menu_item_srl)
+		if (!$menu_srl || !$menu_item_srl)
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 
 		}
-		else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
+		else if (!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i', $target_file['name']) || !checkUploadedFile($target_file['tmp_name']))
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 		}
@@ -1525,13 +1525,13 @@ 
 		// Move the file to a specific director if the uploaded file meets requirement
 		else
 		{
-			$tmp_arr = explode('.',$target_file['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $target_file['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
 			$filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
 
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if (!is_dir($path)) FileHandler::makeDir($path);
 
 			move_uploaded_file($target_file['tmp_name'], $filename);
 			Context::set('filename', $filename);
@@ -1564,14 +1564,14 @@ 
 	{
 		$oModuleModel = getModel('module');
 		$installed_module_list = $oModuleModel->getModulesXmlInfo();
-		if(is_array($installed_module_list))
+		if (is_array($installed_module_list))
 		{
 			$currentLang = Context::getLangType();
 			$menuList = array();
-			foreach($installed_module_list AS $key=>$value)
+			foreach ($installed_module_list AS $key=>$value)
 			{
 				$info = $oModuleModel->getModuleActionXml($value->module);
-				if($info->menu) $menuList[$value->module] = $info->menu;
+				if ($info->menu) $menuList[$value->module] = $info->menu;
 				unset($info->menu);
 			}
 		}
@@ -1603,8 +1603,8 @@ 
 		$info = $oModuleModel->getModuleActionXml($moduleName);
 
 		$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
+		if (empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
+		if (empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
 		$dbInfo = Context::getDBInfo();
 
 		$args = new stdClass();
@@ -1613,7 +1613,7 @@ 
 		$args->menu_srl = $requestArgs->menu_srl;
 		$args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName);
 		//if now page is https...
-		if(strpos($url, 'https') !== false)
+		if (strpos($url, 'https') !== false)
 		{
 			$args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url);
 		}
@@ -1627,23 +1627,23 @@ 
 		$args->hover_btn = '';
 		$args->active_btn = '';
 		$args->group_srls = implode(',', array_keys($groupSrlList));
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 
 		// Check if already exists
 		$oMenuModel = getAdminModel('menu');
 		$item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 		// Update if exists
-		if($item_info->menu_item_srl == $args->menu_item_srl)
+		if ($item_info->menu_item_srl == $args->menu_item_srl)
 		{
 			$output = $this->_updateMenuItem($args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Insert if not exist
 		else
 		{
-			$args->listorder = -1*$args->menu_item_srl;
+			$args->listorder = -1 * $args->menu_item_srl;
 			$output = executeQuery('menu.insertMenuItem', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Get information of the menu
 		$menu_info = $oMenuModel->getMenu($args->menu_srl);
@@ -1671,23 +1671,23 @@ 
 
 		// Menu Exposure update
 		// if exposure target is only login user...
-		if(!$exposure)
+		if (!$exposure)
 		{
 			$args->group_srls = '';
 		}
 		else
 		{
 			$exposure = explode(',', $exposure);
-			if(in_array($exposure, array('-1','-3')))
+			if (in_array($exposure, array('-1', '-3')))
 			{
 				$args->group_srls = $exposure;
 			}
 
-			if($exposure) $args->group_srls = implode(',', $exposure);
+			if ($exposure) $args->group_srls = implode(',', $exposure);
 		}
 
 		$output = $this->_updateMenuItem($args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1701,21 +1701,21 @@ 
 		$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl);
 		$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
 
-		if($itemInfo->is_shortcut === 'Y')
+		if ($itemInfo->is_shortcut === 'Y')
 		{
 			$moduleGrnatsArgs = new stdClass;
 			$moduleGrnatsArgs->module_srl = $moduleInfo->module_srl;
 			$output = executeQueryArray('module.getModuleGrants', $moduleGrnatsArgs);
-			if(!$output->data) $output->data = array();
+			if (!$output->data) $output->data = array();
 			$moduleGrnats = new stdClass();
-			foreach($output->data as $grant)
+			foreach ($output->data as $grant)
 			{
 				$moduleGrnats->{$grant->name}[] = $grant->group_srl;
 			}
 		}
 
 		$grantList = $xml_info->grant;
-		if(!$grantList) $grantList = new stdClass;
+		if (!$grantList) $grantList = new stdClass;
 
 		$grantList->access = new stdClass();
 		$grantList->access->default = 'guest';
@@ -1723,14 +1723,14 @@ 
 		$grantList->manager->default = 'manager';
 
 		$grant = new stdClass();
-		foreach($grantList AS $grantName=>$grantInfo)
+		foreach ($grantList AS $grantName=>$grantInfo)
 		{
-			if($htPerm[$grantName])
+			if ($htPerm[$grantName])
 			{
 				$htPerm[$grantName] = explode(',', $htPerm[$grantName]);
 
 				// users in a particular group
-				if(is_array($htPerm[$grantName]))
+				if (is_array($htPerm[$grantName]))
 				{
 					$grant->{$grantName} = $htPerm[$grantName];
 					continue;
@@ -1742,13 +1742,13 @@ 
 					continue;
 				}
 			}
-			else if($itemInfo->is_shortcut === 'Y')
+			else if ($itemInfo->is_shortcut === 'Y')
 			{
-				if(isset($moduleGrnats) && $moduleGrnats->{$grantName}) $grant->{$grantName} = $moduleGrnats->{$grantName};
+				if (isset($moduleGrnats) && $moduleGrnats->{$grantName}) $grant->{$grantName} = $moduleGrnats->{$grantName};
 			}
 		}
 
-		if(count($grant))
+		if (count($grant))
 		{
 			$oModuleController = getController('module');
 			$oModuleController->insertModuleGrants($moduleInfo->module_srl, $grant);
@@ -1766,15 +1766,15 @@ 
 	function makeXmlFile($menu_srl)
 	{
 		// Return if there is no information when creating the xml file
-		if(!$menu_srl) return;
+		if (!$menu_srl) return;
 		// Get menu informaton
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->toBool() || !$output->data) return $output;
-		$site_srl = (int)$output->data->site_srl;
+		if (!$output->toBool() || !$output->data) return $output;
+		$site_srl = (int) $output->data->site_srl;
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$oModuleModel = getModel('module');
 			$columnList = array('sites.domain');
@@ -1785,13 +1785,13 @@ 
 		$args->menu_srl = $menu_srl;
 		$args->sort_index = 'listorder';
 		$output = executeQuery('menu.getMenuItems', $args);
-		if(!$output->toBool()) return;
+		if (!$output->toBool()) return;
 		// Specify the name of the cache file
-		$xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl);
-		$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl);
+		$xml_file = sprintf(_XE_PATH_."files/cache/menu/%s.xml.php", $menu_srl);
+		$php_file = sprintf(_XE_PATH_."files/cache/menu/%s.php", $menu_srl);
 		// If no data found, generate an XML file without node data
 		$list = $output->data;
-		if(!$list)
+		if (!$list)
 		{
 			$xml_buff = "<root />";
 			FileHandler::writeFile($xml_file, $xml_buff);
@@ -1799,10 +1799,10 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 		// Create a tree for loop
 		$list_count = count($list);
-		for($i=0;$i<$list_count;$i++)
+		for ($i = 0; $i < $list_count; $i++)
 		{
 			$node = $list[$i];
 			$menu_item_srl = $node->menu_item_srl;
@@ -1858,7 +1858,7 @@ 
 		$php_buff = sprintf(
 			'<?php '.
 			'if(!defined("__XE__")) exit(); '.
-			'$menu = new stdClass();' .
+			'$menu = new stdClass();'.
 			'%s; '.
 			'%s; '.
 			'$menu->list = array(%s); '.
@@ -1887,26 +1887,26 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, $domain)
 	{
-		if(!$source_node) return;
+		if (!$source_node) return;
 
 		$oMenuAdminModel = getAdminModel('menu');
 
-		foreach($source_node as $menu_item_srl => $node)
+		foreach ($source_node as $menu_item_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if ($menu_item_srl && $tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
-			foreach($names as $key => $val)
+			foreach ($names as $key => $val)
 			{
-				$name_arr_str .= sprintf('"%s"=>%s,',$key, var_export($val, true));
+				$name_arr_str .= sprintf('"%s"=>%s,', $key, var_export($val, true));
 			}
 			$name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str);
 
-			$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
-			$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
-			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
+			$url = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->url);
+			$desc = str_replace(array('&', '"', "'"), array('&amp;', '&quot;', '\\\''), $node->desc);
+			if (preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
 			}
@@ -1916,21 +1916,21 @@ 
 			$expand = ($node->expand) ? $node->expand : '';
 
 			$normal_btn = ($node->normal_btn) ? $node->normal_btn : '';
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			if ($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $normal_btn);
 			else $normal_btn = '';
 			$hover_btn = ($node->hover_btn) ? $node->hover_btn : '';
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			if ($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $hover_btn);
 			else $hover_btn = '';
 			$active_btn = ($node->active_btn) ? $node->active_btn : '';
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			if ($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $active_btn);
 			else $active_btn = '';
 
 			$group_srls = ($node->group_srls) ? $node->group_srls : '';
 
-			if($normal_btn)
+			if ($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
+				if ($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
+				if ($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
 				$link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type], ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>&quot; %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str);
 			}
 			else
@@ -1939,8 +1939,8 @@ 
 			}
 
 			// If the value of node->group_srls exists
-			if($group_srls) {
-				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
+			if ($group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))', $group_srls, $group_srls == -1 ? 1 : 0);
 			}
 			else
 			{
@@ -1969,8 +1969,8 @@ 
 				$link
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if ($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			else $buff .= sprintf('<node %s />', $attribute);
 		}
 		return $buff;
 	}
@@ -1989,84 +1989,84 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 	{
 		$output = array("buff"=>"", "url_list"=>array());
-		if(!$source_node) return $output;
+		if (!$source_node) return $output;
 
 		$oMenuAdminModel = getAdminModel('menu');
 
-		foreach($source_node as $menu_item_srl => $node)
+		foreach ($source_node as $menu_item_srl => $node)
 		{
 			// 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);
+			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)
+			foreach ($names as $key => $val)
 			{
-				if(preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]?[a-zA-Z_0-9]*)\'\]\}/', $val) === 1)
+				if (preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]?[a-zA-Z_0-9]*)\'\]\}/', $val) === 1)
 				{
 					$name_arr_str .= sprintf('"%s"=>"%s",', $key, $val);
 				}
 				else
 				{
-					$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\','\''), array('\\\\','\\\''), removeHackTag($val)));
+					$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\', '\''), array('\\\\', '\\\''), removeHackTag($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;
+			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);
+			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);
-			$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
-			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
+			$href = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->href);
+			$url = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->url);
+			$desc = str_replace(array('&', '"', "'"), array('&amp;', '&quot;', '\\\''), $node->desc);
+			if (preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
 			}
 			else $href = var_export($url, true);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
-			$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
-			$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->hover_btn);
-			$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->active_btn);
+			$normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->normal_btn);
+			$hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->hover_btn);
+			$active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->active_btn);
 
-			foreach($child_output['url_list'] as $key =>$val)
+			foreach ($child_output['url_list'] as $key =>$val)
 			{
 				$child_output['url_list'][$key] = addslashes($val);
 			}
 
-			$selected = '"'.implode('","',$child_output['url_list']).'"';
+			$selected = '"'.implode('","', $child_output['url_list']).'"';
 			$child_buff = $child_output['buff'];
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			if ($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $normal_btn);
 			else $normal_btn = '';
 
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			if ($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $hover_btn);
 			else $hover_btn = '';
 
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			if ($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $active_btn);
 			else $active_btn = '';
 
 
 			$group_srls = $node->group_srls;
 
-			if($normal_btn)
+			if ($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
+				if ($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
+				if ($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
 				$link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str);
-				if($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
+				if ($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
 				else $link_active = $link;
 			}
 			else
@@ -2104,7 +2104,7 @@ 
 			);
 
 			// Generate buff data
-			$output['buff'] .=  sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
+			$output['buff'] .= sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
 			$output['name'] .= $name_str;
 		}
 		return $output;
@@ -2118,19 +2118,19 @@ 
 	 */
 	function updateMenuLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if (!count($menu_srl_list)) return;
 		// Delete the value of menu_srls
-		$args->menu_srls = implode(',',$menu_srl_list);
+		$args->menu_srls = implode(',', $menu_srl_list);
 		$output = executeQuery('menu.deleteMenuLayout', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$args->layout_srl = $layout_srl;
 		// Mapping menu_srls, layout_srl
-		for($i=0;$i<count($menu_srl_list);$i++)
+		for ($i = 0; $i < count($menu_srl_list); $i++)
 		{
 			$args->menu_srl = $menu_srl_list[$i];
 			$output = executeQuery('menu.insertMenuLayout', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 	}
 
@@ -2143,47 +2143,47 @@ 
 	{
 		// path setting
 		$path = sprintf('./files/attach/menu_button/%d/', $args->menu_srl);
-		if($args->menu_normal_btn || $args->menu_hover_btn || $args->menu_active_btn && !is_dir($path))
+		if ($args->menu_normal_btn || $args->menu_hover_btn || $args->menu_active_btn && !is_dir($path))
 		{
 			FileHandler::makeDir($path);
 		}
 
-		if($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
+		if ($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
 		{
 			$oMenuModel = getAdminModel('menu');
 			$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 
-			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
-			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
-			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
+			if ($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
+			if ($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
+			if ($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
 		}
 
 		$returnArray = array();
 		$date = date('YmdHis');
 		// normal button
-		if($args->menu_normal_btn)
+		if ($args->menu_normal_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_normal_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_normal_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_normal_btn', $ext);
 
-			if(checkUploadedFile($args->menu_normal_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_normal_btn['tmp_name']))
 			{
-				move_uploaded_file ( $args->menu_normal_btn ['tmp_name'], $filename );
+				move_uploaded_file($args->menu_normal_btn ['tmp_name'], $filename);
 				$returnArray ['normal_btn'] = $filename;
 			}
 		}
 
 		// hover button
-		if($args->menu_hover_btn)
+		if ($args->menu_hover_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_hover_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_hover_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_hover_btn', $ext);
 
-			if(checkUploadedFile($args->menu_hover_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_hover_btn['tmp_name']))
 			{
 				move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename);
 				$returnArray['hover_btn'] = $filename;
@@ -2191,14 +2191,14 @@ 
 		}
 
 		// active button
-		if($args->menu_active_btn)
+		if ($args->menu_active_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_active_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_active_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_active_btn', $ext);
 
-			if(checkUploadedFile($args->menu_active_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_active_btn['tmp_name']))
 			{
 				move_uploaded_file($args->menu_active_btn['tmp_name'], $filename);
 				$returnArray['active_btn'] = $filename;
@@ -2220,7 +2220,7 @@ 
 			"active_btn"=>"",
 		);
 		//normal_btn
-		if($menuItemInfo->normal_btn)
+		if ($menuItemInfo->normal_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->normal_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->normal_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'normal');
@@ -2230,7 +2230,7 @@ 
 		}
 
 		//hover_btn
-		if($menuItemInfo->hover_btn)
+		if ($menuItemInfo->hover_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->hover_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->hover_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'hover');
@@ -2240,7 +2240,7 @@ 
 		}
 
 		//active_btn
-		if($menuItemInfo->active_btn)
+		if ($menuItemInfo->active_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->active_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->active_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'active');
@@ -2255,9 +2255,9 @@ 
 	{
 		$path = sprintf('./files/attach/menu_button/%d/', $menuSrl);
 		$tmp_arr = explode('.', $buttonPath);
-		$ext = $tmp_arr[count($tmp_arr)-1];
+		$ext = $tmp_arr[count($tmp_arr) - 1];
 		$date = date("YmdHis");
-		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl,$date,'menu_'.$mode.'_btn', $ext);
+		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl, $date, 'menu_'.$mode.'_btn', $ext);
 	}
 
 	public function makeHomemenuCacheFile($menuSrl)

Braces +300 added lines, -134 removed lines

@@ -69,7 +69,9 @@ 
 		$site_module_info = Context::get('site_module_info');
 
 		$output = $this->addMenu(Context::get('title'), (int)$site_module_info->site_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('menu_srl', $output->get('menuSrl'));
 		$this->setMessage('success_registed');
@@ -148,8 +150,7 @@ 
 				$moduleConfig->unlinked_menu_srl = $output->get('menuSrl');
 				$oModuleController = getController('module');
 				$oModuleController->updateModuleConfig('menu', $moduleConfig);
-			}
-			else
+			} else
 			{
 				return false;
 			}
@@ -186,8 +187,7 @@ 
 			if($output->toBool() && $output->data)
 			{
 				$moduleInfo->menu_srl = $output->data->menu_srl;
-			}
-			else
+			} else
 			{
 				// create menu item.
 				$item_args->menu_srl = $menuSrl;
@@ -235,7 +235,9 @@ 
 		$args->menu_srl = Context::get('menu_srl');
 
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_registed');
 
@@ -255,8 +257,9 @@ 
 		$menuInfo = $oMenuAdminModel->getMenu($menu_srl);
 
 		$oAdmin = getClass('admin');
-		if($menuInfo->title == $oAdmin->getAdminMenuName())
-			return new BaseObject(-1, 'msg_adminmenu_cannot_delete');
+		if($menuInfo->title == $oAdmin->getAdminMenuName()) {
+					return new BaseObject(-1, 'msg_adminmenu_cannot_delete');
+		}
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl);
@@ -280,8 +283,9 @@ 
 				$originMenu = $value;
 				$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
 
-				if($isStartmenuInclude)
-					break;
+				if($isStartmenuInclude) {
+									break;
+				}
 			}
 		}
 
@@ -366,7 +370,9 @@ 
 			foreach($cache_list as $cache_file)
 			{
 				$pos = strpos($cache_file, $menu_srl.'.');
-				if($pos>0)FileHandler::removeFile($cache_file);
+				if($pos>0) {
+					FileHandler::removeFile($cache_file);
+				}
 			}
 		}
 		// Delete images of menu buttons
@@ -405,8 +411,7 @@ 
 		if($request->is_shortcut == 'Y')
 		{
 			$result = $this->_insertShortcut($request);
-		}
-		else
+		} else
 		{
 			$result = $this->_insertMenu($request, $isProc);
 		}
@@ -464,12 +469,21 @@ 
 			$args->is_shortcut = $request->is_shortcut;
 			$args->url = $request->shortcut_target;
 
-			if(!$args->open_window) $args->open_window = 'N';
-			if(!$args->expand) $args->expand = 'N';
-			if(!$args->is_shortcut) $args->is_shortcut = 'Y';
+			if(!$args->open_window) {
+				$args->open_window = 'N';
+			}
+			if(!$args->expand) {
+				$args->expand = 'N';
+			}
+			if(!$args->is_shortcut) {
+				$args->is_shortcut = 'Y';
+			}
 
-			if($request->menu_name_key) $args->name = $request->menu_name_key;
-			else $args->name = $request->menu_name;
+			if($request->menu_name_key) {
+				$args->name = $request->menu_name_key;
+			} else {
+				$args->name = $request->menu_name;
+			}
 		}
 		// type is module short cut
 		else if(is_numeric($request->shortcut_target))
@@ -504,13 +518,18 @@ 
 			$args->url = '#';
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		$args->menu_item_srl = getNextSequence();
 		$args->listorder = -1*$args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oDB->commit();
 
@@ -532,15 +551,27 @@ 
 		$args->expand = $request->menu_expand;
 		$args->is_shortcut = $request->is_shortcut;
 
-		if(!$args->open_window) $args->open_window = 'N';
-		if(!$args->expand) $args->expand = 'N';
-		if(!$args->is_shortcut) $args->is_shortcut = 'N';
+		if(!$args->open_window) {
+			$args->open_window = 'N';
+		}
+		if(!$args->expand) {
+			$args->expand = 'N';
+		}
+		if(!$args->is_shortcut) {
+			$args->is_shortcut = 'N';
+		}
 
-		if($request->menu_name_key) $args->name = $request->menu_name_key;
-		else $args->name = $request->menu_name;
+		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 = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
 		{
@@ -558,9 +589,15 @@ 
 		}
 
 		// if setting button variables, set argument button variables for db insert. but not upload in this method
-		if($request->normal_btn) $args->normal_btn = $request->normal_btn;
-		if($request->hover_btn) $args->hover_btn = $request->hover_btn;
-		if($request->active_btn) $args->active_btn = $request->active_btn;
+		if($request->normal_btn) {
+			$args->normal_btn = $request->normal_btn;
+		}
+		if($request->hover_btn) {
+			$args->hover_btn = $request->hover_btn;
+		}
+		if($request->active_btn) {
+			$args->active_btn = $request->active_btn;
+		}
 
 		if(!$request->module_id)
 		{
@@ -571,7 +608,9 @@ 
 		$args->menu_item_srl = getNextSequence();
 		$args->listorder = -1*$args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oDB->commit();
 
@@ -652,8 +691,12 @@ 
 		}
 
 		// variables set
-		if($request->menu_open_window != "Y") $request->menu_open_window = "N";
-		if($request->menu_expand != "Y") $request->menu_expand = "N";
+		if($request->menu_open_window != "Y") {
+			$request->menu_open_window = "N";
+		}
+		if($request->menu_expand != "Y") {
+			$request->menu_expand = "N";
+		}
 
 		// Get original information
 		$oMenuAdminModel = getAdminModel('menu');
@@ -680,13 +723,11 @@ 
 
 				$args->url = $newItemInfo->url;
 				$args->is_shortcut = 'Y';
-			}
-			else
+			} else
 			{
 				$args->url = '#';
 			}
-		}
-		else
+		} else
 		{
 			// check already created module instance
 			$oModuleModel = getModel('module');
@@ -719,14 +760,16 @@ 
 		if($request->menu_name_key)
 		{
 			$args->name = $request->menu_name_key;
-		}
-		else
+		} else
 		{
 			$args->name = $request->menu_name;
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		unset($args->group_srls);
 		$args->open_window = $request->menu_open_window;
@@ -828,8 +871,7 @@ 
 		{
 			$this->setError($returnObj->error);
 			$this->setMessage($returnObj->message);
-		}
-		else
+		} else
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -856,7 +898,9 @@ 
 		if($args->is_force != 'Y')
 		{
 			$output = executeQuery('menu.getChildMenuCount', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			if($output->data->count > 0)
 			{
 				return new BaseObject(-1001, 'msg_cannot_delete_for_child');
@@ -874,7 +918,9 @@ 
 			return $this->stop('msg_cannot_delete_for_admin_topmenu');
 		}
 
-		if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
+		if($itemInfo->parent_srl) {
+			$parent_srl = $itemInfo->parent_srl;
+		}
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $args->menu_srl);
@@ -948,9 +994,15 @@ 
 		// Update the xml file and get its location
 		$xml_file = $this->makeXmlFile($args->menu_srl);
 		// Delete all of image buttons
-		if($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
-		if($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
-		if($node['active_btn']) FileHandler::removeFile($node['active_btn']);
+		if($node['normal_btn']) {
+			FileHandler::removeFile($node['normal_btn']);
+		}
+		if($node['hover_btn']) {
+			FileHandler::removeFile($node['hover_btn']);
+		}
+		if($node['active_btn']) {
+			FileHandler::removeFile($node['active_btn']);
+		}
 
 		// Delete module
 		if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
@@ -1017,7 +1069,9 @@ 
 		$source_srl = Context::get('source_srl');	// Same hierarchy's menu item serial number
 		$target_srl = Context::get('target_srl');	// Self menu item serial number
 
-		if(!$mode || !$parent_srl || !$target_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$mode || !$parent_srl || !$target_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
@@ -1181,8 +1235,11 @@ 
 		// default argument setting
 		$args = new stdClass();
 		$args->menu_srl = $menuSrl;
-		if($parentSrl == 0) $args->parent_srl = $menuSrl;
-		else $args->parent_srl = $parentSrl;
+		if($parentSrl == 0) {
+			$args->parent_srl = $menuSrl;
+		} else {
+			$args->parent_srl = $parentSrl;
+		}
 		$args->menu_name_key = $originMenu['text'];
 		$args->menu_name = $originMenu['text'];
 		$args->menu_open_window = $originMenu['open_window'];
@@ -1275,8 +1332,11 @@ 
 		for($i=0;$i<4;$i++)
 		{
 			$case = rand(0, 1);
-			if($case) $doc = rand(65, 90);
-			else $doc = rand(97, 122);
+			if($case) {
+				$doc = rand(65, 90);
+			} else {
+				$doc = rand(97, 122);
+			}
 
 			$randomString .= chr($doc);
 		}
@@ -1299,15 +1359,21 @@ 
 		// menu name update
 		$args->menu_srl = $this->menuSrl;
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->map = array();
 		if(is_array($parentKeyList))
 		{
 			foreach($parentKeyList as $no=>$srl)
 			{
-				if($srl === 0) continue;
-				if(!is_array($this->map[$srl]))$this->map[$srl] = array();
+				if($srl === 0) {
+					continue;
+				}
+				if(!is_array($this->map[$srl])) {
+					$this->map[$srl] = array();
+				}
 				$this->map[$srl][] = $no;
 			}
 		}
@@ -1409,7 +1475,9 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		$target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if($target_item->menu_item_srl != $target_srl) return new BaseObject(-1,'msg_invalid_request');
+		if($target_item->menu_item_srl != $target_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// Move the menu location(change the order menu appears)
 		if($mode == 'move')
 		{
@@ -1420,24 +1488,33 @@ 
 			if($source_srl)
 			{
 				$source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
-				if($source_item->menu_item_srl != $source_srl) return new BaseObject(-1,'msg_invalid_request');
+				if($source_item->menu_item_srl != $source_srl) {
+					return new BaseObject(-1,'msg_invalid_request');
+				}
 				$args->listorder = $source_item->listorder-1;
-			}
-			else
+			} else
 			{
 				$output = executeQuery('menu.getMaxListorder', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 				$args->listorder = (int)$output->data->listorder;
-				if(!$args->listorder) $args->listorder= 0;
+				if(!$args->listorder) {
+					$args->listorder= 0;
+				}
 			}
 			$args->parent_srl = $parent_srl;
 			$output = executeQuery('menu.updateMenuItemListorder', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->parent_srl = $parent_srl;
 			$args->menu_item_srl = $target_srl;
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			//module's menu_srl move also
 			if($isShortcut == 'N' && !empty($url))
@@ -1465,14 +1542,15 @@ 
 				}
 			}
 			// Add a child
-		}
-		elseif($mode == 'insert')
+		} elseif($mode == 'insert')
 		{
 			$args->menu_item_srl = $target_srl;
 			$args->parent_srl = $parent_srl;
 			$args->listorder = -1*getNextSequence();
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$xml_file = $this->makeXmlFile($menu_srl);
@@ -1516,8 +1594,7 @@ 
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 
-		}
-		else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
+		} else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 		}
@@ -1531,7 +1608,9 @@ 
 			$path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
 			$filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
 
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if(!is_dir($path)) {
+				FileHandler::makeDir($path);
+			}
 
 			move_uploaded_file($target_file['tmp_name'], $filename);
 			Context::set('filename', $filename);
@@ -1571,7 +1650,9 @@ 
 			foreach($installed_module_list AS $key=>$value)
 			{
 				$info = $oModuleModel->getModuleActionXml($value->module);
-				if($info->menu) $menuList[$value->module] = $info->menu;
+				if($info->menu) {
+					$menuList[$value->module] = $info->menu;
+				}
 				unset($info->menu);
 			}
 		}
@@ -1603,8 +1684,12 @@ 
 		$info = $oModuleModel->getModuleActionXml($moduleName);
 
 		$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
+		if(empty($url)) {
+			$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
+		}
+		if(empty($url)) {
+			$url = getNotEncodedFullUrl('', 'module', 'admin');
+		}
 		$dbInfo = Context::getDBInfo();
 
 		$args = new stdClass();
@@ -1616,8 +1701,7 @@ 
 		if(strpos($url, 'https') !== false)
 		{
 			$args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url);
-		}
-		else
+		} else
 		{
 			$args->url = str_replace($dbInfo->default_url, '', $url);
 		}
@@ -1636,14 +1720,18 @@ 
 		if($item_info->menu_item_srl == $args->menu_item_srl)
 		{
 			$output = $this->_updateMenuItem($args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Insert if not exist
 		else
 		{
 			$args->listorder = -1*$args->menu_item_srl;
 			$output = executeQuery('menu.insertMenuItem', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Get information of the menu
 		$menu_info = $oMenuModel->getMenu($args->menu_srl);
@@ -1674,8 +1762,7 @@ 
 		if(!$exposure)
 		{
 			$args->group_srls = '';
-		}
-		else
+		} else
 		{
 			$exposure = explode(',', $exposure);
 			if(in_array($exposure, array('-1','-3')))
@@ -1683,7 +1770,9 @@ 
 				$args->group_srls = $exposure;
 			}
 
-			if($exposure) $args->group_srls = implode(',', $exposure);
+			if($exposure) {
+				$args->group_srls = implode(',', $exposure);
+			}
 		}
 
 		$output = $this->_updateMenuItem($args);
@@ -1706,7 +1795,9 @@ 
 			$moduleGrnatsArgs = new stdClass;
 			$moduleGrnatsArgs->module_srl = $moduleInfo->module_srl;
 			$output = executeQueryArray('module.getModuleGrants', $moduleGrnatsArgs);
-			if(!$output->data) $output->data = array();
+			if(!$output->data) {
+				$output->data = array();
+			}
 			$moduleGrnats = new stdClass();
 			foreach($output->data as $grant)
 			{
@@ -1715,7 +1806,9 @@ 
 		}
 
 		$grantList = $xml_info->grant;
-		if(!$grantList) $grantList = new stdClass;
+		if(!$grantList) {
+			$grantList = new stdClass;
+		}
 
 		$grantList->access = new stdClass();
 		$grantList->access->default = 'guest';
@@ -1741,10 +1834,11 @@ 
 					$grant->{$grantName}[] = $htPerm[$grantName];
 					continue;
 				}
-			}
-			else if($itemInfo->is_shortcut === 'Y')
+			} else if($itemInfo->is_shortcut === 'Y')
 			{
-				if(isset($moduleGrnats) && $moduleGrnats->{$grantName}) $grant->{$grantName} = $moduleGrnats->{$grantName};
+				if(isset($moduleGrnats) && $moduleGrnats->{$grantName}) {
+					$grant->{$grantName} = $moduleGrnats->{$grantName};
+				}
 			}
 		}
 
@@ -1766,12 +1860,16 @@ 
 	function makeXmlFile($menu_srl)
 	{
 		// Return if there is no information when creating the xml file
-		if(!$menu_srl) return;
+		if(!$menu_srl) {
+			return;
+		}
 		// Get menu informaton
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->toBool() || !$output->data) return $output;
+		if(!$output->toBool() || !$output->data) {
+			return $output;
+		}
 		$site_srl = (int)$output->data->site_srl;
 
 		if($site_srl)
@@ -1785,7 +1883,9 @@ 
 		$args->menu_srl = $menu_srl;
 		$args->sort_index = 'listorder';
 		$output = executeQuery('menu.getMenuItems', $args);
-		if(!$output->toBool()) return;
+		if(!$output->toBool()) {
+			return;
+		}
 		// Specify the name of the cache file
 		$xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl);
 		$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl);
@@ -1799,7 +1899,9 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 		// Create a tree for loop
 		$list_count = count($list);
 		for($i=0;$i<$list_count;$i++)
@@ -1887,7 +1989,9 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, $domain)
 	{
-		if(!$source_node) return;
+		if(!$source_node) {
+			return;
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
@@ -1895,7 +1999,9 @@ 
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if($menu_item_srl&&$tree[$menu_item_srl]) {
+				$child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			}
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
 			foreach($names as $key => $val)
@@ -1909,31 +2015,48 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = var_export($url, true);
 			}
-			else $href = var_export($url, true);
 			$is_shortcut = ($node->is_shortcut) ? $node->is_shortcut : '';
 			$open_window = ($node->open_window) ? $node->open_window : '';
 			$expand = ($node->expand) ? $node->expand : '';
 
 			$normal_btn = ($node->normal_btn) ? $node->normal_btn : '';
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-			else $normal_btn = '';
+			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) {
+				$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			} else {
+				$normal_btn = '';
+			}
 			$hover_btn = ($node->hover_btn) ? $node->hover_btn : '';
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-			else $hover_btn = '';
+			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) {
+				$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			} else {
+				$hover_btn = '';
+			}
 			$active_btn = ($node->active_btn) ? $node->active_btn : '';
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-			else $active_btn = '';
+			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) {
+				$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			} else {
+				$active_btn = '';
+			}
 
 			$group_srls = ($node->group_srls) ? $node->group_srls : '';
 
 			if($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
+				if($hover_btn) {
+					$hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn);
+				} else {
+					$hover_str = '';
+				}
+				if($active_btn) {
+					$active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn);
+				} else {
+					$active_str = '';
+				}
 				$link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type], ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>&quot; %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str);
-			}
-			else
+			} else
 			{
 				$link = '<?php print $_names[$lang_type]; ?>';
 			}
@@ -1941,8 +2064,7 @@ 
 			// If the value of node->group_srls exists
 			if($group_srls) {
 				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
-			}
-			else
+			} else
 			{
 				$group_check_code = "true";
 			}
@@ -1969,8 +2091,11 @@ 
 				$link
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if($child_buff) {
+				$buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			} else {
+				$buff .=  sprintf('<node %s />', $attribute);
+			}
 		}
 		return $buff;
 	}
@@ -1989,15 +2114,20 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 	{
 		$output = array("buff"=>"", "url_list"=>array());
-		if(!$source_node) return $output;
+		if(!$source_node) {
+			return $output;
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		foreach($source_node as $menu_item_srl => $node)
 		{
 			// 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());
+			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);
@@ -2007,8 +2137,7 @@ 
 				if(preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]?[a-zA-Z_0-9]*)\'\]\}/', $val) === 1)
 				{
 					$name_arr_str .= sprintf('"%s"=>"%s",', $key, $val);
-				}
-				else
+				} else
 				{
 					$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\','\''), array('\\\\','\\\''), removeHackTag($val)));
 				}
@@ -2016,11 +2145,16 @@ 
 			$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;
+			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";
+			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);
@@ -2029,8 +2163,9 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = var_export($url, true);
 			}
-			else $href = var_export($url, true);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
 			$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
@@ -2047,29 +2182,48 @@ 
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-			else $normal_btn = '';
+			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) {
+				$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			} else {
+				$normal_btn = '';
+			}
 
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-			else $hover_btn = '';
+			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) {
+				$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			} else {
+				$hover_btn = '';
+			}
 
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-			else $active_btn = '';
+			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) {
+				$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			} else {
+				$active_btn = '';
+			}
 
 
 			$group_srls = $node->group_srls;
 
 			if($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
+				if($hover_btn) {
+					$hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn);
+				} else {
+					$hover_str = '';
+				}
+				if($active_btn) {
+					$active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn);
+				} else {
+					$active_str = '';
+				}
 				$link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str);
-				if($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
-				else $link_active = $link;
-			}
-			else
+				if($active_btn) {
+					$link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
+				} else {
+					$link_active = $link;
+				}
+			} else
 			{
 				$link_active = $link = sprintf('$_menu_names[%d][$lang_type]', $node->menu_item_srl);
 			}
@@ -2118,11 +2272,15 @@ 
 	 */
 	function updateMenuLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if(!count($menu_srl_list)) {
+			return;
+		}
 		// Delete the value of menu_srls
 		$args->menu_srls = implode(',',$menu_srl_list);
 		$output = executeQuery('menu.deleteMenuLayout', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$args->layout_srl = $layout_srl;
 		// Mapping menu_srls, layout_srl
@@ -2130,7 +2288,9 @@ 
 		{
 			$args->menu_srl = $menu_srl_list[$i];
 			$output = executeQuery('menu.insertMenuLayout', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 	}
 
@@ -2153,9 +2313,15 @@ 
 			$oMenuModel = getAdminModel('menu');
 			$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 
-			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
-			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
-			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
+			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) {
+				FileHandler::removeFile($itemInfo->normal_btn);
+			}
+			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) {
+				FileHandler::removeFile($itemInfo->hover_btn);
+			}
+			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) {
+				FileHandler::removeFile($itemInfo->active_btn);
+			}
 		}
 
 		$returnArray = array();

modules/document/document.model.php

Braces +300 added lines, -139 removed lines

@@ -58,18 +58,24 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if(count($_document_list) <= 0) {
+			return;
+		}
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
 		foreach($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if(!$val->document_srl || $checked_documents[$val->document_srl]) {
+				continue;
+			}
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if(!count($document_srls)) {
+			return;
+		}
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
@@ -77,8 +83,12 @@ 
 		{
 			foreach($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if(!isset($val->value)) {
+					continue;
+				}
+				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) {
+					$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				}
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
@@ -89,7 +99,9 @@ 
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) {
+				continue;
+			}
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
@@ -101,10 +113,15 @@ 
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
-					else $v = null;
+					if(isset($val[$user_lang_code])) {
+						$v = $val[$user_lang_code];
+					} else if(isset($val[$document_lang_code])) {
+						$v = $val[$document_lang_code];
+					} else if(isset($val[0])) {
+						$v = $val[0];
+					} else {
+						$v = null;
+					}
 					$extra_keys[$idx]->value = $v;
 				}
 			}
@@ -113,9 +130,13 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if($vars[-1][$user_lang_code]) {
+				$_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			}
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if($vars[-2][$user_lang_code]) {
+				$_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			}
 
 			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
@@ -136,7 +157,9 @@ 
 	 */
 	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if(!$document_srl) {
+			return new documentItem();
+		}
 
 		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
@@ -146,9 +169,13 @@ 
 				return $oDocument;
 			}
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if($load_extra_vars) {
+				$this->setToAllDocumentExtraVars();
+			}
+		}
+		if($is_admin) {
+			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -167,8 +194,7 @@ 
 		{
 			$list_count = count($document_srls);
 			$document_srls = implode(',',$document_srls);
-		}
-		else
+		} else
 		{
 			$list_count = 1;
 		}
@@ -179,28 +205,38 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return;
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		$document_count = count($document_list);
 		foreach($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		$output = null;
 		if(count($result))
@@ -248,18 +284,15 @@ 
 		{
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
-		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		} elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
 			$args->sort_index = str_replace('documents.','',$args->sort_index);
 			$output = executeQueryArray($query_id, $args);
-		}
-		elseif ($sort_check->isExtraVars)
+		} elseif ($sort_check->isExtraVars)
 		{
 			$output = executeQueryArray($query_id, $args);
-		}
-		else
+		} else
 		{
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
@@ -269,11 +302,15 @@ 
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if(!$output->toBool()||!count($output->data)) {
+					return $output;
+				}
 
 				foreach($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if($val->document_srl) {
+						$target_srls[] = $val->document_srl;
+					}
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -291,14 +328,15 @@ 
 				$output->total_count = $page_navigation->total_count;
 				$output->total_page = $page_navigation->total_page;
 				$output->page = $page_navigation->cur_page;
-			}
-			else
+			} else
 			{
 				$output = executeQueryArray($query_id, $args, $columnList);
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
@@ -313,20 +351,26 @@ 
 		{
 			foreach($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if($attribute->is_notice == 'Y') {
+					$virtual_number --;
+				}
 			}
 		}
 
 		foreach($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if($except_notice && $attribute->is_notice == 'Y') {
+				continue;
+			}
 			$document_srl = $attribute->document_srl;
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -334,7 +378,9 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		if(count($output->data))
 		{
@@ -362,12 +408,16 @@ 
 		$args->module_srl = $obj->module_srl;
 		$args->category_srl= $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if(!$output->toBool()||!$output->data) {
+			return;
+		}
 
 		foreach($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
@@ -463,7 +513,9 @@ 
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if(!$keys) {
+					$keys = array();
+				}
 
 				if($oCacheHandler->isSupport())
 				{
@@ -493,7 +545,9 @@ 
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
+			ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		}
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -523,7 +577,9 @@ 
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 
 			$oModuleModel = getModel('module');
 			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
@@ -596,7 +652,9 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if(is_null($search_obj)) {
+			$search_obj = new stdClass();
+		}
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
@@ -613,7 +671,9 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output->data;
 	}
@@ -652,34 +712,29 @@ 
 		if($sort_check->isExtraVars)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
 				if($args->order_type === 'desc')
 				{
 					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
-				}
-				else
+				} else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
-			}
-			elseif($sort_check->sort_index === 'regdate')
+			} elseif($sort_check->sort_index === 'regdate')
 			{
 
 				if($args->order_type === 'asc')
 				{
 					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
-				}
-				else
+				} else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 
-			}
-			else
+			} else
 			{
 				return 1;
 			}
@@ -705,15 +760,16 @@ 
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if(!$node) {
+			return;
+		}
 
 		if($node->group_srls)
 		{
 			$group_srls = explode(',',$node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
-		}
-		else
+		} else
 		{
 			unset($node->group_srls);
 			$node->group_srls = array();
@@ -731,7 +787,9 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		if($output->data->count > 0) {
+			return true;
+		}
 		return false;
 	}
 
@@ -750,7 +808,9 @@ 
 		if(!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if(!$oDocumentController->makeCategoryFile($module_srl)) {
+				return array();
+			}
 		}
 
 		include($filename);
@@ -770,7 +830,9 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 		$idx = 0;
 		$list_order = array();
 		foreach($list as $key => $val)
@@ -790,8 +852,11 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
-			else $selected = false;
+			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) {
+				$selected = true;
+			} else {
+				$selected = false;
+			}
 
 			$obj->selected = $selected;
 
@@ -802,14 +867,18 @@ 
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if($selected) {
+					$expand = true;
+				}
 
 				while($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if($expand) {
+						$document_category[$parent_srl]->expand = $expand;
+					}
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -817,7 +886,9 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if(count($val['list'])) {
+				$this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			}
 		}
 		$document_category[$list_order[0]]->first = true;
 		$document_category[$list_order[count($list_order)-1]]->last = true;
@@ -885,13 +956,20 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -911,14 +989,21 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -929,7 +1014,9 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$module_srl = Context::get('module_srl');
 		$categories= $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
@@ -1024,7 +1111,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
@@ -1044,15 +1133,20 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if(!$mid || !$alias) {
+			return null;
+		}
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
-		else return $output->data->document_srl;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data->document_srl;
+		}
 	}
 
 	/**
@@ -1063,15 +1157,20 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if(!$module_srl || !$title) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
-		else
+		if(!$output->data) {
+			return null;
+		} else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if(is_array($output->data)) {
+				return $output->data[0]->document_srl;
+			}
 			return $output->data->document_srl;
 		}
 	}
@@ -1083,13 +1182,18 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if(!$document_srl) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
-		else return $output->data[0]->alias_title;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data[0]->alias_title;
+		}
 	}
 
 	/**
@@ -1146,17 +1250,23 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1164,13 +1274,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1212,34 +1327,45 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if($point != -1) {
+			$point = 1;
+		}
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
 		if($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if($document_config->use_vote_down!='S') {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 			$args->below_point = 0;
-		}
-		else
+		} else
 		{
-			if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if($document_config->use_vote_up!='S') {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
 		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oMemberModel = getModel('member');
 		if($output->data)
@@ -1261,9 +1387,11 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
-			return array_flip($this->getStatusList());
-		else return $lang->status_name_list;
+		if(!isset($lang->status_name_list)) {
+					return array_flip($this->getStatusList());
+		} else {
+			return $lang->status_name_list;
+		}
 	}
 
 	/**
@@ -1287,20 +1415,22 @@ 
 				if (!$extra_output->data || !$extra_output->toBool())
 				{
 					$sortIndex = 'list_order';
-				}
-				else
+				} else
 				{
 					$check_array = array();
 					foreach($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
-					else $isExtraVars = true;
+					if(!in_array($sortIndex, $check_array)) {
+						$sortIndex = 'list_order';
+					} else {
+						$isExtraVars = true;
+					}
 				}
+			} else {
+							$sortIndex = 'list_order';
 			}
-			else
-				$sortIndex = 'list_order';
 		}
 		$returnObj = new stdClass();
 		$returnObj->sort_index = $sortIndex;
@@ -1338,7 +1468,9 @@ 
 
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if(!isset($orderType[$args->order_type])) {
+			$args->order_type = 'asc';
+		}
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
 		if($searchOpt->mid)
@@ -1349,21 +1481,29 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
-		else $args->module_srl = $searchOpt->module_srl;
+		if(is_array($searchOpt->module_srl)) {
+			$args->module_srl = implode(',', $searchOpt->module_srl);
+		} else {
+			$args->module_srl = $searchOpt->module_srl;
+		}
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
-		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		if(is_array($searchOpt->exclude_module_srl)) {
+			$args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		} else {
+			$args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		}
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
-		else
+		if($searchOpt->statusList) {
+			$args->statusList = $searchOpt->statusList;
+		} else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
-			else
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl) {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
+			} else {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			}
 		}
 
 		// Category is selected, further sub-categories until all conditions
@@ -1391,18 +1531,24 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1410,18 +1556,28 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
-					else $args->{"s_".$search_target} = '';
+					if($search_keyword=='N') {
+						$args->{"s_".$search_target} = 'N';
+					} elseif($search_keyword=='Y') {
+						$args->{"s_".$search_target} = 'Y';
+					} else {
+						$args->{"s_".$search_target} = '';
+					}
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					} elseif($search_keyword=='temp') {
+						$args->statusList = array($this->getConfigStatus('temp'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1466,13 +1622,14 @@ 
 		if ($searchOpt->isExtraVars)
 		{
 			$query_id = 'document.getDocumentListExtraSort';
-		}
-		else
+		} else
 		{
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if($args->sort_index != 'list_order' || $args->order_type != 'asc') {
+				$use_division = false;
+			}
 
 			/**
 			 * If it is true, use_division changed to use the document division
@@ -1487,8 +1644,7 @@ 
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
-				}
-				else
+				} else
 				{
 					$listSqlID = 'document.getDocumentList';
 					$divisionSqlID = 'document.getDocumentDivision';
@@ -1545,7 +1701,9 @@ 
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if($output->data->count<1) {
+						$last_division = null;
+					}
 				}
 
 				$args->division = $division;
@@ -1586,8 +1744,12 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return array();
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		return $document_list;
 	}
@@ -1602,8 +1764,7 @@ 
 		if(Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
-		}
-		else
+		} else
 		{
 			$iconSkin = $documentConfig->icons;
 		}

Spacing +239 added lines, -239 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	function getDocumentExtraVarsFromDB($documentSrls)
 	{
-		if(!is_array($documentSrls) || count($documentSrls) == 0)
+		if (!is_array($documentSrls) || count($documentSrls) == 0)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -58,52 +58,52 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if (count($_document_list) <= 0) return;
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
-		foreach($_document_list as $key => $val)
+		foreach ($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if (!$val->document_srl || $checked_documents[$val->document_srl]) continue;
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if (!count($document_srls)) return;
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
-		if($output->toBool() && $output->data)
+		if ($output->toBool() && $output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if (!isset($val->value)) continue;
+				if (!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
 
 		$user_lang_code = Context::getLangType();
-		for($i=0,$c=count($document_srls);$i<$c;$i++)
+		for ($i = 0, $c = count($document_srls); $i < $c; $i++)
 		{
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if (!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
 			$document_lang_code = $_document_list[$document_srl]->get('lang_code');
 			// Expand the variable processing
-			if(count($extra_keys))
+			if (count($extra_keys))
 			{
-				foreach($extra_keys as $idx => $key)
+				foreach ($extra_keys as $idx => $key)
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
+					if (isset($val[$user_lang_code])) $v = $val[$user_lang_code];
+					else if (isset($val[$document_lang_code])) $v = $val[$document_lang_code];
+					else if (isset($val[0])) $v = $val[0];
 					else $v = null;
 					$extra_keys[$idx]->value = $v;
 				}
@@ -113,11 +113,11 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if ($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title', $vars[-1][$user_lang_code]);
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if ($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content', $vars[-2][$user_lang_code]);
 
-			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
+			if ($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
 				unset($checked_documents[$document_srl]);
 			}
@@ -134,21 +134,21 @@ 
 	 * @param array $columnList
 	 * @return documentItem
 	 */
-	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if (!$document_srl) return new documentItem();
 
-		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+		if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
 			$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				return $oDocument;
 			}
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
+		if ($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -161,12 +161,12 @@ 
 	 * @param array $columnList
 	 * @return array value type is documentItem
 	 */
-	function getDocuments($document_srls, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(is_array($document_srls))
+		if (is_array($document_srls))
 		{
 			$list_count = count($document_srls);
-			$document_srls = implode(',',$document_srls);
+			$document_srls = implode(',', $document_srls);
 		}
 		else
 		{
@@ -179,33 +179,33 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return;
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		$document_count = count($document_list);
-		foreach($document_list as $key => $attribute)
+		foreach ($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
 		$output = null;
-		if(count($result))
+		if (count($result))
 		{
-			foreach($result as $document_srl => $val)
+			foreach ($result as $document_srl => $val)
 			{
 				$output[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 			}
@@ -222,7 +222,7 @@ 
 	 * @param array $columnList
 	 * @return BaseObject
 	 */
-	function getDocumentList($obj, $except_notice = false, $load_extra_vars=true, $columnList = array())
+	function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array())
 	{
 		$sort_check = $this->_setSortIndex($obj, $load_extra_vars);
 		$obj->sort_index = $sort_check->sort_index;
@@ -232,7 +232,7 @@ 
 		// Call trigger (before)
 		// This trigger can be used to set an alternative output using a different search method
 		$output = ModuleHandler::triggerCall('document.getDocumentList', 'before', $obj);
-		if($output instanceof BaseObject && !$output->toBool())
+		if ($output instanceof BaseObject && !$output->toBool())
 		{
 			return $output;
 		}
@@ -249,10 +249,10 @@ 
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
 		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		elseif ($sort_check->isExtraVars && substr_count($obj->search_target, 'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
-			$args->sort_index = str_replace('documents.','',$args->sort_index);
+			$args->sort_index = str_replace('documents.', '', $args->sort_index);
 			$output = executeQueryArray($query_id, $args);
 		}
 		elseif ($sort_check->isExtraVars)
@@ -264,16 +264,16 @@ 
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
 			$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1, 'document.getDocumentListWithinExtraVars' => 1);
-			if(isset($groupByQuery[$query_id]))
+			if (isset($groupByQuery[$query_id]))
 			{
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if (!$output->toBool() || !count($output->data)) return $output;
 
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if ($val->document_srl) $target_srls[] = $val->document_srl;
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -281,7 +281,7 @@ 
 				$virtual_number = $keys[0];
 
 				$target_args = new stdClass();
-				$target_args->document_srls = implode(',',$target_srls);
+				$target_args->document_srls = implode(',', $target_srls);
 				$target_args->list_order = $args->sort_index;
 				$target_args->order_type = $args->order_type;
 				$target_args->list_count = $args->list_count;
@@ -298,35 +298,35 @@ 
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
 
-		if(!isset($virtual_number))
+		if (!isset($virtual_number))
 		{
 			$keys = array_keys($data);
 			$virtual_number = $keys[0];
 		}
 
-		if($except_notice)
+		if ($except_notice)
 		{
-			foreach($data as $key => $attribute)
+			foreach ($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if ($attribute->is_notice == 'Y') $virtual_number--;
 			}
 		}
 
-		foreach($data as $key => $attribute)
+		foreach ($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if ($except_notice && $attribute->is_notice == 'Y') continue;
 			$document_srl = $attribute->document_srl;
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -334,11 +334,11 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $number => $document)
+			foreach ($output->data as $number => $document)
 			{
 				$output->data[$number] = $GLOBALS['XE_DOCUMENT_LIST'][$document->document_srl];
 			}
@@ -360,16 +360,16 @@ 
 	{
 		$args = new stdClass();
 		$args->module_srl = $obj->module_srl;
-		$args->category_srl= $obj->category_srl;
+		$args->category_srl = $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -380,7 +380,7 @@ 
 		}
 		$this->setToAllDocumentExtraVars();
 
-		foreach($result->data as $document_srl => $val)
+		foreach ($result->data as $document_srl => $val)
 		{
 			$result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
@@ -396,20 +396,20 @@ 
 	 */
 	function getExtraKeys($module_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
 		{
 			$keys = false;
 			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'module_document_extra_keys:' . $module_srl;
+				$object_key = 'module_document_extra_keys:'.$module_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$keys = $oCacheHandler->get($cache_key);
 			}
 
 			$oExtraVar = ExtraVar::getInstance($module_srl);
 
-			if($keys === false)
+			if ($keys === false)
 			{
 				$obj = new stdClass();
 				$obj->module_srl = $module_srl;
@@ -419,13 +419,13 @@ 
 
 				// correcting index order
 				$isFixed = FALSE;
-				if(is_array($output->data))
+				if (is_array($output->data))
 				{
 					$prevIdx = 0;
-					foreach($output->data as $no => $value)
+					foreach ($output->data as $no => $value)
 					{
 						// case first
-						if($prevIdx == 0 && $value->idx != 1)
+						if ($prevIdx == 0 && $value->idx != 1)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -439,7 +439,7 @@ 
 						}
 
 						// case others
-						if($prevIdx > 0 && $prevIdx + 1 != $value->idx)
+						if ($prevIdx > 0 && $prevIdx + 1 != $value->idx)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -456,16 +456,16 @@ 
 					}
 				}
 
-				if($isFixed)
+				if ($isFixed)
 				{
 					$output = executeQueryArray('document.getDocumentExtraKeys', $obj);
 				}
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if (!$keys) $keys = array();
 
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $keys);
 				}
@@ -486,14 +486,14 @@ 
 	 */
 	function getExtraVars($module_srl, $document_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
 		{
 			// Extended to extract the values of variables set
 			$oDocument = $this->getDocument($document_srl, false);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if (is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -516,71 +516,71 @@ 
 
 		$oDocumentController = getController('document');
 		// Members must be a possible feature
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+			if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 			$oModuleModel = getModel('module');
-			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-			if($document_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl)
+			$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+			if ($document_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a Referral Button
 				$url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote', '', 'javascript');
 			}
 
-			if($document_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl)
+			if ($document_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add button to negative
-				$url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','','javascript');
+				$url = sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote_down', '', 'javascript');
 			}
 
 			// Adding Report
 			$url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_declare','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_declare', '', 'javascript');
 
 			// Add Bookmark button
 			$url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_scrap', '', 'javascript');
 		}
 		// Add print button
-		$url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
-		$oDocumentController->addDocumentPopupMenu($url,'cmd_print','','printDocument');
+		$url = getUrl('', 'module', 'document', 'act', 'dispDocumentPrint', 'document_srl', $document_srl);
+		$oDocumentController->addDocumentPopupMenu($url, 'cmd_print', '', 'printDocument');
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
-		if($this->grant->manager)
+		if ($this->grant->manager)
 		{
 			$str_confirm = Context::getLang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_trash', '', 'javascript');
 		}
 
 		// If you are managing to find posts by ip
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$oDocumentModel = getModel('document');
-			$oDocument = $oDocumentModel->getDocument($document_srl);	//before setting document recycle
+			$oDocument = $oDocumentModel->getDocument($document_srl); //before setting document recycle
 
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				// Find a post equivalent to ip address
-				$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+				$url = getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'ipaddress', 'search_keyword', $oDocument->getIpAddress());
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_search_by_ipaddress', $icon_path, 'TraceByIpaddress');
 
 				$url = sprintf("var params = new Array(); params['ipaddress_list']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_add_ip_to_spamfilter', '', 'javascript');
 			}
 		}
 		// Changing the language of pop-up menu
 		$menus = Context::get('document_popup_menu_list');
 		$menus_count = count($menus);
-		for($i=0;$i<$menus_count;$i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -596,13 +596,13 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if (is_null($search_obj)) $search_obj = new stdClass();
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -613,7 +613,7 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output->data;
 	}
@@ -632,7 +632,7 @@ 
 		$output = executeQuery('document.getDocumentExtraVarsCount', $args);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -649,29 +649,29 @@ 
 
 		$this->_setSearchOption($opt, $args, $query_id, $use_division);
 
-		if($sort_check->isExtraVars)
+		if ($sort_check->isExtraVars)
 		{
 			return 1;
 		}
 		else
 		{
-			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
+			if ($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
-				if($args->order_type === 'desc')
+				if ($args->order_type === 'desc')
 				{
-					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+					$args->{'rev_'.$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 				else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 			}
-			elseif($sort_check->sort_index === 'regdate')
+			elseif ($sort_check->sort_index === 'regdate')
 			{
 
-				if($args->order_type === 'asc')
+				if ($args->order_type === 'asc')
 				{
-					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+					$args->{'rev_'.$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 				else
 				{
@@ -686,9 +686,9 @@ 
 		}
 
 		// Guhanhu total number of the article search page
-		$output = executeQuery($query_id . 'Page', $args);
+		$output = executeQuery($query_id.'Page', $args);
 		$count = $output->data->count;
-		$page = (int)(($count-1)/$opt->list_count)+1;
+		$page = (int) (($count - 1) / $opt->list_count) + 1;
 		return $page;
 	}
 
@@ -700,16 +700,16 @@ 
 	 */
 	function getCategory($category_srl, $columnList = array())
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if (!$node) return;
 
-		if($node->group_srls)
+		if ($node->group_srls)
 		{
-			$group_srls = explode(',',$node->group_srls);
+			$group_srls = explode(',', $node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
 		}
@@ -730,8 +730,8 @@ 
 	{
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
-		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		$output = executeQuery('document.getChildCategoryCount', $args);
+		if ($output->data->count > 0) return true;
 		return false;
 	}
 
@@ -747,10 +747,10 @@ 
 		// Category of the target module file swollen
 		$filename = sprintf("%sfiles/cache/document_category/%s.php", _XE_PATH_, $module_srl);
 		// If the target file to the cache file regeneration category
-		if(!file_exists($filename))
+		if (!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if (!$oDocumentController->makeCategoryFile($module_srl)) return array();
 		}
 
 		include($filename);
@@ -770,10 +770,10 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if (!count($list)) return;
 		$idx = 0;
 		$list_order = array();
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
 			$obj = new stdClass;
 			$obj->mid = $val['mid'];
@@ -782,7 +782,7 @@ 
 			$obj->parent_srl = $val['parent_srl'];
 			$obj->title = $obj->text = $val['text'];
 			$obj->description = $val['description'];
-			$obj->expand = $val['expand']=='Y'?true:false;
+			$obj->expand = $val['expand'] == 'Y' ?true:false;
 			$obj->color = $val['color'];
 			$obj->document_count = $val['document_count'];
 			$obj->depth = $depth;
@@ -790,26 +790,26 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
+			if (Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
 			else $selected = false;
 
 			$obj->selected = $selected;
 
 			$list_order[$idx++] = $obj->category_srl;
 			// If you have a parent category of child nodes apply data
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if ($selected) $expand = true;
 
-				while($parent_srl)
+				while ($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if ($expand) $document_category[$parent_srl]->expand = $expand;
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -817,10 +817,10 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if (count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth + 1);
 		}
 		$document_category[$list_order[0]]->first = true;
-		$document_category[$list_order[count($list_order)-1]]->last = true;
+		$document_category[$list_order[count($list_order) - 1]]->last = true;
 	}
 
 	/**
@@ -835,7 +835,7 @@ 
 		$args->module_srl = $module_srl;
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategoryDocumentCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -845,8 +845,8 @@ 
 	 */
 	function getCategoryXmlFile($module_srl)
 	{
-		$xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
-		if(!file_exists($xml_file))
+		$xml_file = sprintf('files/cache/document_category/%s.xml.php', $module_srl);
+		if (!file_exists($xml_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -861,8 +861,8 @@ 
 	 */
 	function getCategoryPhpFile($module_srl)
 	{
-		$php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
-		if(!file_exists($php_file))
+		$php_file = sprintf('files/cache/document_category/%s.php', $module_srl);
+		if (!file_exists($php_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -877,7 +877,7 @@ 
 	 */
 	function getMonthlyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -885,13 +885,13 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -903,7 +903,7 @@ 
 	 */
 	function getDailyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -911,14 +911,14 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -929,17 +929,17 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$module_srl = Context::get('module_srl');
-		$categories= $this->getCategoryList($module_srl);
+		$categories = $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
 		// No additional category
 		$output = "0,0,{$lang->none_category}\n";
-		if($categories)
+		if ($categories)
 		{
-			foreach($categories as $category_srl => $category)
+			foreach ($categories as $category_srl => $category)
 			{
-				$output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
+				$output .= sprintf("%d,%d,%s\n", $category_srl, $category->depth, $category->title);
 			}
 		}
 		$this->add('categories', $output);
@@ -951,7 +951,7 @@ 
 	 */
 	function getDocumentConfig()
 	{
-		if($this->documentConfig === NULL)
+		if ($this->documentConfig === NULL)
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
@@ -1024,11 +1024,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
-		if(!$category_info)
+		if (!$category_info)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -1044,14 +1044,14 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if (!$mid || !$alias) return null;
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data->document_srl;
 	}
 
@@ -1063,15 +1063,15 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if (!$module_srl || !$title) return null;
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if (is_array($output->data)) return $output->data[0]->document_srl;
 			return $output->data->document_srl;
 		}
 	}
@@ -1083,12 +1083,12 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if (!$document_srl) return null;
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data[0]->alias_title;
 	}
 
@@ -1131,32 +1131,32 @@ 
 	{
 		// Variable check
 		$args = new stdClass;
-		$args->category_srl = $obj->category_srl?$obj->category_srl:null;
+		$args->category_srl = $obj->category_srl ? $obj->category_srl : null;
 		$args->sort_index = $obj->sort_index;
-		$args->order_type = $obj->order_type?$obj->order_type:'desc';
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->order_type = $obj->order_type ? $obj->order_type : 'desc';
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		// Search options
 		$search_target = $obj->search_target;
 		$search_keyword = $obj->search_keyword;
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1164,13 +1164,13 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1179,7 +1179,7 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1191,9 +1191,9 @@ 
 		}
 
 		$output = executeQueryArray('document.getTrashList', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $attribute)
+			foreach ($output->data as $key => $attribute)
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -1212,46 +1212,46 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if ($point != -1) $point = 1;
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($point == -1)
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_down != 'S') return new BaseObject(-1, 'msg_invalid_request');
 			$args->below_point = 0;
 		}
 		else
 		{
-			if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_up != 'S') return new BaseObject(-1, 'msg_invalid_request');
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
-		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		$output = executeQueryArray('document.getVotedMemberList', $args);
+		if (!$output->toBool()) return $output;
 
 		$oMemberModel = getModel('member');
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $d)
+			foreach ($output->data as $k => $d)
 			{
 				$profile_image = $oMemberModel->getProfileImage($d->member_srl);
 				$output->data[$k]->src = $profile_image->src;
 			}
 		}
 
-		$this->add('voted_member_list',$output->data);
+		$this->add('voted_member_list', $output->data);
 	}
 
 	/**
@@ -1261,7 +1261,7 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
+		if (!isset($lang->status_name_list))
 			return array_flip($this->getStatusList());
 		else return $lang->status_name_list;
 	}
@@ -1276,7 +1276,7 @@ 
 	{
 		$sortIndex = $obj->sort_index;
 		$isExtraVars = false;
-		if(!in_array($sortIndex, array('list_order','regdate','last_update','update_order','readed_count','voted_count','blamed_count','comment_count','trackback_count','uploaded_count','title','category_srl')))
+		if (!in_array($sortIndex, array('list_order', 'regdate', 'last_update', 'update_order', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'trackback_count', 'uploaded_count', 'title', 'category_srl')))
 		{
 			// get module_srl extra_vars list
 			if ($load_extra_vars)
@@ -1291,11 +1291,11 @@ 
 				else
 				{
 					$check_array = array();
-					foreach($extra_output->data as $val)
+					foreach ($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
+					if (!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
 					else $isExtraVars = true;
 				}
 			}
@@ -1323,13 +1323,13 @@ 
 	{
 		// Variable check
 		$args = new stdClass();
-		$args->category_srl = $searchOpt->category_srl?$searchOpt->category_srl:null;
+		$args->category_srl = $searchOpt->category_srl ? $searchOpt->category_srl : null;
 		$args->order_type = $searchOpt->order_type;
-		$args->page = $searchOpt->page?$searchOpt->page:1;
-		$args->list_count = $searchOpt->list_count?$searchOpt->list_count:20;
-		$args->page_count = $searchOpt->page_count?$searchOpt->page_count:10;
-		$args->start_date = $searchOpt->start_date?$searchOpt->start_date:null;
-		$args->end_date = $searchOpt->end_date?$searchOpt->end_date:null;
+		$args->page = $searchOpt->page ? $searchOpt->page : 1;
+		$args->list_count = $searchOpt->list_count ? $searchOpt->list_count : 20;
+		$args->page_count = $searchOpt->page_count ? $searchOpt->page_count : 10;
+		$args->start_date = $searchOpt->start_date ? $searchOpt->start_date : null;
+		$args->end_date = $searchOpt->end_date ? $searchOpt->end_date : null;
 		$args->member_srl = $searchOpt->member_srl;
 		$args->member_srls = $searchOpt->member_srls;
 
@@ -1339,10 +1339,10 @@ 
 
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if (!isset($orderType[$args->order_type])) $args->order_type = 'asc';
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
-		if($searchOpt->mid)
+		if ($searchOpt->mid)
 		{
 			$oModuleModel = getModel('module');
 			$args->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -1350,30 +1350,30 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
+		if (is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
 		else $args->module_srl = $searchOpt->module_srl;
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		if (is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
 		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
+		if ($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
 		else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
+			if ($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
 			else
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
 		}
 
 		// Category is selected, further sub-categories until all conditions
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$category_list = $this->getCategoryList($args->module_srl);
 			$category_info = $category_list[$args->category_srl];
 			$category_info->childs[] = $args->category_srl;
-			$args->category_srl = implode(',',$category_info->childs);
+			$args->category_srl = implode(',', $category_info->childs);
 		}
 
 		// Used to specify the default query id (based on several search options to query id modified)
@@ -1386,24 +1386,24 @@ 
 		$search_target = $searchOpt->search_target;
 		$search_keyword = $searchOpt->search_keyword;
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1411,18 +1411,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
+					if ($search_keyword == 'N') $args->{"s_".$search_target} = 'N';
+					elseif ($search_keyword == 'Y') $args->{"s_".$search_target} = 'Y';
 					else $args->{"s_".$search_target} = '';
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
+					elseif ($search_keyword == 'temp') $args->statusList = array($this->getConfigStatus('temp'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1430,17 +1430,17 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'member_srls' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 
-					if($logged_info->member_srl)
+					if ($logged_info->member_srl)
 					{
 						$srls = explode(',', $search_keyword);
-						foreach($srls as $srl)
+						foreach ($srls as $srl)
 						{
-							if(abs($srl) != $logged_info->member_srl)
+							if (abs($srl) != $logged_info->member_srl)
 							{
 								break; // foreach
 							}
@@ -1451,7 +1451,7 @@ 
 					}
 					break;
 				case 'blamed_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword * -1;
+					$args->{"s_".$search_target} = (int) $search_keyword * -1;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1464,7 +1464,7 @@ 
 					$use_division = true;
 					break;
 				case 'tag' :
-					$args->s_tags = str_replace(' ','%',$search_keyword);
+					$args->s_tags = str_replace(' ', '%', $search_keyword);
 					$query_id = 'document.getDocumentListWithinTag';
 					break;
 				case 'extra_vars':
@@ -1472,9 +1472,9 @@ 
 					$query_id = 'document.getDocumentListWithinExtraVars';
 					break;
 				default :
-					if(strpos($search_target,'extra_vars')!==false) {
+					if (strpos($search_target, 'extra_vars') !== false) {
 						$args->var_idx = substr($search_target, strlen('extra_vars'));
-						$args->var_value = str_replace(' ','%',$search_keyword);
+						$args->var_value = str_replace(' ', '%', $search_keyword);
 						$args->sort_index = 'documents.'.$args->sort_index;
 						$query_id = 'document.getDocumentListWithExtraVars';
 					}
@@ -1491,18 +1491,18 @@ 
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if ($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
 
 			/**
 			 * If it is true, use_division changed to use the document division
 			 */
-			if($use_division)
+			if ($use_division)
 			{
 				// Division begins
-				$division = (int)Context::get('division');
+				$division = (int) Context::get('division');
 
 				// order by list_order and (module_srl===0 or module_srl may count), therefore case table full scan
-				if($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
+				if ($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
@@ -1514,7 +1514,7 @@ 
 				}
 
 				// If you do not value the best division top
-				if(!$division)
+				if (!$division)
 				{
 					$division_args = new stdClass();
 					$division_args->module_srl = $args->module_srl;
@@ -1525,7 +1525,7 @@ 
 					$division_args->statusList = $args->statusList;
 
 					$output = executeQuery($divisionSqlID, $division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$division = $item->list_order;
@@ -1534,10 +1534,10 @@ 
 				}
 
 				// The last division
-				$last_division = (int)Context::get('last_division');
+				$last_division = (int) Context::get('last_division');
 
 				// Division after division from the 5000 value of the specified Wanted
-				if(!$last_division)
+				if (!$last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
@@ -1549,7 +1549,7 @@ 
 					$last_division_args->page = 5001;
 
 					$output = executeQuery($divisionSqlID, $last_division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$last_division = $item->list_order;
@@ -1557,14 +1557,14 @@ 
 				}
 
 				// Make sure that after last_division article
-				if($last_division)
+				if ($last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if ($output->data->count < 1) $last_division = null;
 				}
 
 				$args->division = $division;
@@ -1597,7 +1597,7 @@ 
 	 * @param int $count
 	 * @return object
 	 */
-	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0 )
+	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0)
 	{
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
@@ -1605,8 +1605,8 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return array();
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		return $document_list;
 	}
@@ -1618,7 +1618,7 @@ 
 	function getDocumentExtraImagePath()
 	{
 		$documentConfig = getModel('document')->getDocumentConfig();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
 		}
@@ -1626,7 +1626,7 @@ 
 		{
 			$iconSkin = $documentConfig->icons;
 		}
-		$path = sprintf('%s%s',getUrl(), "modules/document/tpl/icons/$iconSkin/");
+		$path = sprintf('%s%s', getUrl(), "modules/document/tpl/icons/$iconSkin/");
 
 		return $path;
 	}

modules/krzip/krzip.class.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 
 if(!function_exists('lcfirst'))
 {
+	/**
+	 * @param string $text
+	 */
 	function lcfirst($text)
 	{
 		return strtolower(substr($text, 0, 1)) . substr($text, 1);

Spacing +2 added lines, -2 removed lines

@@ -6,11 +6,11 @@
  * @brief  Krzip module high class.
  */
 
-if(!function_exists('lcfirst'))
+if (!function_exists('lcfirst'))
 {
 	function lcfirst($text)
 	{
-		return strtolower(substr($text, 0, 1)) . substr($text, 1);
+		return strtolower(substr($text, 0, 1)).substr($text, 1);
 	}
 }
 

modules/seo/seo.class.php

Doc Comments +7 added lines

@@ -54,6 +54,9 @@ 
 		return $config;
 	}
 
+	/**
+	 * @param string $property
+	 */
 	public function addMeta($property, $content, $attr_name = 'property')
 	{
 		if (!$content) return;
@@ -68,6 +71,10 @@ 
 		$this->SEO['meta'][] = array('property' => $property, 'content' => $content, 'attr_name' => $attr_name);
 	}
 
+	/**
+	 * @param string $rel
+	 * @param string $href
+	 */
 	public function addLink($rel, $href)
 	{
 		if (!$href) return;

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('seo');
 
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$request_uri = $IDN->encode(Context::get('request_uri'));
 
@@ -31,16 +31,16 @@ 
 		if (!$config->ga_track_subdomain) $config->ga_track_subdomain = 'N';
 		if ($config->site_image) 
 		{
-			$config->site_image_url = $request_uri . 'files/attach/site_image/' . $config->site_image;
+			$config->site_image_url = $request_uri.'files/attach/site_image/'.$config->site_image;
 
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport()) {
+			if ($oCacheHandler->isSupport()) {
 				$site_image = false;
 				$cache_key = 'seo:site_image';
 				$site_image = $oCacheHandler->get($cache_key);
-				if(!$site_image) {
-					$path = _XE_PATH_ . 'files/attach/site_image/';
-					list($width, $height) = @getimagesize($path . $config->site_image);
+				if (!$site_image) {
+					$path = _XE_PATH_.'files/attach/site_image/';
+					list($width, $height) = @getimagesize($path.$config->site_image);
 					$site_image_dimension = array(
 						'width' => $width,
 						'height' => $height
@@ -86,9 +86,9 @@ 
 			foreach ($list as $val) {
 				if ($type == 'meta') {
 					$attr_name = $val['attr_name'];
-					Context::addHtmlHeader('<meta ' . $attr_name . '="' . $val['property'] . '" content="' . $val['content'] . '" />');
+					Context::addHtmlHeader('<meta '.$attr_name.'="'.$val['property'].'" content="'.$val['content'].'" />');
 				} elseif ($type == 'link') {
-					Context::addHtmlHeader('<link rel="' . $val['rel'] . '" href="' . $val['href'] . '" />');
+					Context::addHtmlHeader('<link rel="'.$val['rel'].'" href="'.$val['href'].'" />');
 				}
 			}
 		}
@@ -114,7 +114,7 @@ 
 </script>
 GASCRIPT;
 
-			Context::addHtmlHeader($ga_script . PHP_EOL);
+			Context::addHtmlHeader($ga_script.PHP_EOL);
 		}
 
 		// Naver Analytics
@@ -124,7 +124,7 @@ 
 <script src="//wcs.naver.net/wcslog.js"></script>
 <script>if(!wcs_add){var wcs_add={wa:'{$config->na_id}'};}if(typeof wcs_do!="undefined"){wcs_do();}</script>
 NASCRIPT;
-			Context::addHtmlFooter($na_script . PHP_EOL);
+			Context::addHtmlFooter($na_script.PHP_EOL);
 		}
 	}
 
@@ -139,7 +139,7 @@ 
 
 		$seo_config = $this->getConfig();
 
-		if($seo_config->enable === 'Y') {
+		if ($seo_config->enable === 'Y') {
 			foreach ($this->triggers as $trigger) {
 				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) return TRUE;
 			}
@@ -155,7 +155,7 @@ 
 
 		$seo_config = $this->getConfig();
 
-		if($seo_config->enable === 'Y') {
+		if ($seo_config->enable === 'Y') {
 			foreach ($this->triggers as $trigger) {
 				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) {
 					$oModuleController->insertTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]);

Braces +27 added lines, -9 removed lines

@@ -24,11 +24,21 @@ 
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$request_uri = $IDN->encode(Context::get('request_uri'));
 
-		if (!$config) $config = new stdClass;
-		if (!$config->enable) $config->enable = 'Y';
-		if (!$config->use_optimize_title) $config->use_optimize_title = 'N';
-		if (!$config->ga_except_admin) $config->ga_except_admin = 'N';
-		if (!$config->ga_track_subdomain) $config->ga_track_subdomain = 'N';
+		if (!$config) {
+			$config = new stdClass;
+		}
+		if (!$config->enable) {
+			$config->enable = 'Y';
+		}
+		if (!$config->use_optimize_title) {
+			$config->use_optimize_title = 'N';
+		}
+		if (!$config->ga_except_admin) {
+			$config->ga_except_admin = 'N';
+		}
+		if (!$config->ga_track_subdomain) {
+			$config->ga_track_subdomain = 'N';
+		}
 		if ($config->site_image) 
 		{
 			$config->site_image_url = $request_uri . 'files/attach/site_image/' . $config->site_image;
@@ -56,7 +66,9 @@ 
 
 	public function addMeta($property, $content, $attr_name = 'property')
 	{
-		if (!$content) return;
+		if (!$content) {
+			return;
+		}
 
 		$oModuleController = getController('module');
 		$oModuleController->replaceDefinedLangCode($content);
@@ -70,7 +82,9 @@ 
 
 	public function addLink($rel, $href)
 	{
-		if (!$href) return;
+		if (!$href) {
+			return;
+		}
 
 		$this->SEO['link'][] = array('rel' => $rel, 'href' => $href);
 	}
@@ -81,7 +95,9 @@ 
 		$logged_info = Context::get('logged_info');
 
 		foreach ($this->SEO as $type => $list) {
-			if (!$list || !count($list)) continue;
+			if (!$list || !count($list)) {
+				continue;
+			}
 
 			foreach ($list as $val) {
 				if ($type == 'meta') {
@@ -141,7 +157,9 @@ 
 
 		if($seo_config->enable === 'Y') {
 			foreach ($this->triggers as $trigger) {
-				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) return TRUE;
+				if (!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) {
+					return TRUE;
+				}
 			}
 		}
 

modules/syndication/syndication.controller.php

Doc Comments +3 added lines

@@ -174,6 +174,9 @@
 		$output = executeQuery('syndication.deleteLog', $args);
 	}
 
+	/**
+	 * @param string $type
+	 */
 	function ping($id, $type, $page=1) {
 		$this->ping_message = '';
 debugPrint($id);

Spacing +28 added lines, -28 removed lines

@@ -12,16 +12,16 @@ 
 	var $ping_message = '';
 
 	function triggerInsertDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -31,16 +31,16 @@ 
 	}
 
 	function triggerUpdateDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -50,16 +50,16 @@ 
 	}
 
 	function triggerDeleteDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
 
@@ -75,14 +75,14 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$output = executeQuery('syndication.getExceptModule', $obj);
-		if($output->data->count) return $this->makeObject();
+		if ($output->data->count) return $this->makeObject();
 		
 
 		$id = $oSyndicationModel->getID('site', $obj->module_srl);
@@ -93,21 +93,21 @@ 
 
 	function triggerMoveDocumentModule(&$obj)
 	{
-		if($obj->module_srl < 1) return $this->makeObject();
+		if ($obj->module_srl < 1) return $this->makeObject();
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$arr_document_srl = explode(',', $obj->document_srls);
-		if(!$arr_document_srl) return $this->makeObject();
+		if (!$arr_document_srl) return $this->makeObject();
 
-		foreach($arr_document_srl as $document_srl)
+		foreach ($arr_document_srl as $document_srl)
 		{
 			$target_id = sprintf('%s-%s', $obj->module_srl, $document_srl);
 			$id = $oSyndicationModel->getID('article', $target_id);
@@ -121,11 +121,11 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, '', '');
 
@@ -140,11 +140,11 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if ($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if ($config->syndication_use != 'Y') return $this->makeObject();
 
 		// 신디케이션 삭제 로그 제거
 		$this->deleteLog($obj->module_srl, $obj->document_srl);
@@ -174,7 +174,7 @@ 
 		$output = executeQuery('syndication.deleteLog', $args);
 	}
 
-	function ping($id, $type, $page=1) {
+	function ping($id, $type, $page = 1) {
 		$this->ping_message = '';
 debugPrint($id);
 		$oSyndicationModel = getModel('syndication');
@@ -182,14 +182,14 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if(!$config->syndication_token)
+		if (!$config->syndication_token)
 		{
 			$this->ping_message = 'Syndication Token empty';
 			$oSyndicationModel->setResentPingLog($this->ping_message);
 			return false;
 		}
 
-		if(!$this->checkOpenSSLSupport())
+		if (!$this->checkOpenSSLSupport())
 		{
 			$lang = Context::get('lang');
 			$this->ping_message = $lang->msg_need_openssl_support;
@@ -197,7 +197,7 @@ 
 			return false;
 		}
 
-		if(substr($config->site_url,-1)!='/')
+		if (substr($config->site_url, -1) != '/')
 		{
 			$config->site_url .= '/';
 		}
@@ -217,11 +217,11 @@ 
 		$buff = FileHandler::getRemoteResource($ping_url, null, 10, 'POST', 'application/x-www-form-urlencoded', $ping_header, array(), array('ping_url'=>$ping_body), $request_config);
 
 		$xml = new XmlParser();
-		$xmlDoc= $xml->parse($buff);
+		$xmlDoc = $xml->parse($buff);
 
-		if($xmlDoc->result->error_code->body != '000')
+		if ($xmlDoc->result->error_code->body != '000')
 		{
-			if(!$buff)
+			if (!$buff)
 			{
 				$this->ping_message = 'Socket connection error. Check your Server Environment.';
 			}

Braces +61 added lines, -22 removed lines

@@ -12,16 +12,22 @@ 
 	var $ping_message = '';
 
 	function triggerInsertDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -31,16 +37,22 @@ 
 	}
 
 	function triggerUpdateDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$target_id = sprintf('%s-%s', $obj->module_srl, $obj->document_srl);
 		$id = $oSyndicationModel->getID('article', $target_id);
@@ -50,16 +62,22 @@ 
 	}
 
 	function triggerDeleteDocument(&$obj) {
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
 
@@ -75,14 +93,20 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$output = executeQuery('syndication.getExceptModule', $obj);
-		if($output->data->count) return $this->makeObject();
+		if($output->data->count) {
+			return $this->makeObject();
+		}
 		
 
 		$id = $oSyndicationModel->getID('site', $obj->module_srl);
@@ -93,19 +117,27 @@ 
 
 	function triggerMoveDocumentModule(&$obj)
 	{
-		if($obj->module_srl < 1) return $this->makeObject();
+		if($obj->module_srl < 1) {
+			return $this->makeObject();
+		}
 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$arr_document_srl = explode(',', $obj->document_srls);
-		if(!$arr_document_srl) return $this->makeObject();
+		if(!$arr_document_srl) {
+			return $this->makeObject();
+		}
 
 		foreach($arr_document_srl as $document_srl)
 		{
@@ -121,11 +153,15 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		$this->insertLog($obj->module_srl, $obj->document_srl, '', '');
 
@@ -140,11 +176,15 @@ 
 		$oSyndicationModel = getModel('syndication');
 		$oModuleModel = getModel('module');
 
-		if($oSyndicationModel->isExceptedModules($obj->module_srl)) return $this->makeObject();
+		if($oSyndicationModel->isExceptedModules($obj->module_srl)) {
+			return $this->makeObject();
+		}
 
 		$config = $oModuleModel->getModuleConfig('syndication');
 
-		if($config->syndication_use!='Y') return $this->makeObject();
+		if($config->syndication_use!='Y') {
+			return $this->makeObject();
+		}
 
 		// 신디케이션 삭제 로그 제거
 		$this->deleteLog($obj->module_srl, $obj->document_srl);
@@ -224,8 +264,7 @@ 
 			if(!$buff)
 			{
 				$this->ping_message = 'Socket connection error. Check your Server Environment.';
-			}
-			else
+			} else
 			{
 				$this->ping_message = $xmlDoc->result->message->body;
 			}

modules/syndication/syndication.model.php

Doc Comments +18 added lines

@@ -63,6 +63,9 @@ 
 		return $module_srls;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	function getLang($key, $site_srl)
 	{
 		if(!$this->langs[$site_srl])
@@ -438,6 +441,12 @@ 
 		return $article;
 	}
 
+	/**
+	 * @param string $startTime
+	 * @param string $endTime
+	 * @param string $type
+	 * @param string $id
+	 */
 	function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
 		if($this->site_url==null) $this->init();
 
@@ -481,6 +490,12 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $startTime
+	 * @param string $endTime
+	 * @param string $type
+	 * @param string $id
+	 */
 	function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
 		if($this->site_url==null) $this->init();
 
@@ -538,6 +553,9 @@ 
 		return $output->data;
 	}
 
+	/**
+	 * @param string $type
+	 */
 	function getID($type, $target_id = null) {
 		if($this->site_url==null) $this->init();
 

Spacing +110 added lines, -110 removed lines

@@ -11,7 +11,7 @@ 
 {
 	private $site_url = null;
 	private $uri_scheme = 'http://';
-	private $syndication_password= null;
+	private $syndication_password = null;
 	private $year = null;
 	private $langs = array();
 	private $granted_modules = array();
@@ -20,15 +20,15 @@ 
 	function init() {
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if(Context::getSslStatus() == 'always') $this->uri_scheme = 'https://';
+		if (Context::getSslStatus() == 'always') $this->uri_scheme = 'https://';
 
 		$this->site_url = preg_replace('/\/+$/is', '', $config->site_url);
 		$this->syndication_password = $config->syndication_password;
 		$this->year = $config->year;
 
 		$output = executeQueryArray('syndication.getGrantedModules');
-		if($output->data) {
-			foreach($output->data as $key => $val) {
+		if ($output->data) {
+			foreach ($output->data as $key => $val) {
 				$this->granted_modules[] = $val->module_srl;
 			}
 		}
@@ -41,10 +41,10 @@ 
 		$args->module_srl = $module_srl;
 
 		$output = executeQuery('syndication.getExceptModule', $args);
-		if($output->data->count) return TRUE;
+		if ($output->data->count) return TRUE;
 
 		$output = executeQuery('syndication.getGrantedModule', $args);
-		if($output->data->count) return TRUE;
+		if ($output->data->count) return TRUE;
 
 		return FALSE;
 	}
@@ -55,7 +55,7 @@ 
 		$module_srls = array();
 		if (is_array($output->data))
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
 				$module_srls[] = $val->module_srl;
 			}
@@ -65,21 +65,21 @@ 
 
 	function getLang($key, $site_srl)
 	{
-		if(!$this->langs[$site_srl])
+		if (!$this->langs[$site_srl])
 		{
 			$this->langs[$site_srl] = array();
 			$args = new stdClass;
 			$args->site_srl = $site_srl;
 			$args->lang_code = Context::getLangType();
 			$output = executeQueryArray("syndication.getLang", $args);
-			if(!$output->toBool() || !$output->data) return $key;
+			if (!$output->toBool() || !$output->data) return $key;
 
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
 				$this->langs[$site_srl][$value->name] = $value->value;
 			}
 		}
-		if($this->langs[$site_srl][$key])
+		if ($this->langs[$site_srl][$key])
 		{
 			return $this->langs[$site_srl][$key];
 		}
@@ -89,7 +89,7 @@ 
 	function handleLang($title, $site_srl)
 	{
 		$matches = NULL;
-		if(!preg_match("/\\\$user_lang->(.+)/", $title, $matches))
+		if (!preg_match("/\\\$user_lang->(.+)/", $title, $matches))
 		{
 			return $title;
 		}
@@ -102,9 +102,9 @@ 
 	function getSyndicationList() {
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if(!$config->year || !$config->site_url || !$config->syndication_token) 
+		if (!$config->year || !$config->site_url || !$config->syndication_token) 
 		{
-			return $this->makeObject(-1,'msg_check_syndication_config');
+			return $this->makeObject(-1, 'msg_check_syndication_config');
 		}
 
 		$id = Context::get('id');
@@ -114,49 +114,49 @@ 
 		$endTime = Context::get('end-time');
 
 		$page = Context::get('page');
-		if(!$page)
+		if (!$page)
 		{
 			$page = 1;
 		}
 		$vars = Context::getRequestVars();
-		if(!$id || !$type)
+		if (!$id || !$type)
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
-		if(!preg_match('/^tag:([^,]+),([0-9]+):(site|channel|article)(.*)$/i',$id,$matches)) 
+		if (!preg_match('/^tag:([^,]+),([0-9]+):(site|channel|article)(.*)$/i', $id, $matches)) 
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
-		if($config->syndication_password != Context::get('syndication_password'))
+		if ($config->syndication_password != Context::get('syndication_password'))
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
 		$url = $matches[1];
 		$year = $matches[2];
 		$target = $matches[3];
 		$id = $matches[4];
-		if($id && $id{0}==':')
+		if ($id && $id{0} == ':')
 		{
 			$id = substr($id, 1);
 		}
 
 		$module_srl = null;
 		$document_srl = null;
-		if($id && strpos($id,'-')!==false) 
+		if ($id && strpos($id, '-') !== false) 
 		{
 			list($module_srl, $document_srl) = explode('-', $id);
 		}
-		elseif($id) 
+		elseif ($id) 
 		{
 			$module_srl = $id;
 		}
 
-		if(!$url || !$year || !$target)
+		if (!$url || !$year || !$target)
 		{
-			return $this->makeObject(-1,'msg_invalid_request');
+			return $this->makeObject(-1, 'msg_invalid_request');
 		}
 
 		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
@@ -164,12 +164,12 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 
-		if($target == 'channel' && !$module_srl)
+		if ($target == 'channel' && !$module_srl)
 		{
 			$target = 'site';
 		}
 
-		if($module_srl)
+		if ($module_srl)
 		{
 			$args = new stdClass;
 			$args->module_srls = $module_srl;
@@ -178,13 +178,13 @@ 
 			self::$modules[$module_srl] = $output->data;
 		}
 
-		if($target == 'channel' && $module_srl)
+		if ($target == 'channel' && $module_srl)
 		{
-			if($module_info) 
+			if ($module_info) 
 			{
 				$args->module_srl = $module_srl;
 				$output = executeQuery('syndication.getExceptModules', $args);
-				if($output->data->count) 
+				if ($output->data->count) 
 				{
 					$error = 'target is not founded';
 				}
@@ -197,7 +197,7 @@ 
 			unset($args);
 		}
 
-		if(!$error) 
+		if (!$error) 
 		{
 			Context::set('target', $target);
 			Context::set('type', $type);
@@ -208,20 +208,20 @@ 
 			$oModuleModel = getModel('module');
 			$site_config = $oModuleModel->getModuleConfig('module');
 
-			switch($target) 
+			switch ($target) 
 			{
 				case 'site' :
 						$site_info = new stdClass;
 						$site_info->id = $this->getID('site');
-						$site_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
+						$site_info->site_url = getFullSiteUrl($this->uri_scheme.$this->site_url, '');
 						$site_info->site_title = $this->handleLang($site_module_info->browser_title, $site_module_info->site_srl);
 						$site_info->title = $site_info->site_title;
 
-						if($module_srl)
+						if ($module_srl)
 						{
 							$args->module_srl = $module_srl;
 							$site_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-							if(!$site_info->title)
+							if (!$site_info->title)
 							{
 								$site_info->title = $site_info->site_title;
 							}
@@ -229,10 +229,10 @@ 
 						else
 						{
 							$except_module_output = executeQueryArray('syndication.getExceptModuleSrls');
-							if(is_array($except_module_output->data))
+							if (is_array($except_module_output->data))
 							{
 								$except_module_srls = array();
-								foreach($except_module_output->data as $val)
+								foreach ($except_module_output->data as $val)
 								{
 									$except_module_srls[] = $val->module_srl;
 								}
@@ -242,25 +242,25 @@ 
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
 
-						if($output->data)
+						if ($output->data)
 						{
 							$site_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
 						}
 
-						$site_info->self_href = $this->getSelfHref($site_info->id,$type);
+						$site_info->self_href = $this->getSelfHref($site_info->id, $type);
 						Context::set('site_info', $site_info);
 
 						$this->setTemplateFile('site');
-						switch($type) {
+						switch ($type) {
 							case 'article' :
 								// 문서 전체를 신디케이션에 추가
-								Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article',$site_info->id));
+								Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article', $site_info->id));
 								$next_url = Context::get('articles')->next_url;
 								
 								break;
 							case 'deleted' :
 								// 문서 전체를 신디케이션에서 삭제
-								Context::set('deleted', $this->getArticles($module_srl, $page, $startTime, $endTime, 'deleted',$site_info->id));
+								Context::set('deleted', $this->getArticles($module_srl, $page, $startTime, $endTime, 'deleted', $site_info->id));
 								$next_url = Context::get('deleted')->next_url;
 								break;
 							default :
@@ -269,7 +269,7 @@ 
 						}
 
 						// 다음 페이지가 있다면 다시 신디케이션 호출
-						if($next_url)
+						if ($next_url)
 						{
 							$oSyndicationController = getController('syndication');
 							$oSyndicationController->ping(Context::get('id'), Context::get('type'), ++$page);
@@ -282,10 +282,10 @@ 
 						$channel_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
 						$channel_info->updated = date("Y-m-d\\TH:i:s").$time_zone;
 						$channel_info->self_href = $this->getSelfHref($channel_info->id, $type);
-						$channel_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
+						$channel_info->site_url = getFullSiteUrl($this->uri_scheme.$this->site_url, '');
 						$channel_info->alternative_href = $this->getChannelAlternativeHref($module_info->module_srl);
 						$channel_info->summary = $module_info->description;
-						if($module_info->module == "textyle")
+						if ($module_info->module == "textyle")
 						{
 							$channel_info->type = "blog";
 							$channel_info->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
@@ -295,17 +295,17 @@ 
 							$channel_info->type = "web";
 						}
 						$except_module_srls = $this->getExceptModuleSrls();
-						if($except_module_srls)
+						if ($except_module_srls)
 						{
-							$args->except_modules = implode(',',$except_module_srls);
+							$args->except_modules = implode(',', $except_module_srls);
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if ($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
 						Context::set('channel_info', $channel_info);
 
 						$this->setTemplateFile('channel');
-						switch($type) {
+						switch ($type) {
 							case 'article' :
 									Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article', $channel_info->id));
 								break;
@@ -323,29 +323,29 @@ 
 						$channel_info->id = $this->getID('channel', $module_info->module_srl);
 						$channel_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
 						$channel_info->site_title = $site_config->siteTitle;
-						if(!$channel_info->site_title) {
+						if (!$channel_info->site_title) {
 							$channel_info->site_title = $channel_info->title;
 						}
 						$channel_info->updated = date("Y-m-d\\TH:i:s").$time_zone;
 						$channel_info->self_href = $this->getSelfHref($channel_info->id, $type);
-						$channel_info->site_url = getFullSiteUrl($this->uri_scheme . $this->site_url, '');
+						$channel_info->site_url = getFullSiteUrl($this->uri_scheme.$this->site_url, '');
 						$channel_info->alternative_href = $this->getChannelAlternativeHref($module_info->module_srl);
 						$channel_info->webmaster_name = $member_config->webmaster_name;
 						$channel_info->webmaster_email = $member_config->webmaster_email;
 
 						$except_module_srls = $this->getExceptModuleSrls();
-						if($except_module_srls)
+						if ($except_module_srls)
 						{
-							$args->except_modules = implode(',',$except_module_srls);
+							$args->except_modules = implode(',', $except_module_srls);
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if ($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
 						Context::set('channel_info', $channel_info);
 						Context::set('member_config', $member_config);
 
 						$this->setTemplateFile('channel');
-						switch($type) {
+						switch ($type) {
 							case "article" :
 								$articles = new stdClass; 
 								$articles->list = array($this->getArticle($document_srl));
@@ -371,15 +371,15 @@ 
 
 	// @DEPRECATED
 	function getChannels() {
-		if($module_srls) $args->module_srls = $module_srls;
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if ($module_srls) $args->module_srls = $module_srls;
+		if (count($this->granted_modules)) $args->except_module_srls = implode(',', $this->granted_modules);
 		$output = executeQueryArray('syndication.getModules', $args);
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
-		if($output->data) {
-			foreach($output->data as $module_info) {
+		if ($output->data) {
+			foreach ($output->data as $module_info) {
 				unset($obj);
 				$obj = new stdClass;
 				$obj->id = $this->getID('channel', $module_info->module_srl);
@@ -388,7 +388,7 @@ 
 				$obj->self_href = $this->getSelfHref($obj->id, 'channel');
 				$obj->alternative_href = $this->getChannelAlternativeHref($module_info);
 				$obj->summary = $module_info->description;
-				if($module_info->module == "textyle")
+				if ($module_info->module == "textyle")
 				{
 					$obj->type = "blog";
 					$obj->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
@@ -405,15 +405,15 @@ 
 	}
 
 	function getArticle($document_srl) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
 		$oDocumentModel = getModel('document');
-		$oDocument = $oDocumentModel->getDocument($document_srl,false,false);
-		if(!$oDocument->isExists()) return;
+		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
+		if (!$oDocument->isExists()) return;
 
 		$val = $oDocument->getObjectVars();
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
 		$mdoule_info = self::$modules[$oDocument->get('module_srl')];
@@ -427,7 +427,7 @@ 
 		$article->nick_name = (!$oDocument->get('nick_name')) ? $oDocument->get('user_name') : $oDocument->get('nick_name');
 		$article->title = $oDocument->getTitle();
 		$article->content = $oDocument->get('content');
-		if($val->category_srl) {
+		if ($val->category_srl) {
 			$category = $oDocumentModel->getCategory($val->category_srl);
 			$category_title = $category->title;
 			$article->category = new stdClass();
@@ -438,14 +438,14 @@ 
 		return $article;
 	}
 
-	function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+	function getArticles($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
+		if ($this->site_url == null) $this->init();
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl = $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if ($module_srl) $args->module_srl = $module_srl;
+		if ($startTime) $args->start_date = $this->getDate($startTime);
+		if ($endTime) $args->end_date = $this->getDate($endTime);
+		if (count($this->granted_modules)) $args->except_module_srls = implode(',', $this->granted_modules);
 		$args->page = $page;
 		$output = executeQueryArray('syndication.getDocumentList', $args);
 		$cur_page = $output->page_navigation->cur_page;
@@ -455,23 +455,23 @@ 
 		$result->next_url = null;
 		$result->list = array();
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
-		if($cur_page<$total_page) {
+		if ($cur_page < $total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
-			$result->next_url = $next_url.'&page='.($cur_page+1);
+			if ($startTime) $next_url .= '&startTime='.$startTime;
+			if ($endTime) $next_url .= '&endTime='.$endTime;
+			$result->next_url = $next_url.'&page='.($cur_page + 1);
 		}
 
-		if($output->data) {
-			foreach($output->data as $key => $val) {
+		if ($output->data) {
+			foreach ($output->data as $key => $val) {
 				$article = new stdClass();
 				$article->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
 				$article->updated = date("Y-m-d\\TH:i:s", ztime($val->last_update)).$time_zone;
 				$article->published = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-				$article->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'document_srl', $val->document_srl);
+				$article->alternative_href = getFullSiteUrl($this->uri_scheme.$this->site_url, '', 'document_srl', $val->document_srl);
 				$article->channel_alternative_href = $this->getChannelAlternativeHref($val->module_srl);
 				$article->nick_name = (!$val->nick_name) ? $val->user_name : $val->nick_name;
 				$article->content = $val->content;
@@ -482,12 +482,12 @@ 
 	}
 
 	function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl= $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
+		if ($module_srl) $args->module_srl = $module_srl;
+		if ($startTime) $args->start_date = $this->getDate($startTime);
+		if ($endTime) $args->end_date = $this->getDate($endTime);
 		$args->page = $page;
 
 		$output = executeQueryArray('syndication.getDeletedList', $args);
@@ -499,21 +499,21 @@ 
 		$result->next_url = null;
 		$result->list = array();
 
-		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
+		$time_zone = substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3);
 		Context::set('time_zone', $time_zone);
 
-		if($cur_page<$total_page) {
+		if ($cur_page < $total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
-			$result->next_url = $next_url . '&page='.($cur_page+1);
+			if ($startTime) $next_url .= '&startTime='.$startTime;
+			if ($endTime) $next_url .= '&endTime='.$endTime;
+			$result->next_url = $next_url.'&page='.($cur_page + 1);
 		}
 
-		if($output->data) {
-			foreach($output->data as $key => $val) {
+		if ($output->data) {
+			foreach ($output->data as $key => $val) {
 				$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
 				$val->deleted = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-				$val->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'document_srl', $val->document_srl);
+				$val->alternative_href = getFullSiteUrl($this->uri_scheme.$this->site_url, '', 'document_srl', $val->document_srl);
 				$val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
 				$output->data[$key] = $val;
 			}
@@ -527,10 +527,10 @@ 
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('syndication.getDeletedList', $args);
-		foreach($output->data as $key => $val) {
+		foreach ($output->data as $key => $val) {
 			$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
 			$val->deleted = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$time_zone;
-			$val->alternative_href = getFullSiteUrl($this->uri_scheme . $this->site_url, '', 'document_srl', $val->document_srl);
+			$val->alternative_href = getFullSiteUrl($this->uri_scheme.$this->site_url, '', 'document_srl', $val->document_srl);
 			$val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
 			$output->data[$key] = $val;
 		}
@@ -539,42 +539,42 @@ 
 	}
 
 	function getID($type, $target_id = null) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
-		return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type) . ($target_id?':'.$target_id:'');
+		return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type).($target_id ? ':'.$target_id : '');
 	}
 
 	function getChannelAlternativeHref($module_srl) {
 		static $module_info = array();
-		if(!isset($module_info[$module_srl])) {
+		if (!isset($module_info[$module_srl])) {
 			$args = new stdClass;
 			$args->module_srl = $module_srl;
 			$output = executeQuery('syndication.getModuleSiteInfo', $args);
-			if($output->data) $module_info[$module_srl] = $output->data;
+			if ($output->data) $module_info[$module_srl] = $output->data;
 			else $module_info[$module_srl] = null;
 		}
 
-		if(is_null($module_info[$module_srl])) return $this->site_url;
+		if (is_null($module_info[$module_srl])) return $this->site_url;
 
 		$domain = $module_info[$module_srl]->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info[$module_srl]->mid);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url . $url;
+		if (substr($url, 0, 1) == '/') $domain = $this->uri_scheme.$this->site_url.$url;
 		return $url;
 	}
 
 	function getSelfHref($id, $type = null) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
-		return  sprintf('%s/?module=syndication&act=getSyndicationList&id=%s&type=%s&syndication_password=%s', $this->uri_scheme . $this->site_url, $id, $type, $this->syndication_password);
+		return  sprintf('%s/?module=syndication&act=getSyndicationList&id=%s&type=%s&syndication_password=%s', $this->uri_scheme.$this->site_url, $id, $type, $this->syndication_password);
 	}
 
 	/**
 	 * 문서의 고유 URL 반환
 	 */
 	function getAlternativeHref($document_srl, $module_srl) {
-		if($this->site_url==null) $this->init();
+		if ($this->site_url == null) $this->init();
 
-		if(!self::$modules[$module_srl]) {
+		if (!self::$modules[$module_srl]) {
 			$args = new stdClass;
 			$args->module_srls = $module_srl;
 			$output = executeQuery('syndication.getModules', $args);
@@ -586,20 +586,20 @@ 
 
 		$domain = $module_info->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info->mid, 'document_srl', $document_srl);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url.$url;
+		if (substr($url, 0, 1) == '/') $domain = $this->uri_scheme.$this->site_url.$url;
 		return $url;
 	}
 
 	function getDate($date) {
 		$time = strtotime($date);
-		if($time == -1) $time = ztime(str_replace(array('-','T',':'),'',$date));
+		if ($time == -1) $time = ztime(str_replace(array('-', 'T', ':'), '', $date));
 		return date('YmdHis', $time);
 	}
 
 	function getResentPingLogPath()
 	{
 		$target_filename = _XE_PATH_.'files/cache/tmp/syndication_ping_log';
-		if(!file_exists($target_filename))
+		if (!file_exists($target_filename))
 		{
 			FileHandler::writeFile($target_filename, '');
 		}
@@ -615,7 +615,7 @@ 
 		$args->message = urlencode($msg);
 
 		$list = $this->getResentPingLog();
-		if(count($list)>=10)
+		if (count($list) >= 10)
 		{
 			array_pop($list);
 		}
@@ -630,7 +630,7 @@ 
 		$file_path = $this->getResentPingLogPath();
 		$str = FileHandler::readFile($file_path);
 		$list = array();
-		if($str)
+		if ($str)
 		{
 			$list = unserialize($str);
 		}

Braces +103 added lines, -45 removed lines

@@ -20,7 +20,9 @@ 
 	function init() {
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('syndication');
-		if(Context::getSslStatus() == 'always') $this->uri_scheme = 'https://';
+		if(Context::getSslStatus() == 'always') {
+			$this->uri_scheme = 'https://';
+		}
 
 		$this->site_url = preg_replace('/\/+$/is', '', $config->site_url);
 		$this->syndication_password = $config->syndication_password;
@@ -41,10 +43,14 @@ 
 		$args->module_srl = $module_srl;
 
 		$output = executeQuery('syndication.getExceptModule', $args);
-		if($output->data->count) return TRUE;
+		if($output->data->count) {
+			return TRUE;
+		}
 
 		$output = executeQuery('syndication.getGrantedModule', $args);
-		if($output->data->count) return TRUE;
+		if($output->data->count) {
+			return TRUE;
+		}
 
 		return FALSE;
 	}
@@ -72,7 +78,9 @@ 
 			$args->site_srl = $site_srl;
 			$args->lang_code = Context::getLangType();
 			$output = executeQueryArray("syndication.getLang", $args);
-			if(!$output->toBool() || !$output->data) return $key;
+			if(!$output->toBool() || !$output->data) {
+				return $key;
+			}
 
 			foreach($output->data as $value)
 			{
@@ -82,8 +90,9 @@ 
 		if($this->langs[$site_srl][$key])
 		{
 			return $this->langs[$site_srl][$key];
+		} else {
+			return $key;
 		}
-		else return $key;
 	}
 
 	function handleLang($title, $site_srl)
@@ -92,8 +101,7 @@ 
 		if(!preg_match("/\\\$user_lang->(.+)/", $title, $matches))
 		{
 			return $title;
-		}
-		else
+		} else
 		{
 			return $this->getLang($matches[1], $site_srl);
 		}
@@ -148,8 +156,7 @@ 
 		if($id && strpos($id,'-')!==false) 
 		{
 			list($module_srl, $document_srl) = explode('-', $id);
-		}
-		elseif($id) 
+		} elseif($id) 
 		{
 			$module_srl = $id;
 		}
@@ -188,8 +195,7 @@ 
 				{
 					$error = 'target is not founded';
 				}
-			} 
-			else 
+			} else 
 			{
 				$error = 'target is not founded';
 			}
@@ -225,8 +231,7 @@ 
 							{
 								$site_info->title = $site_info->site_title;
 							}
-						}
-						else
+						} else
 						{
 							$except_module_output = executeQueryArray('syndication.getExceptModuleSrls');
 							if(is_array($except_module_output->data))
@@ -289,8 +294,7 @@ 
 						{
 							$channel_info->type = "blog";
 							$channel_info->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-						}
-						else
+						} else
 						{
 							$channel_info->type = "web";
 						}
@@ -301,7 +305,9 @@ 
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if($output->data) {
+							$channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						}
 						Context::set('channel_info', $channel_info);
 
 						$this->setTemplateFile('channel');
@@ -340,7 +346,9 @@ 
 						}
 
 						$output = executeQuery('syndication.getSiteUpdatedTime', $args);
-						if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						if($output->data) {
+							$channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
+						}
 						Context::set('channel_info', $channel_info);
 						Context::set('member_config', $member_config);
 
@@ -371,8 +379,12 @@ 
 
 	// @DEPRECATED
 	function getChannels() {
-		if($module_srls) $args->module_srls = $module_srls;
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if($module_srls) {
+			$args->module_srls = $module_srls;
+		}
+		if(count($this->granted_modules)) {
+			$args->except_module_srls = implode(',',$this->granted_modules);
+		}
 		$output = executeQueryArray('syndication.getModules', $args);
 
 		$time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
@@ -392,8 +404,7 @@ 
 				{
 					$obj->type = "blog";
 					$obj->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-				}
-				else
+				} else
 				{
 					$obj->type = "web";
 				}
@@ -405,11 +416,15 @@ 
 	}
 
 	function getArticle($document_srl) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl,false,false);
-		if(!$oDocument->isExists()) return;
+		if(!$oDocument->isExists()) {
+			return;
+		}
 
 		$val = $oDocument->getObjectVars();
 
@@ -439,13 +454,23 @@ 
 	}
 
 	function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl = $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
-		if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
+		if($module_srl) {
+			$args->module_srl = $module_srl;
+		}
+		if($startTime) {
+			$args->start_date = $this->getDate($startTime);
+		}
+		if($endTime) {
+			$args->end_date = $this->getDate($endTime);
+		}
+		if(count($this->granted_modules)) {
+			$args->except_module_srls = implode(',',$this->granted_modules);
+		}
 		$args->page = $page;
 		$output = executeQueryArray('syndication.getDocumentList', $args);
 		$cur_page = $output->page_navigation->cur_page;
@@ -460,8 +485,12 @@ 
 
 		if($cur_page<$total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
+			if($startTime) {
+				$next_url .= '&startTime='.$startTime;
+			}
+			if($endTime) {
+				$next_url .= '&endTime='.$endTime;
+			}
 			$result->next_url = $next_url.'&page='.($cur_page+1);
 		}
 
@@ -482,12 +511,20 @@ 
 	}
 
 	function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		$args = new stdClass;
-		if($module_srl) $args->module_srl= $module_srl;
-		if($startTime) $args->start_date = $this->getDate($startTime);
-		if($endTime) $args->end_date = $this->getDate($endTime);
+		if($module_srl) {
+			$args->module_srl= $module_srl;
+		}
+		if($startTime) {
+			$args->start_date = $this->getDate($startTime);
+		}
+		if($endTime) {
+			$args->end_date = $this->getDate($endTime);
+		}
 		$args->page = $page;
 
 		$output = executeQueryArray('syndication.getDeletedList', $args);
@@ -504,8 +541,12 @@ 
 
 		if($cur_page<$total_page) {
 			$next_url = $this->getSelfHref($id, $type);
-			if($startTime) $next_url .= '&startTime='.$startTime;
-			if($endTime) $next_url .= '&endTime='.$endTime;
+			if($startTime) {
+				$next_url .= '&startTime='.$startTime;
+			}
+			if($endTime) {
+				$next_url .= '&endTime='.$endTime;
+			}
 			$result->next_url = $next_url . '&page='.($cur_page+1);
 		}
 
@@ -539,7 +580,9 @@ 
 	}
 
 	function getID($type, $target_id = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type) . ($target_id?':'.$target_id:'');
 	}
@@ -550,20 +593,29 @@ 
 			$args = new stdClass;
 			$args->module_srl = $module_srl;
 			$output = executeQuery('syndication.getModuleSiteInfo', $args);
-			if($output->data) $module_info[$module_srl] = $output->data;
-			else $module_info[$module_srl] = null;
+			if($output->data) {
+				$module_info[$module_srl] = $output->data;
+			} else {
+				$module_info[$module_srl] = null;
+			}
 		}
 
-		if(is_null($module_info[$module_srl])) return $this->site_url;
+		if(is_null($module_info[$module_srl])) {
+			return $this->site_url;
+		}
 
 		$domain = $module_info[$module_srl]->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info[$module_srl]->mid);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url . $url;
+		if(substr($url,0,1)=='/') {
+			$domain = $this->uri_scheme . $this->site_url . $url;
+		}
 		return $url;
 	}
 
 	function getSelfHref($id, $type = null) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		return  sprintf('%s/?module=syndication&act=getSyndicationList&id=%s&type=%s&syndication_password=%s', $this->uri_scheme . $this->site_url, $id, $type, $this->syndication_password);
 	}
@@ -572,7 +624,9 @@ 
 	 * 문서의 고유 URL 반환
 	 */
 	function getAlternativeHref($document_srl, $module_srl) {
-		if($this->site_url==null) $this->init();
+		if($this->site_url==null) {
+			$this->init();
+		}
 
 		if(!self::$modules[$module_srl]) {
 			$args = new stdClass;
@@ -586,13 +640,17 @@ 
 
 		$domain = $module_info->domain;
 		$url = getFullSiteUrl($domain, '', 'mid', $module_info->mid, 'document_srl', $document_srl);
-		if(substr($url,0,1)=='/') $domain = $this->uri_scheme . $this->site_url.$url;
+		if(substr($url,0,1)=='/') {
+			$domain = $this->uri_scheme . $this->site_url.$url;
+		}
 		return $url;
 	}
 
 	function getDate($date) {
 		$time = strtotime($date);
-		if($time == -1) $time = ztime(str_replace(array('-','T',':'),'',$date));
+		if($time == -1) {
+			$time = ztime(str_replace(array('-','T',':'),'',$date));
+		}
 		return date('YmdHis', $time);
 	}
 

modules/syndication/syndication.class.php

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
 		$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
 
 		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
+		if ($oAddonAdminModel->getAddonInfoXml('catpcha')) {
 			$oAddonAdminController = &addonAdminController::getInstance();
 			$oAddonAdminController->doActivate('catpcha');
 			$oAddonAdminController->makeCacheFile();
@@ -47,9 +47,9 @@ 
 
 	function checkUpdate() {
 		$oModuleModel = getModel('module');
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
 
 		return false;
 	}
@@ -58,18 +58,18 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')){
+		if (!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) {
 			$oModuleController->insertTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after');
 		}
-		if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')){
+		if (!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) {
 			$oModuleController->insertTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after');
 		}
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')){
+		if (!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) {
 			$oModuleController->insertTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after');
 		}
 
 		$oAddonAdminModel = getAdminModel('addon');
-		if($oAddonAdminModel->getAddonInfoXml('catpcha')){
+		if ($oAddonAdminModel->getAddonInfoXml('catpcha')) {
 			$oAddonAdminController = &addonAdminController::getInstance();
 			$oAddonAdminController->doActivate('catpcha');
 			$oAddonAdminController->makeCacheFile();
@@ -81,7 +81,7 @@ 
 
 	function checkOpenSSLSupport()
 	{
-		if(!in_array('ssl', stream_get_transports())) {
+		if (!in_array('ssl', stream_get_transports())) {
 			return FALSE;
 		}
 		return TRUE;

Braces +9 added lines, -3 removed lines

@@ -47,9 +47,15 @@
 
 	function checkUpdate() {
 		$oModuleModel = getModel('module');
-		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
+		if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) {
+			return true;
+		}
+		if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) {
+			return true;
+		}
+		if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'syndication', 'controller', 'triggerMoveDocumentModule', 'after')) {
+			return true;
+		}
 
 		return false;
 	}

modules/syndication/syndication.admin.view.php

Spacing +10 added lines, -10 removed lines

@@ -21,28 +21,28 @@ 
 		$oSyndicationModel = getModel('syndication');
 		Context::set('ping_log', $oSyndicationModel->getResentPingLog());
 
-		if(!$module_config->syndication_use)
+		if (!$module_config->syndication_use)
 		{
 			$module_config->syndication_use = 'Y';
 		}
 
-		if(!$module_config->site_url)
+		if (!$module_config->site_url)
 		{
-			$module_config->site_url = Context::getDefaultUrl()?Context::getDefaultUrl():getFullUrl();
+			$module_config->site_url = Context::getDefaultUrl() ?Context::getDefaultUrl() : getFullUrl();
 		}
 
-		if(!$module_config->year)
+		if (!$module_config->year)
 		{
 			$module_config->year = date("Y");
 		}
 
-		if(!isset($module_config->syndication_password))
+		if (!isset($module_config->syndication_password))
 		{
 			$module_config->syndication_password = uniqid();
 		}
 
 		Context::set('syndication_use', $module_config->syndication_use);
-		Context::set('site_url', preg_replace('/^(http|https):\/\//i','',$module_config->site_url));
+		Context::set('site_url', preg_replace('/^(http|https):\/\//i', '', $module_config->site_url));
 		Context::set('year', $module_config->year);
 		Context::set('syndication_token', $module_config->syndication_token);
 		Context::set('syndication_password', $module_config->syndication_password);
@@ -50,9 +50,9 @@ 
 
 		$output = executeQueryArray('syndication.getExceptModules');
 		$except_module_list = array();
-		if($output->data && count($output->data) > 0)
+		if ($output->data && count($output->data) > 0)
 		{
-			foreach($output->data as $item)
+			foreach ($output->data as $item)
 			{
 				$except_module_list[] = $item;
 			}
@@ -62,8 +62,8 @@ 
 
 		//Security
 		$security = new Security();
-		$security->encodeHTML('services..service','except_module..ping');
-		$security->encodeHTML('except_module..mid','except_module..browser_title');
+		$security->encodeHTML('services..service', 'except_module..ping');
+		$security->encodeHTML('except_module..mid', 'except_module..browser_title');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('config');

modules/syndication/syndication.admin.controller.php

Spacing +16 added lines, -16 removed lines

@@ -21,36 +21,36 @@ 
 
 		$config = new stdClass;
 		$config->syndication_use = Context::get('syndication_use');
-		$config->site_url = preg_replace('/\/+$/is','',Context::get('site_url'));
+		$config->site_url = preg_replace('/\/+$/is', '', Context::get('site_url'));
 		$config->year = Context::get('year');
 		$config->syndication_token = Context::get('syndication_token');
 		$config->syndication_password = urlencode(Context::get('syndication_password'));
 
-		if(!$config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if (!$config->site_url) return $this->makeObject(-1, 'msg_site_url_is_null');
+		if (!$config->syndication_token) return $this->makeObject(-1, 'msg_syndication_token_is_null');
 
-		$oModuleController->updateModuleConfig('syndication',$config);
+		$oModuleController->updateModuleConfig('syndication', $config);
 
 		$except_module = Context::get('except_module');
 		$output = executeQuery('syndication.deleteExceptModules');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if ($except_module){
-			$modules = explode(',',$except_module);
-			for($i=0,$c=count($modules);$i<$c;$i++) {
+		if ($except_module) {
+			$modules = explode(',', $except_module);
+			for ($i = 0, $c = count($modules); $i < $c; $i++) {
 				$args->module_srl = $modules[$i];
-				$output = executeQuery('syndication.insertExceptModule',$args);
-				if(!$output->toBool()) return $output;
+				$output = executeQuery('syndication.insertExceptModule', $args);
+				if (!$output->toBool()) return $output;
 			}
 		}
 
-		if(!$this->checkOpenSSLSupport())
+		if (!$this->checkOpenSSLSupport())
 		{
 			return $this->makeObject(-1, 'msg_need_openssl_support');
 		}
 
 		$this->setMessage('success_applied');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON'))) {
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSyndicationAdminConfig');
 			$this->setRedirectUrl($returnUrl);
 			return;
@@ -62,18 +62,18 @@ 
 		$oModuleModel = getModel('module');
 
 		$oSyndicationController = getController('syndication');
-		$oSyndicationModel= getModel('syndication');
+		$oSyndicationModel = getModel('syndication');
 
 		$module_config = $oModuleModel->getModuleConfig('syndication');
 
 		$site_url = trim(Context::get('site_url'));
-		if(!$module_config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$module_config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if (!$module_config->site_url) return $this->makeObject(-1, 'msg_site_url_is_null');
+		if (!$module_config->syndication_token) return $this->makeObject(-1, 'msg_syndication_token_is_null');
 
 		$id = $oSyndicationModel->getID('site');
 
 		// site_url 정보와 token 정보를 이용해서 ping 전송 테스트
-		if($oSyndicationController->ping($id, 'site')===FALSE)
+		if ($oSyndicationController->ping($id, 'site') === FALSE)
 		{
 			$this->setError(-1);
 			$this->setMessage($oSyndicationController->ping_message);

Braces +19 added lines, -8 removed lines

@@ -26,21 +26,29 @@ 
 		$config->syndication_token = Context::get('syndication_token');
 		$config->syndication_password = urlencode(Context::get('syndication_password'));
 
-		if(!$config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if(!$config->site_url) {
+			return $this->makeObject(-1,'msg_site_url_is_null');
+		}
+		if(!$config->syndication_token) {
+			return $this->makeObject(-1,'msg_syndication_token_is_null');
+		}
 
 		$oModuleController->updateModuleConfig('syndication',$config);
 
 		$except_module = Context::get('except_module');
 		$output = executeQuery('syndication.deleteExceptModules');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if ($except_module){
 			$modules = explode(',',$except_module);
 			for($i=0,$c=count($modules);$i<$c;$i++) {
 				$args->module_srl = $modules[$i];
 				$output = executeQuery('syndication.insertExceptModule',$args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 
@@ -67,8 +75,12 @@ 
 		$module_config = $oModuleModel->getModuleConfig('syndication');
 
 		$site_url = trim(Context::get('site_url'));
-		if(!$module_config->site_url) return $this->makeObject(-1,'msg_site_url_is_null');
-		if(!$module_config->syndication_token) return $this->makeObject(-1,'msg_syndication_token_is_null');
+		if(!$module_config->site_url) {
+			return $this->makeObject(-1,'msg_site_url_is_null');
+		}
+		if(!$module_config->syndication_token) {
+			return $this->makeObject(-1,'msg_syndication_token_is_null');
+		}
 
 		$id = $oSyndicationModel->getID('site');
 
@@ -77,8 +89,7 @@ 
 		{
 			$this->setError(-1);
 			$this->setMessage($oSyndicationController->ping_message);
-		}
-		else
+		} else
 		{
 			$this->setMessage('msg_success_ping_test');
 		}