xpressengine / xe-core

classes/context/Context.class.php

Spacing +298 added lines, -298 removed lines

@@ -162,7 +162,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance = null;
-		if(!$theInstance)
+		if (!$theInstance)
 		{
 			$theInstance = new Context();
 		}
@@ -182,10 +182,10 @@ 
 
 		// include ssl action cache file
 		$this->sslActionCacheFile = FileHandler::getRealPath($this->sslActionCacheFile);
-		if(is_readable($this->sslActionCacheFile))
+		if (is_readable($this->sslActionCacheFile))
 		{
 			require($this->sslActionCacheFile);
-			if(isset($sslActions))
+			if (isset($sslActions))
 			{
 				$this->ssl_actions = $sslActions;
 			}
@@ -201,12 +201,12 @@ 
 	function init()
 	{
 		// fix missing HTTP_RAW_POST_DATA in PHP 5.6 and above
-		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
+		if (!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
 		{
 			$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
 			
 			// If content is not XML JSON, unset
-			if(!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
+			if (!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
 			{
 				unset($GLOBALS['HTTP_RAW_POST_DATA']);
 			}
@@ -228,11 +228,11 @@ 
 		$this->_setUploadedArgument();
 
 		$this->loadDBInfo();
-		if($this->db_info->use_sitelock == 'Y')
+		if ($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if (is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
 
-			if(!IpFilter::filter($whitelist))
+			if (!IpFilter::filter($whitelist))
 			{
 				$title = ($this->db_info->sitelock_title) ? $this->db_info->sitelock_title : 'Maintenance in progress...';
 				$message = $this->db_info->sitelock_message;
@@ -242,52 +242,52 @@ 
 				define('_XE_SITELOCK_MESSAGE_', $message);
 
 				header("HTTP/1.1 403 Forbidden");
-				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
+				if (FileHandler::exists(_XE_PATH_.'common/tpl/sitelock.user.html'))
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
+					include _XE_PATH_.'common/tpl/sitelock.user.html';
 				}
 				else
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.html';
+					include _XE_PATH_.'common/tpl/sitelock.html';
 				}
 				exit;
 			}
 		}
 
 		// If XE is installed, get virtual site information
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$site_module_info = $oModuleModel->getDefaultMid();
 
-			if(!isset($site_module_info))
+			if (!isset($site_module_info))
 			{
 				$site_module_info = new stdClass();
 			}
 
 			// if site_srl of site_module_info is 0 (default site), compare the domain to default_url of db_config
-			if($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
+			if ($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
 			{
 				$site_module_info->domain = $this->db_info->default_url;
 			}
 
 			$this->set('site_module_info', $site_module_info);
-			if($site_module_info->site_srl && isSiteID($site_module_info->domain))
+			if ($site_module_info->site_srl && isSiteID($site_module_info->domain))
 			{
 				$this->set('vid', $site_module_info->domain, TRUE);
 			}
 
-			if(!isset($this->db_info))
+			if (!isset($this->db_info))
 			{
 				$this->db_info = new stdClass();
 			}
 
 			$this->db_info->lang_type = $site_module_info->default_language;
-			if(!$this->db_info->lang_type)
+			if (!$this->db_info->lang_type)
 			{
 				$this->db_info->lang_type = 'en';
 			}
-			if(!$this->db_info->use_db_session)
+			if (!$this->db_info->use_db_session)
 			{
 				$this->db_info->use_db_session = 'N';
 			}
@@ -297,30 +297,30 @@ 
 		$lang_supported = $this->loadLangSelected();
 
 		// Retrieve language type set in user's cookie
-		if($this->lang_type = $this->get('l'))
+		if ($this->lang_type = $this->get('l'))
 		{
-			if($_COOKIE['lang_type'] != $this->lang_type)
+			if ($_COOKIE['lang_type'] != $this->lang_type)
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/');
 			}
 		}
-		elseif($_COOKIE['lang_type'])
+		elseif ($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
 
 		// If it's not exists, follow default language type set in db_info
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = $this->db_info->lang_type;
 		}
 
 		// if still lang_type has not been set or has not-supported type , set as English.
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = 'en';
 		}
-		if(is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
+		if (is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
 		{
 			$this->lang_type = 'en';
 		}
@@ -329,10 +329,10 @@ 
 		$this->setLangType($this->lang_type);
 
 		// load module module's language file according to language setting
-		$this->loadLang(_XE_PATH_ . 'modules/module/lang');
+		$this->loadLang(_XE_PATH_.'modules/module/lang');
 
 		// set session handler
-		if(self::isInstalled() && $this->db_info->use_db_session == 'Y')
+		if (self::isInstalled() && $this->db_info->use_db_session == 'Y')
 		{
 			$oSessionModel = getModel('session');
 			$oSessionController = getController('session');
@@ -341,11 +341,11 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if ($sess = $_POST[session_name()]) session_id($sess);
 		session_start();
 
 		// set authentication information in Context and session
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$oModuleModel->loadModuleExtends();
@@ -353,15 +353,15 @@ 
 			$oMemberModel = getModel('member');
 			$oMemberController = getController('member');
 
-			if($oMemberController && $oMemberModel)
+			if ($oMemberController && $oMemberModel)
 			{
 				// if signed in, validate it.
-				if($oMemberModel->isLogged())
+				if ($oMemberModel->isLogged())
 				{
 					$oMemberController->setSessionInfo();
 				}
 				// check auto sign-in
-				elseif($_COOKIE['xeak'])
+				elseif ($_COOKIE['xeak'])
 				{
 					$oMemberController->doAutologin();
 				}
@@ -373,7 +373,7 @@ 
 
 		// load common language file
 		$this->lang = &$GLOBALS['lang'];
-		$this->loadLang(_XE_PATH_ . 'common/lang/');
+		$this->loadLang(_XE_PATH_.'common/lang/');
 
 		// check if using rewrite module
 		$this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE);
@@ -381,28 +381,28 @@ 
 		// set locations for javascript use
 		$url = array();
 		$current_url = self::getRequestUri();
-		if($_SERVER['REQUEST_METHOD'] == 'GET')
+		if ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
-			if($this->get_vars)
+			if ($this->get_vars)
 			{
 				$url = array();
-				foreach($this->get_vars as $key => $val)
+				foreach ($this->get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
-							$url[] = $key . '[' . $k . ']=' . urlencode($v);
+							$url[] = $key.'['.$k.']='.urlencode($v);
 						}
 					}
-					elseif($val)
+					elseif ($val)
 					{
-						$url[] = $key . '=' . urlencode($val);
+						$url[] = $key.'='.urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
+				if ($url) $current_url .= '?'.join('&', $url);
 			}
 			else
 			{
@@ -417,12 +417,12 @@ 
 		$this->set('current_url', $current_url);
 		$this->set('request_uri', self::getRequestUri());
 
-		if(strpos($current_url, 'xn--') !== FALSE)
+		if (strpos($current_url, 'xn--') !== FALSE)
 		{
 			$this->set('current_url', self::decodeIdna($current_url));
 		}
 
-		if(strpos(self::getRequestUri(), 'xn--') !== FALSE)
+		if (strpos(self::getRequestUri(), 'xn--') !== FALSE)
 		{
 			$this->set('request_uri', self::decodeIdna(self::getRequestUri()));
 		}
@@ -447,19 +447,19 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
 
 		$config_file = $self->getConfigFile();
-		if(is_readable($config_file))
+		if (is_readable($config_file))
 		{
 			include($config_file);
 		}
 
 		// If master_db information does not exist, the config file needs to be updated
-		if(!isset($db_info->master_db))
+		if (!isset($db_info->master_db))
 		{
 			$db_info->master_db = array();
 			$db_info->master_db["db_type"] = $db_info->db_type;
@@ -477,7 +477,7 @@ 
 			$db_info->master_db["db_table_prefix"] = $db_info->db_table_prefix;
 			unset($db_info->db_table_prefix);
 
-			if(isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
+			if (isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
 			{
 				$db_info->master_db["db_table_prefix"] .= '_';
 			}
@@ -489,33 +489,33 @@ 
 			$oInstallController->makeConfigFile();
 		}
 
-		if(!$db_info->use_prepared_statements)
+		if (!$db_info->use_prepared_statements)
 		{
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
+		if (!$db_info->time_zone)
 			$db_info->time_zone = date('O');
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
+		if ($db_info->qmail_compatibility != 'Y')
 			$db_info->qmail_compatibility = 'N';
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
+		if (!$db_info->use_db_session)
 			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
+		if (!$db_info->use_ssl)
 			$db_info->use_ssl = 'none';
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
 		$self->set('_https_port', ($db_info->https_port) ? $db_info->https_port : NULL);
 
-		if(!$db_info->sitelock_whitelist) {
+		if (!$db_info->sitelock_whitelist) {
 			$db_info->sitelock_whitelist = '127.0.0.1';
 		}
 
-		if(is_string($db_info->sitelock_whitelist)) {
+		if (is_string($db_info->sitelock_whitelist)) {
 			$db_info->sitelock_whitelist = explode(',', $db_info->sitelock_whitelist);
 		}
 
@@ -586,10 +586,10 @@ 
 	function loadLangSupported()
 	{
 		static $lang_supported = null;
-		if(!$lang_supported)
+		if (!$lang_supported)
 		{
-			$langs = file(_XE_PATH_ . 'common/lang/lang.info');
-			foreach($langs as $val)
+			$langs = file(_XE_PATH_.'common/lang/lang.info');
+			foreach ($langs as $val)
 			{
 				list($lang_prefix, $lang_text) = explode(',', $val);
 				$lang_text = trim($lang_text);
@@ -607,17 +607,17 @@ 
 	function loadLangSelected()
 	{
 		static $lang_selected = null;
-		if(!$lang_selected)
+		if (!$lang_selected)
 		{
-			$orig_lang_file = _XE_PATH_ . 'common/lang/lang.info';
-			$selected_lang_file = _XE_PATH_ . 'files/config/lang_selected.info';
-			if(!FileHandler::hasContent($selected_lang_file))
+			$orig_lang_file = _XE_PATH_.'common/lang/lang.info';
+			$selected_lang_file = _XE_PATH_.'files/config/lang_selected.info';
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
-				$old_selected_lang_file = _XE_PATH_ . 'files/cache/lang_selected.info';
+				$old_selected_lang_file = _XE_PATH_.'files/cache/lang_selected.info';
 				FileHandler::moveFile($old_selected_lang_file, $selected_lang_file);
 			}
 
-			if(!FileHandler::hasContent($selected_lang_file))
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
@@ -626,7 +626,7 @@ 
 			else
 			{
 				$langs = file($selected_lang_file);
-				foreach($langs as $val)
+				foreach ($langs as $val)
 				{
 					list($lang_prefix, $lang_text) = explode(',', $val);
 					$lang_text = trim($lang_text);
@@ -645,44 +645,44 @@ 
 	function checkSSO()
 	{
 		// pass if it's not GET request or XE is not yet installed
-		if($this->db_info->use_sso != 'Y' || isCrawler())
+		if ($this->db_info->use_sso != 'Y' || isCrawler())
 		{
 			return TRUE;
 		}
 		$checkActList = array('rss' => 1, 'atom' => 1);
-		if(self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
+		if (self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
 		{
 			return TRUE;
 		}
 
 		// pass if default URL is not set
 		$default_url = trim($this->db_info->default_url);
-		if(!$default_url)
+		if (!$default_url)
 		{
 			return TRUE;
 		}
 
-		if(substr_compare($default_url, '/', -1) !== 0)
+		if (substr_compare($default_url, '/', -1) !== 0)
 		{
 			$default_url .= '/';
 		}
 
 		// for sites recieving SSO valdiation
-		if($default_url == self::getRequestUri())
+		if ($default_url == self::getRequestUri())
 		{
-			if(self::get('url'))
+			if (self::get('url'))
 			{
 				$url = base64_decode(self::get('url'));
 				$url_info = parse_url($url);
-				if(!Password::checkSignature($url, self::get('sig')))
+				if (!Password::checkSignature($url, self::get('sig')))
 				{
 					echo self::get('lang')->msg_invalid_request;
 					return false;
 				}
 
-				$url_info['query'].= ($url_info['query'] ? '&' : '') . 'SSOID=' . urlencode(session_id()) . '&sig=' . urlencode(Password::createSignature(session_id()));
-				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':' . $url_info['port'] : '', $url_info['path'], $url_info['query']);
-				header('location:' . $redirect_url);
+				$url_info['query'] .= ($url_info['query'] ? '&' : '').'SSOID='.urlencode(session_id()).'&sig='.urlencode(Password::createSignature(session_id()));
+				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':'.$url_info['port'] : '', $url_info['path'], $url_info['query']);
+				header('location:'.$redirect_url);
 
 				return FALSE;
 			}
@@ -691,9 +691,9 @@ 
 		else
 		{
 			// result handling : set session_name()
-			if($session_name = self::get('SSOID'))
+			if ($session_name = self::get('SSOID'))
 			{
-				if(!Password::checkSignature($session_name, self::get('sig')))
+				if (!Password::checkSignature($session_name, self::get('sig')))
 				{
 					echo self::get('lang')->msg_invalid_request;
 					return false;
@@ -702,17 +702,17 @@ 
 				setcookie(session_name(), $session_name);
 
 				$url = preg_replace('/[\?\&]SSOID=.+$/', '', self::getRequestUrl());
-				header('location:' . $url);
+				header('location:'.$url);
 				return FALSE;
 				// send SSO request
 			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			else if (!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()), 0, '/');
 				$origin_url = self::getRequestUrl();
 				$origin_sig = Password::createSignature($origin_url);
 				$url = sprintf("%s?url=%s&sig=%s", $default_url, urlencode(base64_encode($origin_url)), urlencode($origin_sig));
-				header('location:' . $url);
+				header('location:'.$url);
 				return FALSE;
 			}
 		}
@@ -739,7 +739,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -757,15 +757,15 @@ 
 	 */
 	function addBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
 		$self = self::getInstance();
 
-		if($self->site_title)
+		if ($self->site_title)
 		{
-			$self->site_title .= ' - ' . $site_title;
+			$self->site_title .= ' - '.$site_title;
 		}
 		else
 		{
@@ -781,7 +781,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -813,7 +813,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -840,30 +840,30 @@ 
 		global $lang;
 
 		$self = self::getInstance();
-		if(!$self->lang_type)
+		if (!$self->lang_type)
 		{
 			return;
 		}
-		if(!is_object($lang))
+		if (!is_object($lang))
 		{
 			$lang = new stdClass;
 		}
 
-		if(!($filename = $self->_loadXmlLang($path)))
+		if (!($filename = $self->_loadXmlLang($path)))
 		{
 			$filename = $self->_loadPhpLang($path);
 		}
 
-		if(!is_array($self->loaded_lang_files))
+		if (!is_array($self->loaded_lang_files))
 		{
 			$self->loaded_lang_files = array();
 		}
-		if(in_array($filename, $self->loaded_lang_files))
+		if (in_array($filename, $self->loaded_lang_files))
 		{
 			return;
 		}
 
-		if($filename && is_readable($filename))
+		if ($filename && is_readable($filename))
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
@@ -884,24 +884,24 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if (!$path) return;
 
-		$_path = 'eval://' . $path;
+		$_path = 'eval://'.$path;
 
-		if(in_array($_path, $this->loaded_lang_files))
+		if (in_array($_path, $this->loaded_lang_files))
 		{
 			return;
 		}
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
 
-		$oXmlLangParser = new XmlLangParser($path . 'lang.xml', $this->lang_type);
+		$oXmlLangParser = new XmlLangParser($path.'lang.xml', $this->lang_type);
 		$content = $oXmlLangParser->getCompileContent();
 
-		if($content)
+		if ($content)
 		{
 			$this->loaded_lang_files[] = $_path;
 			eval($content);
@@ -916,9 +916,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
+		$oXmlLangParser = new XmlLangParser($path.((substr_compare($path, '/', -1) !== 0) ? '/' : '').'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
 	}
 
@@ -930,22 +930,22 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
-		$path_tpl = $path . '%s.lang.php';
+		$path_tpl = $path.'%s.lang.php';
 		$file = sprintf($path_tpl, $this->lang_type);
 
 		$langs = array('ko', 'en'); // this will be configurable.
-		while(!is_readable($file) && $langs[0])
+		while (!is_readable($file) && $langs[0])
 		{
 			$file = sprintf($path_tpl, array_shift($langs));
 		}
 
-		if(!is_readable($file))
+		if (!is_readable($file))
 		{
 			return FALSE;
 		}
@@ -987,11 +987,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -1007,7 +1007,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1035,17 +1035,17 @@ 
 
 		$obj = clone $source_obj;
 
-		foreach($charset_list as $charset)
+		foreach ($charset_list as $charset)
 		{
-			array_walk($obj,'Context::checkConvertFlag',$charset);
+			array_walk($obj, 'Context::checkConvertFlag', $charset);
 			$flag = self::checkConvertFlag($flag = TRUE);
-			if($flag)
+			if ($flag)
 			{
-				if($charset == 'UTF-8')
+				if ($charset == 'UTF-8')
 				{
 					return $obj;
 				}
-				array_walk($obj,'Context::doConvertEncoding',$charset);
+				array_walk($obj, 'Context::doConvertEncoding', $charset);
 				return $obj;
 			}
 		}
@@ -1064,11 +1064,11 @@ 
 	function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
 		static $flag = TRUE;
-		if($charset)
+		if ($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
+			if (is_array($val))
+				array_walk($val, 'Context::checkConvertFlag', $charset);
+			else if ($val && iconv($charset, $charset, $val) != $val) $flag = FALSE;
 			else $flag = FALSE;
 		}
 		else
@@ -1092,9 +1092,9 @@ 
 	{
 		if (is_array($val))
 		{
-			array_walk($val,'Context::doConvertEncoding',$charset);
+			array_walk($val, 'Context::doConvertEncoding', $charset);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
+		else $val = iconv($charset, 'UTF-8', $val);
 	}
 
 	/**
@@ -1105,7 +1105,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1114,9 +1114,9 @@ 
 
 	function decodeIdna($domain)
 	{
-		if(strpos($domain, 'xn--') !== FALSE)
+		if (strpos($domain, '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));
 			$domain = $IDN->decode($domain);
 		}
@@ -1147,7 +1147,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1187,7 +1187,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1200,30 +1200,30 @@ 
 	 */
 	function _setRequestArgument()
 	{
-		if(!count($_REQUEST))
+		if (!count($_REQUEST))
 		{
 			return;
 		}
 
 		$requestMethod = $this->getRequestMethod();
-		foreach($_REQUEST as $key => $val)
+		foreach ($_REQUEST as $key => $val)
 		{
-			if($val === '' || self::get($key))
+			if ($val === '' || self::get($key))
 			{
 				continue;
 			}
 			$key = htmlentities($key);
 			$val = $this->_filterRequestVar($key, $val);
 
-			if($requestMethod == 'GET' && isset($_GET[$key]))
+			if ($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			elseif ($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			elseif ($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
 			}
@@ -1232,7 +1232,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1243,20 +1243,20 @@ 
 
 	function _recursiveCheckVar($val)
 	{
-		if(is_string($val))
+		if (is_string($val))
 		{
-			foreach($this->patterns as $pattern)
+			foreach ($this->patterns as $pattern)
 			{
-				if(preg_match($pattern, $val))
+				if (preg_match($pattern, $val))
 				{
 					$this->isSuccessInit = FALSE;
 					return;
 				}
 			}
 		}
-		else if(is_array($val))
+		else if (is_array($val))
 		{
-			foreach($val as $val2)
+			foreach ($val as $val2)
 			{
 				$this->_recursiveCheckVar($val2);
 			}
@@ -1270,7 +1270,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1278,7 +1278,7 @@ 
 		$params = array();
 		parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
 		}
@@ -1291,13 +1291,13 @@ 
 	 */
 	function _setXmlRpcArgument()
 	{
-		if($this->getRequestMethod() != 'XMLRPC')
+		if ($this->getRequestMethod() != 'XMLRPC')
 		{
 			return;
 		}
 
 		$xml = $GLOBALS['HTTP_RAW_POST_DATA'];
-		if(Security::detectingXEE($xml))
+		if (Security::detectingXEE($xml))
 		{
 			header("HTTP/1.0 400 Bad Request");
 			exit;
@@ -1309,12 +1309,12 @@ 
 		$params = $xml_obj->methodcall->params;
 		unset($params->node_name, $params->attrs, $params->body);
 
-		if(!count(get_object_vars($params)))
+		if (!count(get_object_vars($params)))
 		{
 			return;
 		}
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterXmlVars($key, $val), TRUE);
 		}
@@ -1329,10 +1329,10 @@ 
 	 */
 	function _filterXmlVars($key, $val)
 	{
-		if(is_array($val))
+		if (is_array($val))
 		{
 			$stack = array();
-			foreach($val as $k => $v)
+			foreach ($val as $k => $v)
 			{
 				$stack[$k] = $this->_filterXmlVars($k, $v);
 			}
@@ -1342,20 +1342,20 @@ 
 
 		$body = $val->body;
 		unset($val->node_name, $val->attrs, $val->body);
-		if(!count(get_object_vars($val)))
+		if (!count(get_object_vars($val)))
 		{
 			return $this->_filterRequestVar($key, $body, 0);
 		}
 
 		$stack = new stdClass();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$output = $this->_filterXmlVars($k, $v);
-			if(is_object($v) && $v->attrs->type == 'array')
+			if (is_object($v) && $v->attrs->type == 'array')
 			{
 				$output = array($output);
 			}
-			if($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
+			if ($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
 			{
 				return $output;
 			}
@@ -1363,7 +1363,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1382,32 +1382,32 @@ 
 	 */
 	function _filterRequestVar($key, $val, $do_stripslashes = 1)
 	{
-		if(!($isArray = is_array($val)))
+		if (!($isArray = is_array($val)))
 		{
 			$val = array($val);
 		}
 
 		$result = array();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$k = htmlentities($k);
-			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
+			if ($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
 			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			elseif ($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif($key === 'vid')
+			elseif ($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
 			}
-			elseif($key === 'xe_validator_id')
+			elseif ($key === 'xe_validator_id')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			elseif (stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
 			}
@@ -1415,12 +1415,12 @@ 
 			{
 				$result[$k] = $v;
 
-				if($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
+				if ($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
 				{
 					$result[$k] = stripslashes($result[$k]);
 				}
 
-				if(!is_array($result[$k]))
+				if (!is_array($result[$k]))
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1448,17 +1448,17 @@ 
 	 */
 	function _setUploadedArgument()
 	{
-		if($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
+		if ($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
 		{
 			return;
 		}
 
-		foreach($_FILES as $key => $val)
+		foreach ($_FILES as $key => $val)
 		{
 			$tmp_name = $val['tmp_name'];
-			if(!is_array($tmp_name))
+			if (!is_array($tmp_name))
 			{
-				if(!$tmp_name || !is_uploaded_file($tmp_name))
+				if (!$tmp_name || !is_uploaded_file($tmp_name))
 				{
 					continue;
 				}
@@ -1468,9 +1468,9 @@ 
 			}
 			else
 			{
-				for($i = 0, $c = count($tmp_name); $i < $c; $i++)
+				for ($i = 0, $c = count($tmp_name); $i < $c; $i++)
 				{
-					if($val['size'][$i] > 0)
+					if ($val['size'][$i] > 0)
 					{
 						$file['name'] = $val['name'][$i];
 						$file['type'] = $val['type'][$i];
@@ -1502,16 +1502,16 @@ 
 	function getRequestUrl()
 	{
 		static $url = null;
-		if(is_null($url))
+		if (is_null($url))
 		{
 			$url = self::getRequestUri();
-			if(count($_GET) > 0)
+			if (count($_GET) > 0)
 			{
-				foreach($_GET as $key => $val)
+				foreach ($_GET as $key => $val)
 				{
-					$vars[] = $key . '=' . ($val ? urlencode(self::convertEncodingStr($val)) : '');
+					$vars[] = $key.'='.($val ? urlencode(self::convertEncodingStr($val)) : '');
 				}
-				$url .= '?' . join('&', $vars);
+				$url .= '?'.join('&', $vars);
 			}
 		}
 		return $url;
@@ -1526,7 +1526,7 @@ 
 		$self = self::getInstance();
 		$js_callback_func = isset($_GET['xe_js_callback']) ? $_GET['xe_js_callback'] : $_POST['xe_js_callback'];
 
-		if(!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
+		if (!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
 		{
 			unset($js_callback_func);
 			unset($_GET['xe_js_callback']);
@@ -1554,22 +1554,22 @@ 
 		$self = self::getInstance();
 
 		// retrieve virtual site information
-		if(is_null($site_module_info))
+		if (is_null($site_module_info))
 		{
 			$site_module_info = self::get('site_module_info');
 		}
 
 		// If $domain is set, handle it (if $domain is vid type, remove $domain and handle with $vid)
-		if($domain && isSiteID($domain))
+		if ($domain && isSiteID($domain))
 		{
 			$vid = $domain;
 			$domain = '';
 		}
 
 		// If $domain, $vid are not set, use current site information
-		if(!$domain && !$vid)
+		if (!$domain && !$vid)
 		{
-			if($site_module_info->domain && isSiteID($site_module_info->domain))
+			if ($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
 			}
@@ -1580,21 +1580,21 @@ 
 		}
 
 		// if $domain is set, compare current URL. If they are same, remove the domain, otherwise link to the domain.
-		if($domain)
+		if ($domain)
 		{
 			$domain_info = parse_url($domain);
-			if(is_null($current_info))
+			if (is_null($current_info))
 			{
-				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . getScriptPath());
+				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].getScriptPath());
 			}
-			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
+			if ($domain_info['host'].$domain_info['path'] == $current_info['host'].$current_info['path'])
 			{
 				unset($domain);
 			}
 			else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
-				if(substr_compare($domain, '/', -1) !== 0)
+				if (substr_compare($domain, '/', -1) !== 0)
 				{
 					$domain .= '/';
 				}
@@ -1604,10 +1604,10 @@ 
 		$get_vars = array();
 
 		// If there is no GET variables or first argument is '' to reset variables
-		if(!$self->get_vars || $args_list[0] == '')
+		if (!$self->get_vars || $args_list[0] == '')
 		{
 			// rearrange args_list
-			if(is_array($args_list) && $args_list[0] == '')
+			if (is_array($args_list) && $args_list[0] == '')
 			{
 				array_shift($args_list);
 			}
@@ -1619,13 +1619,13 @@ 
 		}
 
 		// arrange args_list
-		for($i = 0, $c = count($args_list); $i < $c; $i += 2)
+		for ($i = 0, $c = count($args_list); $i < $c; $i += 2)
 		{
 			$key = $args_list[$i];
 			$val = trim($args_list[$i + 1]);
 
 			// If value is not set, remove the key
-			if(!isset($val) || !strlen($val))
+			if (!isset($val) || !strlen($val))
 			{
 				unset($get_vars[$key]);
 				continue;
@@ -1636,7 +1636,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1653,17 +1653,17 @@ 
 			'dispDocumentAdminManageDocument' => 'dispDocumentManageDocument',
 			'dispModuleAdminSelectList' => 'dispModuleSelectList'
 		);
-		if($act_alias[$act])
+		if ($act_alias[$act])
 		{
 			$get_vars['act'] = $act_alias[$act];
 		}
 
 		// organize URL
 		$query = '';
-		if(count($get_vars) > 0)
+		if (count($get_vars) > 0)
 		{
 			// if using rewrite mod
-			if($self->allow_rewrite)
+			if ($self->allow_rewrite)
 			{
 				$var_keys = array_keys($get_vars);
 				sort($var_keys);
@@ -1683,8 +1683,8 @@ 
 					'vid' => $vid,
 					'mid' => $mid,
 					'mid.vid' => "$vid/$mid",
-					'entry.mid' => "$mid/entry/" . $get_vars['entry'],
-					'entry.mid.vid' => "$vid/$mid/entry/" . $get_vars['entry'],
+					'entry.mid' => "$mid/entry/".$get_vars['entry'],
+					'entry.mid.vid' => "$vid/$mid/entry/".$get_vars['entry'],
 					'document_srl' => $srl,
 					'document_srl.mid' => "$mid/$srl",
 					'document_srl.vid' => "$vid/$srl",
@@ -1701,66 +1701,66 @@ 
 				$query = $target_map[$target];
 			}
 
-			if(!$query)
+			if (!$query)
 			{
 				$queries = array();
-				foreach($get_vars as $key => $val)
+				foreach ($get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
-							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
+							$queries[] = $key.'['.$k.']='.urlencode($v);
 						}
 					}
-					elseif(!is_array($val))
+					elseif (!is_array($val))
 					{
-						$queries[] = $key . '=' . urlencode($val);
+						$queries[] = $key.'='.urlencode($val);
 					}
 				}
-				if(count($queries) > 0)
+				if (count($queries) > 0)
 				{
-					$query = 'index.php?' . join('&', $queries);
+					$query = 'index.php?'.join('&', $queries);
 				}
 			}
 		}
 
 		// If using SSL always
 		$_use_ssl = $self->get('_use_ssl');
-		if($_use_ssl == 'always')
+		if ($_use_ssl == 'always')
 		{
-			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
+			$query = $self->getRequestUri(ENFORCE_SSL, $domain).$query;
 			// optional SSL use
 		}
-		elseif($_use_ssl == 'optional')
+		elseif ($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
-			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
+			$query = $self->getRequestUri($ssl_mode, $domain).$query;
 			// no SSL
 		}
 		else
 		{
 			// currently on SSL but target is not based on SSL
-			if($_SERVER['HTTPS'] == 'on')
+			if ($_SERVER['HTTPS'] == 'on')
 			{
-				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
+				$query = $self->getRequestUri(ENFORCE_SSL, $domain).$query;
 			}
-			else if($domain) // if $domain is set
+			else if ($domain) // if $domain is set
 			{
-				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
+				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain).$query;
 			}
 			else
 			{
-				$query = getScriptPath() . $query;
+				$query = getScriptPath().$query;
 			}
 		}
 
-		if(!$encode)
+		if (!$encode)
 		{
 			return $query;
 		}
 
-		if(!$autoEncode)
+		if (!$autoEncode)
 		{
 			return htmlspecialchars($query, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 		}
@@ -1769,16 +1769,16 @@ 
 		$encode_queries = array();
 		$parsedUrl = parse_url($query);
 		parse_str($parsedUrl['query'], $output);
-		foreach($output as $key => $value)
+		foreach ($output as $key => $value)
 		{
-			if(preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
+			if (preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
 			{
 				$value = urlencode(htmlspecialchars_decode(urldecode($value)));
 			}
-			$encode_queries[] = $key . '=' . $value;
+			$encode_queries[] = $key.'='.$value;
 		}
 
-		return htmlspecialchars($parsedUrl['path'] . '?' . join('&', $encode_queries), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
+		return htmlspecialchars($parsedUrl['path'].'?'.join('&', $encode_queries), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 	}
 
 	/**
@@ -1793,17 +1793,17 @@ 
 		static $url = array();
 
 		// Check HTTP Request
-		if(!isset($_SERVER['SERVER_PROTOCOL']))
+		if (!isset($_SERVER['SERVER_PROTOCOL']))
 		{
 			return;
 		}
 
-		if(self::get('_use_ssl') == 'always')
+		if (self::get('_use_ssl') == 'always')
 		{
 			$ssl_mode = ENFORCE_SSL;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$domain_key = md5($domain);
 		}
@@ -1812,14 +1812,14 @@ 
 			$domain_key = 'default';
 		}
 
-		if(isset($url[$ssl_mode][$domain_key]))
+		if (isset($url[$ssl_mode][$domain_key]))
 		{
 			return $url[$ssl_mode][$domain_key];
 		}
 
 		$current_use_ssl = ($_SERVER['HTTPS'] == 'on');
 
-		switch($ssl_mode)
+		switch ($ssl_mode)
 		{
 			case FOLLOW_REQUEST_SSL: $use_ssl = $current_use_ssl;
 				break;
@@ -1829,34 +1829,34 @@ 
 				break;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$target_url = trim($domain);
-			if(substr_compare($target_url, '/', -1) !== 0)
+			if (substr_compare($target_url, '/', -1) !== 0)
 			{
-				$target_url.= '/';
+				$target_url .= '/';
 			}
 		}
 		else
 		{
-			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
+			$target_url = $_SERVER['HTTP_HOST'].getScriptPath();
 		}
 
-		$url_info = parse_url('http://' . $target_url);
+		$url_info = parse_url('http://'.$target_url);
 
-		if($current_use_ssl != $use_ssl)
+		if ($current_use_ssl != $use_ssl)
 		{
 			unset($url_info['port']);
 		}
 
-		if($use_ssl)
+		if ($use_ssl)
 		{
 			$port = self::get('_https_port');
-			if($port && $port != 443)
+			if ($port && $port != 443)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 443)
+			elseif ($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
@@ -1864,17 +1864,17 @@ 
 		else
 		{
 			$port = self::get('_http_port');
-			if($port && $port != 80)
+			if ($port && $port != 80)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 80)
+			elseif ($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
 		}
 
-		$url[$ssl_mode][$domain_key] = sprintf('%s://%s%s%s', $use_ssl ? 'https' : $url_info['scheme'], $url_info['host'], $url_info['port'] && $url_info['port'] != 80 ? ':' . $url_info['port'] : '', $url_info['path']);
+		$url[$ssl_mode][$domain_key] = sprintf('%s://%s%s%s', $use_ssl ? 'https' : $url_info['scheme'], $url_info['host'], $url_info['port'] && $url_info['port'] != 80 ? ':'.$url_info['port'] : '', $url_info['path']);
 
 		return $url[$ssl_mode][$domain_key];
 	}
@@ -1891,16 +1891,16 @@ 
 	{
 		$self = self::getInstance();
 		$self->context->{$key} = $val;
-		if($set_to_get_vars === FALSE)
+		if ($set_to_get_vars === FALSE)
 		{
 			return;
 		}
-		if($val === NULL || $val === '')
+		if ($val === NULL || $val === '')
 		{
 			unset($self->get_vars->{$key});
 			return;
 		}
-		if($set_to_get_vars || $self->get_vars->{$key})
+		if ($set_to_get_vars || $self->get_vars->{$key})
 		{
 			$self->get_vars->{$key} = $val;
 		}
@@ -1916,7 +1916,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -1931,7 +1931,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -1939,7 +1939,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -1965,7 +1965,7 @@ 
 	function getRequestVars()
 	{
 		$self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -1982,13 +1982,13 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		if(!isset($self->ssl_actions[$action]))
+		if (!isset($self->ssl_actions[$action]))
 		{
 			$self->ssl_actions[$action] = 1;
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2006,16 +2006,16 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			unset($self->ssl_actions);
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		foreach($action_array as $action)
+		foreach ($action_array as $action)
 		{
-			if(!isset($self->ssl_actions[$action]))
+			if (!isset($self->ssl_actions[$action]))
 			{
 				$self->ssl_actions[$action] = 1;
 				$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2034,7 +2034,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2051,7 +2051,7 @@ 
 	function getSSLActions()
 	{
 		$self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2078,12 +2078,12 @@ 
 	 */
 	function normalizeFilePath($file)
 	{
-		if($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
+		if ($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
 		{
-			$file = './' . $file;
+			$file = './'.$file;
 		}
 		$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
-		while(strpos($file, '/../') !== FALSE)
+		while (strpos($file, '/../') !== FALSE)
 		{
 			$file = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $file, 1);
 		}
@@ -2102,13 +2102,13 @@ 
 	{
 		$file = self::normalizeFilePath($file);
 		$script_path = getScriptPath();
-		if(strpos($file, './') === 0)
+		if (strpos($file, './') === 0)
 		{
-			$file = $script_path . substr($file, 2);
+			$file = $script_path.substr($file, 2);
 		}
-		elseif(strpos($file, '../') === 0)
+		elseif (strpos($file, '../') === 0)
 		{
-			$file = self::normalizeFilePath($script_path . $file);
+			$file = self::normalizeFilePath($script_path.$file);
 		}
 
 		return $file;
@@ -2178,12 +2178,12 @@ 
 	 */
 	function addJsFile($file, $optimized = FALSE, $targetie = '', $index = 0, $type = 'head', $isRuleset = FALSE, $autoPath = null)
 	{
-		if($isRuleset)
+		if ($isRuleset)
 		{
-			if(strpos($file, '#') !== FALSE)
+			if (strpos($file, '#') !== FALSE)
 			{
 				$file = str_replace('#', '', $file);
-				if(!is_readable($file))
+				if (!is_readable($file))
 				{
 					$file = $autoPath;
 				}
@@ -2248,9 +2248,9 @@ 
 		ksort($files);
 		$files = array_values($files);
 		$filenames = array();
-		for($i = 0, $c = count($files); $i < $c; ++$i)
+		for ($i = 0, $c = count($files); $i < $c; ++$i)
 		{
-			if(in_array($files[$i]['file'], $filenames))
+			if (in_array($files[$i]['file'], $filenames))
 			{
 				unset($files[$i]);
 			}
@@ -2335,14 +2335,14 @@ 
 	 */
 	function getJavascriptPluginInfo($pluginName)
 	{
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		$plugin_path = './common/js/plugins/' . $pluginName . '/';
-		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		$plugin_path = './common/js/plugins/'.$pluginName.'/';
+		$info_file = $plugin_path.'plugin.load';
+		if (!is_readable($info_file))
 		{
 			return;
 		}
@@ -2352,32 +2352,32 @@ 
 		$result->jsList = array();
 		$result->cssList = array();
 
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
 
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
-				$result->jsList[] = $plugin_path . $filename;
+				$result->jsList[] = $plugin_path.$filename;
 			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			elseif (substr_compare($filename, '.css', -4) === 0)
 			{
-				$result->cssList[] = $plugin_path . $filename;
+				$result->cssList[] = $plugin_path.$filename;
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path.'lang'))
 		{
-			$result->langPath = $plugin_path . 'lang';
+			$result->langPath = $plugin_path.'lang';
 		}
 
 		return $result;
@@ -2393,50 +2393,50 @@ 
 		static $loaded_plugins = array();
 
 		$self = self::getInstance();
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		if($loaded_plugins[$plugin_name])
+		if ($loaded_plugins[$plugin_name])
 		{
 			return;
 		}
 		$loaded_plugins[$plugin_name] = TRUE;
 
-		$plugin_path = './common/js/plugins/' . $plugin_name . '/';
-		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		$plugin_path = './common/js/plugins/'.$plugin_name.'/';
+		$info_file = $plugin_path.'plugin.load';
+		if (!is_readable($info_file))
 		{
 			return;
 		}
 
 		$list = file($info_file);
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
-				$self->loadFile(array($plugin_path . $filename, 'body', '', 0), TRUE);
+				$self->loadFile(array($plugin_path.$filename, 'body', '', 0), TRUE);
 			}
-			if(substr_compare($filename, '.css', -4) === 0)
+			if (substr_compare($filename, '.css', -4) === 0)
 			{
-				$self->loadFile(array($plugin_path . $filename, 'all', '', 0), TRUE);
+				$self->loadFile(array($plugin_path.$filename, 'all', '', 0), TRUE);
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path.'lang'))
 		{
-			$self->loadLang($plugin_path . 'lang');
+			$self->loadLang($plugin_path.'lang');
 		}
 	}
 
@@ -2449,7 +2449,7 @@ 
 	function addHtmlHeader($header)
 	{
 		$self = self::getInstance();
-		$self->html_header .= "\n" . $header;
+		$self->html_header .= "\n".$header;
 	}
 
 	function clearHtmlHeader()
@@ -2501,7 +2501,7 @@ 
 	function addBodyHeader($header)
 	{
 		$self = self::getInstance();
-		$self->body_header .= "\n" . $header;
+		$self->body_header .= "\n".$header;
 	}
 
 	/**
@@ -2523,7 +2523,7 @@ 
 	function addHtmlFooter($footer)
 	{
 		$self = self::getInstance();
-		$self->html_footer .= ($self->Htmlfooter ? "\n" : '') . $footer;
+		$self->html_footer .= ($self->Htmlfooter ? "\n" : '').$footer;
 	}
 
 	/**
@@ -2544,7 +2544,7 @@ 
 	 */
 	function getConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/db.config.php';
+		return _XE_PATH_.'files/config/db.config.php';
 	}
 
 	/**
@@ -2554,7 +2554,7 @@ 
 	 */
 	function getFTPConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/ftp.config.php';
+		return _XE_PATH_.'files/config/ftp.config.php';
 	}
 
 	/**
@@ -2606,14 +2606,14 @@ 
 		$_path = explode('/', $path);
 		$_base = explode('/', $base_url);
 
-		if(!$_base[count($_base) - 1])
+		if (!$_base[count($_base) - 1])
 		{
 			array_pop($_base);
 		}
 
-		foreach($_xe as $idx => $dir)
+		foreach ($_xe as $idx => $dir)
 		{
-			if($_path[0] != $dir)
+			if ($_path[0] != $dir)
 			{
 				break;
 			}
@@ -2621,9 +2621,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2633,13 +2633,13 @@ 
 			}
 		}
 
-		if(count($_base) > 0)
+		if (count($_base) > 0)
 		{
 			array_unshift($_path, join('/', $_base));
 		}
 
-		$path = '/' . join('/', $_path);
-		if(substr_compare($path, '/', -1) !== 0)
+		$path = '/'.join('/', $_path);
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -2654,13 +2654,13 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_array($self->meta_tags))
+		if (!is_array($self->meta_tags))
 		{
 			$self->meta_tags = array();
 		}
 
 		$ret = array();
-		foreach($self->meta_tags as $key => $val)
+		foreach ($self->meta_tags as $key => $val)
 		{
 			list($name, $is_http_equiv) = explode("\t", $key);
 			$ret[] = array('name' => $name, 'is_http_equiv' => $is_http_equiv, 'content' => $val);
@@ -2680,7 +2680,7 @@ 
 	function addMetaTag($name, $content, $is_http_equiv = FALSE)
 	{
 		$self = self::getInstance();
-		$self->meta_tags[$name . "\t" . ($is_http_equiv ? '1' : '0')] = $content;
+		$self->meta_tags[$name."\t".($is_http_equiv ? '1' : '0')] = $content;
 	}
 
 }

Braces +81 added lines, -95 removed lines

@@ -230,7 +230,9 @@ 
 		$this->loadDBInfo();
 		if($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if(is_array($this->db_info->sitelock_whitelist)) {
+				$whitelist = $this->db_info->sitelock_whitelist;
+			}
 
 			if(!IpFilter::filter($whitelist))
 			{
@@ -245,8 +247,7 @@ 
 				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
-				}
-				else
+				} else
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.html';
 				}
@@ -303,8 +304,7 @@ 
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/');
 			}
-		}
-		elseif($_COOKIE['lang_type'])
+		} elseif($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
@@ -341,7 +341,9 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if($sess = $_POST[session_name()]) {
+			session_id($sess);
+		}
 		session_start();
 
 		// set authentication information in Context and session
@@ -394,22 +396,21 @@ 
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif($val)
+					} elseif($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
-			}
-			else
+				if($url) {
+					$current_url .= '?' . join('&', $url);
+				}
+			} else
 			{
 				$current_url = $this->getUrl();
 			}
-		}
-		else
+		} else
 		{
 			$current_url = self::getRequestUri();
 		}
@@ -494,18 +495,22 @@ 
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
-			$db_info->time_zone = date('O');
+		if(!$db_info->time_zone) {
+					$db_info->time_zone = date('O');
+		}
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
-			$db_info->qmail_compatibility = 'N';
+		if($db_info->qmail_compatibility != 'Y') {
+					$db_info->qmail_compatibility = 'N';
+		}
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
-			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
-			$db_info->use_ssl = 'none';
+		if(!$db_info->use_db_session) {
+					$db_info->use_db_session = 'N';
+		}
+		if(!$db_info->use_ssl) {
+					$db_info->use_ssl = 'none';
+		}
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
@@ -622,8 +627,7 @@ 
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
 				$lang_selected = self::loadLangSupported();
-			}
-			else
+			} else
 			{
 				$langs = file($selected_lang_file);
 				foreach($langs as $val)
@@ -687,8 +691,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -705,8 +708,7 @@ 
 				header('location:' . $url);
 				return FALSE;
 				// send SSO request
-			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			} else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()), 0, '/');
 				$origin_url = self::getRequestUrl();
@@ -766,8 +768,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -867,8 +868,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -884,7 +884,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -916,7 +918,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
@@ -930,7 +934,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1066,12 +1072,14 @@ 
 		static $flag = TRUE;
 		if($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
-			else $flag = FALSE;
-		}
-		else
+			if(is_array($val)) {
+							array_walk($val,'Context::checkConvertFlag',$charset);
+			} else if($val && iconv($charset,$charset,$val)!=$val) {
+				$flag = FALSE;
+			} else {
+				$flag = FALSE;
+			}
+		} else
 		{
 			$return = $flag;
 			$flag = TRUE;
@@ -1093,8 +1101,9 @@ 
 		if (is_array($val))
 		{
 			array_walk($val,'Context::doConvertEncoding',$charset);
+		} else {
+			$val = iconv($charset,'UTF-8',$val);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
 	}
 
 	/**
@@ -1105,7 +1114,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1218,16 +1229,13 @@ 
 			if($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			} elseif($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			} elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
-			}
-			else
+			} else
 			{
 				$set_to_vars = FALSE;
 			}
@@ -1253,8 +1261,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1394,24 +1401,19 @@ 
 			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
-			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			} elseif($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif($key === 'vid')
+			} elseif($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
-			}
-			elseif($key === 'xe_validator_id')
+			} elseif($key === 'xe_validator_id')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			} elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
-			}
-			else
+			} else
 			{
 				$result[$k] = $v;
 
@@ -1465,8 +1467,7 @@ 
 				$val['name'] = htmlspecialchars($val['name'], ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 				$this->set($key, $val, TRUE);
 				$this->is_uploaded = TRUE;
-			}
-			else
+			} else
 			{
 				for($i = 0, $c = count($tmp_name); $i < $c; $i++)
 				{
@@ -1572,8 +1573,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1590,8 +1590,7 @@ 
 			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
 			{
 				unset($domain);
-			}
-			else
+			} else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
 				if(substr_compare($domain, '/', -1) !== 0)
@@ -1611,8 +1610,7 @@ 
 			{
 				array_shift($args_list);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
@@ -1639,8 +1637,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1712,8 +1709,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1731,25 +1727,23 @@ 
 		{
 			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			// optional SSL use
-		}
-		elseif($_use_ssl == 'optional')
+		} elseif($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
 			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
 			// no SSL
-		}
-		else
+		} else
 		{
 			// currently on SSL but target is not based on SSL
 			if($_SERVER['HTTPS'] == 'on')
 			{
 				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
-			}
-			else if($domain) // if $domain is set
+			} else if($domain) {
+				// if $domain is set
 			{
 				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
 			}
-			else
+			} else
 			{
 				$query = getScriptPath() . $query;
 			}
@@ -1806,8 +1800,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1836,8 +1829,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1855,20 +1847,17 @@ 
 			if($port && $port != 443)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 443)
+			} elseif($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
-		}
-		else
+		} else
 		{
 			$port = self::get('_http_port');
 			if($port && $port != 80)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 80)
+			} elseif($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
@@ -2105,8 +2094,7 @@ 
 		if(strpos($file, './') === 0)
 		{
 			$file = $script_path . substr($file, 2);
-		}
-		elseif(strpos($file, '../') === 0)
+		} elseif(strpos($file, '../') === 0)
 		{
 			$file = self::normalizeFilePath($script_path . $file);
 		}
@@ -2368,8 +2356,7 @@ 
 			if(substr_compare($filename, '.js', -3) === 0)
 			{
 				$result->jsList[] = $plugin_path . $filename;
-			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			} elseif(substr_compare($filename, '.css', -4) === 0)
 			{
 				$result->cssList[] = $plugin_path . $filename;
 			}
@@ -2626,8 +2613,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}