xpressengine / xe-core

modules/menu/menu.admin.controller.php

Doc Comments +23 added lines, -3 removed lines

@@ -245,7 +245,7 @@ 
 
 	/**
 	 * Delete menu process method
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function procMenuAdminDelete()
 	{
@@ -304,6 +304,7 @@ 
 	/**
 	 * Delete menu
 	 * Delete menu_item and xml cache files
+	 * @param string $menu_srl
 	 * @return Object
 	 */
 	function deleteMenu($menu_srl)
@@ -380,6 +381,7 @@ 
 
 	/**
 	 * Add an item to the menu, simple version
+	 * @param stdClass $request
 	 * @return void
 	 */
 	public function procMenuAdminInsertItem($request = NULL)
@@ -519,6 +521,9 @@ 
 		$this->setMessage('success_registed', 'info');
 	}
 
+	/**
+	 * @param boolean $isProc
+	 */
 	private function _insertMenu(&$request, $isProc)
 	{
 		$oDB = DB::getInstance();
@@ -584,6 +589,7 @@ 
 	 * insert module by men create value
 	 * @request value of client request
 	 * @args value for menu create
+	 * @param stdClass $args
 	 * @return bool result of create module
 	 */
 	private function _insertModule(&$request, &$args)
@@ -641,7 +647,7 @@ 
 
 	/**
 	 * Update an item to the menu, simple version
-	 * @return void
+	 * @return Object|null
 	 */
 	public function procMenuAdminUpdateItem()
 	{
@@ -842,6 +848,7 @@ 
 	/**
 	 * Delete menu item ( Only include BO )
 	 * @args menu_srl, menu_item_srl, is_force
+	 * @param stdClass $args
 	 * @return void|Object
 	 */
 	public function deleteItem($args)
@@ -990,6 +997,9 @@ 
 		return new Object(0, 'success');
 	}
 
+	/**
+	 * @param DB $oDB
+	 */
 	private function _recursiveDeleteMenuItem(&$oDB, &$menuInfo, $node)
 	{
 		$output = $this->_deleteMenuItem($oDB, $menuInfo, $node);
@@ -1009,7 +1019,7 @@ 
 
 	/**
 	 * Move menu items
-	 * @return void
+	 * @return Object|null
 	 */
 	function procMenuAdminMoveItem()
 	{
@@ -1174,6 +1184,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $parentSrl
+	 */
 	private function _copyMenu($menuSrl, $parentSrl, &$originMenu)
 	{
 		$oMenuAdminModel = getAdminModel('menu');
@@ -2182,6 +2195,7 @@ 
 	/**
 	 * When copy a menu, button copied also.
 	 * @param $args menuItemInfo with button values
+	 * @param string $insertedMenuItemSrl
 	 */
 	private function _copyButton($insertedMenuItemSrl, $insertedMenuSrl, &$menuItemInfo)
 	{
@@ -2222,6 +2236,9 @@ 
 		return $copied_info;
 	}
 
+	/**
+	 * @param string $mode
+	 */
 	private function _changeMenuItemSrlInButtonPath($buttonPath, $menuSrl, $menuItemSrl, $mode)
 	{
 		$path = sprintf('./files/attach/menu_button/%d/', $menuSrl);
@@ -2231,6 +2248,9 @@ 
 		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl,$date,'menu_'.$mode.'_btn', $ext);
 	}
 
+	/**
+	 * @param integer $menuSrl
+	 */
 	public function makeHomemenuCacheFile($menuSrl)
 	{
 		$cacheBuff .= sprintf('<?php if(!defined("__XE__")) exit();');

Spacing +303 added lines, -303 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 Object(-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 Object(-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 Object(-1, 'msg_cannot_delete_homemenu');
 		}
 
 		$output = $this->deleteMenu($menu_srl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return new Object(-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 Object(0,'success_deleted');
+		return new Object(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 Object(-1, 'msg_invalid_request');
 		}
 
 		$this->_setMenuSrl($request->parent_srl, $request->menu_srl);
-		if(!$request->menu_srl)
+		if (!$request->menu_srl)
 		{
 			return new Object(-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 Object($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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-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 Object(-1,'msg_invalid_request');
+		if (!$mode || !$parent_srl || !$target_srl) return new Object(-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 Object(-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 Object(-1,'msg_invalid_request');
+		if ($target_item->menu_item_srl != $target_srl) return new Object(-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 Object(-1,'msg_invalid_request');
-				$args->listorder = $source_item->listorder-1;
+				if ($source_item->menu_item_srl != $source_srl) return new Object(-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, str_replace(array('\\', '\''), array('\\\\', '\\\''), $val));
+				$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\', '\''), array('\\\\', '\\\''), $val));
 			}
 			$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;
 
 			$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=&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
@@ -1938,7 +1938,7 @@ 
 				$link = '<?php print $_names[$lang_type]; ?>';
 			}
 			// 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 $group_check_code = "true";
 			$attribute = sprintf(
 				'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" desc="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
@@ -1962,8 +1962,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;
 	}
@@ -1982,84 +1982,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_]+)\'\]\}/', $val) === 1)
+				if (preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]+)\'\]\}/', $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 = sprintf('"%s"', $url);
 			$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
@@ -2097,7 +2097,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;
@@ -2111,19 +2111,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;
 		}
 	}
 
@@ -2136,47 +2136,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;
@@ -2184,14 +2184,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;
@@ -2213,7 +2213,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');
@@ -2223,7 +2223,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');
@@ -2233,7 +2233,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');
@@ -2248,9 +2248,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 +304 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 Object(-1, 'msg_adminmenu_cannot_delete');
+		if($menuInfo->title == $oAdmin->getAdminMenuName()) {
+					return new Object(-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 Object(-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 Object(-1,'msg_invalid_request');
+		if(!$mode || !$parent_srl || !$target_srl) {
+			return new Object(-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 Object(-1,'msg_invalid_request');
+		if($target_item->menu_item_srl != $target_srl) {
+			return new Object(-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 Object(-1,'msg_invalid_request');
+				if($source_item->menu_item_srl != $source_srl) {
+					return new Object(-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,37 +2015,57 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = sprintf('"%s"', $url);
 			}
-			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
 			$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=&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]; ?>';
 			}
 			// 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 $group_check_code = "true";
+			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 {
+				$group_check_code = "true";
+			}
 			$attribute = sprintf(
 				'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" desc="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
 				$menu_item_srl,
@@ -1962,8 +2088,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;
 	}
@@ -1982,15 +2111,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);
@@ -2000,8 +2134,7 @@ 
 				if(preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]+)\'\]\}/', $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)));
 				}
@@ -2009,11 +2142,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);
@@ -2022,8 +2160,9 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = sprintf('"%s"', $url);
 			}
-			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
 			$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
@@ -2040,29 +2179,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);
 			}
@@ -2111,11 +2269,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
@@ -2123,7 +2285,9 @@ 
 		{
 			$args->menu_srl = $menu_srl_list[$i];
 			$output = executeQuery('menu.insertMenuLayout', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 	}
 
@@ -2146,9 +2310,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/menu/menu.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
 
 	/**
 	 * Get module's detail setup contents
-	 * @return void
+	 * @return Object|null
 	 */
 	public function getMenuAdminDetailSetup()
 	{

Braces +72 added lines, -45 removed lines

@@ -41,7 +41,9 @@ 
 		// document.getDocumentList query execution
 		$output = executeQuery('menu.getMenuList', $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -63,7 +65,9 @@ 
 		$args->site_srl = $site_srl ;
 		$args->menu_srl = $menu_srl;
 		$output = executeQueryArray('menu.getMenus', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 		$menus = $output->data;
 		return $menus;
 	}
@@ -80,7 +84,9 @@ 
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$menu_info = $output->data;
 		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
@@ -105,10 +111,15 @@ 
 		$args->title = $title;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('menu.getMenuByTitle', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
-		if(is_array($output->data)) $menu_info = $output->data[0];
-		else $menu_info = $output->data;
+		if(is_array($output->data)) {
+			$menu_info = $output->data[0];
+		} else {
+			$menu_info = $output->data;
+		}
 
 		if($menu_info->menu_srl)
 		{
@@ -152,15 +163,20 @@ 
 		$output = executeQuery('menu.getMenuItem', $args);
 		$node = $output->data;
 		settype($node,'object');
-		if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
-		else $node->group_srls = array();
+		if($node->group_srls) {
+			$node->group_srls = explode(',',$node->group_srls);
+		} else {
+			$node->group_srls = array();
+		}
 
 		$tmp_name = unserialize($node->name);
 		if($tmp_name && count($tmp_name))
 		{
 			$selected_lang = array();
 			$rand_name = $tmp_name[Context::getLangType()];
-			if(!$rand_name) $rand_name = array_shift($tmp_name);
+			if(!$rand_name) {
+				$rand_name = array_shift($tmp_name);
+			}
 			$node->name = $rand_name;
 		}
 		return $node;
@@ -178,13 +194,13 @@ 
 		if(!$menuItem->url)
 		{
 			$menuItem->moduleType = null;
-		}
-		else if(strncasecmp('http', $menuItem->url, 4) !== 0)
+		} else if(strncasecmp('http', $menuItem->url, 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
-			if(!$moduleInfo) $menuItem->moduleType = 'url';
-			else
+			if(!$moduleInfo) {
+				$menuItem->moduleType = 'url';
+			} else
 			{
 				if($moduleInfo->mid == $menuItem->url)
 				{
@@ -193,8 +209,9 @@ 
 					$menuItem->layoutSrl = $moduleInfo->layout_srl;
 				}
 			}
+		} else {
+			$menuItem->moduleType = 'url';
 		}
-		else $menuItem->moduleType = 'url';
 
 		// grant setting
 		if(is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
@@ -202,12 +219,10 @@ 
 			if($menuItem->group_srls[0] == -1)
 			{
 				$menuItem->grant = 'member';
-			}
-			else if($menuItem->group_srls[0] == -3)
+			} else if($menuItem->group_srls[0] == -3)
 			{
 				$menuItem->grant = 'manager';
-			}
-			else
+			} else
 			{
 				$menuItem->grant = 'group';
 			}
@@ -228,11 +243,15 @@ 
 				{
 					$tmp = $oModuleAdminModel->getLangCode(0, $value->title);
 					$groupList[$value->group_srl]->title = $tmp[Context::getLangType()];
+				} else {
+					$groupList[$value->group_srl]->title = $value->title;
 				}
-				else $groupList[$value->group_srl]->title = $value->title;
 
-				if(in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
-				else $groupList[$value->group_srl]->isChecked = false;
+				if(in_array($key, $menuItem->group_srls)) {
+					$groupList[$value->group_srl]->isChecked = true;
+				} else {
+					$groupList[$value->group_srl]->isChecked = false;
+				}
 			}
 		}
 		$menuItem->groupList = $groupList;
@@ -305,11 +324,12 @@ 
 			$item_info->parent_srl = $parent_srl;
 			$item_info->parent_menu_name = $parent_info->name;
 			// In case of modifying the existing menu or addting a new menu to the root
-		}
-		else
+		} else
 		{
 			// Get information of the menu if menu_item_srl exists
-			if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
+			if($menu_item_srl) {
+				$item_info = $this->getMenuItemInfo($menu_item_srl);
+			}
 			// Get only menu_item_srl if no values found, considering it as adding a new menu
 			if(!$item_info->menu_item_srl)
 			{
@@ -349,7 +369,9 @@ 
 		foreach($_allModules as $module_name)
 		{
 			$module = $oModuleModel->getModuleInfoXml($module_name);
-			if(!isset($module)) continue;
+			if(!isset($module)) {
+				continue;
+			}
 			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
 			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
 			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);
@@ -379,8 +401,7 @@ 
 				$oModuleInfo->title = $pageTypeName['OUTSIDE'];
 				$oModuleInfo->no_skin = 'Y';
 				$allModules['OUTSIDE'] = $oModuleInfo;
-			}
-			else
+			} else
 			{
 				$allModules[$module_name] = $module;
 			}
@@ -414,7 +435,9 @@ 
 
 		// after trigger
 		$output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$localModuleList = array_unique($moduleList);
 
@@ -425,7 +448,9 @@ 
 		$remoteModuleList = array();
 		foreach($remotePackageList as $package)
 		{
-			if(strpos($package->path, './modules/') !== 0) continue;
+			if(strpos($package->path, './modules/') !== 0) {
+				continue;
+			}
 
 			$pathInfo = explode('/', $package->path);
 			$remoteModuleList[] = $pathInfo[2];
@@ -464,8 +489,7 @@ 
 					$oModuleInfo->title = $pageTypeName['OUTSIDE'];
 					$oModuleInfo->no_skin = 'Y';
 					$moduleInfoList['OUTSIDE'] = $oModuleInfo;
-				}
-				else
+				} else
 				{
 					$moduleInfoList[$value] = $moduleInfo;
 				}
@@ -497,8 +521,11 @@ 
 			$isMenuFixed = false;
 			$output = $this->getMenu($menuSrl);
 			$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl);
-			if(file_exists($php_file)) include($php_file);
-			else $oMenuAdminController->makeXmlFile($menuSrl);
+			if(file_exists($php_file)) {
+				include($php_file);
+			} else {
+				$oMenuAdminController->makeXmlFile($menuSrl);
+			}
 
 			if(count($menu->list)>0)
 			{
@@ -518,8 +545,7 @@ 
 			$menuItems->title = $output->title;
 			$menuItems->menuItems = $menu;
 			$menuList[] = $menuItems;
-		}
-		else
+		} else
 		{
 			$menuListFromDB = $this->getMenus($siteSrl);
 			if(is_array($menuListFromDB))
@@ -527,8 +553,9 @@ 
 				$oAdmin = getClass('admin');
 				foreach($menuListFromDB AS $key=>$value)
 				{
-					if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
-					else
+					if($value->title == $oAdmin->getAdminMenuName()) {
+						unset($output[$key]);
+					} else
 					{
 						unset($menu);
 						unset($menuItems);
@@ -564,8 +591,7 @@ 
 						if($value->menu_srl == $this->menuSrlWithinHome)
 						{
 							$menuList[-1] = $menuItems;
-						}
-						else
+						} else
 						{
 							$menuList[] = $menuItems;
 						}
@@ -639,8 +665,11 @@ 
 			$args = new stdClass;
 			$args->menu_item_srl = $menu['node_srl'];
 			$args->is_shortcut = 'Y';
-			if($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
-			else $args->name = $menu['menu_name'];
+			if($menu['menu_name_key']) {
+				$args->name = $menu['menu_name_key'];
+			} else {
+				$args->name = $menu['menu_name'];
+			}
 			$output = executeQuery('menu.updateMenuItem', $args);
 
 			$isMenuFixed = true;
@@ -661,8 +690,7 @@ 
 				if($midInfo->page_type)
 				{
 					$menu['module_type'] = $midInfo->page_type;
-				}
-				else
+				} else
 				{
 					$menu['module_type'] = $midInfo->module;
 				}
@@ -671,8 +699,7 @@ 
 			if($moduleInfo->setup_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
-			}
-			else if($moduleInfo->default_index_act)
+			} else if($moduleInfo->default_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->default_index_act;
 			}

Spacing +90 added lines, -90 removed lines

@@ -27,21 +27,21 @@ 
 	 */
 	function getMenuList($obj)
 	{
-		if(!$obj->site_srl)
+		if (!$obj->site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$obj->site_srl = (int)$site_module_info->site_srl;
+			$obj->site_srl = (int) $site_module_info->site_srl;
 		}
 		$args = new stdClass;
 		$args->site_srl = $obj->site_srl;
 		$args->sort_index = $obj->sort_index;
-		$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->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;
 		// document.getDocumentList query execution
 		$output = executeQuery('menu.getMenuList', $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 
 		return $output;
 	}
@@ -53,17 +53,17 @@ 
 	 */
 	function getMenus($site_srl = null)
 	{
-		if(!isset($site_srl))
+		if (!isset($site_srl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		// Get information from the DB
 		$args = new stdClass();
-		$args->site_srl = $site_srl ;
+		$args->site_srl = $site_srl;
 		$args->menu_srl = $menu_srl;
 		$output = executeQueryArray('menu.getMenus', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 		$menus = $output->data;
 		return $menus;
 	}
@@ -80,11 +80,11 @@ 
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$menu_info = $output->data;
-		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
-		$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl);
+		$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php', $menu_srl);
+		$menu_info->php_file = sprintf('./files/cache/menu/%s.php', $menu_srl);
 		return $menu_info;
 	}
 
@@ -97,7 +97,7 @@ 
 	function getMenuByTitle($title, $site_srl = 0)
 	{
 		// Get information from the DB
-		if(!is_array($title))
+		if (!is_array($title))
 		{
 			$title = array($title);
 		}
@@ -105,15 +105,15 @@ 
 		$args->title = $title;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('menu.getMenuByTitle', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
-		if(is_array($output->data)) $menu_info = $output->data[0];
+		if (is_array($output->data)) $menu_info = $output->data[0];
 		else $menu_info = $output->data;
 
-		if($menu_info->menu_srl)
+		if ($menu_info->menu_srl)
 		{
-			$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_info->menu_srl);
-			$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_info->menu_srl);
+			$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php', $menu_info->menu_srl);
+			$menu_info->php_file = sprintf('./files/cache/menu/%s.php', $menu_info->menu_srl);
 		}
 		return $menu_info;
 	}
@@ -130,7 +130,7 @@ 
 		$args = new stdClass();
 		$args->title = $title;
 		$output = executeQueryArray('menu.getMenuByTitle', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}
@@ -151,16 +151,16 @@ 
 		$args->menu_item_srl = $menu_item_srl;
 		$output = executeQuery('menu.getMenuItem', $args);
 		$node = $output->data;
-		settype($node,'object');
-		if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
+		settype($node, 'object');
+		if ($node->group_srls) $node->group_srls = explode(',', $node->group_srls);
 		else $node->group_srls = array();
 
 		$tmp_name = unserialize($node->name);
-		if($tmp_name && count($tmp_name))
+		if ($tmp_name && count($tmp_name))
 		{
 			$selected_lang = array();
 			$rand_name = $tmp_name[Context::getLangType()];
-			if(!$rand_name) $rand_name = array_shift($tmp_name);
+			if (!$rand_name) $rand_name = array_shift($tmp_name);
 			$node->name = $rand_name;
 		}
 		return $node;
@@ -175,18 +175,18 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$menuItem = $this->getMenuItemInfo($menuItemSrl);
 
-		if(!$menuItem->url)
+		if (!$menuItem->url)
 		{
 			$menuItem->moduleType = null;
 		}
-		else if(strncasecmp('http', $menuItem->url, 4) !== 0)
+		else if (strncasecmp('http', $menuItem->url, 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
-			if(!$moduleInfo) $menuItem->moduleType = 'url';
+			if (!$moduleInfo) $menuItem->moduleType = 'url';
 			else
 			{
-				if($moduleInfo->mid == $menuItem->url)
+				if ($moduleInfo->mid == $menuItem->url)
 				{
 					$menuItem->moduleType = $moduleInfo->module;
 					$menuItem->pageType = $moduleInfo->page_type;
@@ -197,13 +197,13 @@ 
 		else $menuItem->moduleType = 'url';
 
 		// grant setting
-		if(is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
+		if (is_array($menuItem->group_srls) && count($menuItem->group_srls) > 0)
 		{
-			if($menuItem->group_srls[0] == -1)
+			if ($menuItem->group_srls[0] == -1)
 			{
 				$menuItem->grant = 'member';
 			}
-			else if($menuItem->group_srls[0] == -3)
+			else if ($menuItem->group_srls[0] == -3)
 			{
 				$menuItem->grant = 'manager';
 			}
@@ -217,21 +217,21 @@ 
 		$oMemberModel = getModel('member');
 		$oModuleAdminModel = getAdminModel('module');
 		$output = $oMemberModel->getGroups();
-		if(is_array($output))
+		if (is_array($output))
 		{
 			$groupList = array();
-			foreach($output AS $key=>$value)
+			foreach ($output AS $key=>$value)
 			{
 				$groupList[$value->group_srl] = new stdClass();
 				$groupList[$value->group_srl]->group_srl = $value->group_srl;
-				if(substr($value->title,0,12)=='$user_lang->')
+				if (substr($value->title, 0, 12) == '$user_lang->')
 				{
 					$tmp = $oModuleAdminModel->getLangCode(0, $value->title);
 					$groupList[$value->group_srl]->title = $tmp[Context::getLangType()];
 				}
 				else $groupList[$value->group_srl]->title = $value->title;
 
-				if(in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
+				if (in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
 				else $groupList[$value->group_srl]->isChecked = false;
 			}
 		}
@@ -269,10 +269,10 @@ 
 	 */
 	function getMenuItemNames($source_name, $site_srl = null)
 	{
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		// Get language code
 		$oModuleAdminModel = getAdminModel('module');
@@ -296,7 +296,7 @@ 
 
 		// Add a sub-menu if there is parent_srl but not menu_item_srl
 		$item_info = new stdClass;
-		if(!$menu_item_srl && $parent_srl)
+		if (!$menu_item_srl && $parent_srl)
 		{
 			// Get information of the parent menu
 			$parent_info = $this->getMenuItemInfo($parent_srl);
@@ -309,9 +309,9 @@ 
 		else
 		{
 			// Get information of the menu if menu_item_srl exists
-			if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
+			if ($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
 			// Get only menu_item_srl if no values found, considering it as adding a new menu
-			if(!$item_info->menu_item_srl)
+			if (!$item_info->menu_item_srl)
 			{
 				$item_info->menu_item_srl = getNextSequence();
 			}
@@ -327,7 +327,7 @@ 
 		$oTemplate = &TemplateHandler::getInstance();
 		$tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
 
-		$this->add('tpl', str_replace("\n"," ",$tpl));
+		$this->add('tpl', str_replace("\n", " ", $tpl));
 	}
 
 	/**
@@ -346,10 +346,10 @@ 
 
 		Context::loadLang('modules/page/lang');
 
-		foreach($_allModules as $module_name)
+		foreach ($_allModules as $module_name)
 		{
 			$module = $oModuleModel->getModuleInfoXml($module_name);
-			if(!isset($module)) continue;
+			if (!isset($module)) continue;
 			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
 			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
 			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);
@@ -361,10 +361,10 @@ 
 			$module->defaultMobileSkin->skin = $defaultMobileSkin;
 			$module->defaultMobileSkin->title = $mobileSkinInfo->title ? $mobileSkinInfo->title : $defaultMobileSkin;
 
-			$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/' . $module_name);
-			$module->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $module->package_srl;
+			$module->package_srl = $oAutoinstallModel->getPackageSrlByPath('./modules/'.$module_name);
+			$module->url = _XE_LOCATION_SITE_.'?mid=download&package_srl='.$module->package_srl;
 
-			if($module_name == 'page')
+			if ($module_name == 'page')
 			{
 				$pageTypeName = Context::getLang('page_type_name');
 				$module->title = $pageTypeName['ARTICLE'];
@@ -401,11 +401,11 @@ 
 		$moduleList = array('page');
 
 		$output = $oModuleModel->getModuleListByInstance($site_srl);
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
-				if($value->instanceCount > 1)
+				if ($value->instanceCount > 1)
 				{
 					$moduleList[] = $value->module;
 				}
@@ -414,7 +414,7 @@ 
 
 		// after trigger
 		$output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$localModuleList = array_unique($moduleList);
 
@@ -423,9 +423,9 @@ 
 		// get have instance
 		$remotePackageList = $oAutoinstallModel->getHaveInstance(array('path'));
 		$remoteModuleList = array();
-		foreach($remotePackageList as $package)
+		foreach ($remotePackageList as $package)
 		{
-			if(strpos($package->path, './modules/') !== 0) continue;
+			if (strpos($package->path, './modules/') !== 0) continue;
 
 			$pathInfo = explode('/', $package->path);
 			$remoteModuleList[] = $pathInfo[2];
@@ -443,13 +443,13 @@ 
 
 		$moduleInfoList = array();
 		Context::loadLang('modules/page/lang');
-		if(is_array($moduleList))
+		if (is_array($moduleList))
 		{
-			foreach($moduleList as $value)
+			foreach ($moduleList as $value)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoXml($value);
 
-				if($value == 'page')
+				if ($value == 'page')
 				{
 					$pageTypeName = Context::getLang('page_type_name');
 					$moduleInfo->title = $pageTypeName['ARTICLE'];
@@ -480,10 +480,10 @@ 
 		$siteSrl = Context::get('site_srl');
 		$menuSrl = Context::get('menu_srl');
 
-		if(!isset($siteSrl))
+		if (!isset($siteSrl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			$siteSrl = (int)$site_module_info->site_srl;
+			$siteSrl = (int) $site_module_info->site_srl;
 		}
 
 		$oModuleModel = getModel('module');
@@ -492,24 +492,24 @@ 
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
 
 		$menuList = array();
-		if($menuSrl)
+		if ($menuSrl)
 		{
 			$isMenuFixed = false;
 			$output = $this->getMenu($menuSrl);
-			$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl);
-			if(file_exists($php_file)) include($php_file);
+			$php_file = sprintf(_XE_PATH_.'files/cache/menu/%s.php', $output->menu_srl);
+			if (file_exists($php_file)) include($php_file);
 			else $oMenuAdminController->makeXmlFile($menuSrl);
 
-			if(count($menu->list)>0)
+			if (count($menu->list) > 0)
 			{
-				foreach($menu->list AS $key=>$value)
+				foreach ($menu->list AS $key=>$value)
 				{
-					$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl,$siteSrl);
+					$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl, $siteSrl);
 				}
 			}
 
 			// menu recreate
-			if($isMenuFixed)
+			if ($isMenuFixed)
 			{
 				$oMenuAdminController->makeXmlFile($menuSrl);
 			}
@@ -522,18 +522,18 @@ 
 		else
 		{
 			$menuListFromDB = $this->getMenus($siteSrl);
-			if(is_array($menuListFromDB))
+			if (is_array($menuListFromDB))
 			{
 				$oAdmin = getClass('admin');
-				foreach($menuListFromDB AS $key=>$value)
+				foreach ($menuListFromDB AS $key=>$value)
 				{
-					if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
+					if ($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
 					else
 					{
 						unset($menu);
 						unset($menuItems);
-						$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl);
-						if(!file_exists($value->php_file))
+						$value->php_file = sprintf(_XE_PATH_.'files/cache/menu/%s.php', $value->menu_srl);
+						if (!file_exists($value->php_file))
 						{
 							$oMenuAdminController->makeXmlFile($value->menu_srl);
 						}
@@ -541,16 +541,16 @@ 
 						include($value->php_file);
 
 						$isMenuFixed = false;
-						if(count($menu->list) > 0)
+						if (count($menu->list) > 0)
 						{
-							foreach($menu->list AS $key2=>$value2)
+							foreach ($menu->list AS $key2=>$value2)
 							{
-								$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl,$siteSrl);
+								$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl, $siteSrl);
 							}
 						}
 
 						// menu recreate
-						if($isMenuFixed)
+						if ($isMenuFixed)
 						{
 							$oMenuAdminController->makeXmlFile($value->menu_srl);
 						}
@@ -561,7 +561,7 @@ 
 						$menuItems->menuItems = $menu;
 
 						// If include home menu, move first
-						if($value->menu_srl == $this->menuSrlWithinHome)
+						if ($value->menu_srl == $this->menuSrlWithinHome)
 						{
 							$menuList[-1] = $menuItems;
 						}
@@ -584,7 +584,7 @@ 
 	public function getMenuAdminDetailSetup()
 	{
 		$menuItemSrl = Context::get('menu_item_srl');
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -592,7 +592,7 @@ 
 		$menuItemInfo = $this->getMenuItemInfo($menuItemSrl);
 
 		// if menu is shortcut
-		if($menuItemInfo->is_shortcut == 'Y')
+		if ($menuItemInfo->is_shortcut == 'Y')
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -604,18 +604,18 @@ 
 		// get xml info
 		$moduleConfInfo = $oModuleModel->getModuleInfoXml($moduleInfo->module);
 
-		if($moduleConfInfo->setup_index_act)
+		if ($moduleConfInfo->setup_index_act)
 		{
 			$setupUrl = getNotEncodedUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl, 'isLayoutDrop', '1');
 		}
 
-		if($moduleConfInfo->simple_setup_index_act)
+		if ($moduleConfInfo->simple_setup_index_act)
 		{
 			$oTargetmoduleAdminModel = getAdminModel($moduleInfo->module);
 			$advancedSetupUrl = getUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl);
 			$simpleSetupHtml = $oTargetmoduleAdminModel->{$moduleConfInfo->simple_setup_index_act}($moduleInfo->module_srl, $advancedSetupUrl);
 
-			if($simpleSetupHtml)
+			if ($simpleSetupHtml)
 			{
 				$this->add('simpleSetupHtml', $simpleSetupHtml);
 			}
@@ -628,18 +628,18 @@ 
 	 * @param array $menu
 	 * @return void
 	 */
-	private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl,$siteSrl = 0)
+	private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl, $siteSrl = 0)
 	{
 		$oModuleModel = getModel('module');
 		// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
-		if(!$menu['url'] && $menu['is_shortcut'] == 'N')
+		if (!$menu['url'] && $menu['is_shortcut'] == 'N')
 		{
 			$menu['is_shortcut'] = 'Y';
 
 			$args = new stdClass;
 			$args->menu_item_srl = $menu['node_srl'];
 			$args->is_shortcut = 'Y';
-			if($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
+			if ($menu['menu_name_key']) $args->name = $menu['menu_name_key'];
 			else $args->name = $menu['menu_name'];
 			$output = executeQuery('menu.updateMenuItem', $args);
 
@@ -648,17 +648,17 @@ 
 
 		//if menu type is module menu
 		//if(!empty($menu['url']) && !preg_match('/^http/i', $menu['url']))
-		if($menu['is_shortcut'] != 'Y')
+		if ($menu['is_shortcut'] != 'Y')
 		{
 			unset($midInfo, $moduleInfo);
 			$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], $siteSrl);
 			$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
 
-			if($midInfo)
+			if ($midInfo)
 			{
 				$menu['module_srl'] = $midInfo->module_srl;
 				$menu['module'] = $midInfo->module;
-				if($midInfo->page_type)
+				if ($midInfo->page_type)
 				{
 					$menu['module_type'] = $midInfo->page_type;
 				}
@@ -668,16 +668,16 @@ 
 				}
 			}
 
-			if($moduleInfo->setup_index_act)
+			if ($moduleInfo->setup_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->setup_index_act;
 			}
-			else if($moduleInfo->default_index_act)
+			else if ($moduleInfo->default_index_act)
 			{
 				$menu['setup_index_act'] = $moduleInfo->default_index_act;
 			}
 
-			if($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
+			if ($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
 			{
 				$menu['is_start_module'] = true;
 				$this->menuSrlWithinHome = $menuSrl;
@@ -686,9 +686,9 @@ 
 			$menu['layout_srl'] = $midInfo->layout_srl;
 			$menu['browser_title'] = $midInfo->browser_title;
 		}
-		if(count($menu['list']) > 0)
+		if (count($menu['list']) > 0)
 		{
-			foreach($menu['list'] as $key=>$value)
+			foreach ($menu['list'] as $key=>$value)
 			{
 				$this->_menuInfoSetting($menu['list'][$key], $start_module, $isMenuFixed, $menuSrl, $siteSrl);
 			}

modules/menu/menu.mobile.php

Doc Comments +1 added lines

@@ -18,6 +18,7 @@
 
 	/**
 	 * Menu depth arrange
+	 * @param integer $depth
 	 * @return void
 	 */
 	function straightenMenu($menu_item, $depth)

Braces +9 added lines, -3 removed lines

@@ -22,14 +22,18 @@ 
 	 */
 	function straightenMenu($menu_item, $depth)
 	{
-		if(!$menu_item['link']) return;
+		if(!$menu_item['link']) {
+			return;
+		}
 		$obj = new stdClass;
 		$obj->href = $menu_item['href'];
 		$obj->depth = $depth;
 		$obj->text = $menu_item['text'];
 		$obj->open_window = $menu_item['open_window'];
 		$this->result[] = $obj;
-		if(!$menu_item['list']) return;
+		if(!$menu_item['list']) {
+			return;
+		}
 		foreach($menu_item['list'] as $item)
 		{
 			$this->straightenMenu($item, $depth+1);
@@ -58,7 +62,9 @@ 
 			$menu_info->php_file = './files/cache/menu/'.$homeMenuSrl.'.php';
 		}
 
-		if(file_exists($menu_info->php_file)) @include($menu_info->php_file);
+		if(file_exists($menu_info->php_file)) {
+			@include($menu_info->php_file);
+		}
 		if(is_array($menu->list))
 		{
 			foreach($menu->list as $menu_item)

Spacing +11 added lines, -11 removed lines

@@ -22,17 +22,17 @@ 
 	 */
 	function straightenMenu($menu_item, $depth)
 	{
-		if(!$menu_item['link']) return;
+		if (!$menu_item['link']) return;
 		$obj = new stdClass;
 		$obj->href = $menu_item['href'];
 		$obj->depth = $depth;
 		$obj->text = $menu_item['text'];
 		$obj->open_window = $menu_item['open_window'];
 		$this->result[] = $obj;
-		if(!$menu_item['list']) return;
-		foreach($menu_item['list'] as $item)
+		if (!$menu_item['list']) return;
+		foreach ($menu_item['list'] as $item)
 		{
-			$this->straightenMenu($item, $depth+1);
+			$this->straightenMenu($item, $depth + 1);
 		}
 	}
 
@@ -43,25 +43,25 @@ 
 	function dispMenuMenu()
 	{
 		$menu_srl = Context::get('menu_srl');
-		$oAdminModel =& getAdminModel('menu');
+		$oAdminModel = & getAdminModel('menu');
 		$menu_info = $oAdminModel->getMenu($menu_srl);
 
-		if(!$menu_srl)
+		if (!$menu_srl)
 		{
 			$oMenuAdminController = getAdminController('menu');
 			$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
 
-			if(file_exists($homeMenuCacheFile))
+			if (file_exists($homeMenuCacheFile))
 			{
 				@include($homeMenuCacheFile);
 			}
 			$menu_info->php_file = './files/cache/menu/'.$homeMenuSrl.'.php';
 		}
 
-		if(file_exists($menu_info->php_file)) @include($menu_info->php_file);
-		if(is_array($menu->list))
+		if (file_exists($menu_info->php_file)) @include($menu_info->php_file);
+		if (is_array($menu->list))
 		{
-			foreach($menu->list as $menu_item)
+			foreach ($menu->list as $menu_item)
 			{
 				$this->straightenMenu($menu_item, 0);
 			}
@@ -69,7 +69,7 @@ 
 
 		Context::set('menu', $this->result);	
 
-		$this->setTemplatePath(sprintf("%stpl/",$this->module_path));
+		$this->setTemplatePath(sprintf("%stpl/", $this->module_path));
 		$this->setTemplateFile('menu.html');
 	}
 }

modules/module/module.admin.controller.php

Doc Comments +6 added lines

@@ -260,6 +260,9 @@ 
 		return $module_srl;
 	}
 
+	/**
+	 * @param boolean $isProc
+	 */
 	private function _returnByProc($isProc, $msg='msg_invalid_request')
 	{
 		if(!$isProc)
@@ -938,6 +941,9 @@ 
 
 	}
 
+	/**
+	 * @param string $skinVars
+	 */
 	public function setDesignInfo($moduleSrl = 0, $mid = '', $skinType = 'P', $layoutSrl = 0, $isSkinFix = 'Y', $skinName = '', $skinVars = NULL)
 	{
 		if(!$moduleSrl && !$mid)

Braces +155 added lines, -79 removed lines

@@ -22,7 +22,9 @@ 
 		$args = new stdClass();
 		$args->title = Context::get('title');
 		$output = executeQuery('module.insertModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage("success_registed");
 
@@ -36,7 +38,9 @@ 
 	function procModuleAdminUpdateCategory()
 	{
 		$output = $this->doUpdateModuleCategory();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_updated');
 
@@ -50,7 +54,9 @@ 
 	function procModuleAdminDeleteCategory()
 	{
 		$output = $this->doDeleteModuleCategory();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_deleted');
 
@@ -91,8 +97,7 @@ 
 			// Get information of the target module to copy
 			$module_srl = Context::get('module_srl');
 			$args = Context::getRequestVars();
-		}
-		else
+		} else
 		{
 			$module_srl = $args->module_srl;
 		}
@@ -107,11 +112,19 @@ 
 		for($i=1;$i<=10;$i++)
 		{
 			$mid = trim($args->{"mid_".$i});
-			if(!$mid) continue;
-			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
+			if(!$mid) {
+				continue;
+			}
+			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) {
+				return new Object(-1, 'msg_limit_mid');
+			}
 			$browser_title = $args->{"browser_title_".$i};
-			if(!$mid) continue;
-			if($mid && !$browser_title) $browser_title = $mid;
+			if(!$mid) {
+				continue;
+			}
+			if($mid && !$browser_title) {
+				$browser_title = $mid;
+			}
 			$clones[$mid] = $browser_title;
 		}
 		if(count($clones) < 1)
@@ -131,7 +144,9 @@ 
 		$grant = array();
 		if($output->data)
 		{
-			foreach($output->data as $val) $grant[$val->name][] = $val->group_srl;
+			foreach($output->data as $val) {
+				$grant[$val->name][] = $val->group_srl;
+			}
 		}
 
 		// get Extra Vars
@@ -218,11 +233,19 @@ 
 			}
 
 			// Grant module permissions
-			if(count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
-			if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			if(count($grant) > 0) {
+				$oModuleController->insertModuleGrants($module_srl, $grant);
+			}
+			if($extra_vars) {
+				$oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			}
 
-			if($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
-			if($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			if($moduleSkinVars) {
+				$oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
+			}
+			if($moduleMobileSkinVars) {
+				$oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			}
 
 			$triggerObj->moduleSrlList[] = $module_srl;
 		}
@@ -235,8 +258,7 @@ 
 		{
 			$message = implode('\n', $errorLog);
 			$this->setMessage($message);
-		}
-		else
+		} else
 		{
 			$message = $lang->success_registed;
 			$this->setMessage('success_registed');
@@ -262,9 +284,9 @@ 
 
 	private function _returnByProc($isProc, $msg='msg_invalid_request')
 	{
-		if(!$isProc)
-			return;
-		else
+		if(!$isProc) {
+					return;
+		} else
 		{
 			return new Object(-1, $msg);
 		}
@@ -282,7 +304,9 @@ 
 		// Get information of the module
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$module_info) return new Object(-1,'msg_invalid_request');
+		if(!$module_info) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Register Admin ID
 		$oModuleController->deleteAdminId($module_srl);
 		$admin_member = Context::get('admin_member');
@@ -292,7 +316,9 @@ 
 			foreach($admin_members as $admin_id)
 			{
 				$admin_id = trim($admin_id);
-				if(!$admin_id) continue;
+				if(!$admin_id) {
+					continue;
+				}
 				$oModuleController->insertAdminId($module_srl, $admin_id);
 			}
 		}
@@ -318,15 +344,18 @@ 
 				$grant->{$grant_name}[] = $default;
 				continue;
 				// users in a particular group
-			}
-			else
+			} else
 			{
 				$group_srls = Context::get($grant_name);
 				if($group_srls)
 				{
-					if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-					elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-					else $group_srls = array($group_srls);
+					if(strpos($group_srls,'|@|')!==false) {
+						$group_srls = explode('|@|',$group_srls);
+					} elseif(strpos($group_srls,',')!==false) {
+						$group_srls = explode(',',$group_srls);
+					} else {
+						$group_srls = array($group_srls);
+					}
 					$grant->{$grant_name} = $group_srls;
 				}
 				continue;
@@ -338,7 +367,9 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQuery('module.deleteModuleGrants', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Permissions stored in the DB
 		foreach($grant as $grant_name => $group_srls)
 		{
@@ -349,7 +380,9 @@ 
 				$args->name = $grant_name;
 				$args->group_srl = $val;
 				$output = executeQuery('module.insertModuleGrant', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 		$this->setMessage('success_registed');
@@ -375,19 +408,16 @@ 
 				if($module_info->is_mskin_fix == 'Y')
 				{
 					$skin = $module_info->mskin;
-				}
-				else
+				} else
 				{
 					$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M');
 				}
-			}
-			else
+			} else
 			{
 				if($module_info->is_skin_fix == 'Y')
 				{
 					$skin = $module_info->skin;
-				}
-				else
+				} else
 				{
 					$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P');
 				}
@@ -400,8 +430,7 @@ 
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 				$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
-			}
-			else
+			} else
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 				$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
@@ -421,7 +450,9 @@ 
 			{
 				foreach($skin_info->extra_vars as $vars)
 				{
-					if($vars->type!='image') continue;
+					if($vars->type!='image') {
+						continue;
+					}
 
 					$image_obj = $obj->{$vars->name};
 					// Get a variable to delete
@@ -453,7 +484,9 @@ 
 					// Upload the file to a path
 					$path = sprintf("./files/attach/images/%s/", $module_srl);
 					// Create a directory
-					if(!FileHandler::makeDir($path)) return false;
+					if(!FileHandler::makeDir($path)) {
+						return false;
+					}
 
 					$filename = $path.$image_obj['name'];
 					// Move the file
@@ -484,8 +517,7 @@ 
 			if($mode === 'M')
 			{
 				$output = $oModuleController->insertModuleMobileSkinVars($module_srl, $obj);
-			}
-			else
+			} else
 			{
 				$output = $oModuleController->insertModuleSkinVars($module_srl, $obj);
 			}
@@ -506,10 +538,14 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
+		if(!$vars->module_srls) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new Object(-1,'msg_invalid_request');
+		if(count($module_srls) < 1) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$oModuleController= getController('module');
@@ -541,8 +577,7 @@ 
 			if(Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
-			}
-			else
+			} else
 			{
 				global $lang;
 				htmlHeader();
@@ -561,10 +596,14 @@ 
 	function procModuleAdminModuleGrantSetup()
 	{
 		$module_srls = Context::get('module_srls');
-		if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		if(!$module_srls) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new Object(-1,'msg_invalid_request');
+		if(count($modules) < 1) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -592,17 +631,20 @@ 
 				$grant->{$grant_name}[] = $default;
 				continue;
 				// Users in a particular group
-			}
-			else
+			} else
 			{
 				$group_srls = Context::get($grant_name);
 				if($group_srls)
 				{
 					if(!is_array($group_srls))
 					{
-						if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-						elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-						else $group_srls = array($group_srls);
+						if(strpos($group_srls,'|@|')!==false) {
+							$group_srls = explode('|@|',$group_srls);
+						} elseif(strpos($group_srls,',')!==false) {
+							$group_srls = explode(',',$group_srls);
+						} else {
+							$group_srls = array($group_srls);
+						}
 					}
 					$grant->{$grant_name} = $group_srls;
 				}
@@ -617,7 +659,9 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.deleteModuleGrants', $args);
-			if(!$output->toBool()) continue;
+			if(!$output->toBool()) {
+				continue;
+			}
 			// Permissions stored in the DB
 			foreach($grant as $grant_name => $group_srls)
 			{
@@ -628,7 +672,9 @@ 
 					$args->name = $grant_name;
 					$args->group_srl = $val;
 					$output = executeQuery('module.insertModuleGrant', $args);
-					if(!$output->toBool()) return $output;
+					if(!$output->toBool()) {
+						return $output;
+					}
 				}
 			}
 		}
@@ -638,8 +684,7 @@ 
 			if(Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
-			}
-			else
+			} else
 			{
 				global $lang;
 				htmlHeader();
@@ -665,18 +710,30 @@ 
 		$args->site_srl = (int)$site_module_info->site_srl;
 		$args->name = str_replace(' ','_',Context::get('lang_code'));
 		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
+		if(!empty($args->lang_name)) {
+			$args->name = $args->lang_name;
+		}
 
 		// if args->name is empty, random generate for user define language
-		if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		if(empty($args->name)) {
+			$args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		}
 
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		if(!$args->name) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Check whether a language code exists
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// If exists, clear the old values for updating
-		if($output->data) $output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if($output->data) {
+			$output = executeQuery('module.deleteLang', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Enter
 		$lang_supported = Context::get('lang_supported');
 		foreach($lang_supported as $key => $val)
@@ -693,7 +750,9 @@ 
 			if($args->value)
 			{
 				$output = executeQuery('module.insertLang', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
@@ -716,11 +775,17 @@ 
 		$args->site_srl = (int)$site_module_info->site_srl;
 		$args->name = str_replace(' ','_',Context::get('name'));
 		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		if(!empty($args->lang_name)) {
+			$args->name = $args->lang_name;
+		}
+		if(!$args->name) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
 
 		$this->setMessage("success_deleted", 'info');
@@ -731,7 +796,9 @@ 
 
 	function procModuleAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -744,14 +811,20 @@ 
 		$args = new stdClass;
 		$logged_info = Context::get('logged_info');
 		$site_module_info = Context::get('site_module_info');
-		if($site_keyword) $args->site_keyword = $site_keyword;
+		if($site_keyword) {
+			$args->site_keyword = $site_keyword;
+		}
 
 		if(!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
-			else $args->site_srl = (int)$site_module_info->site_srl;
+			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) {
+				$args->site_srl = 0;
+			} else {
+				$args->site_srl = (int)$site_module_info->site_srl;
+			}
+		} else {
+			$args->site_srl = $site_srl;
 		}
-		else $args->site_srl = $site_srl;
 
 		$args->sort_index1 = 'sites.domain';
 
@@ -764,7 +837,9 @@ 
 			foreach($output->data as $val)
 			{
 				$module = trim($val->module);
-				if(!$module) continue;
+				if(!$module) {
+					continue;
+				}
 
 				// replace user defined lang.
 				$oModuleController->replaceDefinedLangCode($val->browser_title);
@@ -800,7 +875,9 @@ 
 		{
 			foreach($mid_list as $module => $val)
 			{
-				if(!$selected_module) $selected_module = $module;
+				if(!$selected_module) {
+					$selected_module = $module;
+				}
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
 
 				if(!$xml_info)
@@ -823,8 +900,7 @@ 
 							{
 								$mid_list[$module]->list[$key]->module_category_srl = $categoryNameList[$categorySrl];
 							}
-						}
-						else
+						} else
 						{
 							$mid_list[$module]->list[$key]->module_category_srl = Context::getLang('none_category');
 						}
@@ -851,13 +927,14 @@ 
 		{
 			$site_module_info = Context::get('site_module_info');
 			$args->site_srl = (int)$site_module_info->site_srl;
-		}
-		else
+		} else
 		{
 			$args->site_srl = $site_srl;
 		}
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool() || !$output->data) return;
+		if(!$output->toBool() || !$output->data) {
+			return;
+		}
 		// Set the cache directory
 		$cache_path = _XE_PATH_.'files/cache/lang_defined/';
 		FileHandler::makeDir($cache_path);
@@ -950,8 +1027,7 @@ 
 		if($mid)
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid);
-		}
-		else
+		} else
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}

Spacing +153 added lines, -153 removed lines

@@ -22,7 +22,7 @@ 
 		$args = new stdClass();
 		$args->title = Context::get('title');
 		$output = executeQuery('module.insertModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage("success_registed");
 
@@ -36,7 +36,7 @@ 
 	function procModuleAdminUpdateCategory()
 	{
 		$output = $this->doUpdateModuleCategory();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_updated');
 
@@ -50,7 +50,7 @@ 
 	function procModuleAdminDeleteCategory()
 	{
 		$output = $this->doDeleteModuleCategory();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_deleted');
 
@@ -85,7 +85,7 @@ 
 	function procModuleAdminCopyModule($args = NULL)
 	{
 		$isProc = false;
-		if(!$args)
+		if (!$args)
 		{
 			$isProc = true;
 			// Get information of the target module to copy
@@ -97,24 +97,24 @@ 
 			$module_srl = $args->module_srl;
 		}
 
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return $this->_returnByProc($isProc);
 		}
 
 		// Get module name to create and browser title
 		$clones = array();
-		for($i=1;$i<=10;$i++)
+		for ($i = 1; $i <= 10; $i++)
 		{
 			$mid = trim($args->{"mid_".$i});
-			if(!$mid) continue;
-			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
+			if (!$mid) continue;
+			if (!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
 			$browser_title = $args->{"browser_title_".$i};
-			if(!$mid) continue;
-			if($mid && !$browser_title) $browser_title = $mid;
+			if (!$mid) continue;
+			if ($mid && !$browser_title) $browser_title = $mid;
 			$clones[$mid] = $browser_title;
 		}
-		if(count($clones) < 1)
+		if (count($clones) < 1)
 		{
 			return $this->_returnByProc($isProc);
 		}
@@ -129,9 +129,9 @@ 
 		$module_args->module_srl = $module_srl;
 		$output = executeQueryArray('module.getModuleGrants', $module_args);
 		$grant = array();
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val) $grant[$val->name][] = $val->group_srl;
+			foreach ($output->data as $val) $grant[$val->name][] = $val->group_srl;
 		}
 
 		// get Extra Vars
@@ -139,9 +139,9 @@ 
 		$extra_args->module_srl = $module_srl;
 		$extra_output = executeQueryArray('module.getModuleExtraVars', $extra_args);
 		$extra_vars = new stdClass();
-		if($extra_output->toBool() && is_array($extra_output->data))
+		if ($extra_output->toBool() && is_array($extra_output->data))
 		{
-			foreach($extra_output->data as $info)
+			foreach ($extra_output->data as $info)
 			{
 				$extra_vars->{$info->name} = $info->value;
 			}
@@ -150,17 +150,17 @@ 
 		$tmpModuleSkinVars = $oModuleModel->getModuleSkinVars($module_srl);
 		$tmpModuleMobileSkinVars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 
-		if($tmpModuleSkinVars)
+		if ($tmpModuleSkinVars)
 		{
-			foreach($tmpModuleSkinVars as $key=>$value)
+			foreach ($tmpModuleSkinVars as $key=>$value)
 			{
 				$moduleSkinVars->{$key} = $value->value;
 			}
 		}
 
-		if($tmpModuleMobileSkinVars)
+		if ($tmpModuleMobileSkinVars)
 		{
-			foreach($tmpModuleMobileSkinVars as $key=>$value)
+			foreach ($tmpModuleMobileSkinVars as $key=>$value)
 			{
 				$moduleMobileSkinVars->{$key} = $value->value;
 			}
@@ -174,7 +174,7 @@ 
 		$triggerObj->moduleSrlList = array();
 
 		$errorLog = array();
-		foreach($clones as $mid => $browser_title)
+		foreach ($clones as $mid => $browser_title)
 		{
 			$clone_args = new stdClass;
 			$clone_args = clone $module_info;
@@ -188,29 +188,29 @@ 
 			// Create a module
 			$output = $oModuleController->insertModule($clone_args);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
-				$errorLog[] = $mid . ' : '. $output->message;
+				$errorLog[] = $mid.' : '.$output->message;
 				continue;
 			}
 			$module_srl = $output->get('module_srl');
 
-			if($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE')
+			if ($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE')
 			{
 				// copy document
 				$oDocumentAdminController = getAdminController('document');
 				$copyOutput = $oDocumentAdminController->copyDocumentModule(array($extra_vars->document_srl), $module_srl, $module_info->category_srl);
 				$document_srls = $copyOutput->get('copied_srls');
-				if($document_srls && count($document_srls) > 0)
+				if ($document_srls && count($document_srls) > 0)
 				{
 					$extra_vars->document_srl = array_pop($document_srls);
 				}
 
-				if($extra_vars->mdocument_srl)
+				if ($extra_vars->mdocument_srl)
 				{
 					$copyOutput = $oDocumentAdminController->copyDocumentModule(array($extra_vars->mdocument_srl), $module_srl, $module_info->category_srl);
 					$copiedSrls = $copyOutput->get('copied_srls');
-					if($copiedSrls && count($copiedSrls) > 0)
+					if ($copiedSrls && count($copiedSrls) > 0)
 					{
 						$extra_vars->mdocument_srl = array_pop($copiedSrls);
 					}
@@ -218,11 +218,11 @@ 
 			}
 
 			// Grant module permissions
-			if(count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
-			if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			if (count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
+			if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
 
-			if($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
-			if($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			if ($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
+			if ($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
 
 			$triggerObj->moduleSrlList[] = $module_srl;
 		}
@@ -231,7 +231,7 @@ 
 
 		$oDB->commit();
 
-		if(count($errorLog) > 0)
+		if (count($errorLog) > 0)
 		{
 			$message = implode('\n', $errorLog);
 			$this->setMessage($message);
@@ -242,9 +242,9 @@ 
 			$this->setMessage('success_registed');
 		}
 
-		if($isProc)
+		if ($isProc)
 		{
-			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+			if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
 				global $lang;
 				htmlHeader();
@@ -260,9 +260,9 @@ 
 		return $module_srl;
 	}
 
-	private function _returnByProc($isProc, $msg='msg_invalid_request')
+	private function _returnByProc($isProc, $msg = 'msg_invalid_request')
 	{
-		if(!$isProc)
+		if (!$isProc)
 			return;
 		else
 		{
@@ -282,17 +282,17 @@ 
 		// Get information of the module
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$module_info) return new Object(-1,'msg_invalid_request');
+		if (!$module_info) return new Object(-1, 'msg_invalid_request');
 		// Register Admin ID
 		$oModuleController->deleteAdminId($module_srl);
 		$admin_member = Context::get('admin_member');
-		if($admin_member)
+		if ($admin_member)
 		{
-			$admin_members = explode(',',$admin_member);
-			foreach($admin_members as $admin_id)
+			$admin_members = explode(',', $admin_member);
+			foreach ($admin_members as $admin_id)
 			{
 				$admin_id = trim($admin_id);
-				if(!$admin_id) continue;
+				if (!$admin_id) continue;
 				$oModuleController->insertAdminId($module_srl, $admin_id);
 			}
 		}
@@ -307,13 +307,13 @@ 
 		$grant_list->manager->default = 'manager';
 
 		$grant = new stdClass();
-		foreach($grant_list as $grant_name => $grant_info)
+		foreach ($grant_list as $grant_name => $grant_info)
 		{
 			// Get the default value
 			$default = Context::get($grant_name.'_default');
 			// -1 = Log-in user only, -2 = site members only, -3 = manager only, 0 = all users
 			$grant->{$grant_name} = array();
-			if(strlen($default))
+			if (strlen($default))
 			{
 				$grant->{$grant_name}[] = $default;
 				continue;
@@ -322,10 +322,10 @@ 
 			else
 			{
 				$group_srls = Context::get($grant_name);
-				if($group_srls)
+				if ($group_srls)
 				{
-					if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-					elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+					if (strpos($group_srls, '|@|') !== false) $group_srls = explode('|@|', $group_srls);
+					elseif (strpos($group_srls, ',') !== false) $group_srls = explode(',', $group_srls);
 					else $group_srls = array($group_srls);
 					$grant->{$grant_name} = $group_srls;
 				}
@@ -338,18 +338,18 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQuery('module.deleteModuleGrants', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Permissions stored in the DB
-		foreach($grant as $grant_name => $group_srls)
+		foreach ($grant as $grant_name => $group_srls)
 		{
-			foreach($group_srls as $val)
+			foreach ($group_srls as $val)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->name = $grant_name;
 				$args->group_srl = $val;
 				$output = executeQuery('module.insertModuleGrant', $args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 		$this->setMessage('success_registed');
@@ -368,11 +368,11 @@ 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'skin', 'mskin', 'is_skin_fix', 'is_mskin_fix');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if($module_info->module_srl)
+		if ($module_info->module_srl)
 		{
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
-				if($module_info->is_mskin_fix == 'Y')
+				if ($module_info->is_mskin_fix == 'Y')
 				{
 					$skin = $module_info->mskin;
 				}
@@ -383,7 +383,7 @@ 
 			}
 			else
 			{
-				if($module_info->is_skin_fix == 'Y')
+				if ($module_info->is_skin_fix == 'Y')
 				{
 					$skin = $module_info->skin;
 				}
@@ -394,9 +394,9 @@ 
 			}
 
 			// Get skin information (to check extra_vars)
-			$module_path = _XE_PATH_ . 'modules/'.$module_info->module;
+			$module_path = _XE_PATH_.'modules/'.$module_info->module;
 
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 				$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
@@ -417,35 +417,35 @@ 
 			unset($obj->module);
 			unset($obj->_mode);
 			// Separately handle if a type of extra_vars is an image in the original skin_info
-			if($skin_info->extra_vars)
+			if ($skin_info->extra_vars)
 			{
-				foreach($skin_info->extra_vars as $vars)
+				foreach ($skin_info->extra_vars as $vars)
 				{
-					if($vars->type!='image') continue;
+					if ($vars->type != 'image') continue;
 
 					$image_obj = $obj->{$vars->name};
 					// Get a variable to delete
 					$del_var = $obj->{"del_".$vars->name};
 					unset($obj->{"del_".$vars->name});
-					if($del_var == 'Y')
+					if ($del_var == 'Y')
 					{
 						FileHandler::removeFile($skin_vars[$vars->name]->value);
 						continue;
 					}
 					// Use the previous data if not uploaded
-					if(!$image_obj['tmp_name'])
+					if (!$image_obj['tmp_name'])
 					{
 						$obj->{$vars->name} = $skin_vars[$vars->name]->value;
 						continue;
 					}
 					// Ignore if the file is not successfully uploaded
-					if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
+					if (!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
 					{
 						unset($obj->{$vars->name});
 						continue;
 					}
 					// Ignore if the file is not an image
-					if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
+					if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
 					{
 						unset($obj->{$vars->name});
 						continue;
@@ -453,11 +453,11 @@ 
 					// Upload the file to a path
 					$path = sprintf("./files/attach/images/%s/", $module_srl);
 					// Create a directory
-					if(!FileHandler::makeDir($path)) return false;
+					if (!FileHandler::makeDir($path)) return false;
 
 					$filename = $path.$image_obj['name'];
 					// Move the file
-					if(!move_uploaded_file($image_obj['tmp_name'], $filename))
+					if (!move_uploaded_file($image_obj['tmp_name'], $filename))
 					{
 						unset($obj->{$vars->name});
 						continue;
@@ -481,7 +481,7 @@ 
 			*/
 			$oModuleController = getController('module');
 
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
 				$output = $oModuleController->insertModuleMobileSkinVars($module_srl, $obj);
 			}
@@ -489,7 +489,7 @@ 
 			{
 				$output = $oModuleController->insertModuleSkinVars($module_srl, $obj);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -506,29 +506,29 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
+		if (!$vars->module_srls) return new Object(-1, 'msg_invalid_request');
 
-		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new Object(-1,'msg_invalid_request');
+		$module_srls = explode(',', $vars->module_srls);
+		if (count($module_srls) < 1) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$oModuleController= getController('module');
+		$oModuleController = getController('module');
 		$columnList = array('module_srl', 'module', 'menu_srl', 'site_srl', 'mid', 'browser_title', 'is_default', 'content', 'mcontent', 'open_rss', 'regdate');
-		$updateList = array('module_category_srl','layout_srl','skin','mlayout_srl','mskin','description','header_text','footer_text', 'use_mobile');
-		foreach($updateList as $key=>$val)
+		$updateList = array('module_category_srl', 'layout_srl', 'skin', 'mlayout_srl', 'mskin', 'description', 'header_text', 'footer_text', 'use_mobile');
+		foreach ($updateList as $key=>$val)
 		{
-			if(!strlen($vars->{$val}))
+			if (!strlen($vars->{$val}))
 			{
 				unset($updateList[$key]);
 				$columnList[] = $val;
 			}
 		}
 
-		foreach($module_srls as $module_srl)
+		foreach ($module_srls as $module_srl)
 		{
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 
-			foreach($updateList as $val)
+			foreach ($updateList as $val)
 			{
 				$module_info->{$val} = $vars->{$val};
 			}
@@ -536,9 +536,9 @@ 
 		}
 
 		$this->setMessage('success_registed');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
 			}
@@ -561,10 +561,10 @@ 
 	function procModuleAdminModuleGrantSetup()
 	{
 		$module_srls = Context::get('module_srls');
-		if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		if (!$module_srls) return new Object(-1, 'msg_invalid_request');
 
-		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new Object(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (count($modules) < 1) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -581,13 +581,13 @@ 
 
 		$grant = new stdClass;
 
-		foreach($grant_list as $grant_name => $grant_info)
+		foreach ($grant_list as $grant_name => $grant_info)
 		{
 			// Get the default value
 			$default = Context::get($grant_name.'_default');
 			// -1 = Sign only, 0 = all users
 			$grant->{$grant_name} = array();
-			if(strlen($default))
+			if (strlen($default))
 			{
 				$grant->{$grant_name}[] = $default;
 				continue;
@@ -596,12 +596,12 @@ 
 			else
 			{
 				$group_srls = Context::get($grant_name);
-				if($group_srls)
+				if ($group_srls)
 				{
-					if(!is_array($group_srls))
+					if (!is_array($group_srls))
 					{
-						if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-						elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+						if (strpos($group_srls, '|@|') !== false) $group_srls = explode('|@|', $group_srls);
+						elseif (strpos($group_srls, ',') !== false) $group_srls = explode(',', $group_srls);
 						else $group_srls = array($group_srls);
 					}
 					$grant->{$grant_name} = $group_srls;
@@ -612,30 +612,30 @@ 
 		}
 
 		// Stored in the DB
-		foreach($modules as $module_srl)
+		foreach ($modules as $module_srl)
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.deleteModuleGrants', $args);
-			if(!$output->toBool()) continue;
+			if (!$output->toBool()) continue;
 			// Permissions stored in the DB
-			foreach($grant as $grant_name => $group_srls)
+			foreach ($grant as $grant_name => $group_srls)
 			{
-				foreach($group_srls as $val)
+				foreach ($group_srls as $val)
 				{
 					$args = new stdClass();
 					$args->module_srl = $module_srl;
 					$args->name = $grant_name;
 					$args->group_srl = $val;
 					$output = executeQuery('module.insertModuleGrant', $args);
-					if(!$output->toBool()) return $output;
+					if (!$output->toBool()) return $output;
 				}
 			}
 		}
 		$this->setMessage('success_registed');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
 			}
@@ -662,38 +662,38 @@ 
 		$target = Context::get('target');
 		$module = Context::get('module');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
-		$args->name = str_replace(' ','_',Context::get('lang_code'));
-		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
+		$args->site_srl = (int) $site_module_info->site_srl;
+		$args->name = str_replace(' ', '_', Context::get('lang_code'));
+		$args->lang_name = str_replace(' ', '_', Context::get('lang_name'));
+		if (!empty($args->lang_name)) $args->name = $args->lang_name;
 
 		// if args->name is empty, random generate for user define language
-		if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		if (empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
 
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		if (!$args->name) return new Object(-1, 'msg_invalid_request');
 		// Check whether a language code exists
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// If exists, clear the old values for updating
-		if($output->data) $output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if ($output->data) $output = executeQuery('module.deleteLang', $args);
+		if (!$output->toBool()) return $output;
 		// Enter
 		$lang_supported = Context::get('lang_supported');
-		foreach($lang_supported as $key => $val)
+		foreach ($lang_supported as $key => $val)
 		{
 			$args->lang_code = $key;
 			$args->value = trim(Context::get($key));
 
 			// if request method is json, strip slashes
-			if(Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+			if (Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 			{
 				$args->value = stripslashes($args->value);
 			}
 
-			if($args->value)
+			if ($args->value)
 			{
 				$output = executeQuery('module.insertLang', $args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
@@ -713,14 +713,14 @@ 
 		// Get language code
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
-		$args->name = str_replace(' ','_',Context::get('name'));
-		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
-		if(!$args->name) return new Object(-1,'msg_invalid_request');
+		$args->site_srl = (int) $site_module_info->site_srl;
+		$args->name = str_replace(' ', '_', Context::get('name'));
+		$args->lang_name = str_replace(' ', '_', Context::get('lang_name'));
+		if (!empty($args->lang_name)) $args->name = $args->lang_name;
+		if (!$args->name) return new Object(-1, 'msg_invalid_request');
 
 		$output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$this->makeCacheDefinedLangCode($args->site_srl);
 
 		$this->setMessage("success_deleted", 'info');
@@ -731,7 +731,7 @@ 
 
 	function procModuleAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -744,12 +744,12 @@ 
 		$args = new stdClass;
 		$logged_info = Context::get('logged_info');
 		$site_module_info = Context::get('site_module_info');
-		if($site_keyword) $args->site_keyword = $site_keyword;
+		if ($site_keyword) $args->site_keyword = $site_keyword;
 
-		if(!$site_srl)
+		if (!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
-			else $args->site_srl = (int)$site_module_info->site_srl;
+			if ($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
+			else $args->site_srl = (int) $site_module_info->site_srl;
 		}
 		else $args->site_srl = $site_srl;
 
@@ -759,12 +759,12 @@ 
 		// Get a list of modules at the site
 		$output = executeQueryArray('module.getSiteModules', $args);
 		$mid_list = array();
-		if(count($output->data) > 0)
+		if (count($output->data) > 0)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
 				$module = trim($val->module);
-				if(!$module) continue;
+				if (!$module) continue;
 
 				// replace user defined lang.
 				$oModuleController->replaceDefinedLangCode($val->browser_title);
@@ -775,7 +775,7 @@ 
 				$obj->browser_title = $val->browser_title;
 				$obj->mid = $val->mid;
 				$obj->module_category_srl = $val->module_category_srl;
-				if($val->module_category_srl > 0)
+				if ($val->module_category_srl > 0)
 				{
 					$moduleCategorySrl[] = $val->module_category_srl;
 				}
@@ -787,23 +787,23 @@ 
 		$moduleCategorySrl = array_unique($moduleCategorySrl);
 		$output = $oModuleModel->getModuleCategories($moduleCategorySrl);
 		$categoryNameList = array();
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output as $value)
+			foreach ($output as $value)
 			{
 				$categoryNameList[$value->module_category_srl] = $value->title;
 			}
 		}
 
 		$selected_module = Context::get('selected_module');
-		if(count($mid_list) > 0)
+		if (count($mid_list) > 0)
 		{
-			foreach($mid_list as $module => $val)
+			foreach ($mid_list as $module => $val)
 			{
-				if(!$selected_module) $selected_module = $module;
+				if (!$selected_module) $selected_module = $module;
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
 
-				if(!$xml_info)
+				if (!$xml_info)
 				{
 					unset($mid_list[$module]);
 					continue;
@@ -812,14 +812,14 @@ 
 				$mid_list[$module]->title = $xml_info->title;
 
 				// change module category srl to title
-				if(is_array($val->list))
+				if (is_array($val->list))
 				{
-					foreach($val->list as $key=>$value)
+					foreach ($val->list as $key=>$value)
 					{
-						if($value->module_category_srl > 0)
+						if ($value->module_category_srl > 0)
 						{
 							$categorySrl = $mid_list[$module]->list[$key]->module_category_srl;
-							if(isset($categoryNameList[$categorySrl]))
+							if (isset($categoryNameList[$categorySrl]))
 							{
 								$mid_list[$module]->list[$key]->module_category_srl = $categoryNameList[$categorySrl];
 							}
@@ -847,23 +847,23 @@ 
 		$args = new stdClass();
 
 		// Get the language file of the current site
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$args->site_srl = (int)$site_module_info->site_srl;
+			$args->site_srl = (int) $site_module_info->site_srl;
 		}
 		else
 		{
 			$args->site_srl = $site_srl;
 		}
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool() || !$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 		// Set the cache directory
 		$cache_path = _XE_PATH_.'files/cache/lang_defined/';
 		FileHandler::makeDir($cache_path);
 
 		$langMap = array();
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
 			$langMap[$val->lang_code][$val->name] = $val->value;
 		}
@@ -872,27 +872,27 @@ 
 		$dbInfo = Context::getDBInfo();
 		$defaultLang = $dbInfo->lang_type;
 
-		if(!is_array($langMap[$defaultLang]))
+		if (!is_array($langMap[$defaultLang]))
 		{
 			$langMap[$defaultLang] = array();
 		}
 
-		foreach($lang_supported as $langCode => $langName)
+		foreach ($lang_supported as $langCode => $langName)
 		{
-			if(!is_array($langMap[$langCode]))
+			if (!is_array($langMap[$langCode]))
 			{
 				$langMap[$langCode] = array();
 			}
 
 			$langMap[$langCode] += $langMap[$defaultLang];
-			foreach($lang_supported as $targetLangCode => $targetLangName)
+			foreach ($lang_supported as $targetLangCode => $targetLangName)
 			{
-				if($langCode == $targetLangCode || $langCode == $defaultLang)
+				if ($langCode == $targetLangCode || $langCode == $defaultLang)
 				{
 					continue;
 				}
 
-				if(!is_array($langMap[$targetLangCode]))
+				if (!is_array($langMap[$targetLangCode]))
 				{
 					$langMap[$targetLangCode] = array();
 				}
@@ -901,7 +901,7 @@ 
 			}
 
 			$buff = array("<?php if(!defined('__XE__')) exit();");
-			foreach($langMap[$langCode] as $code => $value)
+			foreach ($langMap[$langCode] as $code => $value)
 			{
 				$buff[] = sprintf('$lang[\'%s\'] = \'%s\';', $code, addcslashes(stripcslashes($value), "'"));
 			}
@@ -924,7 +924,7 @@ 
 
 		$isSkinFix = Context::get('is_skin_fix');
 
-		if($isSkinFix)
+		if ($isSkinFix)
 		{
 			$isSkinFix = ($isSkinFix == 'N') ? 'N' : 'Y';
 		}
@@ -940,14 +940,14 @@ 
 
 	public function setDesignInfo($moduleSrl = 0, $mid = '', $skinType = 'P', $layoutSrl = 0, $isSkinFix = 'Y', $skinName = '', $skinVars = NULL)
 	{
-		if(!$moduleSrl && !$mid)
+		if (!$moduleSrl && !$mid)
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}
 
 		$oModuleModel = getModel('module');
 
-		if($mid)
+		if ($mid)
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid);
 		}
@@ -956,7 +956,7 @@ 
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}
 
-		if(!$moduleInfo)
+		if (!$moduleInfo)
 		{
 			return $this->stop(-1, 'msg_module_not_exists');
 		}
@@ -965,26 +965,26 @@ 
 		$layoutTargetValue = ($skinType == 'M') ? 'mlayout_srl' : 'layout_srl';
 		$skinFixTargetValue = ($skinType == 'M') ? 'is_mskin_fix' : 'is_skin_fix';
 
-		if(strlen($layoutSrl))
+		if (strlen($layoutSrl))
 		{
 			$moduleInfo->{$layoutTargetValue} = $layoutSrl;
 		}
 
-		if(strlen($isSkinFix))
+		if (strlen($isSkinFix))
 		{
 			$moduleInfo->{$skinFixTargetValue} = $isSkinFix;
 		}
 
-		if($isSkinFix == 'Y')
+		if ($isSkinFix == 'Y')
 		{
 			$moduleInfo->{$skinTargetValue} = $skinName;
 			$skinVars = json_decode($skinVars);
 
-			if(is_array($skinVars))
+			if (is_array($skinVars))
 			{
-				foreach($skinVars as $key => $val)
+				foreach ($skinVars as $key => $val)
 				{
-					if(empty($val))
+					if (empty($val))
 					{
 						continue;
 					}
@@ -1005,7 +1005,7 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$useMobile = Context::get('use_mobile');
 
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}

modules/module/module.admin.model.php

Doc Comments +6 added lines, -1 removed lines

@@ -56,6 +56,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $modulePath
+	 */
 	function getSelectedManageHTML($grantList, $tabChoice = array(), $modulePath = NULL)
 	{
 		if($modulePath)
@@ -306,7 +309,7 @@ 
 	 * Skin setting page for the module
 	 *
 	 * @param $module_srl sequence of module
-	 * @param $mode P or M
+	 * @param string $mode P or M
 	 * @return string The HTML code
 	 */
 	function _getModuleSkinHTML($module_srl, $mode)
@@ -395,6 +398,7 @@ 
 	/**
 	 * @brief Get values for a particular language code
 	 * Return its corresponding value if lang_code is specified. Otherwise return $name.
+	 * @param string $name
 	 */
 	function getLangCode($site_srl, $name, $isFullLanguage = FALSE)
 	{
@@ -513,6 +517,7 @@ 
 
 	/**
 	 * @brief Return current lang list
+	 * @param stdClass $args
 	 */
 	function getLangListByLangcode($args)
 	{

Braces +78 added lines, -44 removed lines

@@ -26,7 +26,9 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new Object();
+		if(!$output->toBool() || !$output->data) {
+			return new Object();
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -49,7 +51,9 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -96,8 +100,12 @@ 
 		{
 			foreach($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -158,8 +166,12 @@ 
 		{
 			foreach($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -176,11 +188,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$default_grant[$val->name] = 'all';
+				} else if($val->group_srl == -1) {
+					$default_grant[$val->name] = 'member';
+				} else if($val->group_srl == -2) {
+					$default_grant[$val->name] = 'site';
+				} else if($val->group_srl == -3) {
+					$default_grant[$val->name] = 'manager';
+				} else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
 					$default_grant[$val->name] = 'group';
@@ -235,8 +251,12 @@ 
 		{
 			foreach($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grantList->{$key} = $val;
 			}
 		}
@@ -253,11 +273,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$defaultGrant->{$val->name} = 'all';
+				} else if($val->group_srl == -1) {
+					$defaultGrant->{$val->name} = 'member';
+				} else if($val->group_srl == -2) {
+					$defaultGrant->{$val->name} = 'site';
+				} else if($val->group_srl == -3) {
+					$defaultGrant->{$val->name} = 'manager';
+				} else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
 					$defaultGrant->{$val->name} = 'group';
@@ -315,26 +339,25 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if(!$module_info) {
+			return;
+		}
 
 		if($mode === 'P')
 		{
 			if($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->skin;
 			}
-		}
-		else
+		} else
 		{
 			if($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->mskin;
 			}
@@ -347,8 +370,7 @@ 
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
-		}
-		else
+		} else
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
@@ -364,8 +386,9 @@ 
 				if($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
+				} else {
+					$value = '';
 				}
-				else $value = '';
 				if($type=="checkbox")
 				{
 					$value = $value?unserialize($value):array();
@@ -401,8 +424,7 @@ 
 		if($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
-		}
-		else
+		} else
 		{
 			$lang_supported = Context::get('lang_supported');
 		}
@@ -420,19 +442,21 @@ 
 					$selected_lang[$val->lang_code] = $val->value;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$tmp = unserialize($name);
 			if($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
+				if(!$rand_name) {
+					$rand_name = array_shift($tmp);
+				}
 				if(is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach($lang_supported as $key => $val) {
+											$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					}
 				}
 			}
 		}
@@ -440,8 +464,9 @@ 
 		$output = array();
 		if(is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach($lang_supported as $key => $val) {
+							$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			}
 		}
 		return $output;
 	}
@@ -452,7 +477,9 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new Object(-1,'msg_invalid_request');
+		if(!$name) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
 		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
@@ -465,7 +492,9 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +502,9 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if($output->toBool()) {
+			$langList = $output->data;
+		}
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,7 +516,9 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$langList = array();
 
@@ -517,7 +550,9 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output;
 	}
@@ -592,8 +627,7 @@ 
 		if(Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
-		}
-		else
+		} else
 		{
 			$module_srl = Context::get('module_srl');
 		}

Spacing +84 added lines, -84 removed lines

@@ -26,16 +26,16 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new Object();
+		if (!$output->toBool() || !$output->data) return new Object();
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$info_xml = $oModuleModel->getModuleInfoXml($val->module);
 			$oModuleController->replaceDefinedLangCode($val->browser_title);
-			$list[$val->module_srl] = array('module_srl'=>$val->module_srl,'mid'=>$val->mid,'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
+			$list[$val->module_srl] = array('module_srl'=>$val->module_srl, 'mid'=>$val->mid, 'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
 		}
-		$modules = explode(',',$args->module_srls);
-		for($i=0;$i<count($modules);$i++)
+		$modules = explode(',', $args->module_srls);
+		for ($i = 0; $i < count($modules); $i++)
 		{
 			$module_list[$modules[$i]] = $list[$modules[$i]];
 		}
@@ -49,7 +49,7 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -58,12 +58,12 @@ 
 
 	function getSelectedManageHTML($grantList, $tabChoice = array(), $modulePath = NULL)
 	{
-		if($modulePath)
+		if ($modulePath)
 		{
 			// get the skins path
 			$oModuleModel = getModel('module');
 			$skin_list = $oModuleModel->getSkins($modulePath);
-			Context::set('skin_list',$skin_list);
+			Context::set('skin_list', $skin_list);
 
 			$mskin_list = $oModuleModel->getSkins($modulePath, "m.skins");
 			Context::set('mskin_list', $mskin_list);
@@ -74,7 +74,7 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$security = new Security();
@@ -83,21 +83,21 @@ 
 		$security->encodeHTML('skin_list..title');
 		$security->encodeHTML('mskin_list..title');
 
-		$grant_list =new stdClass();
+		$grant_list = new stdClass();
 		// Grant virtual permission for access and manager
-		if(!$grantList)
+		if (!$grantList)
 		{
-			$grantList =new stdClass();
+			$grantList = new stdClass();
 		}
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($grantList))
+		if (count($grantList))
 		{
-			foreach($grantList as $key => $val)
+			foreach ($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -119,7 +119,7 @@ 
 		$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
 		Context::set('setup_content', $content);
 
-		if(count($tabChoice) == 0)
+		if (count($tabChoice) == 0)
 		{
 			$tabChoice = array('tab1'=>1, 'tab2'=>1, 'tab3'=>1);
 		}
@@ -136,7 +136,7 @@ 
 	 */
 	function getModuleGrantHTML($module_srl, $source_grant_list)
 	{
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return;
 		}
@@ -154,12 +154,12 @@ 
 		$grant_list->access = new stdClass();
 		$grant_list->access->title = Context::getLang('grant_access');
 		$grant_list->access->default = 'guest';
-		if(count($source_grant_list))
+		if (count($source_grant_list))
 		{
-			foreach($source_grant_list as $key => $val)
+			foreach ($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -172,14 +172,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
+				if ($val->group_srl == 0) $default_grant[$val->name] = 'all';
+				else if ($val->group_srl == -1) $default_grant[$val->name] = 'member';
+				else if ($val->group_srl == -2) $default_grant[$val->name] = 'site';
+				else if ($val->group_srl == -3) $default_grant[$val->name] = 'manager';
 				else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
@@ -213,12 +213,12 @@ 
 	{
 		$targetModule = Context::get('target_module');
 		$moduleSrl = Context::get('module_srl');
-		if(!$targetModule || !$moduleSrl)
+		if (!$targetModule || !$moduleSrl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if($targetModule == '_SHORTCUT')
+		if ($targetModule == '_SHORTCUT')
 		{
 			return new Object(0);
 		}
@@ -231,12 +231,12 @@ 
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($xmlInfo->grant))
+		if (count($xmlInfo->grant))
 		{
-			foreach($xmlInfo->grant as $key => $val)
+			foreach ($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grantList->{$key} = $val;
 			}
 		}
@@ -249,14 +249,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $moduleSrl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
+				if ($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
+				else if ($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
+				else if ($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
+				else if ($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
 				else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
@@ -265,15 +265,15 @@ 
 			}
 		}
 
-		if(is_object($grantList))
+		if (is_object($grantList))
 		{
-			foreach($grantList AS $key=>$value)
+			foreach ($grantList AS $key=>$value)
 			{
-				if(isset($defaultGrant->{$key}))
+				if (isset($defaultGrant->{$key}))
 				{
 					$grantList->{$key}->grant = $defaultGrant->{$key};
 				}
-				if(isset($selectedGroup->{$key}))
+				if (isset($selectedGroup->{$key}))
 				{
 					$grantList->{$key}->group_srls = $selectedGroup->{$key};
 				}
@@ -315,11 +315,11 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if (!$module_info) return;
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
-			if($module_info->is_skin_fix == 'N')
+			if ($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
 			}
@@ -330,7 +330,7 @@ 
 		}
 		else
 		{
-			if($module_info->is_mskin_fix == 'N')
+			if ($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
 			}
@@ -343,7 +343,7 @@ 
 		$module_path = './modules/'.$module_info->module;
 
 		// Get XML information of the skin and skin sinformation set in DB
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
@@ -354,25 +354,25 @@ 
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 		}
 
-		if(count($skin_info->extra_vars)) 
+		if (count($skin_info->extra_vars)) 
 		{
-			foreach($skin_info->extra_vars as $key => $val) 
+			foreach ($skin_info->extra_vars as $key => $val) 
 			{
 				$group = $val->group;
 				$name = $val->name;
 				$type = $val->type;
-				if($skin_vars[$name]) 
+				if ($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
 				}
 				else $value = '';
-				if($type=="checkbox")
+				if ($type == "checkbox")
 				{
-					$value = $value?unserialize($value):array();
+					$value = $value ?unserialize($value) : array();
 				}
 
 				$value = empty($value) ? $val->default : $value;
-				$skin_info->extra_vars[$key]->value= $value;
+				$skin_info->extra_vars[$key]->value = $value;
 			}
 		}
 
@@ -398,7 +398,7 @@ 
 	 */
 	function getLangCode($site_srl, $name, $isFullLanguage = FALSE)
 	{
-		if($isFullLanguage)
+		if ($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
 		}
@@ -407,15 +407,15 @@ 
 			$lang_supported = Context::get('lang_supported');
 		}
 
-		if(substr($name,0,12)=='$user_lang->')
+		if (substr($name, 0, 12) == '$user_lang->')
 		{
 			$args = new stdClass();
-			$args->site_srl = (int)$site_srl;
-			$args->name = substr($name,12);
+			$args->site_srl = (int) $site_srl;
+			$args->name = substr($name, 12);
 			$output = executeQueryArray('module.getLang', $args);
-			if($output->data)
+			if ($output->data)
 			{
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
 					$selected_lang[$val->lang_code] = $val->value;
 				}
@@ -424,24 +424,24 @@ 
 		else
 		{
 			$tmp = unserialize($name);
-			if($tmp)
+			if ($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
-				if(is_array($lang_supported))
+				if (!$rand_name) $rand_name = array_shift($tmp);
+				if (is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach ($lang_supported as $key => $val)
+						$selected_lang[$key] = $tmp[$key] ? $tmp[$key] : $rand_name;
 				}
 			}
 		}
 
 		$output = array();
-		if(is_array($lang_supported))
+		if (is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach ($lang_supported as $key => $val)
+				$output[$key] = $selected_lang[$key] ? $selected_lang[$key] : $name;
 		}
 		return $output;
 	}
@@ -452,7 +452,7 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new Object(-1,'msg_invalid_request');
+		if (!$name) return new Object(-1, 'msg_invalid_request');
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
 		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
@@ -465,7 +465,7 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +473,7 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if ($output->toBool()) $langList = $output->data;
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,23 +485,23 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$langList = array();
 
 		// search value
 		$output = executeQueryArray('module.getLangNameByValue', $args);
-		if($output->toBool() && is_array($output->data))
+		if ($output->toBool() && is_array($output->data))
 		{
 			unset($args->value);
 
-			foreach($output->data as $data)
+			foreach ($output->data as $data)
 			{
 				$args->langName = $data->name;
 				$columnList = array('lang_code', 'name', 'value');
 				$outputByName = executeQueryArray('module.getLangListByName', $args, $columnList);
 
-				if($outputByName->toBool())
+				if ($outputByName->toBool())
 				{
 					$langList = array_merge($langList, $outputByName->data);
 				}
@@ -517,7 +517,7 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output;
 	}
@@ -528,7 +528,7 @@ 
 	function getModuleAdminMultilingualHtml()
 	{
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'multilingual_v17.html');
 
 		$this->add('html', $tpl);
 	}
@@ -540,7 +540,7 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 		$args->langCode = Context::get('lang_code');
 		$args->page = Context::get('page');
 		$args->sort_index = 'name';
@@ -550,7 +550,7 @@ 
 		$args->list_count = Context::get('list_count');
 		$args->page_count = 5;
 
-		if(!$args->langCode)
+		if (!$args->langCode)
 		{
 			$args->langCode = Context::get('lang_type');
 		}
@@ -567,7 +567,7 @@ 
 		$oSecurity->encodeHTML('lang_code_list..');
 
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17_list.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'multilingual_v17_list.html');
 
 		$this->add('html', $tpl);
 	}
@@ -577,9 +577,9 @@ 
 	 */
 	function getModuleAdminModuleSearcherHtml()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/admin/lang');
+		Context::loadLang(_XE_PATH_.'modules/admin/lang');
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'module_searcher_v17.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'module_searcher_v17.html');
 
 		$this->add('html', $tpl);
 	}
@@ -589,7 +589,7 @@ 
 	 */
 	function getModuleAdminModuleInfo()
 	{
-		if(Context::get('search_module_srl'))
+		if (Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
 		}

modules/module/module.controller.php

Doc Comments +7 added lines

@@ -933,6 +933,7 @@ 
 
 	/**
 	 * @brief Insert skin vars to a module
+	 * @param string $mode
 	 */
 	function _insertModuleSkinVars($module_srl, $obj, $mode)
 	{
@@ -1006,6 +1007,7 @@ 
 
 	/**
 	 * @brief Remove skin vars of a module
+	 * @param string $mode
 	 */
 	function _deleteModuleSkinVars($module_srl, $mode)
 	{
@@ -1242,6 +1244,7 @@ 
 
 	/**
 	 * @brief Update a file into the file box
+	 * @param stdClass $vars
 	 */
 	function updateModuleFileBox($vars)
 	{
@@ -1283,6 +1286,7 @@ 
 
 	/**
 	 * @brief Add a file into the file box
+	 * @param stdClass $vars
 	 */
 	function insertModuleFileBox($vars)
 	{
@@ -1336,6 +1340,9 @@ 
 		if(!$output->toBool()) return $output;
 	}
 
+	/**
+	 * @param stdClass $vars
+	 */
 	function deleteModuleFileBox($vars)
 	{
 		// delete real file

Spacing +161 added lines, -161 removed lines

@@ -29,7 +29,7 @@ 
 		$output = executeQuery('module.insertActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -51,7 +51,7 @@ 
 		$output = executeQuery('module.deleteActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -75,12 +75,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.insertTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -104,12 +104,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.deleteTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -129,12 +129,12 @@ 
 		$args->module = $module;
 
 		$output = executeQuery('module.deleteModuleTriggers', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -148,11 +148,11 @@ 
 	 * @brief Add module extend
 	 *
 	 */
-	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function insertModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if ($kind != 'admin') $kind = '';
+		if (!in_array($type, array('model', 'controller', 'view', 'api', 'mobile'))) return false;
+		if (in_array($parent_module, array('module', 'addon', 'widget', 'layout'))) return false;
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +164,7 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if ($output->data->count > 0) return false;
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -174,7 +174,7 @@ 
 	 * @brief Delete module extend
 	 *
 	 */
-	function deleteModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function deleteModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -199,9 +199,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if (!$origin_config) $origin_config = new stdClass;
 
-		foreach($config as $key => $val)
+		foreach ($config as $key => $val)
 		{
 			$origin_config->{$key} = $val;
 		}
@@ -215,19 +215,19 @@ 
 	 */
 	function insertModuleConfig($module, $config, $site_srl = 0)
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->module = $module;
 		$args->config = serialize($config);
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -246,13 +246,13 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -265,10 +265,10 @@ 
 	 */
 	function insertSite($domain, $index_module_srl)
 	{
-		if(isSiteID($domain))
+		if (isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
+			if ($oModuleModel->isIDExists($domain, 0)) return new Object(-1, 'msg_already_registed_vid');
 		}
 		else
 		{
@@ -284,10 +284,10 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new Object(-1,'msg_already_registed_vid');
+		if ($output) return new Object(-1, 'msg_already_registed_vid');
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -302,32 +302,32 @@ 
 		$columnList = array('sites.site_srl', 'sites.domain');
 		$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
 
-		if(!$args->domain && $site_info->site_srl == $args->site_srl)
+		if (!$args->domain && $site_info->site_srl == $args->site_srl)
 		{
 			$args->domain = $site_info->domain;
 		}
 
-		if($site_info->domain != $args->domain)
+		if ($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
+			if ($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1, 'msg_already_registed_domain');
+			if (isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1, 'msg_already_registed_vid');
 
-			if($args->domain && !isSiteID($args->domain))
+			if ($args->domain && !isSiteID($args->domain))
 			{
 				$args->domain = (strlen($args->domain) >= 1 && substr_compare($args->domain, '/', -1) === 0) ? substr($args->domain, 0, -1) : $args->domain;
 			}
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if ($args->site_srl == 0) $vid = '';
+		else $vid = $args->domain;
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -345,7 +345,7 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
+		if (!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -379,7 +379,7 @@ 
 	 */
 	function insertModule($args)
 	{
-		if(isset($args->isMenuCreate))
+		if (isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
 		}
@@ -389,11 +389,11 @@ 
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
+		if ($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,16 +404,16 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if (!$args->module_srl) $args->module_srl = getNextSequence();
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -423,13 +423,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -443,14 +443,14 @@ 
 
 		$args->browser_title = strip_tags($args->browser_title);
 
-		if($isMenuCreate == TRUE)
+		if ($isMenuCreate == TRUE)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->menu_srl = $args->menu_srl;
 			$menuOutput = executeQuery('menu.getMenu', $menuArgs);
 
 			// if menu is not created, create menu also. and does not supported that in virtual site.
-			if(!$menuOutput->data && !$args->site_srl)
+			if (!$menuOutput->data && !$args->site_srl)
 			{
 				$oMenuAdminModel = getAdminModel('menu');
 
@@ -468,7 +468,7 @@ 
 				$menuArgs->listorder = $args->menu_item_srl * -1;
 
 				$menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs);
-				if(!$menuItemOutput->toBool())
+				if (!$menuItemOutput->toBool())
 				{
 					$oDB->rollback();
 					return $menuItemOutput;
@@ -481,7 +481,7 @@ 
 		// Insert a module
 		$args->menu_srl = $menuArgs->menu_srl;
 		$output = executeQuery('module.insertModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -493,12 +493,12 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 		return $output;
 	}
 
@@ -508,7 +508,7 @@ 
 	function updateModule($args)
 	{
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -517,29 +517,29 @@ 
 		$columnList = array('module_srl', 'site_srl', 'browser_title', 'mid');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
 
-		if(!$args->site_srl || !$args->browser_title)
+		if (!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if (!$args->site_srl) $args->site_srl = (int) $module_info->site_srl;
+			if (!$args->browser_title) $args->browser_title = $module_info->browser_title;
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
 
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if(!$output->toBool() || $output->data->count)
+		if (!$output->toBool() || $output->data->count)
 		{
 			$oDB->rollback();
 			return new Object(-1, 'msg_module_name_exists');
 		}
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -549,13 +549,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -565,7 +565,7 @@ 
 			}
 		}
 		$output = executeQuery('module.updateModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -575,15 +575,15 @@ 
 		$menuArgs->url = $module_info->mid;
 		$menuArgs->site_srl = $module_info->site_srl;
 		$menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs);
-		if($menuOutput->data && count($menuOutput->data))
+		if ($menuOutput->data && count($menuOutput->data))
 		{
 			$oMenuAdminController = getAdminController('menu');
-			foreach($menuOutput->data as $itemInfo)
+			foreach ($menuOutput->data as $itemInfo)
 			{
 				$itemInfo->url = $args->mid;
 
 				$updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo);
-				if(!$updateMenuItemOutput->toBool())
+				if (!$updateMenuItemOutput->toBool())
 				{
 					$oDB->rollback();
 					return $updateMenuItemOutput;
@@ -592,7 +592,7 @@ 
 		}
 
 		// if mid changed, change mid of success_return_url to new mid
-		if($module_info->mid != $args->mid && Context::get('success_return_url'))
+		if ($module_info->mid != $args->mid && Context::get('success_return_url'))
 		{
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 		}
@@ -602,11 +602,11 @@ 
 
 		$oDB->commit();
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -625,7 +625,7 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if (!!$output->error) return false;
 
 		return true;
 	}
@@ -640,11 +640,11 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -659,7 +659,7 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -669,7 +669,7 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
+		if (!$site_srl) $args->site_srl = $site_module_info->site_srl;
 		else $args->site_srl = $site_srl;
 
 		unset($output);
@@ -678,9 +678,9 @@ 
 		$menuOutput = $oMenuAdminModel->getMenuList($args);
 
 		// get menu_srl by site_srl
-		if(is_array($menuOutput->data))
+		if (is_array($menuOutput->data))
 		{
-			foreach($menuOutput->data AS $key=>$value)
+			foreach ($menuOutput->data AS $key=>$value)
 			{
 				$args->menu_srl = $value->menu_srl;
 				break;
@@ -689,7 +689,7 @@ 
 
 		$output = executeQuery('menu.getMenuItemByUrl', $args);
 		// menu delete
-		if($output->data)
+		if ($output->data)
 		{
 			unset($args);
 			$args = new stdClass;
@@ -700,7 +700,7 @@ 
 			$oMenuAdminController = getAdminController('menu');
 			$output = $oMenuAdminController->deleteItem($args);
 
-			if($output->isSuccess)
+			if ($output->isSuccess)
 			{
 				return new Object(0, 'success_deleted');
 			}
@@ -722,19 +722,19 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
+		if ($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -744,7 +744,7 @@ 
 		$args->module_srl = $module_srl;
 		// Delete module information from the DB
 		$output = executeQuery('module.deleteModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -758,10 +758,10 @@ 
 		// Remove the module manager
 		$this->deleteAdminId($module_srl);
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('module.deleteModule', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -773,7 +773,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -795,10 +795,10 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -814,7 +814,7 @@ 
 		$output = executeQuery('module.updateModuleMenu', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -827,15 +827,15 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if (!count($menu_srl_list)) return;
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
-		$args->menu_srls = implode(',',$menu_srl_list);
+		$args->menu_srls = implode(',', $menu_srl_list);
 		$output = executeQuery('module.updateModuleLayout', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -854,37 +854,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
-		foreach($arr_admins as $key => $user_id)
+		if (!is_array($arr_admins) || !count($arr_admins)) return new Object();
+		foreach ($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if (!trim($user_id)) continue;
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new Object();
+		if (!count($admins)) return new Object();
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 		{
-			$args->email_address = '\''.implode('\',\'',$admins).'\'';
+			$args->email_address = '\''.implode('\',\'', $admins).'\'';
 		}
 		else
 		{
-			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
+			$args->user_ids = '\''.implode('\',\'', $admins).'\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			unset($args);
 			$args = new stdClass;
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		return new Object();
 	}
@@ -897,12 +897,12 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
 		else
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
 
-		if(!$member_info->member_srl) return;
+		if (!$member_info->member_srl) return;
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -917,11 +917,11 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 
-		if($admin_id)
+		if ($admin_id)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if ($member_info->member_srl) $args->member_srl = $member_info->member_srl;
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -958,18 +958,18 @@ 
 		$oDB->begin();
 
 		$output = $this->_deleteModuleSkinVars($module_srl, $mode);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new Object();
+		if (!$obj || !count($obj)) return new Object();
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
 			// #17927989 For an old board which used the old blog module
 			// it often saved menu item(stdClass) on the skin info column
@@ -980,9 +980,9 @@ 
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 
-			if($mode === 'P')
+			if ($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
 			}
@@ -990,7 +990,7 @@ 
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 				$oDB->rollback();
@@ -1029,7 +1029,7 @@ 
 		$args->module_srl = $module_srl;
 		$mode = $mode === 'P' ? 'P' : 'M';
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
@@ -1043,7 +1043,7 @@ 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->delete($cache_key);
 		}
@@ -1058,22 +1058,22 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if (is_object($val) || is_array($val)) continue;
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_extra_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1092,7 +1092,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_extra_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1108,19 +1108,19 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $name => $val)
+		foreach ($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if (!$val || !count($val)) continue;
 
-			foreach($val as $group_srl)
+			foreach ($val as $group_srl)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if (!$args->name || !$args->group_srl) continue;
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1141,9 +1141,9 @@ 
 	 */
 	function replaceDefinedLangCode(&$output, $isReplaceLangCode = true)
 	{
-		if($isReplaceLangCode)
+		if ($isReplaceLangCode)
 		{
-			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
+			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this, '_replaceLangCode'), $output);
 		}
 	}
 
@@ -1151,27 +1151,27 @@ 
 	{
 		static $lang = null;
 
-		if(is_null($lang))
+		if (is_null($lang))
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info)
+			if (!$site_module_info)
 			{
 				$oModuleModel = getModel('module');
 				$site_module_info = $oModuleModel->getDefaultMid();
 				Context::set('site_module_info', $site_module_info);
 			}
 			$cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
-			if(!file_exists($cache_file))
+			if (!file_exists($cache_file))
 			{
 				$oModuleAdminController = getAdminController('module');
 				$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
 			}
 
-			if(file_exists($cache_file))
+			if (file_exists($cache_file))
 			{
-				$moduleAdminControllerMtime = filemtime(_XE_PATH_ . 'modules/module/module.admin.controller.php');
+				$moduleAdminControllerMtime = filemtime(_XE_PATH_.'modules/module/module.admin.controller.php');
 				$cacheFileMtime = filemtime($cache_file);
-				if($cacheFileMtime < $moduleAdminControllerMtime)
+				if ($cacheFileMtime < $moduleAdminControllerMtime)
 				{
 					$oModuleAdminController = getAdminController('module');
 					$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
@@ -1180,9 +1180,9 @@ 
 				require_once($cache_file);
 			}
 		}
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if (!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
 
-		return str_replace('$user_lang->','',$matches[0]);
+		return str_replace('$user_lang->', '', $matches[0]);
 	}
 
 
@@ -1195,17 +1195,17 @@ 
 		if ($ajax) Context::setRequestMethod('JSON');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 
-		$vars = Context::gets('addfile','filter');
+		$vars = Context::gets('addfile', 'filter');
 		$attributeNames = Context::get('attribute_name');
 		$attributeValues = Context::get('attribute_value');
-		if(is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
+		if (is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
 		{
 			$attributes = array();
-			foreach($attributeNames as $no => $name)
+			foreach ($attributeNames as $no => $name)
 			{
-				if(empty($name))
+				if (empty($name))
 				{
 					continue;
 				}
@@ -1217,16 +1217,16 @@ 
 		$vars->comment = $attributes;
 		$module_filebox_srl = Context::get('module_filebox_srl');
 
-		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$ext = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+		if ($vars->filter) $filter = explode(',', $vars->filter);
+		else $filter = array('jpg', 'jpeg', 'gif', 'png');
+		if (!in_array($ext, $filter)) return new Object(-1, 'msg_error_occured');
 
 		$vars->member_srl = $logged_info->member_srl;
 
 		// update
-		if($module_filebox_srl > 0)
+		if ($module_filebox_srl > 0)
 		{
 			$vars->module_filebox_srl = $module_filebox_srl;
 			$output = $this->updateModuleFileBox($vars);
@@ -1234,10 +1234,10 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+			if (!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+			if (!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
+			if ($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1251,7 +1251,7 @@ 
 		}
 		else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
+			if ($output) $this->add('save_filename', $output->get('save_filename'));
 			else $this->add('save_filename', '');
 		}
 	}
@@ -1263,7 +1263,7 @@ 
 	{
 		$args = new stdClass;
 		// have file
-		if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
+		if ($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
 		{
 			$oModuleModel = getModel('module');
 			$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
@@ -1272,18 +1272,18 @@ 
 			$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 			FileHandler::makeDir($path);
 
-			$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
+			$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $ext);
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if (!checkUploadedFile($tmp)) return false;
 
-			if(!@move_uploaded_file($tmp, $save_filename))
+			if (!@move_uploaded_file($tmp, $save_filename))
 			{
 				return false;
 			}
 
-			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 			$args->filename = $save_filename;
 			$args->filesize = $vars->addfile['size'];
 		}
@@ -1309,14 +1309,14 @@ 
 		$oModuleModel = getModel('module');
 		$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 		FileHandler::makeDir($path);
-		$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
+		$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $vars->ext);
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if (!checkUploadedFile($tmp)) return false;
 
 		// upload
-		if(!@move_uploaded_file($tmp, $save_filename))
+		if (!@move_uploaded_file($tmp, $save_filename))
 		{
 			return false;
 		}
@@ -1327,7 +1327,7 @@ 
 		$args->member_srl = $vars->member_srl;
 		$args->comment = $vars->comment;
 		$args->filename = $save_filename;
-		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$args->filesize = $vars->addfile['size'];
 
 		$output = executeQuery('module.insertModuleFileBox', $args);
@@ -1342,14 +1342,14 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1372,11 +1372,11 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if (!$timeout) $timeout = 60;
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if ($member_srl) $args->member_srl = $member_srl;
 		$output = executeQuery('module.insertLock', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output->add('lock_name', $lock_name);
 			$output->add('deadline', $args->deadline);
@@ -1405,7 +1405,7 @@ 
 		$output = executeQuery('module.updateModuleInSites', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

Braces +220 added lines, -102 removed lines

@@ -150,9 +150,15 @@ 
 	 */
 	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if($kind != 'admin') {
+			$kind = '';
+		}
+		if(!in_array($type,array('model','controller','view','api','mobile'))) {
+			return false;
+		}
+		if(in_array($parent_module, array('module','addon','widget','layout'))) {
+			return false;
+		}
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +170,9 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if($output->data->count>0) {
+			return false;
+		}
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -199,7 +207,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if(!$origin_config) {
+			$origin_config = new stdClass;
+		}
 
 		foreach($config as $key => $val)
 		{
@@ -221,7 +231,9 @@ 
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
@@ -246,7 +258,9 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
@@ -268,9 +282,10 @@ 
 		if(isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
-		}
-		else
+			if($oModuleModel->isIDExists($domain, 0)) {
+				return new Object(-1,'msg_already_registed_vid');
+			}
+		} else
 		{
 			$domain = strtolower($domain);
 		}
@@ -284,10 +299,14 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new Object(-1,'msg_already_registed_vid');
+		if($output) {
+			return new Object(-1,'msg_already_registed_vid');
+		}
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -310,8 +329,12 @@ 
 		if($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
+			if($info->site_srl && $info->site_srl != $args->site_srl) {
+				return new Object(-1,'msg_already_registed_domain');
+			}
+			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) {
+				return new Object(-1,'msg_already_registed_vid');
+			}
 
 			if($args->domain && !isSiteID($args->domain))
 			{
@@ -320,8 +343,11 @@ 
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if($args->site_srl == 0) {
+			$vid='';
+		} else {
+			$vid=$args->domain;
+		}
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
@@ -345,7 +371,9 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
+		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) {
+			return new Object(-1, 'msg_limit_mid');
+		}
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -382,18 +410,23 @@ 
 		if(isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
-		}
-		else
+		} else
 		{
 			$isMenuCreate = TRUE;
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
+		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) {
+			return new Object(-1, 'msg_module_name_exists');
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,20 +437,20 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if(!$args->module_srl) {
+			$args->module_srl = getNextSequence();
+		}
 
 		// default value
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -426,14 +459,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -508,7 +539,9 @@ 
 	function updateModule($args)
 	{
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -519,8 +552,12 @@ 
 
 		if(!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if(!$args->site_srl) {
+				$args->site_srl = (int)$module_info->site_srl;
+			}
+			if(!$args->browser_title) {
+				$args->browser_title = $module_info->browser_title;
+			}
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
@@ -536,14 +573,12 @@ 
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -552,14 +587,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -625,7 +658,9 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if(!!$output->error) {
+			return false;
+		}
 
 		return true;
 	}
@@ -640,7 +675,9 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
@@ -659,7 +696,9 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -669,8 +708,11 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
-		else $args->site_srl = $site_srl;
+		if(!$site_srl) {
+			$args->site_srl = $site_module_info->site_srl;
+		} else {
+			$args->site_srl = $site_srl;
+		}
 
 		unset($output);
 
@@ -703,8 +745,7 @@ 
 			if($output->isSuccess)
 			{
 				return new Object(0, 'success_deleted');
-			}
-			else
+			} else
 			{
 				return new Object($output->error, $output->message);
 			}
@@ -722,19 +763,25 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
+		if($module_srl == $start_module->index_module_srl) {
+			return new Object(-1, 'msg_cannot_delete_startmodule');
+		}
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -795,7 +842,9 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		if($oCacheHandler->isSupport())
@@ -827,7 +876,9 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if(!count($menu_srl_list)) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
@@ -854,28 +905,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
+		if(!is_array($arr_admins) || !count($arr_admins)) {
+			return new Object();
+		}
 		foreach($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if(!trim($user_id)) {
+				continue;
+			}
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new Object();
+		if(!count($admins)) {
+			return new Object();
+		}
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 		if($member_config->identifier == 'email_address')
 		{
 			$args->email_address = '\''.implode('\',\'',$admins).'\'';
-		}
-		else
+		} else
 		{
 			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -884,7 +944,9 @@ 
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		return new Object();
 	}
@@ -897,12 +959,15 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
-			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
-		else
-			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		if($member_config->identifier == 'email_address') {
+					$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
+		} else {
+					$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		}
 
-		if(!$member_info->member_srl) return;
+		if(!$member_info->member_srl) {
+			return;
+		}
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -921,7 +986,9 @@ 
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if($member_info->member_srl) {
+				$args->member_srl = $member_info->member_srl;
+			}
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -965,7 +1032,9 @@ 
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new Object();
+		if(!$obj || !count($obj)) {
+			return new Object();
+		}
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
@@ -975,18 +1044,23 @@ 
 			// it often saved menu item(stdClass) on the skin info column
 			// When updating the module on XE core 1.2.0 later versions, it occurs an error
 			// fixed the error
-			if (is_object($val)) continue;
-			if (is_array($val)) $val = serialize($val);
+			if (is_object($val)) {
+				continue;
+			}
+			if (is_array($val)) {
+				$val = serialize($val);
+			}
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 
 			if($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
@@ -1033,8 +1107,7 @@ 
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
-		}
-		else
+		} else
 		{
 			$object_key = 'module_mobile_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleMobileSkinVars';
@@ -1058,17 +1131,23 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if(is_object($val) || is_array($val)) {
+				continue;
+			}
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
@@ -1108,11 +1187,15 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if(!$val || !count($val)) {
+				continue;
+			}
 
 			foreach($val as $group_srl)
 			{
@@ -1120,7 +1203,9 @@ 
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if(!$args->name || !$args->group_srl) {
+					continue;
+				}
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1180,7 +1265,9 @@ 
 				require_once($cache_file);
 			}
 		}
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if(!Context::get($matches[1]) && $lang[$matches[1]]) {
+			return $lang[$matches[1]];
+		}
 
 		return str_replace('$user_lang->','',$matches[0]);
 	}
@@ -1192,10 +1279,14 @@ 
 	function procModuleFileBoxAdd()
 	{
 		$ajax = Context::get('ajax');
-		if ($ajax) Context::setRequestMethod('JSON');
+		if ($ajax) {
+			Context::setRequestMethod('JSON');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$vars = Context::gets('addfile','filter');
 		$attributeNames = Context::get('attribute_name');
@@ -1219,9 +1310,14 @@ 
 
 		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+		if($vars->filter) {
+			$filter = explode(',',$vars->filter);
+		} else {
+			$filter = array('jpg','jpeg','gif','png');
+		}
+		if(!in_array($ext,$filter)) {
+			return new Object(-1, 'msg_error_occured');
+		}
 
 		$vars->member_srl = $logged_info->member_srl;
 
@@ -1234,10 +1330,16 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+			if(!Context::isUploaded()) {
+				return new Object(-1, 'msg_error_occured');
+			}
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+			if(!is_uploaded_file($addfile['tmp_name'])) {
+				return new Object(-1, 'msg_error_occured');
+			}
+			if($vars->addfile['error'] != 0) {
+				return new Object(-1, 'msg_error_occured');
+			}
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1248,11 +1350,13 @@ 
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
 			$this->setRedirectUrl($returnUrl);
 			return;
-		}
-		else
+		} else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
-			else $this->add('save_filename', '');
+			if($output) {
+				$this->add('save_filename', $output->get('save_filename'));
+			} else {
+				$this->add('save_filename', '');
+			}
 		}
 	}
 
@@ -1276,7 +1380,9 @@ 
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if(!checkUploadedFile($tmp)) {
+				return false;
+			}
 
 			if(!@move_uploaded_file($tmp, $save_filename))
 			{
@@ -1313,7 +1419,9 @@ 
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if(!checkUploadedFile($tmp)) {
+			return false;
+		}
 
 		// upload
 		if(!@move_uploaded_file($tmp, $save_filename))
@@ -1342,14 +1450,20 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$module_filebox_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1372,9 +1486,13 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if(!$timeout) {
+			$timeout = 60;
+		}
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if($member_srl) {
+			$args->member_srl = $member_srl;
+		}
 		$output = executeQuery('module.insertLock', $args);
 		if($output->toBool())
 		{

modules/page/page.view.php

Doc Comments +4 added lines

@@ -129,6 +129,8 @@ 
 
 	/**
 	 * @brief Save the file and return if a file is requested by http
+	 * @param integer $caching_interval
+	 * @param string $cache_file
 	 */
 	function getHtmlPage($path, $caching_interval, $cache_file)
 	{
@@ -167,6 +169,8 @@ 
 
 	/**
 	 * @brief Create a cache file in order to include if it is an internal file
+	 * @param integer $caching_interval
+	 * @param string $cache_file
 	 */
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{

Braces +47 added lines, -25 removed lines

@@ -46,12 +46,17 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if($this->module_srl) {
+			Context::set('module_srl',$this->module_srl);
+		}
 
 		$page_type_name = strtolower($this->module_info->page_type);
 		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if(method_exists($this, $method)) $page_content = $this->{$method}();
-		else return new Object(-1, sprintf('%s method is not exists', $method));
+		if(method_exists($this, $method)) {
+			$page_content = $this->{$method}();
+		} else {
+			return new Object(-1, sprintf('%s method is not exists', $method));
+		}
 
 		Context::set('module_info', $this->module_info);
 		Context::set('page_content', $page_content);
@@ -63,24 +68,27 @@ 
 	{
 		if($this->interval>0)
 		{
-			if(!file_exists($this->cache_file)) $mtime = 0;
-			else $mtime = filemtime($this->cache_file);
+			if(!file_exists($this->cache_file)) {
+				$mtime = 0;
+			} else {
+				$mtime = filemtime($this->cache_file);
+			}
 
 			if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME'])
 			{
 				$page_content = FileHandler::readFile($this->cache_file); 
 				$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
-			}
-			else
+			} else
 			{
 				$oWidgetController = getController('widget');
 				$page_content = $oWidgetController->transWidgetCode($this->module_info->content);
 				FileHandler::writeFile($this->cache_file, $page_content);
 			}
-		}
-		else
+		} else
 		{
-			if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
+			if(file_exists($this->cache_file)) {
+				FileHandler::removeFile($this->cache_file);
+			}
 			$page_content = $this->module_info->content;
 		}
 		return $page_content;
@@ -104,8 +112,7 @@ 
 		if ($this->module_info->skin)
 		{
 			$templatePath = (sprintf($this->module_path.'skins/%s', $this->module_info->skin));
-		}
-		else
+		} else
 		{
 			$templatePath = ($this->module_path.'skins/default');
 		}
@@ -120,8 +127,11 @@ 
 		// check if it is http or internal file
 		if($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
-			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			if(preg_match("/^([a-z]+):\/\//i",$this->path)) {
+				$content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			} else {
+				$content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			}
 		}
 
 		return $content;
@@ -136,8 +146,7 @@ 
 		if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > $_SERVER['REQUEST_TIME'])
 		{
 			$content = FileHandler::readFile($cache_file);
-		}
-		else
+		} else
 		{
 			FileHandler::getRemoteFile($path, $cache_file);
 			$content = FileHandler::readFile($cache_file);
@@ -154,13 +163,19 @@ 
 		$content = $buff->content;
 		// Extract a title
 		$title = $oPageController->getTitle($content);
-		if($title) Context::setBrowserTitle($title);
+		if($title) {
+			Context::setBrowserTitle($title);
+		}
 		// Extract header script
 		$head_script = $oPageController->getHeadScript($content);
-		if($head_script) Context::addHtmlHeader($head_script);
+		if($head_script) {
+			Context::addHtmlHeader($head_script);
+		}
 		// Extract content from the body
 		$body_script = $oPageController->getBodyScript($content);
-		if(!$body_script) $body_script = $content;
+		if(!$body_script) {
+			$body_script = $content;
+		}
 
 		return $content;
 	}
@@ -171,7 +186,9 @@ 
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{
 		// Cancel if the file doesn't exist
-		if(!file_exists(FileHandler::getRealPath($target_file))) return;
+		if(!file_exists(FileHandler::getRealPath($target_file))) {
+			return;
+		}
 
 		// Get a path and filename
 		$tmp_path = explode('/',$cache_file);
@@ -183,7 +200,9 @@ 
 		// Verify cache
 		if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
 		{
-			if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+			if(file_exists($cache_file)) {
+				FileHandler::removeFile($cache_file);
+			}
 
 			// Read a target file and get content
 			ob_start();
@@ -196,7 +215,9 @@ 
 
 			FileHandler::writeFile($cache_file, $content);
 			// Include and then Return the result
-			if(!file_exists($cache_file)) return;
+			if(!file_exists($cache_file)) {
+				return;
+			}
 			// Attempt to compile
 			$oTemplate = &TemplateHandler::getInstance();
 			$script = $oTemplate->compileDirect($filepath, $filename);
@@ -227,14 +248,15 @@ 
 		{
 				return $matches[0];
 			// In case of  .. , get a path
-		}
-		else if(strncasecmp('..', $val, 2) === 0)
+		} else if(strncasecmp('..', $val, 2) === 0)
 		{
 			$p = Context::pathToUrl($this->path);
 			return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
 		}
 
-		if(strncasecmp('..', $val, 2) === 0) $val = substr($val,2);
+		if(strncasecmp('..', $val, 2) === 0) {
+			$val = substr($val,2);
+		}
 		$p = Context::pathToUrl($this->path);
 		$path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
 

Spacing +32 added lines, -32 removed lines

@@ -22,18 +22,18 @@ 
 		// Get a template path (page in the administrative template tpl putting together)
 		$this->setTemplatePath($this->module_path.'tpl');
 
-		switch($this->module_info->page_type)
+		switch ($this->module_info->page_type)
 		{
 			case 'WIDGET' :
 				{
 					$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					break;
 				}
 			case 'OUTSIDE' :
 				{
 					$this->cache_file = sprintf("%sfiles/cache/opage/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getSslStatus());
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					$this->path = $this->module_info->path;
 					break;
 				}
@@ -46,11 +46,11 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if ($this->module_srl) Context::set('module_srl', $this->module_srl);
 
 		$page_type_name = strtolower($this->module_info->page_type);
-		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if(method_exists($this, $method)) $page_content = $this->{$method}();
+		$method = '_get'.ucfirst($page_type_name).'Content';
+		if (method_exists($this, $method)) $page_content = $this->{$method}();
 		else return new Object(-1, sprintf('%s method is not exists', $method));
 
 		Context::set('module_info', $this->module_info);
@@ -61,12 +61,12 @@ 
 
 	function _getWidgetContent()
 	{
-		if($this->interval>0)
+		if ($this->interval > 0)
 		{
-			if(!file_exists($this->cache_file)) $mtime = 0;
+			if (!file_exists($this->cache_file)) $mtime = 0;
 			else $mtime = filemtime($this->cache_file);
 
-			if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME'])
+			if ($mtime + $this->interval * 60 > $_SERVER['REQUEST_TIME'])
 			{
 				$page_content = FileHandler::readFile($this->cache_file); 
 				$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
@@ -80,7 +80,7 @@ 
 		}
 		else
 		{
-			if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
+			if (file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
 			$page_content = $this->module_info->content;
 		}
 		return $page_content;
@@ -93,7 +93,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument(0, true);
 
-		if($this->module_info->document_srl)
+		if ($this->module_info->document_srl)
 		{
 			$document_srl = $this->module_info->document_srl;
 			$oDocument->setDocument($document_srl);
@@ -118,9 +118,9 @@ 
 	function _getOutsideContent()
 	{
 		// check if it is http or internal file
-		if($this->path)
+		if ($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			if (preg_match("/^([a-z]+):\/\//i", $this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
 			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
 		}
 
@@ -133,7 +133,7 @@ 
 	function getHtmlPage($path, $caching_interval, $cache_file)
 	{
 		// Verify cache
-		if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > $_SERVER['REQUEST_TIME'])
+		if ($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval * 60 > $_SERVER['REQUEST_TIME'])
 		{
 			$content = FileHandler::readFile($cache_file);
 		}
@@ -154,13 +154,13 @@ 
 		$content = $buff->content;
 		// Extract a title
 		$title = $oPageController->getTitle($content);
-		if($title) Context::setBrowserTitle($title);
+		if ($title) Context::setBrowserTitle($title);
 		// Extract header script
 		$head_script = $oPageController->getHeadScript($content);
-		if($head_script) Context::addHtmlHeader($head_script);
+		if ($head_script) Context::addHtmlHeader($head_script);
 		// Extract content from the body
 		$body_script = $oPageController->getBodyScript($content);
-		if(!$body_script) $body_script = $content;
+		if (!$body_script) $body_script = $content;
 
 		return $content;
 	}
@@ -171,32 +171,32 @@ 
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{
 		// Cancel if the file doesn't exist
-		if(!file_exists(FileHandler::getRealPath($target_file))) return;
+		if (!file_exists(FileHandler::getRealPath($target_file))) return;
 
 		// Get a path and filename
-		$tmp_path = explode('/',$cache_file);
-		$filename = $tmp_path[count($tmp_path)-1];
-		$filepath = preg_replace('/'.$filename."$/i","",$cache_file);
+		$tmp_path = explode('/', $cache_file);
+		$filename = $tmp_path[count($tmp_path) - 1];
+		$filepath = preg_replace('/'.$filename."$/i", "", $cache_file);
 		$cache_file = FileHandler::getRealPath($cache_file);
 
 		$level = ob_get_level();
 		// Verify cache
-		if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
+		if ($caching_interval < 1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval * 60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file) < filemtime($target_file))
 		{
-			if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+			if (file_exists($cache_file)) FileHandler::removeFile($cache_file);
 
 			// Read a target file and get content
 			ob_start();
 			include(FileHandler::getRealPath($target_file));
 			$content = ob_get_clean();
 			// Replace relative path to the absolute path 
-			$this->path = str_replace('\\', '/', realpath(dirname($target_file))) . '/';
-			$content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
-			$content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is',array($this,'_replacePath'),$content);
+			$this->path = str_replace('\\', '/', realpath(dirname($target_file))).'/';
+			$content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is', array($this, '_replacePath'), $content);
+			$content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is', array($this, '_replacePath'), $content);
 
 			FileHandler::writeFile($cache_file, $content);
 			// Include and then Return the result
-			if(!file_exists($cache_file)) return;
+			if (!file_exists($cache_file)) return;
 			// Attempt to compile
 			$oTemplate = &TemplateHandler::getInstance();
 			$script = $oTemplate->compileDirect($filepath, $filename);
@@ -223,20 +223,20 @@ 
 		$val = trim($matches[3]);
 		// Pass if the path is external or starts with /, #, { characters
 		// /=absolute path, #=hash in a page, {=Template syntax
-		if(strpos($val, '.') === FALSE || preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i',$val))
+		if (strpos($val, '.') === FALSE || preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i', $val))
 		{
 				return $matches[0];
 			// In case of  .. , get a path
 		}
-		else if(strncasecmp('..', $val, 2) === 0)
+		else if (strncasecmp('..', $val, 2) === 0)
 		{
 			$p = Context::pathToUrl($this->path);
-			return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+			return sprintf("%s%s%s%s", $matches[1], $matches[2], $p.$val, $matches[4]);
 		}
 
-		if(strncasecmp('..', $val, 2) === 0) $val = substr($val,2);
+		if (strncasecmp('..', $val, 2) === 0) $val = substr($val, 2);
 		$p = Context::pathToUrl($this->path);
-		$path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+		$path = sprintf("%s%s%s%s", $matches[1], $matches[2], $p.$val, $matches[4]);
 
 		return $path;
 	}

modules/point/point.controller.php

Doc Comments +1 added lines

@@ -478,6 +478,7 @@
 
 	/**
 	 * @brief Set points
+	 * @param string $mode
 	 */
 	function setPoint($member_srl, $point, $mode = null)
 	{

Spacing +103 added lines, -103 removed lines

@@ -31,7 +31,7 @@ 
 		$point = $config->signup_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point, 'signup');
+		$this->setPoint($member_srl, $cur_point, 'signup');
 
 		return new Object();
 	}
@@ -42,9 +42,9 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new Object();
+		if (!$member_srl) return new Object();
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
+		if (substr($obj->last_login, 0, 8) == date("Ymd")) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -55,7 +55,7 @@ 
 		$point = $config->login_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -66,30 +66,30 @@ 
 	function triggerInsertDocument(&$obj)
 	{
 		$oDocumentModel = getModel('document');
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new Object();
+			if (!$module_srl || !$member_srl) return new Object();
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new Object();
+			if ($module_srl == $member_srl) return new Object();
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -106,24 +106,24 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 
 		// if status is TEMP or PUBLIC... give not point, only status is empty
-		if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$oModuleModel = getModel('module');
 
 			// Get the point module information
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $obj->module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,42 +141,42 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
+		if (!$oDocument->isExists()) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
-		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
+		$module_config = $oModuleModel->getModulePartConfig('point', $oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if (strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new Object();
+		if ($comment_point > 0) return new Object();
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if ($output->data[$i]->member_srl < 1) continue;
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new Object();
+		if ($member_srl) unset($member_srls[abs($member_srl)]);
+		if (!count($member_srls)) return new Object();
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
 		$point = $module_config['download_file'];
-		foreach($member_srls as $member_srl => $cnt)
+		foreach ($member_srls as $member_srl => $cnt)
 		{
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 			$cur_point -= $cnt * $comment_point;
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -189,15 +189,15 @@ 
 	{
 		$oDocumentModel = getModel('document');
 
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new Object();
+			if (!$module_srl || !$member_srl) return new Object();
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new Object();
+			if (!$logged_info->member_srl) return new Object();
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,16 +207,16 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new Object();
+			if ($point < 0) return new Object();
 			$cur_point -= $point;
 			// Add points related to deleting an attachment
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -229,12 +229,12 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
+		if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == abs($member_srl)) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -244,10 +244,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -264,11 +264,11 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
-		if($oDocument->get('member_srl')==$member_srl) return new Object();
+		if (!$oDocument->isExists()) return new Object();
+		if ($oDocument->get('member_srl') == $member_srl) return new Object();
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -276,12 +276,12 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new Object();
+		if ($point < 0) return new Object();
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -301,11 +301,11 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new Object();
+		if ($obj->isvalid != 'Y') return new Object();
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -315,10 +315,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -331,10 +331,10 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new Object();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new Object();
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -348,11 +348,11 @@ 
 		}
 
 		// If the user is not logged in and download requires points, deny access.
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
-			if($config->disable_download == 'Y' && $point)
+			if ($config->disable_download == 'Y' && $point)
 			{
-				return new Object(-1,'msg_not_permitted_download');
+				return new Object(-1, 'msg_not_permitted_download');
 			}
 			else
 			{
@@ -367,7 +367,7 @@ 
 		// If the member does not have enough points, deny access.
 		if ($config->disable_download == 'Y' && $cur_point + $point < 0)
 		{
-			return new Object(-1,'msg_cannot_download');
+			return new Object(-1, 'msg_cannot_download');
 		}
 
 		// Otherwise, points will be adjusted after downloading (triggerDownloadFile).
@@ -381,13 +381,13 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if (!$logged_info->member_srl) return new Object();
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new Object();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new Object();
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -428,22 +428,22 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new Object();
+		if ($target_member_srl == $member_srl) return new Object();
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
 		// Pass if there are no requested points
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new Object();
+			if ($output->data->count) return new Object();
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 		}
 		else
@@ -454,7 +454,7 @@ 
 		$config = $oModuleModel->getModuleConfig('point');
 		// When the requested points are negative, compared it with the current point
 		$_SESSION['banned_document'][$obj->document_srl] = false;
-		if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
+		if ($config->disable_read_document == 'Y' && $point < 0 && abs($point) > $cur_point)
 		{
 			$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
 			$obj->add('content', $message);
@@ -462,14 +462,14 @@ 
 			return new Object(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new Object();
+		if (!$logged_info->member_srl) return new Object();
 		// Pass, if there are no requested points
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -481,7 +481,7 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -490,21 +490,21 @@ 
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
-		if( $obj->point > 0 )
+		if ($obj->point > 0)
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->voted;
 		}
 		else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
 		}
 
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -516,7 +516,7 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if (!$mode || !in_array($mode, $mode_arr)) $mode = 'update';
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -533,7 +533,7 @@ 
 		$args->member_srl = $member_srl;
 		$args->point = $current_point;
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'add' :
 				$args->point += $point;
@@ -546,7 +546,7 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if ($args->point < 0) $args->point = 0;
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -557,7 +557,7 @@ 
 		$trigger_obj->current_level = $current_level;
 		$trigger_obj->set_point = $point;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -568,19 +568,19 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
+		if ($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
 		else executeQuery("point.insertPoint", $args);
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
 
 		// If existing level and a new one are different attempt to set a point group
-		if($level != $current_level)
+		if ($level != $current_level)
 		{
 			// Check if the level, for which the current points are prepared, is calculate and set the correct group
 			$point_group = $config->point_group;
 			// If the point group exists
-			if($point_group && is_array($point_group) && count($point_group) )
+			if ($point_group && is_array($point_group) && count($point_group))
 			{
 				// Get the default group
 				$default_group = $oMemberModel->getDefaultGroup();
@@ -590,29 +590,29 @@ 
 
 				asort($point_group);
 				// Reset group after initialization
-				if($config->group_reset != 'N')
+				if ($config->group_reset != 'N')
 				{
 					// If the new level is in the right group
-					if(in_array($level, $point_group))
+					if (in_array($level, $point_group))
 					{
 						// Delete all groups except the one which the current level belongs to
-						foreach($point_group as $group_srl => $target_level)
+						foreach ($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if ($target_level == $level) $new_group_list[] = $group_srl;
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
 					else
 					{
 						$i = $level;
-						while($i > 0)
+						while ($i > 0)
 						{
-							if(in_array($i, $point_group))
+							if (in_array($i, $point_group))
 							{
-								foreach($point_group as $group_srl => $target_level)
+								foreach ($point_group as $group_srl => $target_level)
 								{
-									if($target_level == $i)
+									if ($target_level == $i)
 									{
 										$new_group_list[] = $group_srl;
 									}
@@ -623,9 +623,9 @@ 
 						}
 					}
 					// Delete the group of a level which is higher than the current level
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if ($target_level > $level) $del_group_list[] = $group_srl;
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -633,16 +633,16 @@ 
 				else
 				{
 					// Check until the current level by rotating setting the configurations of the point groups
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if ($target_level <= $level) $new_group_list[] = $group_srl;
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if (!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
 				// Remove linkage group
-				if($del_group_list && count($del_group_list))
+				if ($del_group_list && count($del_group_list))
 				{
 					$del_group_args = new stdClass;
 					$del_group_args->member_srl = $member_srl;
@@ -650,7 +650,7 @@ 
 					$del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
 				}
 				// Grant a new group
-				foreach($new_group_list as $group_srl)
+				foreach ($new_group_list as $group_srl)
 				{
 					$new_group_args = new stdClass;
 					$new_group_args->member_srl = $member_srl;
@@ -665,7 +665,7 @@ 
 		$trigger_obj->del_group_list = $del_group_list;
 		$trigger_obj->new_level = $level;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -681,17 +681,17 @@ 
 		FileHandler::writeFile($cache_filename, $point);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_0';
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
+			$object_key = 'member_info:'.getNumberingPath($member_srl).$member_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
@@ -705,9 +705,9 @@ 
 		$pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('point', $moduleSrl, $pointConfig);
 			}

Braces +175 added lines, -67 removed lines

@@ -42,9 +42,13 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new Object();
+		if(!$member_srl) {
+			return new Object();
+		}
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
+		if(substr($obj->last_login,0,8)==date("Ymd")) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -70,9 +74,13 @@ 
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new Object();
+			if(!$module_srl || !$member_srl) {
+				return new Object();
+			}
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new Object();
+			if($module_srl == $member_srl) {
+				return new Object();
+			}
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
@@ -82,12 +90,18 @@ 
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -118,12 +132,18 @@ 
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,33 +161,47 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if(strlen($comment_point) == 0 && !is_int($comment_point)) {
+			$comment_point = $config->insert_comment;
+		}
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new Object();
+		if($comment_point>0) {
+			return new Object();
+		}
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
 		for($i=0;$i<$cnt;$i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if($output->data[$i]->member_srl<1) {
+				continue;
+			}
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new Object();
+		if($member_srl) {
+			unset($member_srls[abs($member_srl)]);
+		}
+		if(!count($member_srls)) {
+			return new Object();
+		}
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
@@ -194,10 +228,14 @@ 
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new Object();
+			if(!$module_srl || !$member_srl) {
+				return new Object();
+			}
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new Object();
+			if(!$logged_info->member_srl) {
+				return new Object();
+			}
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,14 +245,22 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new Object();
+			if($point < 0) {
+				return new Object();
+			}
 			$cur_point -= $point;
 			// Add points related to deleting an attachment
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point -= $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -229,12 +275,16 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
+		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -244,7 +294,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -264,11 +316,17 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
-		if($oDocument->get('member_srl')==$member_srl) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
+		if($oDocument->get('member_srl')==$member_srl) {
+			return new Object();
+		}
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -276,9 +334,13 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new Object();
+		if($point < 0) {
+			return new Object();
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -301,11 +363,15 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new Object();
+		if($obj->isvalid != 'Y') {
+			return new Object();
+		}
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -315,7 +381,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->upload_file;
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -331,18 +399,21 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new Object();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new Object();
+		}
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 		if (isset($module_config['download_file']))
 		{
 			$point = intval($module_config['download_file']);
-		}
-		else
+		} else
 		{
 			$point = intval($config->download_file);
 		}
@@ -353,8 +424,7 @@ 
 			if($config->disable_download == 'Y' && $point)
 			{
 				return new Object(-1,'msg_not_permitted_download');
-			}
-			else
+			} else
 			{
 				return new Object();
 			}
@@ -381,13 +451,19 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if(!$logged_info->member_srl) {
+			return new Object();
+		}
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new Object();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new Object();
+		}
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -396,8 +472,7 @@ 
 		if (isset($module_config['download_file']))
 		{
 			$point = intval($module_config['download_file']);
-		}
-		else
+		} else
 		{
 			$point = intval($config->download_file);
 		}
@@ -428,25 +503,32 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new Object();
+		if($target_member_srl == $member_srl) {
+			return new Object();
+		}
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->read_document;
+		}
 		// Pass if there are no requested points
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new Object();
+			if($output->data->count) {
+				return new Object();
+			}
 			$cur_point = $oPointModel->getPoint($member_srl, true);
-		}
-		else
+		} else
 		{
 			$cur_point = 0;
 		}
@@ -462,9 +544,13 @@ 
 			return new Object(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new Object();
+		if(!$logged_info->member_srl) {
+			return new Object();
+		}
 		// Pass, if there are no requested points
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
@@ -481,7 +567,9 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -493,15 +581,20 @@ 
 		if( $obj->point > 0 )
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
-		}
-		else
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->voted;
+			}
+		} else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->blamed;
+			}
 		}
 
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -516,7 +609,9 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if(!$mode || !in_array($mode,$mode_arr)) {
+			$mode = 'update';
+		}
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -546,7 +641,9 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if($args->point < 0) {
+			$args->point = 0;
+		}
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -568,8 +665,11 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
-		else executeQuery("point.insertPoint", $args);
+		if($oPointModel->isExistsPoint($member_srl)) {
+			executeQuery("point.updatePoint", $args);
+		} else {
+			executeQuery("point.insertPoint", $args);
+		}
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
@@ -599,7 +699,9 @@ 
 						foreach($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if($target_level == $level) {
+								$new_group_list[] = $group_srl;
+							}
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
@@ -625,7 +727,9 @@ 
 					// Delete the group of a level which is higher than the current level
 					foreach($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if($target_level > $level) {
+							$del_group_list[] = $group_srl;
+						}
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -636,11 +740,15 @@ 
 					foreach($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if($target_level <= $level) {
+							$new_group_list[] = $group_srl;
+						}
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if(!$new_group_list[0]) {
+					$new_group_list[0] = $default_group->group_srl;
+				}
 				// Remove linkage group
 				if($del_group_list && count($del_group_list))
 				{

modules/poll/poll.admin.controller.php

Doc Comments +1 added lines

@@ -85,6 +85,7 @@
 
 	/**
 	 * @brief Delete the poll (when several questions are registered in one poll, delete this question)
+	 * @param string $poll_index_srl
 	 */
 	function deletePollTitle($poll_index_srl) 
 	{

Spacing +20 added lines, -20 removed lines

@@ -40,22 +40,22 @@ 
 		// Display an error no post is selected
 		$cart = Context::get('cart');
 
-		if(is_array($cart)) $poll_srl_list = $cart;
-		else $poll_srl_list= explode('|@|', $cart);
+		if (is_array($cart)) $poll_srl_list = $cart;
+		else $poll_srl_list = explode('|@|', $cart);
 
 		$poll_count = count($poll_srl_list);
-		if(!$poll_count) return $this->stop('msg_cart_is_null');
+		if (!$poll_count) return $this->stop('msg_cart_is_null');
 		// Delete the post
-		for($i=0;$i<$poll_count;$i++)
+		for ($i = 0; $i < $poll_count; $i++)
 		{
 			$poll_index_srl = trim($poll_srl_list[$i]);
-			if(!$poll_index_srl) continue;
+			if (!$poll_index_srl) continue;
 
 			$output = $this->deletePollTitle($poll_index_srl, true);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
-		$this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
+		$this->setMessage(sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList');
 		$this->setRedirectUrl($returnUrl);
@@ -63,7 +63,7 @@ 
 
 	function procPollAdminAddCart()
 	{
-		$poll_index_srl = (int)Context::get('poll_index_srl');
+		$poll_index_srl = (int) Context::get('poll_index_srl');
 
 		$oPollAdminModel = getAdminModel('poll');
 		//$columnList = array('comment_srl');
@@ -73,11 +73,11 @@ 
 
 		$output = $oPollAdminModel->getPollList($args);
 
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data AS $key=>$value)
+			foreach ($output->data AS $key=>$value)
 			{
-				if($_SESSION['poll_management'][$value->poll_index_srl]) unset($_SESSION['poll_management'][$value->poll_index_srl]);
+				if ($_SESSION['poll_management'][$value->poll_index_srl]) unset($_SESSION['poll_management'][$value->poll_index_srl]);
 				else $_SESSION['poll_management'][$value->poll_index_srl] = true;
 			}
 		}
@@ -97,36 +97,36 @@ 
 		$oDB->begin();
 
 		$output = executeQueryArray('poll.getPollByDeletePollTitle', $args);
-		if($output->toBool() && $output->data && $output->data[0]->count == 1)
+		if ($output->toBool() && $output->data && $output->data[0]->count == 1)
 		{
 			$dargs->poll_srl = $output->data[0]->poll_srl;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollTitle', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollItem', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($dargs->poll_srl)
+		if ($dargs->poll_srl)
 		{
 			$output = executeQuery('poll.deletePoll', $dargs);
-			if(!$output)
+			if (!$output)
 			{
 				$oDB->rollback();
 				return $output;
 			}
 
 			$output = executeQuery('poll.deletePollLog', $dargs);
-			if(!$output)
+			if (!$output)
 			{
 				$oDB->rollback();
 				return $output;
@@ -149,21 +149,21 @@ 
 		$oDB->begin();
 
 		$output = $oDB->executeQuery('poll.deletePoll', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollTitle', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollItem', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;

Braces +19 added lines, -7 removed lines

@@ -40,19 +40,28 @@ 
 		// Display an error no post is selected
 		$cart = Context::get('cart');
 
-		if(is_array($cart)) $poll_srl_list = $cart;
-		else $poll_srl_list= explode('|@|', $cart);
+		if(is_array($cart)) {
+			$poll_srl_list = $cart;
+		} else {
+			$poll_srl_list= explode('|@|', $cart);
+		}
 
 		$poll_count = count($poll_srl_list);
-		if(!$poll_count) return $this->stop('msg_cart_is_null');
+		if(!$poll_count) {
+			return $this->stop('msg_cart_is_null');
+		}
 		// Delete the post
 		for($i=0;$i<$poll_count;$i++)
 		{
 			$poll_index_srl = trim($poll_srl_list[$i]);
-			if(!$poll_index_srl) continue;
+			if(!$poll_index_srl) {
+				continue;
+			}
 
 			$output = $this->deletePollTitle($poll_index_srl, true);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
@@ -77,8 +86,11 @@ 
 		{
 			foreach($output->data AS $key=>$value)
 			{
-				if($_SESSION['poll_management'][$value->poll_index_srl]) unset($_SESSION['poll_management'][$value->poll_index_srl]);
-				else $_SESSION['poll_management'][$value->poll_index_srl] = true;
+				if($_SESSION['poll_management'][$value->poll_index_srl]) {
+					unset($_SESSION['poll_management'][$value->poll_index_srl]);
+				} else {
+					$_SESSION['poll_management'][$value->poll_index_srl] = true;
+				}
 			}
 		}
 	}