xpressengine / xe-core

classes/module/ModuleHandler.class.php

Braces +30 added lines, -45 removed lines

@@ -107,7 +107,9 @@ 
 		$called_position = 'before_module_init';
 		$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);
+		}
 	}
 
 	/**
@@ -160,8 +162,7 @@ 
 			if(!$module_info)
 			{
 				unset($this->document_srl);
-			}
-			else
+			} else
 			{
 				// If it exists, compare mid based on the module information
 				// if mids are not matching, set it as the document's mid
@@ -173,8 +174,7 @@ 
 						$this->mid = $module_info->mid;
 						header('location:' . getNotEncodedSiteUrl($site_module_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl));
 						return FALSE;
-					}
-					else
+					} else
 					{
 						$this->mid = $module_info->mid;
 						Context::set('mid', $this->mid);
@@ -225,15 +225,13 @@ 
 				$site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
 				$redirect_url = getNotEncodedSiteUrl($site_info->domain, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
 				// If it's called from a virtual site, though it's not a module of the virtual site
-			}
-			else
+			} else
 			{
 				$db_info = Context::getDBInfo();
 				if(!$db_info->default_url)
 				{
 					return Context::getLang('msg_default_url_is_not_defined');
-				}
-				else
+				} else
 				{
 					$redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
 				}
@@ -258,8 +256,7 @@ 
 			{
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$layoutSrl = $module_info->{$targetSrl};
 			}
@@ -386,8 +383,7 @@ 
 			if(!$allowedMethod)
 			{
 				$allowedMethodList[0] = 'POST';
-			}
-			else
+			} else
 			{
 				$allowedMethodList = explode('|', strtoupper($allowedMethod));
 			}
@@ -445,8 +441,7 @@ 
 				Mobile::setMobile(FALSE);
 				$oModule = $this->getModuleInstance($this->module, $type, $kind);
 			}
-		}
-		else
+		} else
 		{
 			// create a module instance
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
@@ -499,8 +494,7 @@ 
 					$forward->type = $xml_info->action->{$this->act}->type;
 					$forward->ruleset = $xml_info->action->{$this->act}->ruleset;
 					$forward->act = $this->act;
-				}
-				else
+				} else
 				{
 					$this->error = 'msg_invalid_request';
 					$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -536,8 +530,7 @@ 
 					if(!$allowedMethod)
 					{
 						$allowedMethodList[0] = 'POST';
-					}
-					else
+					} else
 					{
 						$allowedMethodList = explode('|', strtoupper($allowedMethod));
 					}
@@ -565,8 +558,7 @@ 
 						Mobile::setMobile(FALSE);
 						$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 					}
-				}
-				else
+				} else
 				{
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 				}
@@ -596,8 +588,7 @@ 
 							$oModule->setLayoutPath("./modules/admin/tpl");
 							$oModule->setLayoutFile("layout.html");
 						}
-					}
-					else
+					} else
 					{
 						$this->_setInputErrorToContext();
 
@@ -621,8 +612,7 @@ 
 						$oMessageObject->setMessage($this->error);
 						$oMessageObject->dispMessage();
 						return $oMessageObject;
-					}
-					else
+					} else
 					{
 						if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
 						{
@@ -636,12 +626,10 @@ 
 						}
 					}
 				}
-			}
-			else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
+			} else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
 			{
 				$this->act = $xml_info->default_index_act;
-			}
-			else
+			} else
 			{
 				$this->error = 'msg_invalid_request';
 				$oModule->setError(-1);
@@ -739,7 +727,9 @@ 
 			$message = $oModule->getMessage();
 			$messageType = $oModule->getMessageType();
 			$redirectUrl = $oModule->getRedirectUrl();
-			if($messageType == 'error') debugPrint($message, 'ERROR');
+			if($messageType == 'error') {
+				debugPrint($message, 'ERROR');
+			}
 
 			if(!$procResult)
 			{
@@ -749,8 +739,7 @@ 
 					$redirectUrl = Context::get('error_return_url');
 				}
 				$this->_setInputValueToSession();
-			}
-			else
+			} else
 			{
 
 			}
@@ -898,8 +887,7 @@ 
 					$oModule->setTemplatePath($oMessageObject->getTemplatePath());
 					$oModule->setTemplateFile($oMessageObject->getTemplateFile());
 					// Otherwise, set message instance as the target module
-				}
-				else
+				} else
 				{
 					$oModule = $oMessageObject;
 				}
@@ -911,8 +899,7 @@ 
 			if(Mobile::isFromMobilePhone())
 			{
 				$layout_srl = $oModule->module_info->mlayout_srl;
-			}
-			else
+			} else
 			{
 				$layout_srl = $oModule->module_info->layout_srl;
 			}
@@ -971,8 +958,7 @@ 
 									$menu->xml_file = str_replace('.xml.php', $homeMenuSrl . '.xml.php', $menu->xml_file);
 									$menu->php_file = str_replace('.php', $homeMenuSrl . '.php', $menu->php_file);
 									$layout_info->menu->{$menu_id}->menu_srl = $homeMenuSrl;
-								}
-								else
+								} else
 								{
 									$menu->xml_file = str_replace($menu->menu_srl, $homeMenuSrl, $menu->xml_file);
 									$menu->php_file = str_replace($menu->menu_srl, $homeMenuSrl, $menu->php_file);
@@ -1009,8 +995,7 @@ 
 				if($kind == 'admin')
 				{
 					$oModule->setLayoutFile('popup_layout');
-				}
-				else
+				} else
 				{
 					$oModule->setLayoutPath('common/tpl');
 					$oModule->setLayoutFile('default_layout');
@@ -1144,13 +1129,11 @@ 
 		{
 			$instanceName = '%s';
 			$classFile = '%s%s.%s.php';
-		}
-		elseif($kind == 'admin' && array_search($type, $types) < 3)
+		} elseif($kind == 'admin' && array_search($type, $types) < 3)
 		{
 			$instanceName = '%sAdmin%s';
 			$classFile = '%s%s.admin.%s.php';
-		}
-		else
+		} else
 		{
 			$instanceName = '%s%s';
 			$classFile = '%s%s.%s.php';
@@ -1213,7 +1196,9 @@ 
 			$slowlog->caller = $trigger_name . '.' . $called_position;
 			$slowlog->called = $module . '.' . $called_method;
 			$slowlog->called_extension = $module;
-			if($trigger_name != 'XE.writeSlowlog') writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			if($trigger_name != 'XE.writeSlowlog') {
+				writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			}
 
 			if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
 			{

Spacing +178 added lines, -178 removed lines

@@ -35,7 +35,7 @@ 
 	function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '', $module_srl = '')
 	{
 		// If XE has not installed yet, set module as install
-		if(!Context::isInstalled())
+		if (!Context::isInstalled())
 		{
 			$this->module = 'install';
 			$this->act = Context::get('act');
@@ -43,10 +43,10 @@ 
 		}
 
 		$oContext = Context::getInstance();
-		if($oContext->isSuccessInit == FALSE)
+		if ($oContext->isSuccessInit == FALSE)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != "Y")
+			if ($logged_info->is_admin != "Y")
 			{
 				$this->error = 'msg_invalid_request';
 				return;
@@ -59,26 +59,26 @@ 
 		$this->mid = $mid ? $mid : Context::get('mid');
 		$this->document_srl = $document_srl ? (int) $document_srl : (int) Context::get('document_srl');
 		$this->module_srl = $module_srl ? (int) $module_srl : (int) Context::get('module_srl');
-        if($entry = Context::get('entry'))
+        if ($entry = Context::get('entry'))
         {
             $this->entry = Context::convertEncodingStr($entry);
         }
 
 		// Validate variables to prevent XSS
 		$isInvalid = NULL;
-		if($this->module && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->module))
+		if ($this->module && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->module))
 		{
 			$isInvalid = TRUE;
 		}
-		if($this->mid && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->mid))
+		if ($this->mid && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->mid))
 		{
 			$isInvalid = TRUE;
 		}
-		if($this->act && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->act))
+		if ($this->act && !preg_match("/^([a-z0-9\_\-]+)$/i", $this->act))
 		{
 			$isInvalid = TRUE;
 		}
-		if($isInvalid)
+		if ($isInvalid)
 		{
 			htmlHeader();
 			echo Context::getLang("msg_invalid_request");
@@ -87,14 +87,14 @@ 
 			exit;
 		}
 
-		if(isset($this->act) && (strlen($this->act) >= 4 && substr_compare($this->act, 'disp', 0, 4) === 0))
+		if (isset($this->act) && (strlen($this->act) >= 4 && substr_compare($this->act, 'disp', 0, 4) === 0))
 		{
-			if(Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on')
+			if (Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on')
 			{
-				if(Context::get('_https_port')!=null) {
-					header('location:https://' . $_SERVER['HTTP_HOST'] . ':' . Context::get('_https_port') . $_SERVER['REQUEST_URI']);
+				if (Context::get('_https_port') != null) {
+					header('location:https://'.$_SERVER['HTTP_HOST'].':'.Context::get('_https_port').$_SERVER['REQUEST_URI']);
 				} else {
-					header('location:https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+					header('location:https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 				}
 				return;
 			}
@@ -102,9 +102,9 @@ 
 
 		// call a trigger before moduleHandler init
 		ModuleHandler::triggerCall('moduleHandler.init', 'before', $this);
-		if(__ERROR_LOG__ == 1 && __DEBUG_OUTPUT__ == 0)
+		if (__ERROR_LOG__ == 1 && __DEBUG_OUTPUT__ == 0)
 		{
-			if(__DEBUG_PROTECT__ === 0 || __DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ == $_SERVER['REMOTE_ADDR'])
+			if (__DEBUG_PROTECT__ === 0 || __DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ == $_SERVER['REMOTE_ADDR'])
 			{
 				set_error_handler(array($this, 'xeErrorLog'), E_WARNING);
 				register_shutdown_function(array($this, 'shutdownHandler'));
@@ -115,40 +115,40 @@ 
 		$called_position = 'before_module_init';
 		$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);
 	}
 
 	public static function xeErrorLog($errnumber, $errormassage, $errorfile, $errorline, $errorcontext)
 	{
-		if(($errnumber & 3) == 0 || error_reporting() == 0)
+		if (($errnumber & 3) == 0 || error_reporting() == 0)
 		{
 			return false;
 		}
 
 		set_error_handler(function() { }, ~0);
 
-		$debug_file = _XE_PATH_ . 'files/_debug_message.php';
-		if(!file_exists($debug_file))
+		$debug_file = _XE_PATH_.'files/_debug_message.php';
+		if (!file_exists($debug_file))
 		{
 			$print[] = '<?php exit() ?>';
 		}
 
 		$errorname = self::getErrorType($errnumber);
-		$print[] = '['.date('Y-m-d H:i:s').'] ' . $errorname . ' : ' . $errormassage;
+		$print[] = '['.date('Y-m-d H:i:s').'] '.$errorname.' : '.$errormassage;
 		$backtrace_args = defined('DEBUG_BACKTRACE_IGNORE_ARGS') ? \DEBUG_BACKTRACE_IGNORE_ARGS : 0;
 		$backtrace = debug_backtrace($backtrace_args);
-		if(count($backtrace) > 1 && $backtrace[1]['function'] === 'xeErrorLog' && !$backtrace[1]['class'])
+		if (count($backtrace) > 1 && $backtrace[1]['function'] === 'xeErrorLog' && !$backtrace[1]['class'])
 		{
 			array_shift($backtrace);
 		}
 
-		foreach($backtrace as $key => $value)
+		foreach ($backtrace as $key => $value)
 		{
-			$message = '    - ' . $value['file'] . ' : ' . $value['line'];
+			$message = '    - '.$value['file'].' : '.$value['line'];
 			$print[] = $message;
 		}
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 		restore_error_handler();
 
 		return true;
@@ -164,21 +164,21 @@ 
 
 		set_error_handler(function() { }, ~0);
 
-		$debug_file = _XE_PATH_ . 'files/_debug_message.php';
-		if(!file_exists($debug_file))
+		$debug_file = _XE_PATH_.'files/_debug_message.php';
+		if (!file_exists($debug_file))
 		{
 			$print[] = '<?php exit() ?>';
 		}
 
 		$errorname = self::getErrorType($errinfo['type']);
 		$print[] = '['.date('Y-m-d H:i:s').']';
-		$print[] = $errorname . ' : ' . $errinfo['message'];
+		$print[] = $errorname.' : '.$errinfo['message'];
 
-		$message = '    - ' . $errinfo['file'] . ' : ' . $errinfo['line'];
+		$message = '    - '.$errinfo['file'].' : '.$errinfo['line'];
 		$print[] = $message;
 
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 		set_error_handler(array($this, 'dummyHandler'), ~0);
 
 		return true;
@@ -218,9 +218,9 @@ 
 
 		// if success_return_url and error_return_url is incorrect
 		$urls = array(Context::get('success_return_url'), Context::get('error_return_url'));
-		foreach($urls as $url)
+		foreach ($urls as $url)
 		{
-			if(empty($url))
+			if (empty($url))
 			{
 				continue;
 			}
@@ -232,29 +232,29 @@ 
 			$defaultUrlInfo = parse_url($dbInfo->default_url);
 			$defaultHost = $defaultUrlInfo['host'];
 		
-			if($host && ($host != $defaultHost && $host != $site_module_info->domain))
+			if ($host && ($host != $defaultHost && $host != $site_module_info->domain))
 			{
 				throw new Exception('msg_default_url_is_null');
 			}
 		}
 		
-		if(!$this->document_srl && $this->mid && $this->entry)
+		if (!$this->document_srl && $this->mid && $this->entry)
 		{
 			$oDocumentModel = getModel('document');
 			$this->document_srl = $oDocumentModel->getDocumentSrlByAlias($this->mid, $this->entry);
-			if($this->document_srl)
+			if ($this->document_srl)
 			{
 				Context::set('document_srl', $this->document_srl);
 			}
 		}
 
 		// Get module's information based on document_srl, if it's specified
-		if($this->document_srl)
+		if ($this->document_srl)
 		{
 			
 			$module_info = $oModuleModel->getModuleInfoByDocumentSrl($this->document_srl);
 			// If the document does not exist, remove document_srl
-			if(!$module_info)
+			if (!$module_info)
 			{
 				unset($this->document_srl);
 			}
@@ -262,13 +262,13 @@ 
 			{
 				// If it exists, compare mid based on the module information
 				// if mids are not matching, set it as the document's mid
-				if(!$this->mid || ($this->mid != $module_info->mid))
+				if (!$this->mid || ($this->mid != $module_info->mid))
 				{
 					
-					if(Context::getRequestMethod() == 'GET')
+					if (Context::getRequestMethod() == 'GET')
 					{
 						$this->mid = $module_info->mid;
-						header('location:' . getNotEncodedSiteUrl($site_module_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl));
+						header('location:'.getNotEncodedSiteUrl($site_module_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl));
 						return FALSE;
 					}
 					else
@@ -279,7 +279,7 @@ 
 					
 				}
 				// if requested module is different from one of the document, remove the module information retrieved based on the document number
-				if($this->module && $module_info->module != $this->module)
+				if ($this->module && $module_info->module != $this->module)
 				{
 					unset($module_info);
 				}
@@ -288,36 +288,36 @@ 
 		}
 
 		// If module_info is not set yet, and there exists mid information, get module information based on the mid
-		if(!$module_info && $this->mid)
+		if (!$module_info && $this->mid)
 		{
 			$module_info = $oModuleModel->getModuleInfoByMid($this->mid, $site_module_info->site_srl);
 			//if($this->module && $module_info->module != $this->module) unset($module_info);
 		}
 
 		// redirect, if module_site_srl and site_srl are different
-		if(!$this->module && !$module_info && $site_module_info->site_srl == 0 && $site_module_info->module_site_srl > 0)
+		if (!$this->module && !$module_info && $site_module_info->site_srl == 0 && $site_module_info->module_site_srl > 0)
 		{
 			$site_info = $oModuleModel->getSiteInfo($site_module_info->module_site_srl);
-			header("location:" . getNotEncodedSiteUrl($site_info->domain, 'mid', $site_module_info->mid));
+			header("location:".getNotEncodedSiteUrl($site_info->domain, 'mid', $site_module_info->mid));
 			return FALSE;
 		}
 
 		// If module_info is not set still, and $module does not exist, find the default module
-		if(!$module_info && !$this->module && !$this->mid)
+		if (!$module_info && !$this->module && !$this->mid)
 		{
 			$module_info = $site_module_info;
 		}
 
-		if(!$module_info && !$this->module && $site_module_info->module_site_srl)
+		if (!$module_info && !$this->module && $site_module_info->module_site_srl)
 		{
 			$module_info = $site_module_info;
 		}
 
 		// redirect, if site_srl of module_info is different from one of site's module_info
-		if($module_info && $module_info->site_srl != $site_module_info->site_srl && !isCrawler())
+		if ($module_info && $module_info->site_srl != $site_module_info->site_srl && !isCrawler())
 		{
 			// If the module is of virtual site
-			if($module_info->site_srl)
+			if ($module_info->site_srl)
 			{
 				$site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
 				$redirect_url = getNotEncodedSiteUrl($site_info->domain, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
@@ -326,7 +326,7 @@ 
 			else
 			{
 				$db_info = Context::getDBInfo();
-				if(!$db_info->default_url)
+				if (!$db_info->default_url)
 				{
 					return Context::getLang('msg_default_url_is_not_defined');
 				}
@@ -335,12 +335,12 @@ 
 					$redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
 				}
 			}
-			header("location:" . $redirect_url);
+			header("location:".$redirect_url);
 			return FALSE;
 		}
 
 		// If module info was set, retrieve variables from the module information
-		if($module_info)
+		if ($module_info)
 		{
 			$this->module = $module_info->module;
 			$this->mid = $module_info->mid;
@@ -351,7 +351,7 @@ 
 			$targetSrl = (Mobile::isFromMobilePhone()) ? 'mlayout_srl' : 'layout_srl';
 
 			// use the site default layout.
-			if($module_info->{$targetSrl} == -1)
+			if ($module_info->{$targetSrl} == -1)
 			{
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
@@ -369,7 +369,7 @@ 
 		}
 
 		// Set module and mid into module_info
-		if(!isset($this->module_info))
+		if (!isset($this->module_info))
 		{
 			$this->module_info = new stdClass();
 		}
@@ -380,21 +380,21 @@ 
 		$this->module_info->site_srl = $site_module_info->site_srl;
 
 		// Still no module? it's an error
-		if(!$this->module)
+		if (!$this->module)
 		{
 			$this->error = 'msg_module_is_not_exists';
 			$this->httpStatusCode = '404';
 		}
 
 		// If mid exists, set mid into context
-		if($this->mid)
+		if ($this->mid)
 		{
 			Context::set('mid', $this->mid, TRUE);
 		}
 		
 		// Call a trigger after moduleHandler init
 		$output = ModuleHandler::triggerCall('moduleHandler.init', 'after', $this->module_info);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$this->error = $output->getMessage();
 			return TRUE;
@@ -416,14 +416,14 @@ 
 		$display_mode = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
 
 		// If error occurred while preparation, return a message instance
-		if($this->error)
+		if ($this->error)
 		{
 			$this->_setInputErrorToContext();
 			$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 			$oMessageObject->setError(-1);
 			$oMessageObject->setMessage($this->error);
 			$oMessageObject->dispMessage();
-			if($this->httpStatusCode)
+			if ($this->httpStatusCode)
 			{
 				$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 			}
@@ -434,22 +434,22 @@ 
 		$xml_info = $oModuleModel->getModuleActionXml($this->module);
 
 		// If not installed yet, modify act
-		if($this->module == "install")
+		if ($this->module == "install")
 		{
-			if(!$this->act || !$xml_info->action->{$this->act})
+			if (!$this->act || !$xml_info->action->{$this->act})
 			{
 				$this->act = $xml_info->default_index_act;
 			}
 		}
 
 		// if act exists, find type of the action, if not use default index act
-		if(!$this->act)
+		if (!$this->act)
 		{
 			$this->act = $xml_info->default_index_act;
 		}
 
 		// still no act means error
-		if(!$this->act)
+		if (!$this->act)
 		{
 			$this->error = 'msg_module_is_not_exists';
 			$this->httpStatusCode = '404';
@@ -459,7 +459,7 @@ 
 			$oMessageObject->setError(-1);
 			$oMessageObject->setMessage($this->error);
 			$oMessageObject->dispMessage();
-			if($this->httpStatusCode)
+			if ($this->httpStatusCode)
 			{
 				$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 			}
@@ -470,17 +470,17 @@ 
 		$type = $xml_info->action->{$this->act}->type;
 		$ruleset = $xml_info->action->{$this->act}->ruleset;
 		$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
-		if(!$kind && $this->module == 'admin')
+		if (!$kind && $this->module == 'admin')
 		{
 			$kind = 'admin';
 		}
 
 		// check REQUEST_METHOD in controller
-		if($type == 'controller')
+		if ($type == 'controller')
 		{
 			$allowedMethod = $xml_info->action->{$this->act}->method;
 
-			if(!$allowedMethod)
+			if (!$allowedMethod)
 			{
 				$allowedMethodList[0] = 'POST';
 			}
@@ -489,7 +489,7 @@ 
 				$allowedMethodList = explode('|', strtoupper($allowedMethod));
 			}
 
-			if(!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
+			if (!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
 			{
 				$this->error = "msg_invalid_request";
 				$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -500,7 +500,7 @@ 
 			}
 		}
 
-		if($this->module_info->use_mobile != "Y")
+		if ($this->module_info->use_mobile != "Y")
 		{
 			Mobile::setMobile(FALSE);
 		}
@@ -508,7 +508,7 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// check CSRF for POST actions
-		if($_SERVER['REQUEST_METHOD'] !== 'GET' && Context::isInstalled() && $this->act !== 'procFileUpload' && !checkCSRF()) {
+		if ($_SERVER['REQUEST_METHOD'] !== 'GET' && Context::isInstalled() && $this->act !== 'procFileUpload' && !checkCSRF()) {
 			$this->error = 'msg_invalid_request';
 			$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 			$oMessageObject->setError(-1);
@@ -518,7 +518,7 @@ 
 		}
 
 		// Admin ip
-		if($kind == 'admin' && $_SESSION['denied_admin'] == 'Y')
+		if ($kind == 'admin' && $_SESSION['denied_admin'] == 'Y')
 		{
 			$this->_setInputErrorToContext();
 			$this->error = "msg_not_permitted_act";
@@ -530,13 +530,13 @@ 
 		}
 
 		// if(type == view, and case for using mobilephone)
-		if($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
+		if ($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
 		{
 			$orig_type = "view";
 			$type = "mobile";
 			// create a module instance
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
-			if(!is_object($oModule) || !method_exists($oModule, $this->act))
+			if (!is_object($oModule) || !method_exists($oModule, $this->act))
 			{
 				$type = $orig_type;
 				Mobile::setMobile(FALSE);
@@ -549,14 +549,14 @@ 
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
 		}
 
-		if(!is_object($oModule))
+		if (!is_object($oModule))
 		{
 			$this->_setInputErrorToContext();
 			$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 			$oMessageObject->setError(-1);
 			$oMessageObject->setMessage($this->error);
 			$oMessageObject->dispMessage();
-			if($this->httpStatusCode)
+			if ($this->httpStatusCode)
 			{
 				$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 			}
@@ -564,10 +564,10 @@ 
 		}
 
 		// If there is no such action in the module object
-		if(!isset($xml_info->action->{$this->act}) || !method_exists($oModule, $this->act))
+		if (!isset($xml_info->action->{$this->act}) || !method_exists($oModule, $this->act))
 		{
 
-			if(!Context::isInstalled())
+			if (!Context::isInstalled())
 			{
 				$this->_setInputErrorToContext();
 				$this->error = 'msg_invalid_request';
@@ -575,7 +575,7 @@ 
 				$oMessageObject->setError(-1);
 				$oMessageObject->setMessage($this->error);
 				$oMessageObject->dispMessage();
-				if($this->httpStatusCode)
+				if ($this->httpStatusCode)
 				{
 					$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 				}
@@ -584,12 +584,12 @@ 
 
 			$forward = NULL;
 			// 1. Look for the module with action name
-			if(preg_match('/^([a-z]+)([A-Z])([a-z0-9\_]+)(.*)$/', $this->act, $matches))
+			if (preg_match('/^([a-z]+)([A-Z])([a-z0-9\_]+)(.*)$/', $this->act, $matches))
 			{
-				$module = strtolower($matches[2] . $matches[3]);
+				$module = strtolower($matches[2].$matches[3]);
 				$xml_info = $oModuleModel->getModuleActionXml($module);
 
-				if($xml_info->action->{$this->act} && ((stripos($this->act, 'admin') !== FALSE) || $xml_info->action->{$this->act}->standalone != 'false'))
+				if ($xml_info->action->{$this->act} && ((stripos($this->act, 'admin') !== FALSE) || $xml_info->action->{$this->act}->standalone != 'false'))
 				{
 					$forward = new stdClass();
 					$forward->module = $module;
@@ -609,12 +609,12 @@ 
 				}
 			}
 
-			if(!$forward)
+			if (!$forward)
 			{
 				$forward = $oModuleModel->getActionForward($this->act);
 			}
 
-			if($forward->module && $forward->type && $forward->act && $forward->act == $this->act)
+			if ($forward->module && $forward->type && $forward->act && $forward->act == $this->act)
 			{
 				$kind = stripos($forward->act, 'admin') !== FALSE ? 'admin' : '';
 				$type = $forward->type;
@@ -626,11 +626,11 @@ 
 
 				// SECISSUE also check foward act method
 				// check REQUEST_METHOD in controller
-				if($type == 'controller')
+				if ($type == 'controller')
 				{
 					$allowedMethod = $xml_info->action->{$forward->act}->method;
 
-					if(!$allowedMethod)
+					if (!$allowedMethod)
 					{
 						$allowedMethodList[0] = 'POST';
 					}
@@ -639,7 +639,7 @@ 
 						$allowedMethodList = explode('|', strtoupper($allowedMethod));
 					}
 
-					if(!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
+					if (!in_array(strtoupper($_SERVER['REQUEST_METHOD']), $allowedMethodList))
 					{
 						$this->error = "msg_invalid_request";
 						$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -650,13 +650,13 @@ 
 					}
 				}
 
-				if($type == "view" && Mobile::isFromMobilePhone())
+				if ($type == "view" && Mobile::isFromMobilePhone())
 				{
 					$orig_type = "view";
 					$type = "mobile";
 					// create a module instance
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
-					if(!is_object($oModule) || !method_exists($oModule, $this->act))
+					if (!is_object($oModule) || !method_exists($oModule, $this->act))
 					{
 						$type = $orig_type;
 						Mobile::setMobile(FALSE);
@@ -668,25 +668,25 @@ 
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 				}
 
-				if(!is_object($oModule))
+				if (!is_object($oModule))
 				{
 					$this->_setInputErrorToContext();
 					$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
 					$oMessageObject->setError(-1);
 					$oMessageObject->setMessage('msg_module_is_not_exists');
 					$oMessageObject->dispMessage();
-					if($this->httpStatusCode)
+					if ($this->httpStatusCode)
 					{
 						$oMessageObject->setHttpStatusCode($this->httpStatusCode);
 					}
 					return $oMessageObject;
 				}
 
-				if($this->module == "admin" && $type == "view")
+				if ($this->module == "admin" && $type == "view")
 				{
-					if($logged_info->is_admin == 'Y')
+					if ($logged_info->is_admin == 'Y')
 					{
-						if($this->act != 'dispLayoutAdminLayoutModify')
+						if ($this->act != 'dispLayoutAdminLayoutModify')
 						{
 							$oAdminView = getAdminView('admin');
 							$oAdminView->makeGnbUrl($forward->module);
@@ -706,10 +706,10 @@ 
 						return $oMessageObject;
 					}
 				}
-				if($kind == 'admin')
+				if ($kind == 'admin')
 				{
 					$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
-					if(!$grant->manager)
+					if (!$grant->manager)
 					{
 						$this->_setInputErrorToContext();
 						$this->error = 'msg_is_not_manager';
@@ -721,7 +721,7 @@ 
 					}
 					else
 					{
-						if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
+						if (!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
 						{
 							$this->_setInputErrorToContext();
 							$this->error = 'msg_is_not_administrator';
@@ -734,7 +734,7 @@ 
 					}
 				}
 			}
-			else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
+			else if ($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
 			{
 				$this->act = $xml_info->default_index_act;
 			}
@@ -748,16 +748,16 @@ 
 		}
 
 		// ruleset check...
-		if(!empty($ruleset))
+		if (!empty($ruleset))
 		{
 			$rulesetModule = $forward->module ? $forward->module : $this->module;
 			$rulesetFile = $oModuleModel->getValidatorFilePath($rulesetModule, $ruleset, $this->mid);
-			if(!empty($rulesetFile))
+			if (!empty($rulesetFile))
 			{
-				if($_SESSION['XE_VALIDATOR_ERROR_LANG'])
+				if ($_SESSION['XE_VALIDATOR_ERROR_LANG'])
 				{
 					$errorLang = $_SESSION['XE_VALIDATOR_ERROR_LANG'];
-					foreach($errorLang as $key => $val)
+					foreach ($errorLang as $key => $val)
 					{
 						Context::setLang($key, $val);
 					}
@@ -766,7 +766,7 @@ 
 
 				$Validator = new Validator($rulesetFile);
 				$result = $Validator->validate();
-				if(!$result)
+				if (!$result)
 				{
 					$lastError = $Validator->getLastError();
 					$returnUrl = Context::get('error_return_url');
@@ -798,26 +798,26 @@ 
 				'dispLayoutPreviewWithModule' => 1
 		);
 		$db_use_mobile = Mobile::isMobileEnabled();
-		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true)
+		if ($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true)
 		{
 			global $lang;
 			$header = '<style>div.xe_mobile{opacity:0.7;margin:1em 0;padding:.5em;background:#333;border:1px solid #666;border-left:0;border-right:0}p.xe_mobile{text-align:center;margin:1em 0}a.xe_mobile{color:#ff0;font-weight:bold;font-size:24px}@media only screen and (min-width:500px){a.xe_mobile{font-size:15px}}</style>';
-			$footer = '<div class="xe_mobile"><p class="xe_mobile"><a class="xe_mobile" href="' . getUrl('m', '1') . '">' . $lang->msg_pc_to_mobile . '</a></p></div>';
+			$footer = '<div class="xe_mobile"><p class="xe_mobile"><a class="xe_mobile" href="'.getUrl('m', '1').'">'.$lang->msg_pc_to_mobile.'</a></p></div>';
 			Context::addHtmlHeader($header);
 			Context::addHtmlFooter($footer);
 		}
 
-		if($type == "view" && $kind != 'admin')
+		if ($type == "view" && $kind != 'admin')
 		{
 			$module_config = $oModuleModel->getModuleConfig('module');
-			if($module_config->htmlFooter)
+			if ($module_config->htmlFooter)
 			{
 				Context::addHtmlFooter($module_config->htmlFooter);
 			}
-			if($module_config->siteTitle)
+			if ($module_config->siteTitle)
 			{
 				$siteTitle = Context::getBrowserTitle();
-				if(!$siteTitle)
+				if (!$siteTitle)
 				{
 					Context::setBrowserTitle($module_config->siteTitle);
 				}
@@ -830,18 +830,18 @@ 
 		$procResult = $oModule->proc();
 
 		$methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1);
-		if(!$oModule->stop_proc && !isset($methodList[Context::getRequestMethod()]))
+		if (!$oModule->stop_proc && !isset($methodList[Context::getRequestMethod()]))
 		{
 			$error = $oModule->getError();
 			$message = $oModule->getMessage();
 			$messageType = $oModule->getMessageType();
 			$redirectUrl = $oModule->getRedirectUrl();
-			if($messageType == 'error') debugPrint($message, 'ERROR');
+			if ($messageType == 'error') debugPrint($message, 'ERROR');
 
-			if(!$procResult)
+			if (!$procResult)
 			{
 				$this->error = $message;
-				if(!$redirectUrl && Context::get('error_return_url'))
+				if (!$redirectUrl && Context::get('error_return_url'))
 				{
 					$redirectUrl = Context::get('error_return_url');
 				}
@@ -854,13 +854,13 @@ 
 
 			$_SESSION['XE_VALIDATOR_ERROR'] = $error;
 			$_SESSION['XE_VALIDATOR_ID'] = Context::get('xe_validator_id');
-			if($message != 'success')
+			if ($message != 'success')
 			{
 				$_SESSION['XE_VALIDATOR_MESSAGE'] = $message;
 			}
 			$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = $messageType;
 
-			if(Context::get('xeVirtualRequestMethod') != 'xml')
+			if (Context::get('xeVirtualRequestMethod') != 'xml')
 			{
 				$_SESSION['XE_VALIDATOR_RETURN_URL'] = $redirectUrl;
 			}
@@ -876,27 +876,27 @@ 
 	 * */
 	function _setInputErrorToContext()
 	{
-		if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR'))
+		if ($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR'))
 		{
 			Context::set('XE_VALIDATOR_ERROR', $_SESSION['XE_VALIDATOR_ERROR']);
 		}
-		if($_SESSION['XE_VALIDATOR_MESSAGE'] && !Context::get('XE_VALIDATOR_MESSAGE'))
+		if ($_SESSION['XE_VALIDATOR_MESSAGE'] && !Context::get('XE_VALIDATOR_MESSAGE'))
 		{
 			Context::set('XE_VALIDATOR_MESSAGE', $_SESSION['XE_VALIDATOR_MESSAGE']);
 		}
-		if($_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] && !Context::get('XE_VALIDATOR_MESSAGE_TYPE'))
+		if ($_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] && !Context::get('XE_VALIDATOR_MESSAGE_TYPE'))
 		{
 			Context::set('XE_VALIDATOR_MESSAGE_TYPE', $_SESSION['XE_VALIDATOR_MESSAGE_TYPE']);
 		}
-		if($_SESSION['XE_VALIDATOR_RETURN_URL'] && !Context::get('XE_VALIDATOR_RETURN_URL'))
+		if ($_SESSION['XE_VALIDATOR_RETURN_URL'] && !Context::get('XE_VALIDATOR_RETURN_URL'))
 		{
 			Context::set('XE_VALIDATOR_RETURN_URL', $_SESSION['XE_VALIDATOR_RETURN_URL']);
 		}
-		if($_SESSION['XE_VALIDATOR_ID'] && !Context::get('XE_VALIDATOR_ID'))
+		if ($_SESSION['XE_VALIDATOR_ID'] && !Context::get('XE_VALIDATOR_ID'))
 		{
 			Context::set('XE_VALIDATOR_ID', $_SESSION['XE_VALIDATOR_ID']);
 		}
-		if(count($_SESSION['INPUT_ERROR']))
+		if (count($_SESSION['INPUT_ERROR']))
 		{
 			Context::set('INPUT_ERROR', $_SESSION['INPUT_ERROR']);
 		}
@@ -926,7 +926,7 @@ 
 	{
 		$requestVars = Context::getRequestVars();
 		unset($requestVars->act, $requestVars->mid, $requestVars->vid, $requestVars->success_return_url, $requestVars->error_return_url);
-		foreach($requestVars AS $key => $value)
+		foreach ($requestVars AS $key => $value)
 		{
 			$_SESSION['INPUT_ERROR'][$key] = $value;
 		}
@@ -940,41 +940,41 @@ 
 	function displayContent($oModule = NULL)
 	{
 		// If the module is not set or not an object, set error
-		if(!$oModule || !is_object($oModule))
+		if (!$oModule || !is_object($oModule))
 		{
 			$this->error = 'msg_module_is_not_exists';
 			$this->httpStatusCode = '404';
 		}
 
 		// If connection to DB has a problem even though it's not install module, set error
-		if($this->module != 'install' && isset($GLOBALS['__DB__']) && $GLOBALS['__DB__'][Context::getDBType()]->isConnected() == FALSE)
+		if ($this->module != 'install' && isset($GLOBALS['__DB__']) && $GLOBALS['__DB__'][Context::getDBType()]->isConnected() == FALSE)
 		{
 			$this->error = 'msg_dbconnect_failed';
 		}
 
 		// Call trigger after moduleHandler proc
 		$output = ModuleHandler::triggerCall('moduleHandler.proc', 'after', $oModule);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$this->error = $output->getMessage();
 		}
 
 		// Use message view object, if HTML call
 		$methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1);
-		if(!isset($methodList[Context::getRequestMethod()]))
+		if (!isset($methodList[Context::getRequestMethod()]))
 		{
 
-			if($_SESSION['XE_VALIDATOR_RETURN_URL'])
+			if ($_SESSION['XE_VALIDATOR_RETURN_URL'])
 			{
 				$display_handler = new DisplayHandler();
 				$display_handler->_debugOutput();
 
-				header('location:' . $_SESSION['XE_VALIDATOR_RETURN_URL']);
+				header('location:'.$_SESSION['XE_VALIDATOR_RETURN_URL']);
 				return;
 			}
 
 			// If error occurred, handle it
-			if($this->error)
+			if ($this->error)
 			{
 				// display content with message module instance
 				$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
@@ -983,14 +983,14 @@ 
 				$oMessageObject->setMessage($this->error);
 				$oMessageObject->dispMessage();
 
-				if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200')
+				if ($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200')
 				{
 					$this->_setHttpStatusMessage($oMessageObject->getHttpStatusCode());
 					$oMessageObject->setTemplateFile('http_status_code');
 				}
 
 				// If module was called normally, change the templates of the module into ones of the message view module
-				if($oModule)
+				if ($oModule)
 				{
 					$oModule->setTemplatePath($oMessageObject->getTemplatePath());
 					$oModule->setTemplateFile($oMessageObject->getTemplateFile());
@@ -1005,7 +1005,7 @@ 
 			}
 
 			// Check if layout_srl exists for the module
-			if(Mobile::isFromMobilePhone())
+			if (Mobile::isFromMobilePhone())
 			{
 				$layout_srl = $oModule->module_info->mlayout_srl;
 			}
@@ -1015,58 +1015,58 @@ 
 			}
 
 			// if layout_srl is rollback by module, set default layout
-			if($layout_srl == -1)
+			if ($layout_srl == -1)
 			{
 				$viewType = (Mobile::isFromMobilePhone()) ? 'M' : 'P';
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layout_srl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $oModule->module_info->site_srl);
 			}
 
-			if($layout_srl && !$oModule->getLayoutFile())
+			if ($layout_srl && !$oModule->getLayoutFile())
 			{
 
 				// If layout_srl exists, get information of the layout, and set the location of layout_path/ layout_file
 				$oLayoutModel = getModel('layout');
 				$layout_info = $oLayoutModel->getLayout($layout_srl);
-				if($layout_info)
+				if ($layout_info)
 				{
 
 					// Input extra_vars into $layout_info
-					if($layout_info->extra_var_count)
+					if ($layout_info->extra_var_count)
 					{
 
-						foreach($layout_info->extra_var as $var_id => $val)
+						foreach ($layout_info->extra_var as $var_id => $val)
 						{
-							if($val->type == 'image')
+							if ($val->type == 'image')
 							{
-								if(strncmp('./files/attach/images/', $val->value, 22) === 0)
+								if (strncmp('./files/attach/images/', $val->value, 22) === 0)
 								{
-									$val->value = Context::getRequestUri() . substr($val->value, 2);
+									$val->value = Context::getRequestUri().substr($val->value, 2);
 								}
 							}
 							$layout_info->{$var_id} = $val->value;
 						}
 					}
 					// Set menus into context
-					if($layout_info->menu_count)
+					if ($layout_info->menu_count)
 					{
-						foreach($layout_info->menu as $menu_id => $menu)
+						foreach ($layout_info->menu as $menu_id => $menu)
 						{
 							// set default menu set(included home menu)
-							if(!$menu->menu_srl || $menu->menu_srl == -1)
+							if (!$menu->menu_srl || $menu->menu_srl == -1)
 							{
 								$oMenuAdminController = getAdminController('menu');
 								$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
 
-								if(FileHandler::exists($homeMenuCacheFile))
+								if (FileHandler::exists($homeMenuCacheFile))
 								{
 									include($homeMenuCacheFile);
 								}
 
-								if(!$menu->menu_srl)
+								if (!$menu->menu_srl)
 								{
-									$menu->xml_file = str_replace('.xml.php', $homeMenuSrl . '.xml.php', $menu->xml_file);
-									$menu->php_file = str_replace('.php', $homeMenuSrl . '.php', $menu->php_file);
+									$menu->xml_file = str_replace('.xml.php', $homeMenuSrl.'.xml.php', $menu->xml_file);
+									$menu->php_file = str_replace('.php', $homeMenuSrl.'.php', $menu->php_file);
 									$layout_info->menu->{$menu_id}->menu_srl = $homeMenuSrl;
 								}
 								else
@@ -1077,7 +1077,7 @@ 
 							}
 
 							$php_file = FileHandler::exists($menu->php_file);
-							if($php_file)
+							if ($php_file)
 							{
 								include($php_file);
 							}
@@ -1093,17 +1093,17 @@ 
 
 					// If layout was modified, use the modified version
 					$edited_layout = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
-					if(file_exists($edited_layout))
+					if (file_exists($edited_layout))
 					{
 						$oModule->setEditedLayoutFile($edited_layout);
 					}
 				}
 			}
 			$isLayoutDrop = Context::get('isLayoutDrop');
-			if($isLayoutDrop)
+			if ($isLayoutDrop)
 			{
 				$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
-				if($kind == 'admin')
+				if ($kind == 'admin')
 				{
 					$oModule->setLayoutFile('popup_layout');
 				}
@@ -1141,7 +1141,7 @@ 
 	function &getModuleInstance($module, $type = 'view', $kind = '')
 	{
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start_time = getMicroTime();
 		}
@@ -1151,51 +1151,51 @@ 
 		$type = strtolower($type);
 
 		$kinds = array('svc' => 1, 'admin' => 1);
-		if(!isset($kinds[$kind]))
+		if (!isset($kinds[$kind]))
 		{
 			$kind = 'svc';
 		}
 
-		$key = $module . '.' . ($kind != 'admin' ? '' : 'admin') . '.' . $type;
+		$key = $module.'.'.($kind != 'admin' ? '' : 'admin').'.'.$type;
 
-		if(is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__']))
+		if (is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__']))
 		{
 			$module = $extend_module = $GLOBALS['__MODULE_EXTEND__'][$key];
 		}
 
 		// if there is no instance of the module in global variable, create a new one
-		if(!isset($GLOBALS['_loaded_module'][$module][$type][$kind]))
+		if (!isset($GLOBALS['_loaded_module'][$module][$type][$kind]))
 		{
 			ModuleHandler::_getModuleFilePath($module, $type, $kind, $class_path, $high_class_file, $class_file, $instance_name);
 
-			if($extend_module && (!is_readable($high_class_file) || !is_readable($class_file)))
+			if ($extend_module && (!is_readable($high_class_file) || !is_readable($class_file)))
 			{
 				$module = $parent_module;
 				ModuleHandler::_getModuleFilePath($module, $type, $kind, $class_path, $high_class_file, $class_file, $instance_name);
 			}
 
 			// Check if the base class and instance class exist
-			if(!class_exists($module, true))
+			if (!class_exists($module, true))
 			{
 				return NULL;
 			}
-			if(!class_exists($instance_name, true))
+			if (!class_exists($instance_name, true))
 			{
 				return NULL;
 			}
 
 			// Create an instance
 			$oModule = new $instance_name();
-			if(!is_object($oModule))
+			if (!is_object($oModule))
 			{
 				return NULL;
 			}
 
 			// Load language files for the class
-			Context::loadLang($class_path . 'lang');
-			if($extend_module)
+			Context::loadLang($class_path.'lang');
+			if ($extend_module)
 			{
-				Context::loadLang(ModuleHandler::getModulePath($parent_module) . 'lang');
+				Context::loadLang(ModuleHandler::getModulePath($parent_module).'lang');
 			}
 
 			// Set variables to the instance
@@ -1203,10 +1203,10 @@ 
 			$oModule->setModulePath($class_path);
 
 			// If the module has a constructor, run it.
-			if(!isset($GLOBALS['_called_constructor'][$instance_name]))
+			if (!isset($GLOBALS['_called_constructor'][$instance_name]))
 			{
 				$GLOBALS['_called_constructor'][$instance_name] = TRUE;
-				if(@method_exists($oModule, $instance_name))
+				if (@method_exists($oModule, $instance_name))
 				{
 					$oModule->{$instance_name}();
 				}
@@ -1216,7 +1216,7 @@ 
 			$GLOBALS['_loaded_module'][$module][$type][$kind] = $oModule;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
 		}
@@ -1232,17 +1232,17 @@ 
 		$highClassFile = sprintf('%s%s%s.class.php', _XE_PATH_, $classPath, $module);
 		$highClassFile = FileHandler::getRealPath($highClassFile);
 
-		$types = array('view','controller','model','api','wap','mobile','class');
-		if(!in_array($type, $types))
+		$types = array('view', 'controller', 'model', 'api', 'wap', 'mobile', 'class');
+		if (!in_array($type, $types))
 		{
 			$type = $types[0];
 		}
-		if($type == 'class')
+		if ($type == 'class')
 		{
 			$instanceName = '%s';
 			$classFile = '%s%s.%s.php';
 		}
-		elseif($kind == 'admin' && array_search($type, $types) < 3)
+		elseif ($kind == 'admin' && array_search($type, $types) < 3)
 		{
 			$instanceName = '%sAdmin%s';
 			$classFile = '%s%s.admin.%s.php';
@@ -1267,26 +1267,26 @@ 
 	function triggerCall($trigger_name, $called_position, &$obj)
 	{
 		// skip if not installed
-		if(!Context::isInstalled())
+		if (!Context::isInstalled())
 		{
 			return new Object();
 		}
 
 		$oModuleModel = getModel('module');
 		$triggers = $oModuleModel->getTriggers($trigger_name, $called_position);
-		if(!$triggers || count($triggers) < 1)
+		if (!$triggers || count($triggers) < 1)
 		{
 			return new Object();
 		}
 		
 		//store before trigger call time
 		$before_trigger_time = NULL;
-		if(__LOG_SLOW_TRIGGER__> 0)
+		if (__LOG_SLOW_TRIGGER__ > 0)
 		{
 			$before_trigger_time = microtime(true);
 		}
 
-		foreach($triggers as $item)
+		foreach ($triggers as $item)
 		{
 			$module = $item->module;
 			$type = $item->type;
@@ -1294,7 +1294,7 @@ 
 
 			// todo why don't we call a normal class object ?
 			$oModule = getModule($module, $type);
-			if(!$oModule || !method_exists($oModule, $called_method))
+			if (!$oModule || !method_exists($oModule, $called_method))
 			{
 				continue;
 			}
@@ -1307,12 +1307,12 @@ 
 			$elapsed_time_trigger = $after_each_trigger_time - $before_each_trigger_time;
 
 			$slowlog = new stdClass;
-			$slowlog->caller = $trigger_name . '.' . $called_position;
-			$slowlog->called = $module . '.' . $called_method;
+			$slowlog->caller = $trigger_name.'.'.$called_position;
+			$slowlog->called = $module.'.'.$called_method;
 			$slowlog->called_extension = $module;
-			if($trigger_name != 'XE.writeSlowlog') writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			if ($trigger_name != 'XE.writeSlowlog') writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
 
-			if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
+			if (is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
 			{
 				return $output;
 			}
@@ -1397,9 +1397,9 @@ 
 			'511' => 'Network Authentication Required',
 		);
 		$statusMessage = $statusMessageList[$code];
-		if(!$statusMessage)
+		if (!$statusMessage)
 		{
-			$statusMessage = 'HTTP ' . $code;
+			$statusMessage = 'HTTP '.$code;
 		}
 
 		Context::set('http_status_code', $code);

config/func.inc.php

Spacing +182 added lines, -182 removed lines

@@ -6,13 +6,13 @@ 
  *
  * @author NAVER (developers@xpressengine.com)
  */
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
 // define an empty function to avoid errors when iconv function doesn't exist
-if(!function_exists('iconv'))
+if (!function_exists('iconv'))
 {
 	eval('
 		function iconv($in_charset, $out_charset, $str)
@@ -220,7 +220,7 @@ 
 {
 	$oDB = DB::getInstance();
 	$output = $oDB->executeQuery($query_id, $args, $arg_columns);
-	if(!is_array($output->data) && count($output->data) > 0)
+	if (!is_array($output->data) && count($output->data) > 0)
 	{
 		$output->data = array($output->data);
 	}
@@ -250,7 +250,7 @@ 
 function setUserSequence($seq)
 {
 	$arr_seq = array();
-	if(isset($_SESSION['seq']))
+	if (isset($_SESSION['seq']))
 	{
 		$arr_seq = $_SESSION['seq'];
 	}
@@ -266,11 +266,11 @@ 
  */
 function checkUserSequence($seq)
 {
-	if(!isset($_SESSION['seq']))
+	if (!isset($_SESSION['seq']))
 	{
 		return false;
 	}
-	if(!in_array($seq, $_SESSION['seq']))
+	if (!in_array($seq, $_SESSION['seq']))
 	{
 		return false;
 	}
@@ -296,7 +296,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 		$url = Context::getUrl($num_args, $args_list);
 	else
 		$url = Context::getRequestUri();
@@ -315,7 +315,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
 	}
@@ -338,7 +338,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, TRUE, TRUE);
 	}
@@ -360,16 +360,16 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -384,17 +384,17 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -410,7 +410,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -432,7 +432,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -454,7 +454,7 @@ 
 	$args_list = func_get_args();
 
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
@@ -463,10 +463,10 @@ 
 	$num_args = count($args_list);
 
 	$url = Context::getUrl($num_args, $args_list, $domain);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -479,7 +479,7 @@ 
 function getCurrentPageUrl()
 {
 	$protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
-	$url = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+	$url = $protocol.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 	return htmlspecialchars($url, ENT_COMPAT, 'UTF-8', FALSE);
 }
 
@@ -504,12 +504,12 @@ 
  */
 function cut_str($string, $cut_size = 0, $tail = '...')
 {
-	if($cut_size < 1 || !$string)
+	if ($cut_size < 1 || !$string)
 	{
 		return $string;
 	}
 
-	if($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
+	if ($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
 	{
 		$GLOBALS['use_mb_strimwidth'] = TRUE;
 		return mb_strimwidth($string, 0, $cut_size + 4, $tail, 'utf-8');
@@ -523,16 +523,16 @@ 
 	$char_count = 0;
 
 	$idx = 0;
-	while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
+	while ($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
 	{
 		$c = ord(substr($string, $idx, 1));
 		$char_count++;
-		if($c < 128)
+		if ($c < 128)
 		{
 			$char_width += (int) $chars[$c - 32];
 			$idx++;
 		}
-		else if(191 < $c && $c < 224)
+		else if (191 < $c && $c < 224)
 		{
 			$char_width += $chars[4];
 			$idx += 2;
@@ -545,7 +545,7 @@ 
 	}
 
 	$output = substr($string, 0, $idx);
-	if(strlen($output) < $string_length)
+	if (strlen($output) < $string_length)
 	{
 		$output .= $tail;
 	}
@@ -561,7 +561,7 @@ 
 function zgap()
 {
 	$time_zone = $GLOBALS['_time_zone'];
-	if($time_zone < 0)
+	if ($time_zone < 0)
 	{
 		$to = -1;
 	}
@@ -574,7 +574,7 @@ 
 	$t_min = substr($time_zone, 3, 2) * $to;
 
 	$server_time_zone = date("O");
-	if($server_time_zone < 0)
+	if ($server_time_zone < 0)
 	{
 		$so = -1;
 	}
@@ -601,7 +601,7 @@ 
  */
 function ztime($str)
 {
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
@@ -612,7 +612,7 @@ 
 	$year = (int) substr($str, 0, 4);
 	$month = (int) substr($str, 4, 2);
 	$day = (int) substr($str, 6, 2);
-	if(strlen($str) <= 8)
+	if (strlen($str) <= 8)
 	{
 		$gap = 0;
 	}
@@ -636,19 +636,19 @@ 
 	$gap = $_SERVER['REQUEST_TIME'] + zgap() - ztime($date);
 
 	$lang_time_gap = Context::getLang('time_gap');
-	if($gap < 60)
+	if ($gap < 60)
 	{
 		$buff = sprintf($lang_time_gap['min'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60)
+	elseif ($gap < 60 * 60)
 	{
 		$buff = sprintf($lang_time_gap['mins'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 2)
+	elseif ($gap < 60 * 60 * 2)
 	{
 		$buff = sprintf($lang_time_gap['hour'], (int) ($gap / 60 / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 24)
+	elseif ($gap < 60 * 60 * 24)
 	{
 		$buff = sprintf($lang_time_gap['hours'], (int) ($gap / 60 / 60) + 1);
 	}
@@ -685,40 +685,40 @@ 
 function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
 {
 	// return null if no target time is specified
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
 	// convert the date format according to the language
-	if($conversion == TRUE)
+	if ($conversion == TRUE)
 	{
-		switch(Context::getLangType())
+		switch (Context::getLangType())
 		{
 			case 'en' :
 			case 'es' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'M d, Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'M d, Y H:i:s';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'M d, Y H:i';
 				}
 				break;
 			case 'vi' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'd-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'H:i:s d-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'H:i d-m-Y';
 				}
@@ -727,7 +727,7 @@ 
 	}
 
 	// If year value is less than 1970, handle it separately.
-	if((int) substr($str, 0, 4) < 1970)
+	if ((int) substr($str, 0, 4) < 1970)
 	{
 		$hour = (int) substr($str, 8, 2);
 		$min = (int) substr($str, 10, 2);
@@ -777,9 +777,9 @@ 
 function getEncodeEmailAddress($email)
 {
 	$return = '';
-	for($i = 0, $c = strlen($email); $i < $c; $i++)
+	for ($i = 0, $c = strlen($email); $i < $c; $i++)
 	{
-		$return .= '&#' . (rand(0, 1) == 0 ? ord($email[$i]) : 'X' . dechex(ord($email[$i]))) . ';';
+		$return .= '&#'.(rand(0, 1) == 0 ? ord($email[$i]) : 'X'.dechex(ord($email[$i]))).';';
 	}
 	return $return;
 }
@@ -799,25 +799,25 @@ 
 {
 	static $debug_file;
 
-	if(!(__DEBUG__ & 1))
+	if (!(__DEBUG__ & 1))
 	{
 		return;
 	}
 
 	static $firephp;
 	$bt = debug_backtrace();
-	if(is_array($bt))
+	if (is_array($bt))
 	{
 		$bt_debug_print = array_shift($bt);
 		$bt_called_function = array_shift($bt);
 	}
 	$file_name = str_replace(_XE_PATH_, '', $bt_debug_print['file']);
 	$line_num = $bt_debug_print['line'];
-	$function = $bt_called_function['class'] . $bt_called_function['type'] . $bt_called_function['function'];
+	$function = $bt_called_function['class'].$bt_called_function['type'].$bt_called_function['function'];
 
-	if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+	if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 	{
-		if(!isset($firephp))
+		if (!isset($firephp))
 		{
 			$firephp = FirePHP::getInstance(TRUE);
 		}
@@ -826,16 +826,16 @@ 
 		$label = sprintf('[%s:%d] %s() (Memory usage: current=%s, peak=%s)', $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()), FileHandler::filesize(memory_get_peak_usage()));
 
 		// Check a FirePHP option
-		if($display_option === 'TABLE')
+		if ($display_option === 'TABLE')
 		{
 			$label = $display_option;
 		}
-		if($display_option === 'ERROR')
+		if ($display_option === 'ERROR')
 		{
 			$type = $display_option;
 		}
 		// Check if the IP specified by __DEBUG_PROTECT__ option is same as the access IP.
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			$debug_output = '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';
 			$label = NULL;
@@ -845,52 +845,52 @@ 
 	}
 	else
 	{
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			return;
 		}
 
 		$print = array();
-		if(!$debug_file)
+		if (!$debug_file)
 		{
-			$debug_file = _XE_PATH_ . 'files/' . $file;
+			$debug_file = _XE_PATH_.'files/'.$file;
 		}
-		if(!file_exists($debug_file)) $print[] = '<?php exit() ?>';
+		if (!file_exists($debug_file)) $print[] = '<?php exit() ?>';
 
-		if($display_option === TRUE || $display_option === 'ERROR')
+		if ($display_option === TRUE || $display_option === 'ERROR')
 		{
-			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()));;
+			$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage())); ;
 			$print[] = str_repeat('=', 80);
 		}
 		$type = gettype($debug_output);
-		if(!in_array($type, array('array', 'object', 'resource')))
+		if (!in_array($type, array('array', 'object', 'resource')))
 		{
-			if($display_option === 'ERROR')
+			if ($display_option === 'ERROR')
 			{
-				$print[] = 'ERROR : ' . var_export($debug_output, TRUE);
+				$print[] = 'ERROR : '.var_export($debug_output, TRUE);
 			}
 			else
 			{
-				$print[] = 'DEBUG : ' . $type . '(' . var_export($debug_output, TRUE) . ')';
+				$print[] = 'DEBUG : '.$type.'('.var_export($debug_output, TRUE).')';
 			}
 		}
 		else
 		{
-			$print[] = 'DEBUG : ' . trim(preg_replace('/\r?\n/', "\n" . '        ', print_r($debug_output, true)));
+			$print[] = 'DEBUG : '.trim(preg_replace('/\r?\n/', "\n".'        ', print_r($debug_output, true)));
 		}
 		$backtrace_args = defined('\DEBUG_BACKTRACE_IGNORE_ARGS') ? \DEBUG_BACKTRACE_IGNORE_ARGS : 0;
 		$backtrace = debug_backtrace($backtrace_args);
 
-		if(count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
+		if (count($backtrace) > 1 && $backtrace[1]['function'] === 'debugPrint' && !$backtrace[1]['class'])
 		{
 			array_shift($backtrace);
 		}
-		foreach($backtrace as $val)
+		foreach ($backtrace as $val)
 		{
-			$print[] = '        - ' . $val['file'] . ' : ' . $val['line'];
+			$print[] = '        - '.$val['file'].' : '.$val['line'];
 		}
 		$print[] = PHP_EOL;
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 	}
 }
 
@@ -901,7 +901,7 @@ 
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
-	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+	if (!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
 
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
@@ -911,47 +911,47 @@ 
 	);
 	$write_file = true;
 
-	$log_file = _XE_PATH_ . $log_filename[$type];
+	$log_file = _XE_PATH_.$log_filename[$type];
 
 	$buff = array();
 	$buff[] = '<?php exit(); ?>';
 	$buff[] = date('c');
 
-	if($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
+	if ($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
 	{
-		$buff[] = "\tCaller : " . $obj->caller;
-		$buff[] = "\tCalled : " . $obj->called;
+		$buff[] = "\tCaller : ".$obj->caller;
+		$buff[] = "\tCalled : ".$obj->called;
 	}
-	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	else if ($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
 	{
-		$buff[] = "\tAddon : " . $obj->called;
-		$buff[] = "\tCalled position : " . $obj->caller;
+		$buff[] = "\tAddon : ".$obj->called;
+		$buff[] = "\tCalled position : ".$obj->caller;
 	}
-	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	else if ($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
 	{
-		$buff[] = "\tWidget : " . $obj->called;
+		$buff[] = "\tWidget : ".$obj->called;
 	}
-	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
+	else if ($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
 		$buff[] = $obj->query;
-		$buff[] = "\tQuery ID   : " . $obj->query_id;
-		$buff[] = "\tCaller     : " . $obj->caller;
-		$buff[] = "\tConnection : " . $obj->connection;
+		$buff[] = "\tQuery ID   : ".$obj->query_id;
+		$buff[] = "\tCaller     : ".$obj->caller;
+		$buff[] = "\tConnection : ".$obj->connection;
 	}
 	else
 	{
 		$write_file = false;
 	}
 
-	if($write_file)
+	if ($write_file)
 	{
 		$buff[] = sprintf("\t%0.6f sec", $elapsed_time);
-		$buff[] = PHP_EOL . PHP_EOL;
+		$buff[] = PHP_EOL.PHP_EOL;
 		file_put_contents($log_file, implode(PHP_EOL, $buff), FILE_APPEND);
 	}
 
-	if($type != 'query')
+	if ($type != 'query')
 	{
 		$trigger_args = $obj;
 		$trigger_args->_log_type = $type;
@@ -991,11 +991,11 @@ 
  */
 function delObjectVars($target_obj, $del_obj)
 {
-	if(!is_object($target_obj))
+	if (!is_object($target_obj))
 	{
 		return;
 	}
-	if(!is_object($del_obj))
+	if (!is_object($del_obj))
 	{
 		return;
 	}
@@ -1005,7 +1005,7 @@ 
 
 	$target = array_keys($target_vars);
 	$del = array_keys($del_vars);
-	if(!count($target) || !count($del))
+	if (!count($target) || !count($del))
 	{
 		return $target_obj;
 	}
@@ -1013,10 +1013,10 @@ 
 	$return_obj = new stdClass();
 
 	$target_count = count($target);
-	for($i = 0; $i < $target_count; $i++)
+	for ($i = 0; $i < $target_count; $i++)
 	{
 		$target_key = $target[$i];
-		if(!in_array($target_key, $del))
+		if (!in_array($target_key, $del))
 		{
 			$return_obj->{$target_key} = $target_obj->{$target_key};
 		}
@@ -1029,10 +1029,10 @@ 
 {
 	$del_vars = array('error_return_url', 'success_return_url', 'ruleset', 'xe_validator_id');
 
-	foreach($del_vars as $var)
+	foreach ($del_vars as $var)
 	{
-		if(is_array($vars)) unset($vars[$var]);
-		else if(is_object($vars)) unset($vars->$var);
+		if (is_array($vars)) unset($vars[$var]);
+		else if (is_object($vars)) unset($vars->$var);
 	}
 
 	return $vars;
@@ -1049,12 +1049,12 @@ 
  */
 function handleError($errno, $errstr, $file, $line)
 {
-	if(!__DEBUG__)
+	if (!__DEBUG__)
 	{
 		return;
 	}
 	$errors = array(E_USER_ERROR, E_ERROR, E_PARSE);
-	if(!in_array($errno, $errors))
+	if (!in_array($errno, $errors))
 	{
 		return;
 	}
@@ -1074,8 +1074,8 @@ 
 function getNumberingPath($no, $size = 3)
 {
 	$mod = pow(10, $size);
-	$output = sprintf('%0' . $size . 'd/', $no % $mod);
-	if($no >= $mod)
+	$output = sprintf('%0'.$size.'d/', $no % $mod);
+	if ($no >= $mod)
 	{
 		$output .= getNumberingPath((int) $no / $mod, $size);
 	}
@@ -1095,7 +1095,7 @@ 
 
 function purifierHtml(&$content)
 {
-	require_once(_XE_PATH_ . 'classes/security/Purifier.class.php');
+	require_once(_XE_PATH_.'classes/security/Purifier.class.php');
 	$oPurifier = Purifier::getInstance();
 	$oPurifier->purify($content);
 }
@@ -1108,7 +1108,7 @@ 
  */
 function removeHackTag($content)
 {
-	require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 	$oEmbedFilter = EmbedFilter::getInstance();
 	$oEmbedFilter->check($content);
 
@@ -1150,7 +1150,7 @@ 
  */
 function checkUploadedFile($file)
 {
-	require_once(_XE_PATH_ . 'classes/security/UploadFileFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/UploadFileFilter.class.php');
 	return UploadFileFilter::check($file);
 }
 
@@ -1164,13 +1164,13 @@ 
 {
 	$content = preg_replace('@<(/?)xmp.*?>@i', '<\1xmp>', $content);
 
-	if(($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
+	if (($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
 	{
-		if(($close_xmp = strrpos($content, '</xmp>')) === FALSE)
+		if (($close_xmp = strrpos($content, '</xmp>')) === FALSE)
 		{
 			$content .= '</xmp>';
 		}
-		else if($close_xmp < $start_xmp)
+		else if ($close_xmp < $start_xmp)
 		{
 			$content .= '</xmp>';
 		}
@@ -1190,33 +1190,33 @@ 
 	$tag = strtolower($match[2]);
 
 	// xmp tag ?뺣━
-	if($tag == 'xmp')
+	if ($tag == 'xmp')
 	{
 		return "<{$match[1]}xmp>";
 	}
-	if($match[1])
+	if ($match[1])
 	{
 		return $match[0];
 	}
-	if($match[4])
+	if ($match[4])
 	{
-		$match[4] = ' ' . $match[4];
+		$match[4] = ' '.$match[4];
 	}
 
 	$attrs = array();
-	if(preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
+	if (preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
 	{
-		foreach($m[1] as $idx => $name)
+		foreach ($m[1] as $idx => $name)
 		{
-			if(strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
+			if (strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
 			{
 				continue;
 			}
 
-			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00' . $n[1]) : ($n[2] + 0)); }, $m[3][$idx] . $m[4][$idx]);
+			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00'.$n[1]) : ($n[2] + 0)); }, $m[3][$idx].$m[4][$idx]);
 			$val = preg_replace('/^\s+|[\t\n\r]+/', '', $val);
 
-			if(preg_match('/^[a-z]+script:/i', $val))
+			if (preg_match('/^[a-z]+script:/i', $val))
 			{
 				continue;
 			}
@@ -1227,60 +1227,60 @@ 
 
 	$filter_arrts = array('style', 'src', 'href');
 
-	if($tag === 'object') array_push($filter_arrts, 'data');
-	if($tag === 'param') array_push($filter_arrts, 'value');
+	if ($tag === 'object') array_push($filter_arrts, 'data');
+	if ($tag === 'param') array_push($filter_arrts, 'value');
 
-	foreach($filter_arrts as $attr)
+	foreach ($filter_arrts as $attr)
 	{
-		if(!isset($attrs[$attr])) continue;
+		if (!isset($attrs[$attr])) continue;
 
 		$attr_value = rawurldecode($attrs[$attr]);
 		$attr_value = htmlspecialchars_decode($attr_value, ENT_COMPAT);
 		$attr_value = preg_replace('/\s+|[\t\n\r]+/', '', $attr_value);
-		if(preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
+		if (preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
 		{
 			unset($attrs[$attr]);
 		}
 	}
 
-	if(isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
+	if (isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
 	{
 		unset($attrs['style']);
 	}
 
 	$attr = array();
-	foreach($attrs as $name => $val)
+	foreach ($attrs as $name => $val)
 	{
-		if($tag == 'object' || $tag == 'embed' || $tag == 'a')
+		if ($tag == 'object' || $tag == 'embed' || $tag == 'a')
 		{
 			$attribute = strtolower(trim($name));
-			if($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
+			if ($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
 			{
-				if(stripos($val, 'data:') === 0)
+				if (stripos($val, 'data:') === 0)
 				{
 					continue;
 				}
 			}
 		}
 
-		if($tag == 'img')
+		if ($tag == 'img')
 		{
 			$attribute = strtolower(trim($name));
-			if(stripos($val, 'data:') === 0)
+			if (stripos($val, 'data:') === 0)
 			{
 				continue;
 			}
 		}
 		$val = str_replace('"', '&quot;', $val);
-		$attr[] = $name . "=\"{$val}\"";
+		$attr[] = $name."=\"{$val}\"";
 	}
-	$attr = count($attr) ? ' ' . implode(' ', $attr) : '';
+	$attr = count($attr) ? ' '.implode(' ', $attr) : '';
 
 	return "<{$match[1]}{$tag}{$attr}{$match[4]}>";
 }
 
 // convert hexa value to RGB
-if(!function_exists('hexrgb'))
+if (!function_exists('hexrgb'))
 {
 
 	/**
@@ -1316,9 +1316,9 @@ 
 
 	settype($password, "string");
 
-	for($i = 0; $i < strlen($password); $i++)
+	for ($i = 0; $i < strlen($password); $i++)
 	{
-		if($password[$i] == ' ' || $password[$i] == '\t')
+		if ($password[$i] == ' ' || $password[$i] == '\t')
 		{
 			continue;
 		}
@@ -1330,11 +1330,11 @@ 
 	$result1 = sprintf("%08lx", $nr & ((1 << 31) - 1));
 	$result2 = sprintf("%08lx", $nr2 & ((1 << 31) - 1));
 
-	if($result1 == '80000000')
+	if ($result1 == '80000000')
 	{
 		$nr += 0x80000000;
 	}
-	if($result2 == '80000000')
+	if ($result2 == '80000000')
 	{
 		$nr2 += 0x80000000;
 	}
@@ -1350,7 +1350,7 @@ 
 function getScriptPath()
 {
 	static $url = NULL;
-	if($url == NULL)
+	if ($url == NULL)
 	{
 		$url = str_ireplace('/tools/', '/', preg_replace('/index.php$/i', '', str_replace('\\', '/', $_SERVER['SCRIPT_NAME'])));
 	}
@@ -1380,14 +1380,14 @@ 
 	$decodedStr = '';
 	$pos = 0;
 	$len = strlen($source);
-	while($pos < $len)
+	while ($pos < $len)
 	{
 		$charAt = substr($source, $pos, 1);
-		if($charAt == '%')
+		if ($charAt == '%')
 		{
 			$pos++;
 			$charAt = substr($source, $pos, 1);
-			if($charAt == 'u')
+			if ($charAt == 'u')
 			{
 				// we got a unicode character
 				$pos++;
@@ -1421,21 +1421,21 @@ 
  */
 function _code2utf($num)
 {
-	if($num < 128)
+	if ($num < 128)
 	{
 		return chr($num);
 	}
-	if($num < 2048)
+	if ($num < 2048)
 	{
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		return chr(($num >> 6) + 192).chr(($num & 63) + 128);
 	}
-	if($num < 65536)
+	if ($num < 65536)
 	{
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
-	if($num < 2097152)
+	if ($num < 2097152)
 	{
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
 	return '';
 }
@@ -1450,7 +1450,7 @@ 
  */
 function detectUTF8($string, $return_convert = FALSE, $urldecode = TRUE)
 {
-	if($urldecode)
+	if ($urldecode)
 	{
 		$string = urldecode($string);
 	}
@@ -1458,12 +1458,12 @@ 
 	$sample = iconv('utf-8', 'utf-8', $string);
 	$is_utf8 = (md5($sample) === md5($string));
 
-	if(!$urldecode)
+	if (!$urldecode)
 	{
 		$string = urldecode($string);
 	}
 
-	if($return_convert)
+	if ($return_convert)
 	{
 		return ($is_utf8) ? $string : iconv('euc-kr', 'utf-8', $string);
 	}
@@ -1479,7 +1479,7 @@ 
  */
 function json_encode2($data)
 {
-	switch(gettype($data))
+	switch (gettype($data))
 	{
 		case 'boolean':
 			return $data ? 'true' : 'false';
@@ -1487,15 +1487,15 @@ 
 		case 'double':
 			return $data;
 		case 'string':
-			return '"' . strtr($data, array('\\' => '\\\\', '"' => '\\"')) . '"';
+			return '"'.strtr($data, array('\\' => '\\\\', '"' => '\\"')).'"';
 		case 'object':
 			$data = get_object_vars($data);
 		case 'array':
 			$rel = FALSE; // relative array?
 			$key = array_keys($data);
-			foreach($key as $v)
+			foreach ($key as $v)
 			{
-				if(!is_int($v))
+				if (!is_int($v))
 				{
 					$rel = TRUE;
 					break;
@@ -1503,12 +1503,12 @@ 
 			}
 
 			$arr = array();
-			foreach($data as $k => $v)
+			foreach ($data as $k => $v)
 			{
-				$arr[] = ($rel ? '"' . strtr($k, array('\\' => '\\\\', '"' => '\\"')) . '":' : '') . json_encode2($v);
+				$arr[] = ($rel ? '"'.strtr($k, array('\\' => '\\\\', '"' => '\\"')).'":' : '').json_encode2($v);
 			}
 
-			return $rel ? '{' . join(',', $arr) . '}' : '[' . join(',', $arr) . ']';
+			return $rel ? '{'.join(',', $arr).'}' : '['.join(',', $arr).']';
 		default:
 			return '""';
 	}
@@ -1522,7 +1522,7 @@ 
  */
 function isCrawler($agent = NULL)
 {
-	if(!$agent)
+	if (!$agent)
 	{
 		$agent = $_SERVER['HTTP_USER_AGENT'];
 	}
@@ -1532,9 +1532,9 @@ 
 		/*'211.245.21.110-211.245.21.119' mixsh is closed */
 	);
 
-	foreach($check_agent as $str)
+	foreach ($check_agent as $str)
 	{
-		if(stristr($agent, $str) != FALSE)
+		if (stristr($agent, $str) != FALSE)
 		{
 			return TRUE;
 		}
@@ -1552,7 +1552,7 @@ 
  */
 function stripEmbedTagForAdmin(&$content, $writer_member_srl)
 {
-	if(!Context::get('is_logged'))
+	if (!Context::get('is_logged'))
 	{
 		return;
 	}
@@ -1560,18 +1560,18 @@ 
 	$oModuleModel = getModel('module');
 	$logged_info = Context::get('logged_info');
 
-	if($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
+	if ($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
 	{
-		if($writer_member_srl)
+		if ($writer_member_srl)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($writer_member_srl);
-			if($member_info->is_admin == "Y")
+			if ($member_info->is_admin == "Y")
 			{
 				return;
 			}
 		}
-		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
+		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>".Context::getLang('security_warning_embed')."</p></div>";
 		$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
 		$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
 		$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
@@ -1588,18 +1588,18 @@ 
 function requirePear()
 {
 	static $required = false;
-	if($required)
+	if ($required)
 	{
 		return;
 	}
 
-	if(version_compare(PHP_VERSION, "5.3.0") < 0)
+	if (version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR".PATH_SEPARATOR.get_include_path());
 	}
 	else
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR.1.9.5".PATH_SEPARATOR.get_include_path());
 	}
 
 	$required = true;
@@ -1607,7 +1607,7 @@ 
 
 function checkCSRF()
 {
-	if($_SERVER['REQUEST_METHOD'] != 'POST')
+	if ($_SERVER['REQUEST_METHOD'] != 'POST')
 	{
 		return FALSE;
 	}
@@ -1615,9 +1615,9 @@ 
 	$default_url = Context::getDefaultUrl();
 	$referer = $_SERVER["HTTP_REFERER"];
 
-	if(strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
+	if (strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$referer = $IDN->encode($referer);
 	}
@@ -1628,9 +1628,9 @@ 
 	$oModuleModel = getModel('module');
 	$siteModuleInfo = $oModuleModel->getDefaultMid();
 
-	if($siteModuleInfo->site_srl == 0)
+	if ($siteModuleInfo->site_srl == 0)
 	{
-		if($default_url['host'] !== $referer['host'])
+		if ($default_url['host'] !== $referer['host'])
 		{
 			return FALSE;
 		}
@@ -1638,7 +1638,7 @@ 
 	else
 	{
 		$virtualSiteInfo = $oModuleModel->getSiteInfo($siteModuleInfo->site_srl);
-		if(strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
+		if (strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
 		{
 			return FALSE;
 		}
@@ -1654,15 +1654,15 @@ 
  */
 function recurciveExposureCheck(&$menu)
 {
-	if(is_array($menu))
+	if (is_array($menu))
 	{
-		foreach($menu AS $key=>$value)
+		foreach ($menu AS $key=>$value)
 		{
-			if(!$value['isShow'])
+			if (!$value['isShow'])
 			{
 				unset($menu[$key]);
 			}
-			if(is_array($value['list']) && count($value['list']) > 0)
+			if (is_array($value['list']) && count($value['list']) > 0)
 			{
 				recurciveExposureCheck($menu[$key]['list']);
 			}
@@ -1672,14 +1672,14 @@ 
 
 function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_url')
 {
-	if($requestKey != $dbKey)
+	if ($requestKey != $dbKey)
 	{
 		$arrayUrl = parse_url(Context::get('success_return_url'));
-		if($arrayUrl['query'])
+		if ($arrayUrl['query'])
 		{
 			parse_str($arrayUrl['query'], $parsedStr);
 
-			if(isset($parsedStr[$key]))
+			if (isset($parsedStr[$key]))
 			{
 				$parsedStr[$key] = $requestKey;
 				$successReturnUrl .= $arrayUrl['path'].'?'.http_build_query($parsedStr);
@@ -1722,14 +1722,14 @@ 
  */
 function alertScript($msg)
 {
-	if(!$msg)
+	if (!$msg)
 	{
 		return;
 	}
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-alert("' . $msg . '");
+alert("' . $msg.'");
 //]]>
 </script>';
 }
@@ -1760,7 +1760,7 @@ 
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-' . $reloadScript . '
+' . $reloadScript.'
 //]]>
 </script>';
 }

Braces +53 added lines, -67 removed lines

@@ -296,10 +296,11 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
-		$url = Context::getUrl($num_args, $args_list);
-	else
-		$url = Context::getRequestUri();
+	if($num_args) {
+			$url = Context::getUrl($num_args, $args_list);
+	} else {
+			$url = Context::getRequestUri();
+	}
 
 	return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
 }
@@ -318,8 +319,7 @@ 
 	if($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-	}
-	else
+	} else
 	{
 		$url = Context::getRequestUri();
 	}
@@ -341,8 +341,7 @@ 
 	if($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, TRUE, TRUE);
-	}
-	else
+	} else
 	{
 		$url = Context::getRequestUri();
 	}
@@ -531,13 +530,11 @@ 
 		{
 			$char_width += (int) $chars[$c - 32];
 			$idx++;
-		}
-		else if(191 < $c && $c < 224)
+		} else if(191 < $c && $c < 224)
 		{
 			$char_width += $chars[4];
 			$idx += 2;
-		}
-		else
+		} else
 		{
 			$char_width += $chars[0];
 			$idx += 3;
@@ -564,8 +561,7 @@ 
 	if($time_zone < 0)
 	{
 		$to = -1;
-	}
-	else
+	} else
 	{
 		$to = 1;
 	}
@@ -577,8 +573,7 @@ 
 	if($server_time_zone < 0)
 	{
 		$so = -1;
-	}
-	else
+	} else
 	{
 		$so = 1;
 	}
@@ -615,8 +610,7 @@ 
 	if(strlen($str) <= 8)
 	{
 		$gap = 0;
-	}
-	else
+	} else
 	{
 		$gap = zgap();
 	}
@@ -639,20 +633,16 @@ 
 	if($gap < 60)
 	{
 		$buff = sprintf($lang_time_gap['min'], (int) ($gap / 60) + 1);
-	}
-	elseif($gap < 60 * 60)
+	} elseif($gap < 60 * 60)
 	{
 		$buff = sprintf($lang_time_gap['mins'], (int) ($gap / 60) + 1);
-	}
-	elseif($gap < 60 * 60 * 2)
+	} elseif($gap < 60 * 60 * 2)
 	{
 		$buff = sprintf($lang_time_gap['hour'], (int) ($gap / 60 / 60) + 1);
-	}
-	elseif($gap < 60 * 60 * 24)
+	} elseif($gap < 60 * 60 * 24)
 	{
 		$buff = sprintf($lang_time_gap['hours'], (int) ($gap / 60 / 60) + 1);
-	}
-	else
+	} else
 	{
 		$buff = zdate($date, $format);
 	}
@@ -699,12 +689,10 @@ 
 				if($format == 'Y-m-d')
 				{
 					$format = 'M d, Y';
-				}
-				elseif($format == 'Y-m-d H:i:s')
+				} elseif($format == 'Y-m-d H:i:s')
 				{
 					$format = 'M d, Y H:i:s';
-				}
-				elseif($format == 'Y-m-d H:i')
+				} elseif($format == 'Y-m-d H:i')
 				{
 					$format = 'M d, Y H:i';
 				}
@@ -713,12 +701,10 @@ 
 				if($format == 'Y-m-d')
 				{
 					$format = 'd-m-Y';
-				}
-				elseif($format == 'Y-m-d H:i:s')
+				} elseif($format == 'Y-m-d H:i:s')
 				{
 					$format = 'H:i:s d-m-Y';
-				}
-				elseif($format == 'Y-m-d H:i')
+				} elseif($format == 'Y-m-d H:i')
 				{
 					$format = 'H:i d-m-Y';
 				}
@@ -754,8 +740,7 @@ 
 		);
 
 		$string = strtr($format, $trans);
-	}
-	else
+	} else
 	{
 		// if year value is greater than 1970, get unixtime by using ztime() for date() function's argument. 
 		$string = date($format, ztime($str));
@@ -842,8 +827,7 @@ 
 		}
 
 		$firephp->fb($debug_output, $label, $type);
-	}
-	else
+	} else
 	{
 		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
@@ -855,7 +839,9 @@ 
 		{
 			$debug_file = _XE_PATH_ . 'files/' . $file;
 		}
-		if(!file_exists($debug_file)) $print[] = '<?php exit() ?>';
+		if(!file_exists($debug_file)) {
+			$print[] = '<?php exit() ?>';
+		}
 
 		if($display_option === TRUE || $display_option === 'ERROR')
 		{
@@ -868,13 +854,11 @@ 
 			if($display_option === 'ERROR')
 			{
 				$print[] = 'ERROR : ' . var_export($debug_output, TRUE);
-			}
-			else
+			} else
 			{
 				$print[] = 'DEBUG : ' . $type . '(' . var_export($debug_output, TRUE) . ')';
 			}
-		}
-		else
+		} else
 		{
 			$print[] = 'DEBUG : ' . trim(preg_replace('/\r?\n/', "\n" . '        ', print_r($debug_output, true)));
 		}
@@ -901,7 +885,9 @@ 
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
-	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) {
+		return;
+	}
 
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
@@ -921,25 +907,21 @@ 
 	{
 		$buff[] = "\tCaller : " . $obj->caller;
 		$buff[] = "\tCalled : " . $obj->called;
-	}
-	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	} else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
 	{
 		$buff[] = "\tAddon : " . $obj->called;
 		$buff[] = "\tCalled position : " . $obj->caller;
-	}
-	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	} else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
 	{
 		$buff[] = "\tWidget : " . $obj->called;
-	}
-	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
+	} else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
 		$buff[] = $obj->query;
 		$buff[] = "\tQuery ID   : " . $obj->query_id;
 		$buff[] = "\tCaller     : " . $obj->caller;
 		$buff[] = "\tConnection : " . $obj->connection;
-	}
-	else
+	} else
 	{
 		$write_file = false;
 	}
@@ -1031,8 +1013,11 @@ 
 
 	foreach($del_vars as $var)
 	{
-		if(is_array($vars)) unset($vars[$var]);
-		else if(is_object($vars)) unset($vars->$var);
+		if(is_array($vars)) {
+			unset($vars[$var]);
+		} else if(is_object($vars)) {
+			unset($vars->$var);
+		}
 	}
 
 	return $vars;
@@ -1169,8 +1154,7 @@ 
 		if(($close_xmp = strrpos($content, '</xmp>')) === FALSE)
 		{
 			$content .= '</xmp>';
-		}
-		else if($close_xmp < $start_xmp)
+		} else if($close_xmp < $start_xmp)
 		{
 			$content .= '</xmp>';
 		}
@@ -1227,12 +1211,18 @@ 
 
 	$filter_arrts = array('style', 'src', 'href');
 
-	if($tag === 'object') array_push($filter_arrts, 'data');
-	if($tag === 'param') array_push($filter_arrts, 'value');
+	if($tag === 'object') {
+		array_push($filter_arrts, 'data');
+	}
+	if($tag === 'param') {
+		array_push($filter_arrts, 'value');
+	}
 
 	foreach($filter_arrts as $attr)
 	{
-		if(!isset($attrs[$attr])) continue;
+		if(!isset($attrs[$attr])) {
+			continue;
+		}
 
 		$attr_value = rawurldecode($attrs[$attr]);
 		$attr_value = htmlspecialchars_decode($attr_value, ENT_COMPAT);
@@ -1395,16 +1385,14 @@ 
 				$unicode = hexdec($unicodeHexVal);
 				$decodedStr .= _code2utf($unicode);
 				$pos += 4;
-			}
-			else
+			} else
 			{
 				// we have an escaped ascii character
 				$hexVal = substr($source, $pos, 2);
 				$decodedStr .= chr(hexdec($hexVal));
 				$pos += 2;
 			}
-		}
-		else
+		} else
 		{
 			$decodedStr .= $charAt;
 			$pos++;
@@ -1596,8 +1584,7 @@ 
 	if(version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
 		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
-	}
-	else
+	} else
 	{
 		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
 	}
@@ -1634,8 +1621,7 @@ 
 		{
 			return FALSE;
 		}
-	}
-	else
+	} else
 	{
 		$virtualSiteInfo = $oModuleModel->getSiteInfo($siteModuleInfo->site_srl);
 		if(strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))