xpressengine / xe-core

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)

Spacing +154 added lines, -154 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 BaseObject(-1, 'msg_limit_mid');
+			if (!$mid) continue;
+			if (!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if (!$module_info) return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if (!$vars->module_srls) return new BaseObject(-1, 'msg_invalid_request');
 
-		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new BaseObject(-1,'msg_invalid_request');
+		$module_srls = explode(',', $vars->module_srls);
+		if (count($module_srls) < 1) return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if (!$module_srls) return new BaseObject(-1, 'msg_invalid_request');
 
-		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new BaseObject(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (count($modules) < 1) return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if (!$args->name) return new BaseObject(-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 BaseObject(-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 BaseObject(-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 BaseObject(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-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,20 +847,20 @@ 
 		$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;
 
 		$langMap = array();
-		foreach($output->data as $lang)
+		foreach ($output->data as $lang)
 		{
 			$langMap[$lang->lang_code][$lang->name] = $lang->value;
 		}
@@ -869,29 +869,29 @@ 
 		$dbInfo = Context::getDBInfo();
 		$defaultLang = $dbInfo->lang_type;
 
-		if(!is_array($langMap[$defaultLang]))
+		if (!is_array($langMap[$defaultLang]))
 		{
 			$langMap[$defaultLang] = array();
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 
-		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();
 				}
@@ -899,9 +899,9 @@ 
 				$langMap[$langCode] += $langMap[$targetLangCode];
 			}
 
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'user_defined_langs:' . $args->site_srl . ':' . $langCode;
+				$object_key = 'user_defined_langs:'.$args->site_srl.':'.$langCode;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$oCacheHandler->put($cache_key, $langMap[$langCode]);
 			}
@@ -922,7 +922,7 @@ 
 
 		$isSkinFix = Context::get('is_skin_fix');
 
-		if($isSkinFix)
+		if ($isSkinFix)
 		{
 			$isSkinFix = ($isSkinFix == 'N') ? 'N' : 'Y';
 		}
@@ -938,14 +938,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);
 		}
@@ -954,7 +954,7 @@ 
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}
 
-		if(!$moduleInfo)
+		if (!$moduleInfo)
 		{
 			return $this->stop(-1, 'msg_module_not_exists');
 		}
@@ -963,26 +963,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;
 					}
@@ -1003,7 +1003,7 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$useMobile = Context::get('use_mobile');
 
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}

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 BaseObject(-1, 'msg_limit_mid');
+			if(!$mid) {
+				continue;
+			}
+			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) {
+				return new BaseObject(-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 BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!$module_info) {
+			return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!$vars->module_srls) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new BaseObject(-1,'msg_invalid_request');
+		if(count($module_srls) < 1) {
+			return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!$module_srls) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new BaseObject(-1,'msg_invalid_request');
+		if(count($modules) < 1) {
+			return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!$args->name) {
+			return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!empty($args->lang_name)) {
+			$args->name = $args->lang_name;
+		}
+		if(!$args->name) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-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;
+		}
 
 		$langMap = array();
 		foreach($output->data as $lang)
@@ -948,8 +1025,7 @@ 
 		if($mid)
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid);
-		}
-		else
+		} else
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}

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)
 	{

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 BaseObject();
+		if (!$output->toBool() || !$output->data) return new BaseObject();
 
-		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 BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if($targetModule == '_SHORTCUT')
+		if ($targetModule == '_SHORTCUT')
 		{
 			return new BaseObject(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 BaseObject(-1,'msg_invalid_request');
+		if (!$name) return new BaseObject(-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');
 		}

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 BaseObject();
+		if(!$output->toBool() || !$output->data) {
+			return new BaseObject();
+		}
 
 		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 BaseObject(-1,'msg_invalid_request');
+		if(!$name) {
+			return new BaseObject(-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');
 		}

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

Braces +221 added lines, -104 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 BaseObject(-1,'msg_already_registed_vid');
-		}
-		else
+			if($oModuleModel->isIDExists($domain, 0)) {
+				return new BaseObject(-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 BaseObject(-1,'msg_already_registed_vid');
+		if($output) {
+			return new BaseObject(-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 BaseObject(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1,'msg_already_registed_vid');
+			if($info->site_srl && $info->site_srl != $args->site_srl) {
+				return new BaseObject(-1,'msg_already_registed_domain');
+			}
+			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) {
+				return new BaseObject(-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 BaseObject(-1, 'msg_limit_mid');
+		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_module_name_exists');
+		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) {
+			return new BaseObject(-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';
 			}
@@ -510,14 +541,15 @@ 
 		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;
+		}
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -528,8 +560,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);
@@ -545,14 +581,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';
 			}
@@ -561,14 +595,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';
 			}
@@ -637,7 +669,9 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if(!!$output->error) {
+			return false;
+		}
 
 		return true;
 	}
@@ -652,7 +686,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);
@@ -671,7 +707,9 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -681,8 +719,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);
 
@@ -715,8 +756,7 @@ 
 			if($output->isSuccess)
 			{
 				return new BaseObject(0, 'success_deleted');
-			}
-			else
+			} else
 			{
 				return new BaseObject($output->error, $output->message);
 			}
@@ -734,19 +774,25 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_cannot_delete_startmodule');
+		if($module_srl == $start_module->index_module_srl) {
+			return new BaseObject(-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();
@@ -807,7 +853,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())
@@ -839,7 +887,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;
@@ -866,28 +916,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 BaseObject();
+		if(!is_array($arr_admins) || !count($arr_admins)) {
+			return new BaseObject();
+		}
 		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 BaseObject();
+		if(!count($admins)) {
+			return new BaseObject();
+		}
 
 		$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)
 		{
@@ -896,7 +955,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 BaseObject();
 	}
@@ -909,12 +970,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;
@@ -933,7 +997,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);
 	}
@@ -977,7 +1043,9 @@ 
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new BaseObject();
+		if(!$obj || !count($obj)) {
+			return new BaseObject();
+		}
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
@@ -987,18 +1055,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);
 			}
@@ -1045,8 +1118,7 @@ 
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
-		}
-		else
+		} else
 		{
 			$object_key = 'module_mobile_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleMobileSkinVars';
@@ -1070,17 +1142,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);
 		}
 
@@ -1120,11 +1198,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)
 			{
@@ -1132,7 +1214,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);
 			}
 		}
@@ -1184,7 +1268,9 @@ 
 			}
 		}
 
-		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]);
 	}
@@ -1196,10 +1282,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 BaseObject(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$vars = Context::gets('addfile','filter');
 		$attributeNames = Context::get('attribute_name');
@@ -1223,9 +1313,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 BaseObject(-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 BaseObject(-1, 'msg_error_occured');
+		}
 
 		$vars->member_srl = $logged_info->member_srl;
 
@@ -1238,10 +1333,16 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
+			if(!Context::isUploaded()) {
+				return new BaseObject(-1, 'msg_error_occured');
+			}
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured');
+			if(!is_uploaded_file($addfile['tmp_name'])) {
+				return new BaseObject(-1, 'msg_error_occured');
+			}
+			if($vars->addfile['error'] != 0) {
+				return new BaseObject(-1, 'msg_error_occured');
+			}
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1252,11 +1353,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', '');
+			}
 		}
 	}
 
@@ -1280,7 +1383,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))
 			{
@@ -1317,7 +1422,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))
@@ -1346,14 +1453,20 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_filebox_srl) {
+			return new BaseObject(-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)
@@ -1376,9 +1489,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())
 		{

Spacing +159 added lines, -159 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 BaseObject(-1,'msg_already_registed_vid');
+			if ($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-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 BaseObject(-1,'msg_already_registed_vid');
+		if ($output) return new BaseObject(-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 BaseObject(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1,'msg_already_registed_vid');
+			if ($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1, 'msg_already_registed_domain');
+			if (isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-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 BaseObject(-1, 'msg_limit_mid');
+		if (!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new BaseObject(-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 BaseObject(-1, 'msg_module_name_exists');
+		if ($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-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;
 	}
 
@@ -507,7 +507,7 @@ 
 	 */
 	function updateModule($args)
 	{
-		if(isset($args->isMenuCreate))
+		if (isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
 		}
@@ -517,7 +517,7 @@ 
 		}
 		
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -526,29 +526,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 BaseObject(-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';
 			}
@@ -558,13 +558,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';
 			}
@@ -574,27 +574,27 @@ 
 			}
 		}
 		$output = executeQuery('module.updateModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($isMenuCreate === TRUE)
+		if ($isMenuCreate === TRUE)
 		{
 			$menuArgs = new stdClass;
 			$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;
@@ -604,7 +604,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);
 		}
@@ -614,11 +614,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');
 		}
@@ -637,7 +637,7 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if (!!$output->error) return false;
 
 		return true;
 	}
@@ -652,11 +652,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');
 		}
@@ -671,7 +671,7 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -681,7 +681,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);
@@ -690,9 +690,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;
@@ -701,7 +701,7 @@ 
 
 		$output = executeQuery('menu.getMenuItemByUrl', $args);
 		// menu delete
-		if($output->data)
+		if ($output->data)
 		{
 			unset($args);
 			$args = new stdClass;
@@ -712,7 +712,7 @@ 
 			$oMenuAdminController = getAdminController('menu');
 			$output = $oMenuAdminController->deleteItem($args);
 
-			if($output->isSuccess)
+			if ($output->isSuccess)
 			{
 				return new BaseObject(0, 'success_deleted');
 			}
@@ -734,19 +734,19 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-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 BaseObject(-1, 'msg_cannot_delete_startmodule');
+		if ($module_srl == $start_module->index_module_srl) return new BaseObject(-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();
@@ -756,7 +756,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;
@@ -770,10 +770,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;
@@ -785,7 +785,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -807,10 +807,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');
 		}
@@ -826,7 +826,7 @@ 
 		$output = executeQuery('module.updateModuleMenu', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -839,15 +839,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');
 		}
@@ -866,37 +866,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 BaseObject();
-		foreach($arr_admins as $key => $user_id)
+		if (!is_array($arr_admins) || !count($arr_admins)) return new BaseObject();
+		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 BaseObject();
+		if (!count($admins)) return new BaseObject();
 
 		$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 BaseObject();
 	}
@@ -909,12 +909,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;
@@ -929,11 +929,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);
 	}
@@ -970,18 +970,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 BaseObject();
+		if (!$obj || !count($obj)) return new BaseObject();
 
 		$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
@@ -992,9 +992,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);
 			}
@@ -1002,7 +1002,7 @@ 
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 				$oDB->rollback();
@@ -1041,7 +1041,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';
@@ -1055,7 +1055,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);
 		}
@@ -1070,22 +1070,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);
@@ -1104,7 +1104,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);
@@ -1120,19 +1120,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);
 			}
 		}
@@ -1153,9 +1153,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);
 		}
 	}
 
@@ -1164,29 +1164,29 @@ 
 		static $lang = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($lang === false && $oCacheHandler->isSupport())
+		if ($lang === false && $oCacheHandler->isSupport())
 		{
 			$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);
 			}
 
-			$object_key = 'user_defined_langs:' . $site_module_info->site_srl . ':' . Context::getLangType();
+			$object_key = 'user_defined_langs:'.$site_module_info->site_srl.':'.Context::getLangType();
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$lang = $oCacheHandler->get($cache_key);
 
-			if($lang === false) {
+			if ($lang === false) {
 				$oModuleAdminController = getAdminController('module');
 				$lang = $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
 			}
 		}
 
-		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]);
 	}
 
 
@@ -1199,17 +1199,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 BaseObject(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new BaseObject(-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;
 				}
@@ -1221,16 +1221,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 BaseObject(-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 BaseObject(-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);
@@ -1238,10 +1238,10 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
+			if (!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured');
+			if (!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured');
+			if ($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured');
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1255,7 +1255,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', '');
 		}
 	}
@@ -1267,7 +1267,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);
@@ -1284,9 +1284,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))
+			if (!@move_uploaded_file($tmp, $save_filename))
 			{
 				return false;
 			}
@@ -1321,14 +1321,14 @@ 
 		$ext = explode($vars->addfile['name'], '.');
 		$ext = strtolower(array_pop($ext));
 
-		$save_filename = sprintf('%s%s.%s',$path, $random->createSecureSalt(32, 'hex'), $vars->ext);
+		$save_filename = sprintf('%s%s.%s', $path, $random->createSecureSalt(32, 'hex'), $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;
 		}
@@ -1339,7 +1339,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);
@@ -1354,14 +1354,14 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_filebox_srl) return new BaseObject(-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)
@@ -1384,11 +1384,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);
@@ -1417,7 +1417,7 @@ 
 		$output = executeQuery('module.updateModuleInSites', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

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)
 	{

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 BaseObject(-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;
 	}

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 BaseObject(-1, sprintf('%s method is not exists', $method));
+		if(method_exists($this, $method)) {
+			$page_content = $this->{$method}();
+		} else {
+			return new BaseObject(-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]);
 

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 BaseObject();
 	}
@@ -42,9 +42,9 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new BaseObject();
+		if (!$member_srl) return new BaseObject();
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new BaseObject();
+		if (substr($obj->last_login, 0, 8) == date("Ymd")) return new BaseObject();
 		// 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 BaseObject();
 	}
@@ -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 BaseObject();
+			if (!$module_srl || !$member_srl) return new BaseObject();
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new BaseObject();
+			if ($module_srl == $member_srl) return new BaseObject();
 			// 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 BaseObject();
@@ -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 BaseObject();
+		if (!$oDocument->isExists()) return new BaseObject();
 		// 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 BaseObject();
+		if ($comment_point > 0) return new BaseObject();
 		// 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 BaseObject();
+		if (!$output->data) return new BaseObject();
 		// 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 BaseObject();
+		if ($member_srl) unset($member_srls[abs($member_srl)]);
+		if (!count($member_srls)) return new BaseObject();
 		// 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 BaseObject();
@@ -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 BaseObject();
+			if (!$module_srl || !$member_srl) return new BaseObject();
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new BaseObject();
+			if (!$logged_info->member_srl) return new BaseObject();
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,12 +207,12 @@ 
 			$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 BaseObject();
+			if ($point < 0) return new BaseObject();
 			$cur_point -= $point;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new BaseObject();
@@ -225,12 +225,12 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// 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 BaseObject();
+		if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == abs($member_srl)) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -240,10 +240,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 BaseObject();
 	}
@@ -260,11 +260,11 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// 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 BaseObject();
-		if($oDocument->get('member_srl')==$member_srl) return new BaseObject();
+		if (!$oDocument->isExists()) return new BaseObject();
+		if ($oDocument->get('member_srl') == $member_srl) return new BaseObject();
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -272,12 +272,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 BaseObject();
+		if ($point < 0) return new BaseObject();
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -297,11 +297,11 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new BaseObject();
+		if ($obj->isvalid != 'Y') return new BaseObject();
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -311,10 +311,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 BaseObject();
 	}
@@ -327,10 +327,10 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -344,11 +344,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 BaseObject(-1,'msg_not_permitted_download');
+				return new BaseObject(-1, 'msg_not_permitted_download');
 			}
 			else
 			{
@@ -363,7 +363,7 @@ 
 		// If the member does not have enough points, deny access.
 		if ($config->disable_download == 'Y' && $cur_point + $point < 0)
 		{
-			return new BaseObject(-1,'msg_cannot_download');
+			return new BaseObject(-1, 'msg_cannot_download');
 		}
 
 		// Otherwise, points will be adjusted after downloading (triggerDownloadFile).
@@ -377,13 +377,13 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new BaseObject();
+		if (!$logged_info->member_srl) return new BaseObject();
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -424,22 +424,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 BaseObject();
+		if ($target_member_srl == $member_srl) return new BaseObject();
 		// 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 BaseObject();
+		if (!$point) return new BaseObject();
 		// 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 BaseObject();
+			if ($output->data->count) return new BaseObject();
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 		}
 		else
@@ -450,7 +450,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);
@@ -458,14 +458,14 @@ 
 			return new BaseObject(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new BaseObject();
+		if (!$logged_info->member_srl) return new BaseObject();
 		// Pass, if there are no requested points
-		if(!$point) return new BaseObject();
+		if (!$point) return new BaseObject();
 		// 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 BaseObject();
 	}
@@ -477,7 +477,7 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -486,21 +486,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 BaseObject();
+		if (!$point) return new BaseObject();
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -512,7 +512,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');
@@ -529,7 +529,7 @@ 
 		$args->member_srl = $member_srl;
 		$args->point = $current_point;
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'add' :
 				$args->point += $point;
@@ -542,7 +542,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)
@@ -553,7 +553,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;
 		}
@@ -563,7 +563,7 @@ 
 		$oDB->begin();
 
 		// If there are points, update, if no, insert
-		if($current_point > 0)
+		if ($current_point > 0)
 		{
 			$output = executeQuery("point.updatePoint", $args);
 		}
@@ -571,13 +571,13 @@ 
 		{
 			// 많은 동접시 넣는 과정에서 insert가 미리 이루어졌지만 이 공간으로 넘어올 경우 다시 한번 더 업데이트를 처리.
 			$output = executeQuery("point.insertPoint", $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$output = executeQuery("point.updatePoint", $args);
 			}
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -587,12 +587,12 @@ 
 		$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();
@@ -602,29 +602,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;
 									}
@@ -635,9 +635,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;
 				}
@@ -645,16 +645,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;
@@ -662,7 +662,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;
@@ -677,7 +677,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;
@@ -693,17 +693,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);
 		}
@@ -717,9 +717,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 +165 added lines, -65 removed lines

@@ -42,9 +42,13 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new BaseObject();
+		if(!$member_srl) {
+			return new BaseObject();
+		}
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new BaseObject();
+		if(substr($obj->last_login,0,8)==date("Ymd")) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+			if(!$module_srl || !$member_srl) {
+				return new BaseObject();
+			}
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new BaseObject();
+			if($module_srl == $member_srl) {
+				return new BaseObject();
+			}
 			// 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 BaseObject();
+		if(!$oDocument->isExists()) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+		if($comment_point>0) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+		if($member_srl) {
+			unset($member_srls[abs($member_srl)]);
+		}
+		if(!count($member_srls)) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+			if(!$module_srl || !$member_srl) {
+				return new BaseObject();
+			}
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new BaseObject();
+			if(!$logged_info->member_srl) {
+				return new BaseObject();
+			}
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,9 +245,13 @@ 
 			$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 BaseObject();
+			if($point < 0) {
+				return new BaseObject();
+			}
 			$cur_point -= $point;
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
@@ -225,12 +267,16 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -240,7 +286,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);
@@ -260,11 +308,17 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
-		if($oDocument->get('member_srl')==$member_srl) return new BaseObject();
+		if(!$oDocument->isExists()) {
+			return new BaseObject();
+		}
+		if($oDocument->get('member_srl')==$member_srl) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -272,9 +326,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 BaseObject();
+		if($point < 0) {
+			return new BaseObject();
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -297,11 +355,15 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new BaseObject();
+		if($obj->isvalid != 'Y') {
+			return new BaseObject();
+		}
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -311,7 +373,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);
@@ -327,18 +391,21 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new BaseObject();
+		}
 		$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);
 		}
@@ -349,8 +416,7 @@ 
 			if($config->disable_download == 'Y' && $point)
 			{
 				return new BaseObject(-1,'msg_not_permitted_download');
-			}
-			else
+			} else
 			{
 				return new BaseObject();
 			}
@@ -377,13 +443,19 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new BaseObject();
+		if(!$logged_info->member_srl) {
+			return new BaseObject();
+		}
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new BaseObject();
+		}
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -392,8 +464,7 @@ 
 		if (isset($module_config['download_file']))
 		{
 			$point = intval($module_config['download_file']);
-		}
-		else
+		} else
 		{
 			$point = intval($config->download_file);
 		}
@@ -424,25 +495,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 BaseObject();
+		if($target_member_srl == $member_srl) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// 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 BaseObject();
+			if($output->data->count) {
+				return new BaseObject();
+			}
 			$cur_point = $oPointModel->getPoint($member_srl, true);
-		}
-		else
+		} else
 		{
 			$cur_point = 0;
 		}
@@ -458,9 +536,13 @@ 
 			return new BaseObject(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new BaseObject();
+		if(!$logged_info->member_srl) {
+			return new BaseObject();
+		}
 		// Pass, if there are no requested points
-		if(!$point) return new BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
@@ -477,7 +559,9 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -489,15 +573,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 BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -512,7 +601,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');
@@ -542,7 +633,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)
@@ -566,8 +659,7 @@ 
 		if($current_point > 0)
 		{
 			$output = executeQuery("point.updatePoint", $args);
-		}
-		else
+		} else
 		{
 			// 많은 동접시 넣는 과정에서 insert가 미리 이루어졌지만 이 공간으로 넘어올 경우 다시 한번 더 업데이트를 처리.
 			$output = executeQuery("point.insertPoint", $args);
@@ -611,7 +703,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
@@ -637,7 +731,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;
 				}
@@ -648,11 +744,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;
+				}
 			}
 		}
 	}

modules/spamfilter/spamfilter.admin.controller.php

Doc Comments +3 added lines

@@ -98,6 +98,7 @@ 
 	/**
 	 * @brief Delete IP
 	 * Remove the IP address which was previously registered as a spammers
+	 * @param string $ipaddress
 	 */
 	function deleteIP($ipaddress)
 	{
@@ -111,6 +112,7 @@ 
 	/**
 	 * @brief Register the spam word
 	 * The post, which contains the newly registered spam word, should be considered as a spam
+	 * @param string $word_list
 	 */
 	function insertWord($word_list)
 	{
@@ -141,6 +143,7 @@ 
 	/**
 	 * @brief Remove the spam word
 	 * Remove the word which was previously registered as a spam word
+	 * @param string $word
 	 */
 	function deleteWord($word)
 	{

Braces +36 added lines, -12 removed lines

@@ -20,12 +20,18 @@ 
 		$argsConfig = Context::gets('limits','check_trackback');
 		$flag = Context::get('flag');
 		//interval, limit_count
-		if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
-		if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+		if($argsConfig->check_trackback!='Y') {
+			$argsConfig->check_trackback = 'N';
+		}
+		if($argsConfig->limits!='Y') {
+			$argsConfig->limits = 'N';
+		}
 		// Create and insert the module Controller object
 		$oModuleController = getController('module');
 		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
-		if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+		if(!$moduleConfigOutput->toBool()) {
+			return $moduleConfigOutput;
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigBlock');
 		$this->setRedirectUrl($returnUrl);
@@ -39,9 +45,13 @@ 
 		if($ipaddress_list)
 		{
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if(!$output->toBool() && !$output->get('fail_list')) {
+				return $output;
+			}
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if($output->get('fail_list')) {
+				$message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			}
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -57,9 +67,13 @@ 
 		if($word_list)
 		{
 			$output = $this->insertWord($word_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if(!$output->toBool() && !$output->get('fail_list')) {
+				return $output;
+			}
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if($output->get('fail_list')) {
+				$message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			}
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -73,7 +87,9 @@ 
 	function procSpamfilterAdminDeleteDeniedIP()
 	{
 		$ipAddressList = Context::get('ipaddress');
-		if($ipAddressList) $this->deleteIP($ipAddressList);
+		if($ipAddressList) {
+			$this->deleteIP($ipAddressList);
+		}
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
@@ -101,7 +117,9 @@ 
 	 */
 	function deleteIP($ipaddress)
 	{
-		if(!$ipaddress) return;
+		if(!$ipaddress) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->ipaddress = $ipaddress;
@@ -130,9 +148,13 @@ 
 		foreach($word_list as $word)
 		{
 			$args = new stdClass;
-			if(trim($word)) $args->word = $word;
+			if(trim($word)) {
+				$args->word = $word;
+			}
 			$output = executeQuery('spamfilter.insertDeniedWord', $args);
-			if(!$output->toBool()) $fail_word .= $word.'<br />';
+			if(!$output->toBool()) {
+				$fail_word .= $word.'<br />';
+			}
 		}
 		$output->add('fail_list',$fail_word);
 		return $output;
@@ -144,7 +166,9 @@ 
 	 */
 	function deleteWord($word)
 	{
-		if(!$word) return;
+		if(!$word) {
+			return;
+		}
 		$args = new stdClass;
 		$args->word = $word;
 		return executeQuery('spamfilter.deleteDeniedWord', $args);

Spacing +23 added lines, -23 removed lines

@@ -17,15 +17,15 @@ 
 	function procSpamfilterAdminInsertConfig()
 	{
 		// Get the default information
-		$argsConfig = Context::gets('limits','check_trackback');
+		$argsConfig = Context::gets('limits', 'check_trackback');
 		$flag = Context::get('flag');
 		//interval, limit_count
-		if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
-		if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+		if ($argsConfig->check_trackback != 'Y') $argsConfig->check_trackback = 'N';
+		if ($argsConfig->limits != 'Y') $argsConfig->limits = 'N';
 		// Create and insert the module Controller object
 		$oModuleController = getController('module');
-		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
-		if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter', $argsConfig);
+		if (!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigBlock');
 		$this->setRedirectUrl($returnUrl);
@@ -36,12 +36,12 @@ 
 		//스팸IP  추가
 		$ipaddress_list = Context::get('ipaddress_list');
 		$oSpamfilterController = getController('spamfilter');
-		if($ipaddress_list)
+		if ($ipaddress_list)
 		{
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if ($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')).'</em>';
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -54,12 +54,12 @@ 
 	{
 		//스팸 키워드 추가
 		$word_list = Context::get('word_list');
-		if($word_list)
+		if ($word_list)
 		{
 			$output = $this->insertWord($word_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if ($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')).'</em>';
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -73,7 +73,7 @@ 
 	function procSpamfilterAdminDeleteDeniedIP()
 	{
 		$ipAddressList = Context::get('ipaddress');
-		if($ipAddressList) $this->deleteIP($ipAddressList);
+		if ($ipAddressList) $this->deleteIP($ipAddressList);
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
@@ -91,7 +91,7 @@ 
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
-		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList','active','word');
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList', 'active', 'word');
 		return $this->setRedirectUrl($returnUrl);
 	}
 
@@ -101,7 +101,7 @@ 
 	 */
 	function deleteIP($ipaddress)
 	{
-		if(!$ipaddress) return;
+		if (!$ipaddress) return;
 
 		$args = new stdClass;
 		$args->ipaddress = $ipaddress;
@@ -115,26 +115,26 @@ 
 	function insertWord($word_list)
 	{
 
-		$word_list = str_replace("\r","",$word_list);
-		$word_list = explode("\n",$word_list);
+		$word_list = str_replace("\r", "", $word_list);
+		$word_list = explode("\n", $word_list);
 
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
-			if(!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
+			if (!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
 			{
 				return new BaseObject(-1, 'msg_invalid');
 			}
 		}
 
 		$fail_word = '';
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
 			$args = new stdClass;
-			if(trim($word)) $args->word = $word;
+			if (trim($word)) $args->word = $word;
 			$output = executeQuery('spamfilter.insertDeniedWord', $args);
-			if(!$output->toBool()) $fail_word .= $word.'<br />';
+			if (!$output->toBool()) $fail_word .= $word.'<br />';
 		}
-		$output->add('fail_list',$fail_word);
+		$output->add('fail_list', $fail_word);
 		return $output;
 	}
 
@@ -144,7 +144,7 @@ 
 	 */
 	function deleteWord($word)
 	{
-		if(!$word) return;
+		if (!$word) return;
 		$args = new stdClass;
 		$args->word = $word;
 		return executeQuery('spamfilter.deleteDeniedWord', $args);

modules/spamfilter/spamfilter.controller.php

Doc Comments +2 added lines

@@ -161,6 +161,8 @@
 	/**
 	 * @brief IP registration
 	 * The registered IP address is considered as a spammer
+	 * @param string $ipaddress_list
+	 * @param string $description
 	 */
 	function insertIP($ipaddress_list, $description = null)
 	{

Spacing +45 added lines, -45 removed lines

@@ -27,39 +27,39 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if ($logged_info->is_admin == 'Y') return new BaseObject();
+			if ($grant->manager) return new BaseObject();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
-			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
+			$text = $obj->title.' '.$obj->content.' '.$obj->tags;
 		}
 		else
 		{
-			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
+			$text = $obj->title.' '.$obj->content.' '.$obj->nick_name.' '.$obj->homepage.' '.$obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time beside the modificaiton time
-		if($obj->document_srl == 0)
+		if ($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,39 +72,39 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if ($logged_info->is_admin == 'Y') return new BaseObject();
+			if ($grant->manager) return new BaseObject();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
 			$text = $obj->content;
 		}
 		else
 		{
-			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
+			$text = $obj->content.' '.$obj->nick_name.' '.$obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// If the specified time check is not modified
-		if(!$obj->__isupdate)
+		if (!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,32 +118,32 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
-		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
+		$text = $obj->blog_name.' '.$obj->title.' '.$obj->excerpt.' '.$obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
 
-		list($ipA,$ipB,$ipC,$ipD) = explode('.',$_SERVER['REMOTE_ADDR']);
+		list($ipA, $ipB, $ipC, $ipD) = explode('.', $_SERVER['REMOTE_ADDR']);
 		$ipaddress = $ipA.'.'.$ipB.'.'.$ipC;
 		// In case the title and the blog name are indentical, investigate the IP address of the last 6 hours, delete and ban it.
-		if($obj->title == $obj->excerpt)
+		if ($obj->title == $obj->excerpt)
 		{
-			$oTrackbackController->deleteTrackbackSender(60*60*6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
+			$oTrackbackController->deleteTrackbackSender(60 * 60 * 6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
 			$this->insertIP($ipaddress.'.*', 'AUTO-DENIED : trackback.insertTrackback');
-			return new BaseObject(-1,'msg_alert_trackback_denied');
+			return new BaseObject(-1, 'msg_alert_trackback_denied');
 		}
 		// If trackbacks have been registered by one C-class IP address more than once for the last 30 minutes, ban the IP address and delete all the posts
 		/* 호스팅 환경을 감안하여 일단 이 부분은 동작하지 않도록 주석 처리
@@ -165,24 +165,24 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
-		$ipaddress_list = str_replace("\r","",$ipaddress_list);
-		$ipaddress_list = explode("\n",$ipaddress_list);
-		foreach($ipaddress_list as $ipaddressValue)
+		if (!preg_match($regExr, $ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
+		$ipaddress_list = str_replace("\r", "", $ipaddress_list);
+		$ipaddress_list = explode("\n", $ipaddress_list);
+		foreach ($ipaddress_list as $ipaddressValue)
 		{
 			$args = new stdClass();
-			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/",$ipaddressValue,$matches);
-			if($ipaddress=trim($matches[1]))
+			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/", $ipaddressValue, $matches);
+			if ($ipaddress = trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
+				if (!$description && $matches[4]) $args->description = $matches[4];
 				else $args->description = $description;
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if (!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
 		}
 
-		$output->add('fail_list',$fail_list);
+		$output->add('fail_list', $fail_list);
 		return $output;
 	}
 
@@ -191,22 +191,22 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new BaseObject();
+		if ($logged_info->is_admin == 'Y') return new BaseObject();
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
-		$text = $obj->title . ' ' . $obj->content;
+		$text = $obj->title.' '.$obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save a log
 		$this->insertLog();
 

Braces +76 added lines, -29 removed lines

@@ -27,7 +27,9 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -35,31 +37,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if($logged_info->is_admin == 'Y') {
+				return new BaseObject();
+			}
+			if($grant->manager) {
+				return new BaseObject();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
-		}
-		else
+		} else
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time beside the modificaiton time
 		if($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,7 +83,9 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -80,31 +93,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if($logged_info->is_admin == 'Y') {
+				return new BaseObject();
+			}
+			if($grant->manager) {
+				return new BaseObject();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->content;
-		}
-		else
+		} else
 		{
 			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// If the specified time check is not modified
 		if(!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,20 +140,28 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
@@ -165,7 +195,9 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
+		if(!preg_match($regExr,$ipaddress_list)) {
+			return new BaseObject(-1, 'msg_invalid');
+		}
 		$ipaddress_list = str_replace("\r","",$ipaddress_list);
 		$ipaddress_list = explode("\n",$ipaddress_list);
 		foreach($ipaddress_list as $ipaddressValue)
@@ -175,11 +207,16 @@ 
 			if($ipaddress=trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
-				else $args->description = $description;
+				if(!$description && $matches[4]) {
+					$args->description = $matches[4];
+				} else {
+					$args->description = $description;
+				}
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if(!$output->toBool()) {
+				$fail_list .= $ipaddress.'<br/>';
+			}
 		}
 
 		$output->add('fail_list',$fail_list);
@@ -191,22 +228,32 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new BaseObject();
+		if($logged_info->is_admin == 'Y') {
+			return new BaseObject();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->title . ' ' . $obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save a log
 		$this->insertLog();
 

modules/tag/tag.model.php

Doc Comments +2 added lines

@@ -49,6 +49,7 @@ 
 
 	/**
 	 * @brief document_srl the import tag
+	 * @param stdClass $obj
 	 */
 	function getDocumentSrlByTag($obj)
 	{
@@ -70,6 +71,7 @@ 
 
 	/**
 	 * @brief document used in the import tag
+	 * @param stdClass $obj
 	 */
 	function getDocumentsTagList($obj)
 	{

Spacing +9 added lines, -9 removed lines

@@ -20,7 +20,7 @@ 
 	 */
 	function getTagList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -29,7 +29,7 @@ 
 
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -42,7 +42,7 @@ 
 		$args->count = $obj->sort_index;
 
 		$output = executeQueryArray('tag.getTagList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -53,7 +53,7 @@ 
 	function getDocumentSrlByTag($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -74,7 +74,7 @@ 
 	function getDocumentsTagList($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->document_srl))
+		if (is_array($obj->document_srl))
 		{
 			$args->document_srl = implode(',', $obj->document_srl);
 		}
@@ -84,7 +84,7 @@ 
 		}
 
 		$output = executeQueryArray('tag.getDocumentsTagList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -95,7 +95,7 @@ 
 	function getTagWithUsedList($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -108,9 +108,9 @@ 
 		$output = $this->getDocumentSrlByTag($args);
 		$document_srl = array();
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			foreach ($output->data as $k => $v) $document_srl[] = $v->document_srl;
 		}
 		unset($args);
 

Braces +13 added lines, -11 removed lines

@@ -32,8 +32,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -42,7 +41,9 @@ 
 		$args->count = $obj->sort_index;
 
 		$output = executeQueryArray('tag.getTagList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -56,8 +57,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -77,14 +77,15 @@ 
 		if(is_array($obj->document_srl))
 		{
 			$args->document_srl = implode(',', $obj->document_srl);
-		}
-		else
+		} else
 		{
 			$args->document_srl = $obj->document_srl;
 		}
 
 		$output = executeQueryArray('tag.getDocumentsTagList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -98,8 +99,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -110,7 +110,9 @@ 
 
 		if($output->data)
 		{
-			foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			foreach($output->data as $k => $v) {
+				$document_srl[] = $v->document_srl;
+			}
 		}
 		unset($args);