xpressengine / xe-core

modules/trash/trash.class.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		//$oDB = &DB::getInstance();
 		//$oModuleModel = getModel('module');
 
-		return new BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 }
 /* End of file trash.class.php */

classes/cache/CacheMemcache.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 *
 	 * Do not use this directly. You can use getInstance() instead.
 	 * @param string $url url of memcache
-	 * @return void
+	 * @return false|null
 	 */
 	function CacheMemcache($url)
 	{

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getInstance($url)
 	{
-		if(!$GLOBALS['__CacheMemcache__'])
+		if (!$GLOBALS['__CacheMemcache__'])
 		{
 			$GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
 		}
@@ -41,12 +41,12 @@ 
 	{
 		//$config['url'] = array('memcache://localhost:11211');
 		$config['url'] = is_array($url) ? $url : array($url);
-		if(class_exists('Memcached'))
+		if (class_exists('Memcached'))
 		{
 			$this->Memcache = new Memcached;
 			$this->SelectedExtension = 'Memcached';
 		}
-		elseif(class_exists('Memcache'))
+		elseif (class_exists('Memcache'))
 		{
 			$this->Memcache = new Memcache;
 			$this->SelectedExtension = 'Memcache';
@@ -56,7 +56,7 @@ 
 			return false;
 		}
 
-		foreach($config['url'] as $url)
+		foreach ($config['url'] as $url)
 		{
 			$info = parse_url($url);
 			$this->Memcache->addServer($info['host'], $info['port']);
@@ -70,15 +70,15 @@ 
 	 */
 	function isSupport()
 	{
-		if(isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
+		if (isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'];
 		}
-		if($this->SelectedExtension === 'Memcached')
+		if ($this->SelectedExtension === 'Memcached')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', 1); 
 		}
-		elseif($this->SelectedExtension === 'Memcache')
+		elseif ($this->SelectedExtension === 'Memcache')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1); 
 		}
@@ -96,7 +96,7 @@ 
 	 */
 	function getKey($key)
 	{
-		return md5(_XE_PATH_ . $key);
+		return md5(_XE_PATH_.$key);
 	}
 
 	/**
@@ -118,11 +118,11 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
-		if($this->SelectedExtension === 'Memcached')
+		if ($this->SelectedExtension === 'Memcached')
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
 		}
@@ -145,13 +145,13 @@ 
 		$_key = $this->getKey($key);
 
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !is_array($obj))
 		{
 			return false;
 		}
 		unset($obj[1]);
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;
@@ -174,12 +174,12 @@ 
 	{
 		$_key = $this->getKey($key);
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !is_array($obj))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;

Braces +5 added lines, -10 removed lines

@@ -45,13 +45,11 @@ 
 		{
 			$this->Memcache = new Memcached;
 			$this->SelectedExtension = 'Memcached';
-		}
-		elseif(class_exists('Memcache'))
+		} elseif(class_exists('Memcache'))
 		{
 			$this->Memcache = new Memcache;
 			$this->SelectedExtension = 'Memcache';
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -77,12 +75,10 @@ 
 		if($this->SelectedExtension === 'Memcached')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', 1); 
-		}
-		elseif($this->SelectedExtension === 'Memcache')
+		} elseif($this->SelectedExtension === 'Memcache')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1); 
-		}
-		else
+		} else
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = false;
 		}
@@ -125,8 +121,7 @@ 
 		if($this->SelectedExtension === 'Memcached')
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
-		}
-		else
+		} else
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), MEMCACHE_COMPRESSED, $valid_time);
 		}

classes/display/DisplayHandler.class.php

Spacing +43 added lines, -43 removed lines

@@ -25,7 +25,7 @@ 
 	function printContent(&$oModule)
 	{
 		// Check if the gzip encoding supported
-		if(
+		if (
 				(defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
 				strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE &&
 				extension_loaded('zlib') &&
@@ -36,23 +36,23 @@ 
 		}
 
 		// Extract contents to display by the request method
-		if(Context::get('xeVirtualRequestMethod') == 'xml')
+		if (Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		else if (Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
-			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
 		}
-		else if(Context::getRequestMethod() == 'JSON')
+		else if (Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		else if (Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
 		}
@@ -70,9 +70,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if (file_exists($addon_file)) include($addon_file);
 
-		if(method_exists($handler, "prepareToPrint"))
+		if (method_exists($handler, "prepareToPrint"))
 		{
 			$handler->prepareToPrint($output);
 		}
@@ -80,17 +80,17 @@ 
 		// header output
 
 		$httpStatusCode = $oModule->getHttpStatusCode();
-		if($httpStatusCode && $httpStatusCode != 200)
+		if ($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
 		}
 		else
 		{
-			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
+			if (Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
 			}
-			else if(Context::getResponseMethod() != 'HTML')
+			else if (Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
 			}
@@ -106,13 +106,13 @@ 
 
 		// disable gzip if output already exists
 		ob_flush();
-		if(headers_sent())
+		if (headers_sent())
 		{
 			$this->gz_enabled = FALSE;
 		}
 
 		// enable gzip using zlib extension
-		if($this->gz_enabled)
+		if ($this->gz_enabled)
 		{
 			ini_set('zlib.output_compression', true);
 		}
@@ -133,7 +133,7 @@ 
 	 */
 	function _debugOutput()
 	{
-		if(!__DEBUG__)
+		if (!__DEBUG__)
 		{
 			return;
 		}
@@ -141,32 +141,32 @@ 
 		$end = getMicroTime();
 
 		// Firebug console output
-		if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+		if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 		{
 			static $firephp;
-			if(!isset($firephp))
+			if (!isset($firephp))
 			{
 				$firephp = FirePHP::getInstance(true);
 			}
 
-			if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+			if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 			{
 				$firephp->fb('Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php', 'The IP address is not allowed.');
 				return;
 			}
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
 				$firephp->fb(
 						array(
-							'Request / Response info >>> ' . $_SERVER['REQUEST_METHOD'] . ' / ' . Context::getResponseMethod(),
+							'Request / Response info >>> '.$_SERVER['REQUEST_METHOD'].' / '.Context::getResponseMethod(),
 							array(
 								array('Request URI', 'Request method', 'Response method', 'Response contents size', 'Memory peak usage'),
 								array(
 									sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING'] ? '?' : '', $_SERVER['QUERY_STRING']),
 									$_SERVER['REQUEST_METHOD'],
 									Context::getResponseMethod(),
-									$this->content_size . ' byte',
+									$this->content_size.' byte',
 									FileHandler::filesize(memory_get_peak_usage())
 								)
 							)
@@ -175,7 +175,7 @@ 
 				);
 				$firephp->fb(
 						array(
-							'Elapsed time >>> Total : ' . sprintf('%0.5f sec', $end - __StartTime__),
+							'Elapsed time >>> Total : '.sprintf('%0.5f sec', $end - __StartTime__),
 							array(array('DB queries', 'class file load', 'Template compile', 'XmlParse compile', 'PHP', 'Widgets', 'Trans Content'),
 								array(
 									sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
@@ -193,16 +193,16 @@ 
 			}
 
 			// display DB query history
-			if((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
+			if ((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
 			{
 				$queries_output = array(array('Result/'.PHP_EOL.'Elapsed time', 'Query ID', 'Query'));
-				foreach($GLOBALS['__db_queries__'] as $query)
+				foreach ($GLOBALS['__db_queries__'] as $query)
 				{
-					$queries_output[] = array($query['result'] . PHP_EOL . sprintf('%0.5f', $query['elapsed_time']), str_replace(_XE_PATH_, '', $query['called_file']) . PHP_EOL . $query['called_method'] . '()' . PHP_EOL . $query['query_id'], $query['query']);
+					$queries_output[] = array($query['result'].PHP_EOL.sprintf('%0.5f', $query['elapsed_time']), str_replace(_XE_PATH_, '', $query['called_file']).PHP_EOL.$query['called_method'].'()'.PHP_EOL.$query['query_id'], $query['query']);
 				}
 				$firephp->fb(
 						array(
-							'DB Queries >>> ' . count($GLOBALS['__db_queries__']) . ' Queries, ' . sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
+							'DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
 							$queries_output
 						),
 						'TABLE'
@@ -215,9 +215,9 @@ 
 
 			$buff = array();
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
@@ -248,21 +248,21 @@ 
 				$buff[] = sprintf("\tTrans Content \t\t\t\t\t: %0.5f sec", $GLOBALS['__trans_content_elapsed__']);
 			}
 			// DB Logging
-			if(__DEBUG__ & 4)
+			if (__DEBUG__ & 4)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
 
-				if($GLOBALS['__db_queries__'])
+				if ($GLOBALS['__db_queries__'])
 				{
 					$buff[] = sprintf("\n- DB Queries : %d Queries. %0.5f sec", count($GLOBALS['__db_queries__']), $GLOBALS['__db_elapsed_time__']);
 					$num = 0;
 
-					foreach($GLOBALS['__db_queries__'] as $query)
+					foreach ($GLOBALS['__db_queries__'] as $query)
 					{
-						if($query['result'] == 'Success')
+						if ($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
 						}
@@ -279,30 +279,30 @@ 
 			}
 
 			// Output in HTML comments
-			if($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
+			if ($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
 			{
 				$buff = implode("\r\n", $buff);
 				$buff = sprintf("[%s %s:%d]\r\n%s", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
 
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					$buff = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
 				}
 
-				return "<!--\r\n" . $buff . "\r\n-->";
+				return "<!--\r\n".$buff."\r\n-->";
 			}
 
 			// Output to a file
-			if($buff && __DEBUG_OUTPUT__ == 0)
+			if ($buff && __DEBUG_OUTPUT__ == 0)
 			{
-				$debug_file = _XE_PATH_ . 'files/_debug_message.php';
+				$debug_file = _XE_PATH_.'files/_debug_message.php';
 				$buff = implode(PHP_EOL, $buff);
 				$buff = sprintf("[%s]\n%s", date('Y-m-d H:i:s'), print_r($buff, true));
 
-				$buff = str_repeat('=', 80) . "\n" . $buff . "\n" . str_repeat('-', 80);
-				$buff = "\n<?php\n/*" . $buff . "*/\n?>\n";
+				$buff = str_repeat('=', 80)."\n".$buff."\n".str_repeat('-', 80);
+				$buff = "\n<?php\n/*".$buff."*/\n?>\n";
 
-				if (!@file_put_contents($debug_file, $buff, FILE_APPEND|LOCK_EX))
+				if (!@file_put_contents($debug_file, $buff, FILE_APPEND | LOCK_EX))
 				{
 					return;
 				}
@@ -318,7 +318,7 @@ 
 	{
 		header("Content-Type: text/xml; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
@@ -332,7 +332,7 @@ 
 	{
 		header("Content-Type: text/html; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
@@ -346,7 +346,7 @@ 
 	{
 		header("Content-Type: text/html; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");

Braces +12 added lines, -19 removed lines

@@ -39,24 +39,20 @@ 
 		if(Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		} else if(Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
 			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
-		}
-		else if(Context::getRequestMethod() == 'JSON')
+		} else if(Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		} else if(Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
-		}
-		else
+		} else
 		{
 			$handler = new HTMLDisplayHandler();
 		}
@@ -70,7 +66,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if(file_exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(method_exists($handler, "prepareToPrint"))
 		{
@@ -83,18 +81,15 @@ 
 		if($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
-		}
-		else
+		} else
 		{
 			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
-			}
-			else if(Context::getResponseMethod() != 'HTML')
+			} else if(Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
-			}
-			else
+			} else
 			{
 				$this->_printHTMLHeader();
 			}
@@ -209,8 +204,7 @@ 
 				);
 			}
 			// dislpay the file and HTML comments
-		}
-		else
+		} else
 		{
 
 			$buff = array();
@@ -265,8 +259,7 @@ 
 						if($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
-						}
-						else
+						} else
 						{
 							$query_result = sprintf("Query $s : %d\n\t\t\t   %s", $query['result'], $query['errno'], $query['errstr']);
 						}

modules/module/module.admin.controller.php

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.controller.php

Spacing +161 added lines, -161 removed lines

@@ -29,7 +29,7 @@ 
 		$output = executeQuery('module.insertActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -51,7 +51,7 @@ 
 		$output = executeQuery('module.deleteActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -75,12 +75,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.insertTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -104,12 +104,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.deleteTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -129,12 +129,12 @@ 
 		$args->module = $module;
 
 		$output = executeQuery('module.deleteModuleTriggers', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -148,11 +148,11 @@ 
 	 * @brief Add module extend
 	 *
 	 */
-	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function insertModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if ($kind != 'admin') $kind = '';
+		if (!in_array($type, array('model', 'controller', 'view', 'api', 'mobile'))) return false;
+		if (in_array($parent_module, array('module', 'addon', 'widget', 'layout'))) return false;
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +164,7 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if ($output->data->count > 0) return false;
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -174,7 +174,7 @@ 
 	 * @brief Delete module extend
 	 *
 	 */
-	function deleteModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function deleteModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -199,9 +199,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if (!$origin_config) $origin_config = new stdClass;
 
-		foreach($config as $key => $val)
+		foreach ($config as $key => $val)
 		{
 			$origin_config->{$key} = $val;
 		}
@@ -215,19 +215,19 @@ 
 	 */
 	function insertModuleConfig($module, $config, $site_srl = 0)
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->module = $module;
 		$args->config = serialize($config);
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -246,13 +246,13 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -265,10 +265,10 @@ 
 	 */
 	function insertSite($domain, $index_module_srl)
 	{
-		if(isSiteID($domain))
+		if (isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new 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);
@@ -1276,18 +1276,18 @@ 
 			$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 			FileHandler::makeDir($path);
 
-			$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
+			$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $ext);
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if (!checkUploadedFile($tmp)) return false;
 
-			if(!@move_uploaded_file($tmp, $save_filename))
+			if (!@move_uploaded_file($tmp, $save_filename))
 			{
 				return false;
 			}
 
-			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 			$args->filename = $save_filename;
 			$args->filesize = $vars->addfile['size'];
 		}
@@ -1313,14 +1313,14 @@ 
 		$oModuleModel = getModel('module');
 		$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 		FileHandler::makeDir($path);
-		$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
+		$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $vars->ext);
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if (!checkUploadedFile($tmp)) return false;
 
 		// upload
-		if(!@move_uploaded_file($tmp, $save_filename))
+		if (!@move_uploaded_file($tmp, $save_filename))
 		{
 			return false;
 		}
@@ -1331,7 +1331,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);
@@ -1346,14 +1346,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)
@@ -1376,11 +1376,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);
@@ -1409,7 +1409,7 @@ 
 		$output = executeQuery('module.updateModuleInSites', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

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