xpressengine / xe-core

classes/display/XMLDisplayHandler.php

Spacing +5 added lines, -5 removed lines

@@ -31,25 +31,25 @@
 	 */
 	function _makeXmlDoc($obj)
 	{
-		if(!count($obj))
+		if (!count($obj))
 		{
 			return;
 		}
 
 		$xmlDoc = '';
 
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
-			if(is_numeric($key))
+			if (is_numeric($key))
 			{
 				$key = 'item';
 			}
 
-			if(is_string($val))
+			if (is_string($val))
 			{
 				$xmlDoc .= sprintf('<%s>%s</%s>%s', $key, htmlspecialchars($val, ENT_COMPAT, 'UTF-8', true), $key, "\n");
 			}
-			else if(!is_array($val) && !is_object($val))
+			else if (!is_array($val) && !is_object($val))
 			{
 				$xmlDoc .= sprintf('<%s>%s</%s>%s', $key, $val, $key, "\n");
 			}

Braces +2 added lines, -4 removed lines

@@ -48,12 +48,10 @@
 			if(is_string($val))
 			{
 				$xmlDoc .= sprintf('<%s>%s</%s>%s', $key, htmlspecialchars($val, ENT_COMPAT, 'UTF-8', true), $key, "\n");
-			}
-			else if(!is_array($val) && !is_object($val))
+			} else if(!is_array($val) && !is_object($val))
 			{
 				$xmlDoc .= sprintf('<%s>%s</%s>%s', $key, $val, $key, "\n");
-			}
-			else
+			} else
 			{
 				$xmlDoc .= sprintf('<%s>%s%s</%s>%s', $key, "\n", $this->_makeXmlDoc($val), $key, "\n");
 			}

modules/install/install.controller.php

Spacing +114 added lines, -114 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// Error occurs if already installed
-		if($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
+		if ($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
 		{
 			$this->stop('msg_already_installed');
 		}
@@ -86,7 +86,7 @@ 
 	function _procDBSetting()
 	{
 		// Get DB-related variables
-		$con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+		$con_string = Context::gets('db_type', 'db_port', 'db_hostname', 'db_userid', 'db_password', 'db_database', 'db_table_prefix');
 
 		$db_info = new stdClass();
 		$db_info->master_db = get_object_vars($con_string);
@@ -101,13 +101,13 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$output->toBool()) return $output;
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
+		if (!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
 			header('location:'.$returnUrl);
@@ -121,13 +121,13 @@ 
 	function procConfigSetting()
 	{
 		// Get variables
-		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		$config_info = Context::gets('use_rewrite', 'time_zone');
+		if ($config_info->use_rewrite != 'Y') $config_info->use_rewrite = 'N';
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
+		if (!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
 			header('location:'.$returnUrl);
@@ -141,7 +141,7 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		if (Context::isInstalled()) return new Object(-1, 'msg_already_installed');
 
 		// Assign a temporary administrator when installing
 		$logged_info = new stdClass();
@@ -149,15 +149,15 @@ 
 		Context::set('logged_info', $logged_info);
 
 		// check install config
-		if(Context::get('install_config'))
+		if (Context::get('install_config'))
 		{
 			$db_info = $this->_makeDbInfoByInstallConfig();
 		}
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if (FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
+			if (FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
 		}
 
 		// Set DB type and information
@@ -165,30 +165,30 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Install all the modules
 		try {
 			$oDB->begin();
 			$this->installDownloadedModule();
 			$oDB->commit();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$oDB->rollback();
 			return new Object(-1, $e->getMessage());
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
+		if (!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
 
 		// load script
-		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
-		if(count($scripts)>0)
+		$scripts = FileHandler::readDir(_XE_PATH_.'modules/install/script', '/(\.php)$/');
+		if (count($scripts) > 0)
 		{
 			sort($scripts);
-			foreach($scripts as $script)
+			foreach ($scripts as $script)
 			{
 				$script_path = FileHandler::getRealPath('./modules/install/script/');
-				$output = include($script_path . $script);
+				$output = include($script_path.$script);
 			}
 		}
 
@@ -201,7 +201,7 @@ 
 
 		unset($_SESSION['use_rewrite']);
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
 			header('location:'.$returnUrl);
@@ -239,57 +239,57 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
-		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if (Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		$ftp_info = Context::gets('ftp_host', 'ftp_user', 'ftp_password', 'ftp_port', 'ftp_root_path');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
+		if (!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
-		foreach($ftp_info as $key => $val)
+		foreach ($ftp_info as $key => $val)
 		{
-			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val));
+			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'", "\\'", $val));
 		}
 
 		// If safe_mode
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+			if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1, 'msg_safe_mode_ftp_needed');
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_invalid_auth_info');
+				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
+			if (!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_mkdir_fail');
+				return new Object(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_chmod_fail');
+				return new Object(-1, 'msg_ftp_chmod_fail');
 			}
 
-			if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
+			if (!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_mkdir_fail');
+				return new Object(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_chmod_fail');
+				return new Object(-1, 'msg_ftp_chmod_fail');
 			}
 
 			$oFtp->ftp_quit();
@@ -300,31 +300,31 @@ 
 
 	function procInstallCheckFtp()
 	{
-		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		$ftp_info = Context::gets('ftp_user', 'ftp_password', 'ftp_port', 'sftp');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->sftp) $ftp_info->sftp = 'N';
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1, 'msg_safe_mode_ftp_needed');
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			$connection = ssh2_connect('localhost', $ftp_info->ftp_port);
-			if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
-				return new Object(-1,'msg_ftp_invalid_auth_info');
+				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
 		}
 		else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if (!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_invalid_auth_info');
+				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
 			$oFtp->ftp_quit();
 		}
@@ -341,36 +341,36 @@ 
 		$checklist = array();
 		// 0. check your version of php (5.2.4 or higher)
 		$checklist['php_version'] = true;
-		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
 		{
 			$checklist['php_version'] = false;
 		}
 
-		if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
 		{
 			Context::set('phpversion_warning', true);
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
+		if (is_writable('./') || is_writable('./files')) $checklist['permission'] = true;
 		else $checklist['permission'] = false;
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
+		if (function_exists('xml_parser_create')) $checklist['xml'] = true;
 		else $checklist['xml'] = false;
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
+		if (ini_get('session.auto_start') != 1) $checklist['session'] = true;
 		else $checklist['session'] = false;
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
+		if (function_exists('iconv')) $checklist['iconv'] = true;
 		else $checklist['iconv'] = false;
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
+		if (function_exists('imagecreatefromgif')) $checklist['gd'] = true;
 		else $checklist['gd'] = false;
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
+		if (DB::getEnableList()) $checklist['db'] = true;
 		else $checklist['db'] = false;
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
+		if (!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
 		else $install_enable = true;
 
 		// Save the checked result to the Context
@@ -390,7 +390,7 @@ 
 
 		$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
 
-		if($license_agreement)
+		if ($license_agreement)
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
@@ -401,7 +401,7 @@ 
 			return new Object(-1, 'msg_must_accept_license_agreement');
 		}
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
 			$this->setRedirectUrl($returnUrl);
@@ -424,25 +424,25 @@ 
 		$hostname = $_SERVER['SERVER_NAME'];
 		$port = $_SERVER['SERVER_PORT'];
 		$str_port = '';
-		if($port)
+		if ($port)
 		{
-			$str_port = ':' . $port;
+			$str_port = ':'.$port;
 		}
 
 		$tmpPath = $_SERVER['DOCUMENT_ROOT'];
 
 		//if DIRECTORY_SEPARATOR is not /(IIS)
-		if(DIRECTORY_SEPARATOR !== '/')
+		if (DIRECTORY_SEPARATOR !== '/')
 		{
 			//change to slash for compare
 			$tmpPath = str_replace(DIRECTORY_SEPARATOR, '/', $_SERVER['DOCUMENT_ROOT']);
 		}
 
-		$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
+		$query = "/JUST/CHECK/REWRITE/".$checkFilePath;
 		$currentPath = str_replace($tmpPath, "", _XE_PATH_);
-		if($currentPath != "")
+		if ($currentPath != "")
 		{
-			$query = $currentPath . $query;
+			$query = $currentPath.$query;
 		}
 		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
 		$requestConfig = array();
@@ -467,7 +467,7 @@ 
 			'./files/cache/template_compiled',
 		);
 
-		foreach($directory_list as $dir)
+		foreach ($directory_list as $dir)
 		{
 			FileHandler::makeDir($dir);
 		}
@@ -483,57 +483,57 @@ 
 		$oModuleModel = getModel('module');
 		// Create a table ny finding schemas/*.xml file in each module
 		$module_list = FileHandler::readDir('./modules/', NULL, false, true);
-		foreach($module_list as $module_path)
+		foreach ($module_list as $module_path)
 		{
 			// Get module name
-			$tmp_arr = explode('/',$module_path);
-			$module = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('/', $module_path);
+			$module = $tmp_arr[count($tmp_arr) - 1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if (!$xml_info) continue;
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
-		$this->installModule('module','./modules/module');
+		$this->installModule('module', './modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 		// Determine the order of module installation depending on category
-		$install_step = array('system','content','member');
+		$install_step = array('system', 'content', 'member');
 		// Install all the remaining modules
-		foreach($install_step as $category)
+		foreach ($install_step as $category)
 		{
-			if(count($modules[$category]))
+			if (count($modules[$category]))
 			{
-				foreach($modules[$category] as $module)
+				foreach ($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if ($module == 'module') continue;
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
-					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
+					if (is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 					}
 				}
 				unset($modules[$category]);
 			}
 		}
 		// Install all the remaining modules
-		if(count($modules))
+		if (count($modules))
 		{
-			foreach($modules as $category => $module_list)
+			foreach ($modules as $category => $module_list)
 			{
-				if(count($module_list))
+				if (count($module_list))
 				{
-					foreach($module_list as $module)
+					foreach ($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if ($module == 'module') continue;
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
-						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
+						if ($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 						}
 					}
 				}
@@ -555,31 +555,31 @@ 
 		$schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
 
 		$file_cnt = count($schema_files);
-		for($i=0;$i<$file_cnt;$i++)
+		for ($i = 0; $i < $file_cnt; $i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if (!$file || substr($file, -4) != '.xml') continue;
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
+			if ($output === false)
 				throw new Exception('msg_create_table_failed');
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if (method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
 		return new Object();
 	}
 
 	function _getDBConfigFileContents($db_info)
 	{
-		if(substr($db_info->master_db['db_table_prefix'], -1) != '_')
+		if (substr($db_info->master_db['db_table_prefix'], -1) != '_')
 		{
 			$db_info->master_db['db_table_prefix'] .= '_';
 		}
 
-		foreach($db_info->slave_db as &$slave)
+		foreach ($db_info->slave_db as &$slave)
 		{
-			if(substr($slave['db_table_prefix'], -1) != '_')
+			if (substr($slave['db_table_prefix'], -1) != '_')
 			{
 				$slave['db_table_prefix'] .= '_';
 			}
@@ -587,7 +587,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
-		$buff[] = '$db_info = (object)' . var_export(get_object_vars($db_info), TRUE) . ';';
+		$buff[] = '$db_info = (object)'.var_export(get_object_vars($db_info), TRUE).';';
 
 		return implode(PHP_EOL, $buff);
 	}
@@ -601,13 +601,13 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if (!$db_info) return;
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if (@file_exists($db_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -620,14 +620,14 @@ 
 		$etc_tmp_config_file = $this->etc_tmp_config_file;
 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n";
-		foreach($config_info as $key => $val)
+		foreach ($config_info as $key => $val)
 		{
-			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if (@file_exists($etc_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -642,13 +642,13 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if (!$db_info) return;
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
 			FileHandler::writeFile($config_file, $buff);
 
-			if(@file_exists($config_file))
+			if (@file_exists($config_file))
 			{
 				FileHandler::removeFile($this->db_tmp_config_file);
 				FileHandler::removeFile($this->etc_tmp_config_file);
@@ -663,7 +663,7 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if (!is_array($auto_config)) return false;
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -671,22 +671,22 @@ 
 		$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
 		$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
-		foreach($auto_config as $k => $v)
+		foreach ($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if (!in_array($k, array('host', 'port', 'path'))) $body .= sprintf($fstr, $k, $v, $k);
 		}
 		$body .= "</params>\r\n</methodCall>";
 
-		$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
+		$header = sprintf($fheader, $auto_config['path'], $auto_config['host'], strlen($body), $body);
 		$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5);
 
-		if($fp)
+		if ($fp)
 		{
 			fputs($fp, $header);
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$line = trim(fgets($fp, 4096));
-				if(strncmp('<error>', $line, 7) === 0)
+				if (strncmp('<error>', $line, 7) === 0)
 				{
 					fclose($fp);
 					return false;

modules/menu/menu.admin.controller.php

Spacing +298 added lines, -298 removed lines

@@ -56,7 +56,7 @@ 
 	}
 
 	function __construct() {
-		$this->homeMenuCacheFile = _XE_PATH_ . $this->homeMenuCacheFile;
+		$this->homeMenuCacheFile = _XE_PATH_.$this->homeMenuCacheFile;
 	}
 
 	/**
@@ -68,8 +68,8 @@ 
 		// List variables
 		$site_module_info = Context::get('site_module_info');
 
-		$output = $this->addMenu(Context::get('title'), (int)$site_module_info->site_srl);
-		if(!$output->toBool()) return $output;
+		$output = $this->addMenu(Context::get('title'), (int) $site_module_info->site_srl);
+		if (!$output->toBool()) return $output;
 
 		$this->add('menu_srl', $output->get('menuSrl'));
 		$this->setMessage('success_registed');
@@ -95,7 +95,7 @@ 
 		$args->listorder = $args->menu_srl * -1;
 
 		$output = executeQuery('menu.insertMenu', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -109,13 +109,13 @@ 
 		$unlinked_modules = false;
 		$args = new stdClass;
 		$args->site_srl = 0;
-		$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl',$args);
-		if($output->toBool() && $output->data && count($output->data) > 0)
+		$output = executeQueryArray('module.getNotLinkedModuleBySiteSrl', $args);
+		if ($output->toBool() && $output->data && count($output->data) > 0)
 		{
 			$unlinked_modules = $output->data;
 		}
 
-		if($unlinked_modules)
+		if ($unlinked_modules)
 		{
 			$unlinked_menu_srl = $this->getUnlinkedMenu();
 			$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
@@ -129,21 +129,21 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('menu');
 
-		if($moduleConfig->unlinked_menu_srl)
+		if ($moduleConfig->unlinked_menu_srl)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->menu_srl = $moduleConfig->unlinked_menu_srl;
 			$menuOutput = executeQuery('menu.getMenu', $menuArgs);
-			if(!$menuOutput->data)
+			if (!$menuOutput->data)
 			{
 				unset($moduleConfig->unlinked_menu_srl);
 			}
 		}
 
-		if(!$moduleConfig->unlinked_menu_srl)
+		if (!$moduleConfig->unlinked_menu_srl)
 		{
 			$output = $this->addMenu('unlinked', 0);
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$moduleConfig->unlinked_menu_srl = $output->get('menuSrl');
 				$oModuleController = getController('module');
@@ -168,12 +168,12 @@ 
 	 */
 	function updateLinkModule($moduleInfos, $menuSrl)
 	{
-		if(!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0)
+		if (!$moduleInfos || !is_array($moduleInfos) || count($moduleInfos) == 0 || $menuSrl == 0)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		foreach($moduleInfos as $moduleInfo)
+		foreach ($moduleInfos as $moduleInfo)
 		{
 			// search menu.
 			$args = new stdClass;
@@ -183,7 +183,7 @@ 
 
 			$output = executeQuery('menu.getMenuItemByUrl', $args);
 
-			if($output->toBool() && $output->data)
+			if ($output->toBool() && $output->data)
 			{
 				$moduleInfo->menu_srl = $output->data->menu_srl;
 			}
@@ -194,10 +194,10 @@ 
 				$item_args->url = $moduleInfo->mid;
 				$item_args->name = $moduleInfo->mid;
 				$item_args->menu_item_srl = getNextSequence();
-				$item_args->listorder = -1*$item_args->menu_item_srl;
+				$item_args->listorder = -1 * $item_args->menu_item_srl;
 
 				$output = executeQuery('menu.insertMenuItem', $item_args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -210,7 +210,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -235,7 +235,7 @@ 
 		$args->menu_srl = Context::get('menu_srl');
 
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_registed');
 
@@ -255,14 +255,14 @@ 
 		$menuInfo = $oMenuAdminModel->getMenu($menu_srl);
 
 		$oAdmin = getClass('admin');
-		if($menuInfo->title == $oAdmin->getAdminMenuName())
+		if ($menuInfo->title == $oAdmin->getAdminMenuName())
 			return new Object(-1, 'msg_adminmenu_cannot_delete');
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 		}
@@ -273,25 +273,25 @@ 
 
 		$isStartmenuInclude = false;
 
-		if(is_array($menu->list))
+		if (is_array($menu->list))
 		{
-			foreach($menu->list AS $key=>$value)
+			foreach ($menu->list AS $key=>$value)
 			{
 				$originMenu = $value;
 				$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
 
-				if($isStartmenuInclude)
+				if ($isStartmenuInclude)
 					break;
 			}
 		}
 
-		if($isStartmenuInclude)
+		if ($isStartmenuInclude)
 		{
 			return new Object(-1, 'msg_cannot_delete_homemenu');
 		}
 
 		$output = $this->deleteMenu($menu_srl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return new Object(-1, $output->message);
 		}
@@ -319,7 +319,7 @@ 
 
 		// Delete modules
 		$output = executeQueryArray('menu.getMenuItems', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -327,15 +327,15 @@ 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
 
-		foreach($output->data as $itemInfo)
+		foreach ($output->data as $itemInfo)
 		{
-			if($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0)
+			if ($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl);
-				if($moduleInfo->module_srl)
+				if ($moduleInfo->module_srl)
 				{
 					$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
-					if(!$output->toBool())
+					if (!$output->toBool())
 					{
 						$oDB->rollback();
 						return $output;
@@ -346,27 +346,27 @@ 
 
 		// Delete menu items
 		$output = executeQuery("menu.deleteMenuItems", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Delete the menu
 		$output = executeQuery("menu.deleteMenu", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		// Delete cache files
-		$cache_list = FileHandler::readDir("./files/cache/menu","",false,true);
-		if(count($cache_list))
+		$cache_list = FileHandler::readDir("./files/cache/menu", "", false, true);
+		if (count($cache_list))
 		{
-			foreach($cache_list as $cache_file)
+			foreach ($cache_list as $cache_file)
 			{
 				$pos = strpos($cache_file, $menu_srl.'.');
-				if($pos>0)FileHandler::removeFile($cache_file);
+				if ($pos > 0)FileHandler::removeFile($cache_file);
 			}
 		}
 		// Delete images of menu buttons
@@ -375,7 +375,7 @@ 
 
 		$oDB->commit();
 
-		return new Object(0,'success_deleted');
+		return new Object(0, 'success_deleted');
 	}
 
 	/**
@@ -385,24 +385,24 @@ 
 	public function procMenuAdminInsertItem($request = NULL)
 	{
 		$isProc = false;
-		if(!$request)
+		if (!$request)
 		{
 			$isProc = true;
 			$request = Context::getRequestVars();
 		}
 
-		if(!$request->parent_srl || !$request->menu_name)
+		if (!$request->parent_srl || !$request->menu_name)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$this->_setMenuSrl($request->parent_srl, $request->menu_srl);
-		if(!$request->menu_srl)
+		if (!$request->menu_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if($request->is_shortcut == 'Y')
+		if ($request->is_shortcut == 'Y')
 		{
 			$result = $this->_insertShortcut($request);
 		}
@@ -411,7 +411,7 @@ 
 			$result = $this->_insertMenu($request, $isProc);
 		}
 
-		if($result->error < 0)
+		if ($result->error < 0)
 		{
 			return new Object($result->error, $result->message);
 		}
@@ -419,7 +419,7 @@ 
 		// recreate menu cache file
 		$this->makeXmlFile($request->menu_srl);
 
-		if(!$isProc)
+		if (!$isProc)
 		{
 			return $this->get('menu_item_srl');
 		}
@@ -431,7 +431,7 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 		$itemInfo = $oMenuAdminModel->getMenuItemInfo($parent_srl);
 		// parent_srl is parent menu item's srl
-		if($itemInfo->menu_srl)
+		if ($itemInfo->menu_srl)
 		{
 			$menu_srl = $itemInfo->menu_srl;
 		}
@@ -439,7 +439,7 @@ 
 		else
 		{
 			$output = $oMenuAdminModel->getMenu($parent_srl);
-			if($output->menu_srl == $parent_srl)
+			if ($output->menu_srl == $parent_srl)
 			{
 				$menu_srl = $output->menu_srl;
 				$parent_srl = 0;
@@ -453,7 +453,7 @@ 
 		$oDB->begin();
 
 		// type is url
-		if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
+		if (strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
 		{
 			// set menu variable
 			$args = new stdClass();
@@ -465,27 +465,27 @@ 
 			$args->is_shortcut = $request->is_shortcut;
 			$args->url = $request->shortcut_target;
 
-			if(!$args->open_window) $args->open_window = 'N';
-			if(!$args->expand) $args->expand = 'N';
-			if(!$args->is_shortcut) $args->is_shortcut = 'Y';
+			if (!$args->open_window) $args->open_window = 'N';
+			if (!$args->expand) $args->expand = 'N';
+			if (!$args->is_shortcut) $args->is_shortcut = 'Y';
 
-			if($request->menu_name_key) $args->name = $request->menu_name_key;
+			if ($request->menu_name_key) $args->name = $request->menu_name_key;
 			else $args->name = $request->menu_name;
 		}
 		// type is module short cut
-		else if(is_numeric($request->shortcut_target))
+		else if (is_numeric($request->shortcut_target))
 		{
 			// Get original information
 			$oMenuAdminModel = getAdminModel('menu');
 			$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
-			if(!$itemInfo->menu_item_srl)
+			if (!$itemInfo->menu_item_srl)
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 			unset($itemInfo->normal_btn, $itemInfo->hover_btn, $itemInfo->active_btn);
 
 			$args = $itemInfo;
-			if(count($args->group_srls) == 0)
+			if (count($args->group_srls) == 0)
 			{
 				unset($args->group_srls);
 			}
@@ -505,13 +505,13 @@ 
 			$args->url = '#';
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
 		$args->menu_item_srl = getNextSequence();
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oDB->commit();
 
@@ -533,46 +533,46 @@ 
 		$args->expand = $request->menu_expand;
 		$args->is_shortcut = $request->is_shortcut;
 
-		if(!$args->open_window) $args->open_window = 'N';
-		if(!$args->expand) $args->expand = 'N';
-		if(!$args->is_shortcut) $args->is_shortcut = 'N';
+		if (!$args->open_window) $args->open_window = 'N';
+		if (!$args->expand) $args->expand = 'N';
+		if (!$args->is_shortcut) $args->is_shortcut = 'N';
 
-		if($request->menu_name_key) $args->name = $request->menu_name_key;
+		if ($request->menu_name_key) $args->name = $request->menu_name_key;
 		else $args->name = $request->menu_name;
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
-		if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
+		if ($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		// when menu copy, module already copied
-		if($isProc)
+		if ($isProc)
 		{
 			$result = $this->_insertModule($request, $args);
-			if(!$result->toBool())
+			if (!$result->toBool())
 			{
 				return new Object(-1, $result->message);
 			}
 		}
 
 		// if setting button variables, set argument button variables for db insert. but not upload in this method
-		if($request->normal_btn) $args->normal_btn = $request->normal_btn;
-		if($request->hover_btn) $args->hover_btn = $request->hover_btn;
-		if($request->active_btn) $args->active_btn = $request->active_btn;
+		if ($request->normal_btn) $args->normal_btn = $request->normal_btn;
+		if ($request->hover_btn) $args->hover_btn = $request->hover_btn;
+		if ($request->active_btn) $args->active_btn = $request->active_btn;
 
-		if(!$request->module_id)
+		if (!$request->module_id)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$args->url = $request->module_id;
 		$args->menu_item_srl = getNextSequence();
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oDB->commit();
 
@@ -604,7 +604,7 @@ 
 
 		//module create
 		$site_module_info = Context::get('site_module_info');
-		$cmArgs->site_srl = (int)$site_module_info->site_srl;
+		$cmArgs->site_srl = (int) $site_module_info->site_srl;
 		$cmArgs->browser_title = $args->name;
 		$cmArgs->menu_srl = $request->menu_srl;
 		$cmArgs->layout_srl = -1;
@@ -612,13 +612,13 @@ 
 		$cmArgs->is_skin_fix = 'N';
 		$cmArgs->is_mskin_fix = 'N';
 
-		if(Mobile::isMobileEnabled() === true)
+		if (Mobile::isMobileEnabled() === true)
 		{
 			$cmArgs->use_mobile = 'Y';
 		}
 
 		// if mid is empty, auto create mid
-		if(!$request->module_id)
+		if (!$request->module_id)
 		{
 			$randomMid = $this->_makeRandomMid();
 			$request->module_id = $cmArgs->module.'_'.$randomMid;
@@ -628,7 +628,7 @@ 
 		// check already created module instance
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getModuleInfoByMid($request->module_id);
-		if($output->module_srl)
+		if ($output->module_srl)
 		{
 			return new Object(-1, 'msg_module_name_exists');
 		}
@@ -647,14 +647,14 @@ 
 	{
 		$request = Context::getRequestVars();
 
-		if(!$request->menu_item_srl || !$request->menu_name)
+		if (!$request->menu_item_srl || !$request->menu_name)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		// variables set
-		if($request->menu_open_window != "Y") $request->menu_open_window = "N";
-		if($request->menu_expand != "Y") $request->menu_expand = "N";
+		if ($request->menu_open_window != "Y") $request->menu_open_window = "N";
+		if ($request->menu_expand != "Y") $request->menu_expand = "N";
 
 		// Get original information
 		$oMenuAdminModel = getAdminModel('menu');
@@ -662,19 +662,19 @@ 
 		$args = $itemInfo;
 
 		// if menu type is module, check exists module and update
-		if($itemInfo->is_shortcut == 'Y')
+		if ($itemInfo->is_shortcut == 'Y')
 		{
 			// type is url
-			if(strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
+			if (strncasecmp('http', $request->shortcut_target, 4) === 0 || preg_match('/^(\.\/|\.\.\/|\/).*$/', $request->shortcut_target))
 			{
 				$args->url = $request->shortcut_target;
 			}
 			// type is module short cut
-			else if(is_numeric($request->shortcut_target))
+			else if (is_numeric($request->shortcut_target))
 			{
 				// Get new original information
 				$newItemInfo = $oMenuAdminModel->getMenuItemInfo($request->shortcut_target);
-				if(!$newItemInfo->menu_item_srl)
+				if (!$newItemInfo->menu_item_srl)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
@@ -691,10 +691,10 @@ 
 		{
 			// check already created module instance
 			$oModuleModel = getModel('module');
-			if($request->module_id != $itemInfo->url)
+			if ($request->module_id != $itemInfo->url)
 			{
 				$output = $oModuleModel->getModuleInfoByMid($request->module_id);
-				if($output->module_srl)
+				if ($output->module_srl)
 				{
 					return new Object(-1, 'msg_module_name_exists');
 				}
@@ -702,13 +702,13 @@ 
 
 			// if not exist module, return error
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url);
-			if(!$moduleInfo)
+			if (!$moduleInfo)
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			$moduleInfo->mid = $request->module_id;
-			if($request->browser_title)
+			if ($request->browser_title)
 			{
 				$moduleInfo->browser_title = $request->browser_title;
 			}
@@ -717,7 +717,7 @@ 
 			$args->url = $request->module_id;
 		}
 
-		if($request->menu_name_key)
+		if ($request->menu_name_key)
 		{
 			$args->name = $request->menu_name_key;
 		}
@@ -726,7 +726,7 @@ 
 			$args->name = $request->menu_name;
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
+		if ($request->menu_desc) $args->desc = $request->menu_desc;
 		else $args->desc = '';
 
 		unset($args->group_srls);
@@ -754,38 +754,38 @@ 
 
 		$btnOutput = $this->_uploadButton($args);
 
-		if($btnOutput['normal_btn'])
+		if ($btnOutput['normal_btn'])
 		{
 			$this->add('normal_btn', $btnOutput['normal_btn']);
 			$item_info->normal_btn = $btnOutput['normal_btn'];
 		}
-		if($btnOutput['hover_btn'])
+		if ($btnOutput['hover_btn'])
 		{
 			$this->add('hover_btn', $btnOutput['hover_btn']);
 			$item_info->hover_btn = $btnOutput['hover_btn'];
 		}
-		if($btnOutput['active_btn'])
+		if ($btnOutput['active_btn'])
 		{
 			$this->add('active_btn', $btnOutput['active_btn']);
 			$item_info->active_btn = $btnOutput['active_btn'];
 		}
 
 		// group_srls check
-		if(count($item_info->group_srls) == 0)
+		if (count($item_info->group_srls) == 0)
 		{
 			unset($item_info->group_srls);
 		}
 
 		// Button delete check
-		if(!$btnOutput['normal_btn'] && $args->isNormalDelete == 'Y')
+		if (!$btnOutput['normal_btn'] && $args->isNormalDelete == 'Y')
 		{
 			$item_info->normal_btn = '';
 		}
-		if(!$btnOutput['hover_btn'] && $args->isHoverDelete == 'Y')
+		if (!$btnOutput['hover_btn'] && $args->isHoverDelete == 'Y')
 		{
 			$item_info->hover_btn = '';
 		}
-		if(!$btnOutput['active_btn'] && $args->isActiveDelete == 'Y')
+		if (!$btnOutput['active_btn'] && $args->isActiveDelete == 'Y')
 		{
 			$item_info->active_btn = '';
 		}
@@ -825,7 +825,7 @@ 
 		$args->is_force = Context::get('is_force');
 
 		$returnObj = $this->deleteItem($args);
-		if(is_object($returnObj))
+		if (is_object($returnObj))
 		{
 			$this->setError($returnObj->error);
 			$this->setMessage($returnObj->message);
@@ -854,11 +854,11 @@ 
 		$args->menu_srl = $itemInfo->menu_srl;
 
 		// Display an error that the category cannot be deleted if it has a child node	603
-		if($args->is_force != 'Y')
+		if ($args->is_force != 'Y')
 		{
 			$output = executeQuery('menu.getChildMenuCount', $args);
-			if(!$output->toBool()) return $output;
-			if($output->data->count > 0)
+			if (!$output->toBool()) return $output;
+			if ($output->data->count > 0)
 			{
 				return new Object(-1001, 'msg_cannot_delete_for_child');
 			}
@@ -870,22 +870,22 @@ 
 
 		// check admin menu delete
 		$oAdmin = getClass('admin');
-		if($menu_title == $oAdmin->getAdminMenuName() && $itemInfo->parent_srl == 0)
+		if ($menu_title == $oAdmin->getAdminMenuName() && $itemInfo->parent_srl == 0)
 		{
 			return $this->stop('msg_cannot_delete_for_admin_topmenu');
 		}
 
-		if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
+		if ($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $args->menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $args->menu_item_srl, $originMenu);
 			}
@@ -895,7 +895,7 @@ 
 		$siteInfo = $oModuleModel->getSiteInfo($menuInfo->site_srl);
 		$isStartmenuInclude = false;
 		$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
-		if($isStartmenuInclude)
+		if ($isStartmenuInclude)
 		{
 			return new Object(-1, 'msg_cannot_delete_homemenu');
 		}
@@ -919,14 +919,14 @@ 
 
 	private function _checkHomeMenuInOriginMenu($originMenu, $startMid, &$isStartmenuInclude)
 	{
-		if($originMenu['is_shortcut'] != 'Y' && $originMenu['url'] == $startMid)
+		if ($originMenu['is_shortcut'] != 'Y' && $originMenu['url'] == $startMid)
 		{
 			$isStartmenuInclude = true;
 		}
 
-		if(!$isStartmenuInclude && is_array($originMenu['list']))
+		if (!$isStartmenuInclude && is_array($originMenu['list']))
 		{
-			foreach($originMenu['list'] AS $key=>$value)
+			foreach ($originMenu['list'] AS $key=>$value)
 			{
 				$this->_checkHomeMenuInOriginMenu($value, $startMid, $isStartmenuInclude);
 			}
@@ -940,7 +940,7 @@ 
 		$args->menu_srl = $menuSrl;
 		$args->menu_item_srl = $node['node_srl'];
 		$output = executeQuery("menu.deleteMenuItem", $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -949,12 +949,12 @@ 
 		// Update the xml file and get its location
 		$xml_file = $this->makeXmlFile($args->menu_srl);
 		// Delete all of image buttons
-		if($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
-		if($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
-		if($node['active_btn']) FileHandler::removeFile($node['active_btn']);
+		if ($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
+		if ($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
+		if ($node['active_btn']) FileHandler::removeFile($node['active_btn']);
 
 		// Delete module
-		if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
+		if ($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
 		{
 			$oModuleController = getController('module');
 			$oModuleModel = getModel('module');
@@ -964,12 +964,12 @@ 
 			$args->site_srl = $menuInfo->site_srl;
 			$args->is_shortcut = 'Y';
 			$output = executeQuery('menu.getMenuItemByUrl', $args);
-			if($output->data->menu_item_srl)
+			if ($output->data->menu_item_srl)
 			{
 				$output->data->url = '';
 				$referenceItem = $output->data;
 				$output = $this->_updateMenuItem($referenceItem);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -977,10 +977,10 @@ 
 			}
 
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($node['url'], $menuInfo->site_srl);
-			if($moduleInfo->module_srl)
+			if ($moduleInfo->module_srl)
 			{
 				$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -993,14 +993,14 @@ 
 	private function _recursiveDeleteMenuItem(&$oDB, &$menuInfo, $node)
 	{
 		$output = $this->_deleteMenuItem($oDB, $menuInfo, $node);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return new Object(-1, $output->message);
 		}
 
-		if(is_array($node['list']))
+		if (is_array($node['list']))
 		{
-			foreach($node['list'] AS $key=>$value)
+			foreach ($node['list'] AS $key=>$value)
 			{
 				$this->_recursiveDeleteMenuItem($oDB, $menuInfo, $value);
 			}
@@ -1013,31 +1013,31 @@ 
 	 */
 	function procMenuAdminMoveItem()
 	{
-		$mode = Context::get('mode');	//move
-		$parent_srl = Context::get('parent_srl');	// Parent menu item serial number
-		$source_srl = Context::get('source_srl');	// Same hierarchy's menu item serial number
-		$target_srl = Context::get('target_srl');	// Self menu item serial number
+		$mode = Context::get('mode'); //move
+		$parent_srl = Context::get('parent_srl'); // Parent menu item serial number
+		$source_srl = Context::get('source_srl'); // Same hierarchy's menu item serial number
+		$target_srl = Context::get('target_srl'); // Self menu item serial number
 
-		if(!$mode || !$parent_srl || !$target_srl) return new Object(-1,'msg_invalid_request');
+		if (!$mode || !$parent_srl || !$target_srl) return new Object(-1, 'msg_invalid_request');
 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		// get original menu item info for cache file recreate
 		$originalItemInfo = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if(!$originalItemInfo->menu_item_srl)
+		if (!$originalItemInfo->menu_item_srl)
 		{
 			return new Object(-1, 'msg_empty_menu_item');
 		}
 
 		// get menu properies with child menu
-		$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $originalItemInfo->menu_srl);
+		$phpFile = sprintf(_XE_PATH_."files/cache/menu/%s.php", $originalItemInfo->menu_srl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $originalItemInfo->menu_item_srl, $originMenu);
 			}
@@ -1046,7 +1046,7 @@ 
 		// get target menu info for move
 		$targetMenuItemInfo = $oMenuAdminModel->getMenuItemInfo($parent_srl);
 		// if move in same sitemap
-		if($targetMenuItemInfo->menu_item_srl)
+		if ($targetMenuItemInfo->menu_item_srl)
 		{
 			$menu_srl = $targetMenuItemInfo->menu_srl;
 		}
@@ -1058,20 +1058,20 @@ 
 			$parent_srl = 0;
 		}
 
-		if(!$this->homeModuleMid)
+		if (!$this->homeModuleMid)
 		{
 			$oModuleModel = getModel('module');
 			$oMenuAdminController = getAdminController('menu');
 			$columnList = array('modules.mid',);
 			$output = $oModuleModel->getSiteInfo(0, $columnList);
-			if($output->mid)
+			if ($output->mid)
 			{
 				$this->homeModuleMid = $output->mid;
 			}
 		}
 
 		$this->moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $originMenu['is_shortcut'], $originMenu['url']);
-		if(count($originMenu['list']) > 0)
+		if (count($originMenu['list']) > 0)
 		{
 			$this->_recursiveUpdateMenuItem($originMenu['list'], $menu_srl);
 		}
@@ -1085,9 +1085,9 @@ 
 
 	private function _recursiveUpdateMenuItem($node, $menu_srl)
 	{
-		if(is_array($node))
+		if (is_array($node))
 		{
-			foreach($node AS $key=>$node)
+			foreach ($node AS $key=>$node)
 			{
 				$args = new stdClass();
 				$args->menu_srl = $menu_srl;
@@ -1095,11 +1095,11 @@ 
 				$output = $this->_updateMenuItem($args);
 
 				//module's menu_srl move also
-				if($node['is_shortcut'] == 'N' && !empty($node['url']))
+				if ($node['is_shortcut'] == 'N' && !empty($node['url']))
 				{
 					$oModuleModel = getModel('module');
 					$moduleInfo = $oModuleModel->getModuleInfoByMid($node['url']);
-					if($menu_srl != $moduleInfo->menu_srl)
+					if ($menu_srl != $moduleInfo->menu_srl)
 					{
 						$moduleInfo->menu_srl = $menu_srl;
 						$oModuleController = getController('module');
@@ -1107,7 +1107,7 @@ 
 					}
 				}
 
-				if(count($node['list']) > 0)
+				if (count($node['list']) > 0)
 				{
 					$this->_recursiveUpdateMenuItem($node['list'], $menu_srl);
 				}
@@ -1129,21 +1129,21 @@ 
 		$menuSrl = $itemInfo->menu_srl;
 
 		// get menu properies with child menu
-		$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menuSrl);
+		$phpFile = sprintf(_XE_PATH_."files/cache/menu/%s.php", $menuSrl);
 		$originMenu = NULL;
 
-		if(is_readable(FileHandler::getRealPath($phpFile)))
+		if (is_readable(FileHandler::getRealPath($phpFile)))
 		{
 			include(FileHandler::getRealPath($phpFile));
 
-			if(is_array($menu->list))
+			if (is_array($menu->list))
 			{
 				$this->_searchMenu($menu->list, $menuItemSrl, $originMenu);
 			}
 		}
 
 		// copy the menu item with recursively
-		if(is_array($originMenu))
+		if (is_array($originMenu))
 		{
 			$this->_copyMenu($menuSrl, $parentSrl, $originMenu);
 		}
@@ -1159,15 +1159,15 @@ 
 	 */
 	private function _searchMenu(&$menuList, $menuItemSrl, &$originMenu)
 	{
-		if(array_key_exists($menuItemSrl, $menuList))
+		if (array_key_exists($menuItemSrl, $menuList))
 		{
 			$originMenu = $menuList[$menuItemSrl];
 			return;
 		}
 
-		foreach($menuList AS $key=>$value)
+		foreach ($menuList AS $key=>$value)
 		{
-			if(count($value['list']) > 0)
+			if (count($value['list']) > 0)
 			{
 				$this->_searchMenu($value['list'], $menuItemSrl, $originMenu);
 			}
@@ -1182,7 +1182,7 @@ 
 		// default argument setting
 		$args = new stdClass();
 		$args->menu_srl = $menuSrl;
-		if($parentSrl == 0) $args->parent_srl = $menuSrl;
+		if ($parentSrl == 0) $args->parent_srl = $menuSrl;
 		else $args->parent_srl = $parentSrl;
 		$args->menu_name_key = $originMenu['text'];
 		$args->menu_name = $originMenu['text'];
@@ -1195,7 +1195,7 @@ 
 
 		$isModuleCopySuccess = false;
 		// if menu have a reference of module instance
-		if($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0 )
+		if ($menuItemInfo->is_shortcut == 'N' && strncasecmp('http', $originMenu['url'], 4) !== 0)
 		{
 			$oModuleModel = getModel('module');
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($originMenu['url']);
@@ -1215,22 +1215,22 @@ 
 
 			$args->module_srl = $copiedModuleSrl;
 
-			if($copiedModuleSrl)
+			if ($copiedModuleSrl)
 			{
 				$isModuleCopySuccess = true;
 			}
 		}
 		// if menu type is shortcut
-		else if($menuItemInfo->is_shortcut == 'Y')
+		else if ($menuItemInfo->is_shortcut == 'Y')
 		{
 			$args->shortcut_target = $originMenu['url'];
 			$isModuleCopySuccess = true;
 		}
 
-		if($isModuleCopySuccess)
+		if ($isModuleCopySuccess)
 		{
 			// if have a group permission
-			if($menuItemInfo->group_srls)
+			if ($menuItemInfo->group_srls)
 			{
 				$args->group_srls = $menuItemInfo->group_srls;
 			}
@@ -1244,12 +1244,12 @@ 
 
 			// if have a button, copy a button image also
 			$insertedMenuItemSrl = $this->get('menu_item_srl');
-			if($menuItemInfo->normal_btn || $menuItemInfo->hover_btn || $menuItemInfo->active_btn)
+			if ($menuItemInfo->normal_btn || $menuItemInfo->hover_btn || $menuItemInfo->active_btn)
 			{
 				// copy & upate
 				$update_item_info = $oMenuAdminModel->getMenuItemInfo($insertedMenuItemSrl);
-				$copied_info = $this->_copyButton($insertedMenuItemSrl,$update_item_info->menu_srl, $menuItemInfo);
-				if(count($update_item_info->group_srls) == 0)
+				$copied_info = $this->_copyButton($insertedMenuItemSrl, $update_item_info->menu_srl, $menuItemInfo);
+				if (count($update_item_info->group_srls) == 0)
 				{
 					unset($update_item_info->group_srls);
 				}
@@ -1263,7 +1263,7 @@ 
 
 		// if have a child menu, copy child menu also
 		$childMenu = array_shift($originMenu['list']);
-		if(count($childMenu) > 0)
+		if (count($childMenu) > 0)
 		{
 			$this->_copyMenu($menuSrl, $insertedMenuItemSrl, $childMenu);
 		}
@@ -1273,10 +1273,10 @@ 
 	{
 		$time = $_SERVER['REQUEST_TIME'];
 		$randomString = "";
-		for($i=0;$i<4;$i++)
+		for ($i = 0; $i < 4; $i++)
 		{
 			$case = rand(0, 1);
-			if($case) $doc = rand(65, 90);
+			if ($case) $doc = rand(65, 90);
 			else $doc = rand(97, 122);
 
 			$randomString .= chr($doc);
@@ -1300,32 +1300,32 @@ 
 		// menu name update
 		$args->menu_srl = $this->menuSrl;
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->map = array();
-		if(is_array($parentKeyList))
+		if (is_array($parentKeyList))
 		{
-			foreach($parentKeyList as $no=>$srl)
+			foreach ($parentKeyList as $no=>$srl)
 			{
-				if($srl === 0) continue;
-				if(!is_array($this->map[$srl]))$this->map[$srl] = array();
+				if ($srl === 0) continue;
+				if (!is_array($this->map[$srl]))$this->map[$srl] = array();
 				$this->map[$srl][] = $no;
 			}
 		}
 
 		$result = array();
-		if(is_array($this->itemKeyList))
+		if (is_array($this->itemKeyList))
 		{
-			foreach($this->itemKeyList as $srl)
+			foreach ($this->itemKeyList as $srl)
 			{
-				if(!$this->checked[$srl])
+				if (!$this->checked[$srl])
 				{
 					$target = new stdClass();
 					$this->checked[$srl] = 1;
 					$target->node = $srl;
-					$target->child= array();
+					$target->child = array();
 
-					while(count($this->map[$srl]))
+					while (count($this->map[$srl]))
 					{
 						$this->_setParent($srl, array_shift($this->map[$srl]), $target);
 					}
@@ -1334,13 +1334,13 @@ 
 			}
 		}
 
-		if(is_array($result))
+		if (is_array($result))
 		{
 			$i = 0;
-			foreach($result AS $key=>$node)
+			foreach ($result AS $key=>$node)
 			{
-				$this->moveMenuItem($this->menuSrl, 0, $i, $node->node, 'move');	//move parent node
-				$this->_recursiveMoveMenuItem($node);	//move child node
+				$this->moveMenuItem($this->menuSrl, 0, $i, $node->node, 'move'); //move parent node
+				$this->_recursiveMoveMenuItem($node); //move child node
 				$i = $node->node;
 			}
 		}
@@ -1369,7 +1369,7 @@ 
 		$child_node->child = array();
 		$target->child[] = $child_node;
 
-		while(count($this->map[$child_srl]))
+		while (count($this->map[$child_srl]))
 		{
 			$this->_setParent($child_srl, array_shift($this->map[$child_srl]), $child_node);
 		}
@@ -1384,7 +1384,7 @@ 
 	function _recursiveMoveMenuItem($result)
 	{
 		$i = 0;
-		while(count($result->child))
+		while (count($result->child))
 		{
 			unset($node);
 			$node = array_shift($result->child);
@@ -1404,48 +1404,48 @@ 
 	 * @param string $mode 'move' or 'insert'
 	 * @return void
 	 */
-	function moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $isShortcut='Y', $url=NULL)
+	function moveMenuItem($menu_srl, $parent_srl, $source_srl, $target_srl, $mode, $isShortcut = 'Y', $url = NULL)
 	{
 		// Get the original menus
 		$oMenuAdminModel = getAdminModel('menu');
 
 		$target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request');
+		if ($target_item->menu_item_srl != $target_srl) return new Object(-1, 'msg_invalid_request');
 		// Move the menu location(change the order menu appears)
-		if($mode == 'move')
+		if ($mode == 'move')
 		{
 			$args = new stdClass();
 			$args->parent_srl = $parent_srl;
 			$args->menu_srl = $menu_srl;
 
-			if($source_srl)
+			if ($source_srl)
 			{
 				$source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
-				if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request');
-				$args->listorder = $source_item->listorder-1;
+				if ($source_item->menu_item_srl != $source_srl) return new Object(-1, 'msg_invalid_request');
+				$args->listorder = $source_item->listorder - 1;
 			}
 			else
 			{
 				$output = executeQuery('menu.getMaxListorder', $args);
-				if(!$output->toBool()) return $output;
-				$args->listorder = (int)$output->data->listorder;
-				if(!$args->listorder) $args->listorder= 0;
+				if (!$output->toBool()) return $output;
+				$args->listorder = (int) $output->data->listorder;
+				if (!$args->listorder) $args->listorder = 0;
 			}
 			$args->parent_srl = $parent_srl;
 			$output = executeQuery('menu.updateMenuItemListorder', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->parent_srl = $parent_srl;
 			$args->menu_item_srl = $target_srl;
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			//module's menu_srl move also
-			if($isShortcut == 'N' && !empty($url))
+			if ($isShortcut == 'N' && !empty($url))
 			{
 				$oModuleModel = getModel('module');
 				$moduleInfo = $oModuleModel->getModuleInfoByMid($url);
-				if($menu_srl != $moduleInfo->menu_srl)
+				if ($menu_srl != $moduleInfo->menu_srl)
 				{
 					$moduleInfo->menu_srl = $menu_srl;
 					$oModuleController = getController('module');
@@ -1453,13 +1453,13 @@ 
 				}
 
 				// change home menu cache file
-				if($url == $this->homeModuleMid)
+				if ($url == $this->homeModuleMid)
 				{
-					if(file_exists($this->homeMenuCacheFile))
+					if (file_exists($this->homeMenuCacheFile))
 					{
 						include($this->homeMenuCacheFile);
 					}
-					if(!$homeMenuSrl || $homeMenuSrl != $menu_srl)
+					if (!$homeMenuSrl || $homeMenuSrl != $menu_srl)
 					{
 						$this->makeHomemenuCacheFile($menu_srl);
 					}
@@ -1467,13 +1467,13 @@ 
 			}
 			// Add a child
 		}
-		elseif($mode == 'insert')
+		elseif ($mode == 'insert')
 		{
 			$args->menu_item_srl = $target_srl;
 			$args->parent_srl = $parent_srl;
-			$args->listorder = -1*getNextSequence();
+			$args->listorder = -1 * getNextSequence();
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$xml_file = $this->makeXmlFile($menu_srl);
@@ -1498,8 +1498,8 @@ 
 		// Re-generate the xml file
 		$xml_file = $this->makeXmlFile($menu_srl);
 		// Set return value
-		$this->add('menu_title',$menu_title);
-		$this->add('xml_file',$xml_file);
+		$this->add('menu_title', $menu_title);
+		$this->add('xml_file', $xml_file);
 	}
 
 	/**
@@ -1513,12 +1513,12 @@ 
 		$target = Context::get('target');
 		$target_file = Context::get($target);
 		// Error occurs when the target is neither a uploaded file nor a valid file
-		if(!$menu_srl || !$menu_item_srl)
+		if (!$menu_srl || !$menu_item_srl)
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 
 		}
-		else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
+		else if (!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i', $target_file['name']) || !checkUploadedFile($target_file['tmp_name']))
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 		}
@@ -1526,13 +1526,13 @@ 
 		// Move the file to a specific director if the uploaded file meets requirement
 		else
 		{
-			$tmp_arr = explode('.',$target_file['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $target_file['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
 			$filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
 
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if (!is_dir($path)) FileHandler::makeDir($path);
 
 			move_uploaded_file($target_file['tmp_name'], $filename);
 			Context::set('filename', $filename);
@@ -1565,14 +1565,14 @@ 
 	{
 		$oModuleModel = getModel('module');
 		$installed_module_list = $oModuleModel->getModulesXmlInfo();
-		if(is_array($installed_module_list))
+		if (is_array($installed_module_list))
 		{
 			$currentLang = Context::getLangType();
 			$menuList = array();
-			foreach($installed_module_list AS $key=>$value)
+			foreach ($installed_module_list AS $key=>$value)
 			{
 				$info = $oModuleModel->getModuleActionXml($value->module);
-				if($info->menu) $menuList[$value->module] = $info->menu;
+				if ($info->menu) $menuList[$value->module] = $info->menu;
 				unset($info->menu);
 			}
 		}
@@ -1604,8 +1604,8 @@ 
 		$info = $oModuleModel->getModuleActionXml($moduleName);
 
 		$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
+		if (empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
+		if (empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
 		$dbInfo = Context::getDBInfo();
 
 		$args = new stdClass();
@@ -1614,7 +1614,7 @@ 
 		$args->menu_srl = $requestArgs->menu_srl;
 		$args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName);
 		//if now page is https...
-		if(strpos($url, 'https') !== false)
+		if (strpos($url, 'https') !== false)
 		{
 			$args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url);
 		}
@@ -1628,23 +1628,23 @@ 
 		$args->hover_btn = '';
 		$args->active_btn = '';
 		$args->group_srls = implode(',', array_keys($groupSrlList));
-		$args->listorder = -1*$args->menu_item_srl;
+		$args->listorder = -1 * $args->menu_item_srl;
 
 		// Check if already exists
 		$oMenuModel = getAdminModel('menu');
 		$item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 		// Update if exists
-		if($item_info->menu_item_srl == $args->menu_item_srl)
+		if ($item_info->menu_item_srl == $args->menu_item_srl)
 		{
 			$output = $this->_updateMenuItem($args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Insert if not exist
 		else
 		{
-			$args->listorder = -1*$args->menu_item_srl;
+			$args->listorder = -1 * $args->menu_item_srl;
 			$output = executeQuery('menu.insertMenuItem', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Get information of the menu
 		$menu_info = $oMenuModel->getMenu($args->menu_srl);
@@ -1672,23 +1672,23 @@ 
 
 		// Menu Exposure update
 		// if exposure target is only login user...
-		if(!$exposure)
+		if (!$exposure)
 		{
 			$args->group_srls = '';
 		}
 		else
 		{
 			$exposure = explode(',', $exposure);
-			if(in_array($exposure, array('-1','-3')))
+			if (in_array($exposure, array('-1', '-3')))
 			{
 				$args->group_srls = $exposure;
 			}
 
-			if($exposure) $args->group_srls = implode(',', $exposure);
+			if ($exposure) $args->group_srls = implode(',', $exposure);
 		}
 
 		$output = $this->_updateMenuItem($args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1704,7 +1704,7 @@ 
 		$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
 
 		$grantList = $xml_info->grant;
-		if(!$grantList) $grantList = new stdClass;
+		if (!$grantList) $grantList = new stdClass;
 
 		$grantList->access = new stdClass();
 		$grantList->access->default = 'guest';
@@ -1712,9 +1712,9 @@ 
 		$grantList->manager->default = 'manager';
 
 		$grant = new stdClass;
-		foreach($grantList AS $grantName=>$grantInfo)
+		foreach ($grantList AS $grantName=>$grantInfo)
 		{
-			if(!$htPerm[$grantName])
+			if (!$htPerm[$grantName])
 			{
 				continue;
 			}
@@ -1722,7 +1722,7 @@ 
 			$htPerm[$grantName] = explode(',', $htPerm[$grantName]);
 
 			// users in a particular group
-			if(is_array($htPerm[$grantName]))
+			if (is_array($htPerm[$grantName]))
 			{
 				$grant->{$grantName} = $htPerm[$grantName];
 				continue;
@@ -1736,7 +1736,7 @@ 
 			$grant->{$group_srls} = array();
 		}
 
-		if(count($grant))
+		if (count($grant))
 		{
 			$oModuleController = getController('module');
 			$oModuleController->insertModuleGrants($moduleInfo->module_srl, $grant);
@@ -1754,15 +1754,15 @@ 
 	function makeXmlFile($menu_srl)
 	{
 		// Return if there is no information when creating the xml file
-		if(!$menu_srl) return;
+		if (!$menu_srl) return;
 		// Get menu informaton
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->toBool() || !$output->data) return $output;
-		$site_srl = (int)$output->data->site_srl;
+		if (!$output->toBool() || !$output->data) return $output;
+		$site_srl = (int) $output->data->site_srl;
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$oModuleModel = getModel('module');
 			$columnList = array('sites.domain');
@@ -1773,13 +1773,13 @@ 
 		$args->menu_srl = $menu_srl;
 		$args->sort_index = 'listorder';
 		$output = executeQuery('menu.getMenuItems', $args);
-		if(!$output->toBool()) return;
+		if (!$output->toBool()) return;
 		// Specify the name of the cache file
-		$xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl);
-		$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl);
+		$xml_file = sprintf(_XE_PATH_."files/cache/menu/%s.xml.php", $menu_srl);
+		$php_file = sprintf(_XE_PATH_."files/cache/menu/%s.php", $menu_srl);
 		// If no data found, generate an XML file without node data
 		$list = $output->data;
-		if(!$list)
+		if (!$list)
 		{
 			$xml_buff = "<root />";
 			FileHandler::writeFile($xml_file, $xml_buff);
@@ -1787,10 +1787,10 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 		// Create a tree for loop
 		$list_count = count($list);
-		for($i=0;$i<$list_count;$i++)
+		for ($i = 0; $i < $list_count; $i++)
 		{
 			$node = $list[$i];
 			$menu_item_srl = $node->menu_item_srl;
@@ -1846,7 +1846,7 @@ 
 		$php_buff = sprintf(
 			'<?php '.
 			'if(!defined("__XE__")) exit(); '.
-			'$menu = new stdClass();' .
+			'$menu = new stdClass();'.
 			'%s; '.
 			'%s; '.
 			'$menu->list = array(%s); '.
@@ -1875,26 +1875,26 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, $domain)
 	{
-		if(!$source_node) return;
+		if (!$source_node) return;
 
 		$oMenuAdminModel = getAdminModel('menu');
 
-		foreach($source_node as $menu_item_srl => $node)
+		foreach ($source_node as $menu_item_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if ($menu_item_srl && $tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
-			foreach($names as $key => $val)
+			foreach ($names as $key => $val)
 			{
-				$name_arr_str .= sprintf('"%s"=>\'%s\',',$key, str_replace(array('\\', '\''), array('\\\\', '\\\''), $val));
+				$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\', '\''), array('\\\\', '\\\''), $val));
 			}
 			$name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str);
 
-			$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
-			$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
-			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
+			$url = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->url);
+			$desc = str_replace(array('&', '"', "'"), array('&amp;', '&quot;', '\\\''), $node->desc);
+			if (preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
 			}
@@ -1904,21 +1904,21 @@ 
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			if ($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $normal_btn);
 			else $normal_btn = '';
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			if ($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $hover_btn);
 			else $hover_btn = '';
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			if ($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $active_btn);
 			else $active_btn = '';
 
 			$group_srls = $node->group_srls;
 
-			if($normal_btn)
+			if ($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
+				if ($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
+				if ($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
 				$link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type], ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>&quot; %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str);
 			}
 			else
@@ -1926,7 +1926,7 @@ 
 				$link = '<?php print $_names[$lang_type]; ?>';
 			}
 			// If the value of node->group_srls exists
-			if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
+			if ($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))', $group_srls, $group_srls == -1 ? 1 : 0);
 			else $group_check_code = "true";
 			$attribute = sprintf(
 				'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" desc="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
@@ -1950,8 +1950,8 @@ 
 				$link
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if ($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			else $buff .= sprintf('<node %s />', $attribute);
 		}
 		return $buff;
 	}
@@ -1970,84 +1970,84 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 	{
 		$output = array("buff"=>"", "url_list"=>array());
-		if(!$source_node) return $output;
+		if (!$source_node) return $output;
 
 		$oMenuAdminModel = getAdminModel('menu');
 
-		foreach($source_node as $menu_item_srl => $node)
+		foreach ($source_node as $menu_item_srl => $node)
 		{
 			// Get data from child nodes if exist.
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if ($menu_item_srl && $tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
 			else $child_output = array("buff"=>"", "url_list"=>array());
 
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
 			unset($name_arr_str);
-			foreach($names as $key => $val)
+			foreach ($names as $key => $val)
 			{
-				if(preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]+)\'\]\}/', $val) === 1)
+				if (preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]+)\'\]\}/', $val) === 1)
 				{
 					$name_arr_str .= sprintf('"%s"=>"%s",', $key, $val);
 				}
 				else
 				{
-					$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\','\''), array('\\\\','\\\''), removeHackTag($val)));
+					$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\', '\''), array('\\\\', '\\\''), removeHackTag($val)));
 				}
 			}
 			$name_str = sprintf('$_menu_names[%d] = array(%s); %s', $node->menu_item_srl, $name_arr_str, $child_output['name']);
 
 			// If url value is not empty in the current node, put the value into an array url_list
-			if($node->url) $child_output['url_list'][] = $node->url;
+			if ($node->url) $child_output['url_list'][] = $node->url;
 			$output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
 			// If node->group_srls value exists
-			if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
+			if ($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))', $node->group_srls, $node->group_srls == -1 ? 1 : 0);
 			else $group_check_code = "true";
 
 			// List variables
-			$href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
-			$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
-			$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
-			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
+			$href = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->href);
+			$url = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->url);
+			$desc = str_replace(array('&', '"', "'"), array('&amp;', '&quot;', '\\\''), $node->desc);
+			if (preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
 			}
 			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
-			$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
-			$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->hover_btn);
-			$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->active_btn);
+			$normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->normal_btn);
+			$hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->hover_btn);
+			$active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $node->active_btn);
 
-			foreach($child_output['url_list'] as $key =>$val)
+			foreach ($child_output['url_list'] as $key =>$val)
 			{
 				$child_output['url_list'][$key] = addslashes($val);
 			}
 
-			$selected = '"'.implode('","',$child_output['url_list']).'"';
+			$selected = '"'.implode('","', $child_output['url_list']).'"';
 			$child_buff = $child_output['buff'];
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			if ($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $normal_btn);
 			else $normal_btn = '';
 
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			if ($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $hover_btn);
 			else $hover_btn = '';
 
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			if ($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $active_btn);
 			else $active_btn = '';
 
 
 			$group_srls = $node->group_srls;
 
-			if($normal_btn)
+			if ($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
+				if ($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
+				if ($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
 				$link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str);
-				if($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
+				if ($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
 				else $link_active = $link;
 			}
 			else
@@ -2085,7 +2085,7 @@ 
 			);
 
 			// Generate buff data
-			$output['buff'] .=  sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
+			$output['buff'] .= sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
 			$output['name'] .= $name_str;
 		}
 		return $output;
@@ -2099,19 +2099,19 @@ 
 	 */
 	function updateMenuLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if (!count($menu_srl_list)) return;
 		// Delete the value of menu_srls
-		$args->menu_srls = implode(',',$menu_srl_list);
+		$args->menu_srls = implode(',', $menu_srl_list);
 		$output = executeQuery('menu.deleteMenuLayout', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$args->layout_srl = $layout_srl;
 		// Mapping menu_srls, layout_srl
-		for($i=0;$i<count($menu_srl_list);$i++)
+		for ($i = 0; $i < count($menu_srl_list); $i++)
 		{
 			$args->menu_srl = $menu_srl_list[$i];
 			$output = executeQuery('menu.insertMenuLayout', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 	}
 
@@ -2124,47 +2124,47 @@ 
 	{
 		// path setting
 		$path = sprintf('./files/attach/menu_button/%d/', $args->menu_srl);
-		if($args->menu_normal_btn || $args->menu_hover_btn || $args->menu_active_btn && !is_dir($path))
+		if ($args->menu_normal_btn || $args->menu_hover_btn || $args->menu_active_btn && !is_dir($path))
 		{
 			FileHandler::makeDir($path);
 		}
 
-		if($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
+		if ($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
 		{
 			$oMenuModel = getAdminModel('menu');
 			$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 
-			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
-			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
-			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
+			if ($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
+			if ($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
+			if ($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
 		}
 
 		$returnArray = array();
 		$date = date('YmdHis');
 		// normal button
-		if($args->menu_normal_btn)
+		if ($args->menu_normal_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_normal_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_normal_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_normal_btn', $ext);
 
-			if(checkUploadedFile($args->menu_normal_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_normal_btn['tmp_name']))
 			{
-				move_uploaded_file ( $args->menu_normal_btn ['tmp_name'], $filename );
+				move_uploaded_file($args->menu_normal_btn ['tmp_name'], $filename);
 				$returnArray ['normal_btn'] = $filename;
 			}
 		}
 
 		// hover button
-		if($args->menu_hover_btn)
+		if ($args->menu_hover_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_hover_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_hover_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_hover_btn', $ext);
 
-			if(checkUploadedFile($args->menu_hover_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_hover_btn['tmp_name']))
 			{
 				move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename);
 				$returnArray['hover_btn'] = $filename;
@@ -2172,14 +2172,14 @@ 
 		}
 
 		// active button
-		if($args->menu_active_btn)
+		if ($args->menu_active_btn)
 		{
-			$tmp_arr = explode('.',$args->menu_active_btn['name']);
-			$ext = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('.', $args->menu_active_btn['name']);
+			$ext = $tmp_arr[count($tmp_arr) - 1];
 
 			$filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_active_btn', $ext);
 
-			if(checkUploadedFile($args->menu_active_btn['tmp_name']))
+			if (checkUploadedFile($args->menu_active_btn['tmp_name']))
 			{
 				move_uploaded_file($args->menu_active_btn['tmp_name'], $filename);
 				$returnArray['active_btn'] = $filename;
@@ -2201,7 +2201,7 @@ 
 			"active_btn"=>"",
 		);
 		//normal_btn
-		if($menuItemInfo->normal_btn)
+		if ($menuItemInfo->normal_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->normal_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->normal_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'normal');
@@ -2211,7 +2211,7 @@ 
 		}
 
 		//hover_btn
-		if($menuItemInfo->hover_btn)
+		if ($menuItemInfo->hover_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->hover_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->hover_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'hover');
@@ -2221,7 +2221,7 @@ 
 		}
 
 		//active_btn
-		if($menuItemInfo->active_btn)
+		if ($menuItemInfo->active_btn)
 		{
 			$originFile = FileHandler::getRealPath($menuItemInfo->active_btn);
 			$targetFile = $this->_changeMenuItemSrlInButtonPath($menuItemInfo->active_btn, $insertedMenuSrl, $insertedMenuItemSrl, 'active');
@@ -2236,9 +2236,9 @@ 
 	{
 		$path = sprintf('./files/attach/menu_button/%d/', $menuSrl);
 		$tmp_arr = explode('.', $buttonPath);
-		$ext = $tmp_arr[count($tmp_arr)-1];
+		$ext = $tmp_arr[count($tmp_arr) - 1];
 		$date = date("YmdHis");
-		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl,$date,'menu_'.$mode.'_btn', $ext);
+		return sprintf('%s%d.%s.%s.%s', $path, $menuItemSrl, $date, 'menu_'.$mode.'_btn', $ext);
 	}
 
 	public function makeHomemenuCacheFile($menuSrl)

Braces +297 added lines, -130 removed lines

@@ -69,7 +69,9 @@ 
 		$site_module_info = Context::get('site_module_info');
 
 		$output = $this->addMenu(Context::get('title'), (int)$site_module_info->site_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('menu_srl', $output->get('menuSrl'));
 		$this->setMessage('success_registed');
@@ -148,8 +150,7 @@ 
 				$moduleConfig->unlinked_menu_srl = $output->get('menuSrl');
 				$oModuleController = getController('module');
 				$oModuleController->updateModuleConfig('menu', $moduleConfig);
-			}
-			else
+			} else
 			{
 				return false;
 			}
@@ -186,8 +187,7 @@ 
 			if($output->toBool() && $output->data)
 			{
 				$moduleInfo->menu_srl = $output->data->menu_srl;
-			}
-			else
+			} else
 			{
 				// create menu item.
 				$item_args->menu_srl = $menuSrl;
@@ -235,7 +235,9 @@ 
 		$args->menu_srl = Context::get('menu_srl');
 
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_registed');
 
@@ -255,8 +257,9 @@ 
 		$menuInfo = $oMenuAdminModel->getMenu($menu_srl);
 
 		$oAdmin = getClass('admin');
-		if($menuInfo->title == $oAdmin->getAdminMenuName())
-			return new Object(-1, 'msg_adminmenu_cannot_delete');
+		if($menuInfo->title == $oAdmin->getAdminMenuName()) {
+					return new Object(-1, 'msg_adminmenu_cannot_delete');
+		}
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl);
@@ -280,8 +283,9 @@ 
 				$originMenu = $value;
 				$this->_checkHomeMenuInOriginMenu($originMenu, $siteInfo->mid, $isStartmenuInclude);
 
-				if($isStartmenuInclude)
-					break;
+				if($isStartmenuInclude) {
+									break;
+				}
 			}
 		}
 
@@ -366,7 +370,9 @@ 
 			foreach($cache_list as $cache_file)
 			{
 				$pos = strpos($cache_file, $menu_srl.'.');
-				if($pos>0)FileHandler::removeFile($cache_file);
+				if($pos>0) {
+					FileHandler::removeFile($cache_file);
+				}
 			}
 		}
 		// Delete images of menu buttons
@@ -405,8 +411,7 @@ 
 		if($request->is_shortcut == 'Y')
 		{
 			$result = $this->_insertShortcut($request);
-		}
-		else
+		} else
 		{
 			$result = $this->_insertMenu($request, $isProc);
 		}
@@ -465,12 +470,21 @@ 
 			$args->is_shortcut = $request->is_shortcut;
 			$args->url = $request->shortcut_target;
 
-			if(!$args->open_window) $args->open_window = 'N';
-			if(!$args->expand) $args->expand = 'N';
-			if(!$args->is_shortcut) $args->is_shortcut = 'Y';
+			if(!$args->open_window) {
+				$args->open_window = 'N';
+			}
+			if(!$args->expand) {
+				$args->expand = 'N';
+			}
+			if(!$args->is_shortcut) {
+				$args->is_shortcut = 'Y';
+			}
 
-			if($request->menu_name_key) $args->name = $request->menu_name_key;
-			else $args->name = $request->menu_name;
+			if($request->menu_name_key) {
+				$args->name = $request->menu_name_key;
+			} else {
+				$args->name = $request->menu_name;
+			}
 		}
 		// type is module short cut
 		else if(is_numeric($request->shortcut_target))
@@ -505,13 +519,18 @@ 
 			$args->url = '#';
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		$args->menu_item_srl = getNextSequence();
 		$args->listorder = -1*$args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oDB->commit();
 
@@ -533,15 +552,27 @@ 
 		$args->expand = $request->menu_expand;
 		$args->is_shortcut = $request->is_shortcut;
 
-		if(!$args->open_window) $args->open_window = 'N';
-		if(!$args->expand) $args->expand = 'N';
-		if(!$args->is_shortcut) $args->is_shortcut = 'N';
+		if(!$args->open_window) {
+			$args->open_window = 'N';
+		}
+		if(!$args->expand) {
+			$args->expand = 'N';
+		}
+		if(!$args->is_shortcut) {
+			$args->is_shortcut = 'N';
+		}
 
-		if($request->menu_name_key) $args->name = $request->menu_name_key;
-		else $args->name = $request->menu_name;
+		if($request->menu_name_key) {
+			$args->name = $request->menu_name_key;
+		} else {
+			$args->name = $request->menu_name;
+		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
 		{
@@ -559,9 +590,15 @@ 
 		}
 
 		// if setting button variables, set argument button variables for db insert. but not upload in this method
-		if($request->normal_btn) $args->normal_btn = $request->normal_btn;
-		if($request->hover_btn) $args->hover_btn = $request->hover_btn;
-		if($request->active_btn) $args->active_btn = $request->active_btn;
+		if($request->normal_btn) {
+			$args->normal_btn = $request->normal_btn;
+		}
+		if($request->hover_btn) {
+			$args->hover_btn = $request->hover_btn;
+		}
+		if($request->active_btn) {
+			$args->active_btn = $request->active_btn;
+		}
 
 		if(!$request->module_id)
 		{
@@ -572,7 +609,9 @@ 
 		$args->menu_item_srl = getNextSequence();
 		$args->listorder = -1*$args->menu_item_srl;
 		$output = executeQuery('menu.insertMenuItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oDB->commit();
 
@@ -653,8 +692,12 @@ 
 		}
 
 		// variables set
-		if($request->menu_open_window != "Y") $request->menu_open_window = "N";
-		if($request->menu_expand != "Y") $request->menu_expand = "N";
+		if($request->menu_open_window != "Y") {
+			$request->menu_open_window = "N";
+		}
+		if($request->menu_expand != "Y") {
+			$request->menu_expand = "N";
+		}
 
 		// Get original information
 		$oMenuAdminModel = getAdminModel('menu');
@@ -681,13 +724,11 @@ 
 
 				$args->url = $newItemInfo->url;
 				$args->is_shortcut = 'Y';
-			}
-			else
+			} else
 			{
 				$args->url = '#';
 			}
-		}
-		else
+		} else
 		{
 			// check already created module instance
 			$oModuleModel = getModel('module');
@@ -720,14 +761,16 @@ 
 		if($request->menu_name_key)
 		{
 			$args->name = $request->menu_name_key;
-		}
-		else
+		} else
 		{
 			$args->name = $request->menu_name;
 		}
 
-		if($request->menu_desc) $args->desc = $request->menu_desc;
-		else $args->desc = '';
+		if($request->menu_desc) {
+			$args->desc = $request->menu_desc;
+		} else {
+			$args->desc = '';
+		}
 
 		unset($args->group_srls);
 		$args->open_window = $request->menu_open_window;
@@ -829,8 +872,7 @@ 
 		{
 			$this->setError($returnObj->error);
 			$this->setMessage($returnObj->message);
-		}
-		else
+		} else
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -857,7 +899,9 @@ 
 		if($args->is_force != 'Y')
 		{
 			$output = executeQuery('menu.getChildMenuCount', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			if($output->data->count > 0)
 			{
 				return new Object(-1001, 'msg_cannot_delete_for_child');
@@ -875,7 +919,9 @@ 
 			return $this->stop('msg_cannot_delete_for_admin_topmenu');
 		}
 
-		if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
+		if($itemInfo->parent_srl) {
+			$parent_srl = $itemInfo->parent_srl;
+		}
 
 		// get menu properies with child menu
 		$phpFile = sprintf("./files/cache/menu/%s.php", $args->menu_srl);
@@ -949,9 +995,15 @@ 
 		// Update the xml file and get its location
 		$xml_file = $this->makeXmlFile($args->menu_srl);
 		// Delete all of image buttons
-		if($node['normal_btn']) FileHandler::removeFile($node['normal_btn']);
-		if($node['hover_btn']) FileHandler::removeFile($node['hover_btn']);
-		if($node['active_btn']) FileHandler::removeFile($node['active_btn']);
+		if($node['normal_btn']) {
+			FileHandler::removeFile($node['normal_btn']);
+		}
+		if($node['hover_btn']) {
+			FileHandler::removeFile($node['hover_btn']);
+		}
+		if($node['active_btn']) {
+			FileHandler::removeFile($node['active_btn']);
+		}
 
 		// Delete module
 		if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
@@ -1018,7 +1070,9 @@ 
 		$source_srl = Context::get('source_srl');	// Same hierarchy's menu item serial number
 		$target_srl = Context::get('target_srl');	// Self menu item serial number
 
-		if(!$mode || !$parent_srl || !$target_srl) return new Object(-1,'msg_invalid_request');
+		if(!$mode || !$parent_srl || !$target_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
@@ -1182,8 +1236,11 @@ 
 		// default argument setting
 		$args = new stdClass();
 		$args->menu_srl = $menuSrl;
-		if($parentSrl == 0) $args->parent_srl = $menuSrl;
-		else $args->parent_srl = $parentSrl;
+		if($parentSrl == 0) {
+			$args->parent_srl = $menuSrl;
+		} else {
+			$args->parent_srl = $parentSrl;
+		}
 		$args->menu_name_key = $originMenu['text'];
 		$args->menu_name = $originMenu['text'];
 		$args->menu_open_window = $originMenu['open_window'];
@@ -1276,8 +1333,11 @@ 
 		for($i=0;$i<4;$i++)
 		{
 			$case = rand(0, 1);
-			if($case) $doc = rand(65, 90);
-			else $doc = rand(97, 122);
+			if($case) {
+				$doc = rand(65, 90);
+			} else {
+				$doc = rand(97, 122);
+			}
 
 			$randomString .= chr($doc);
 		}
@@ -1300,15 +1360,21 @@ 
 		// menu name update
 		$args->menu_srl = $this->menuSrl;
 		$output = executeQuery('menu.updateMenu', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->map = array();
 		if(is_array($parentKeyList))
 		{
 			foreach($parentKeyList as $no=>$srl)
 			{
-				if($srl === 0) continue;
-				if(!is_array($this->map[$srl]))$this->map[$srl] = array();
+				if($srl === 0) {
+					continue;
+				}
+				if(!is_array($this->map[$srl])) {
+					$this->map[$srl] = array();
+				}
 				$this->map[$srl][] = $no;
 			}
 		}
@@ -1410,7 +1476,9 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		$target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
-		if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request');
+		if($target_item->menu_item_srl != $target_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Move the menu location(change the order menu appears)
 		if($mode == 'move')
 		{
@@ -1421,24 +1489,33 @@ 
 			if($source_srl)
 			{
 				$source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
-				if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request');
+				if($source_item->menu_item_srl != $source_srl) {
+					return new Object(-1,'msg_invalid_request');
+				}
 				$args->listorder = $source_item->listorder-1;
-			}
-			else
+			} else
 			{
 				$output = executeQuery('menu.getMaxListorder', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 				$args->listorder = (int)$output->data->listorder;
-				if(!$args->listorder) $args->listorder= 0;
+				if(!$args->listorder) {
+					$args->listorder= 0;
+				}
 			}
 			$args->parent_srl = $parent_srl;
 			$output = executeQuery('menu.updateMenuItemListorder', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->parent_srl = $parent_srl;
 			$args->menu_item_srl = $target_srl;
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			//module's menu_srl move also
 			if($isShortcut == 'N' && !empty($url))
@@ -1466,14 +1543,15 @@ 
 				}
 			}
 			// Add a child
-		}
-		elseif($mode == 'insert')
+		} elseif($mode == 'insert')
 		{
 			$args->menu_item_srl = $target_srl;
 			$args->parent_srl = $parent_srl;
 			$args->listorder = -1*getNextSequence();
 			$output = executeQuery('menu.updateMenuItemNode', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$xml_file = $this->makeXmlFile($menu_srl);
@@ -1517,8 +1595,7 @@ 
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 
-		}
-		else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
+		} else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
 		{
 			Context::set('error_messge', Context::getLang('msg_invalid_request'));
 		}
@@ -1532,7 +1609,9 @@ 
 			$path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
 			$filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
 
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if(!is_dir($path)) {
+				FileHandler::makeDir($path);
+			}
 
 			move_uploaded_file($target_file['tmp_name'], $filename);
 			Context::set('filename', $filename);
@@ -1572,7 +1651,9 @@ 
 			foreach($installed_module_list AS $key=>$value)
 			{
 				$info = $oModuleModel->getModuleActionXml($value->module);
-				if($info->menu) $menuList[$value->module] = $info->menu;
+				if($info->menu) {
+					$menuList[$value->module] = $info->menu;
+				}
 				unset($info->menu);
 			}
 		}
@@ -1604,8 +1685,12 @@ 
 		$info = $oModuleModel->getModuleActionXml($moduleName);
 
 		$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
+		if(empty($url)) {
+			$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
+		}
+		if(empty($url)) {
+			$url = getNotEncodedFullUrl('', 'module', 'admin');
+		}
 		$dbInfo = Context::getDBInfo();
 
 		$args = new stdClass();
@@ -1617,8 +1702,7 @@ 
 		if(strpos($url, 'https') !== false)
 		{
 			$args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url);
-		}
-		else
+		} else
 		{
 			$args->url = str_replace($dbInfo->default_url, '', $url);
 		}
@@ -1637,14 +1721,18 @@ 
 		if($item_info->menu_item_srl == $args->menu_item_srl)
 		{
 			$output = $this->_updateMenuItem($args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Insert if not exist
 		else
 		{
 			$args->listorder = -1*$args->menu_item_srl;
 			$output = executeQuery('menu.insertMenuItem', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Get information of the menu
 		$menu_info = $oMenuModel->getMenu($args->menu_srl);
@@ -1675,8 +1763,7 @@ 
 		if(!$exposure)
 		{
 			$args->group_srls = '';
-		}
-		else
+		} else
 		{
 			$exposure = explode(',', $exposure);
 			if(in_array($exposure, array('-1','-3')))
@@ -1684,7 +1771,9 @@ 
 				$args->group_srls = $exposure;
 			}
 
-			if($exposure) $args->group_srls = implode(',', $exposure);
+			if($exposure) {
+				$args->group_srls = implode(',', $exposure);
+			}
 		}
 
 		$output = $this->_updateMenuItem($args);
@@ -1704,7 +1793,9 @@ 
 		$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
 
 		$grantList = $xml_info->grant;
-		if(!$grantList) $grantList = new stdClass;
+		if(!$grantList) {
+			$grantList = new stdClass;
+		}
 
 		$grantList->access = new stdClass();
 		$grantList->access->default = 'guest';
@@ -1754,12 +1845,16 @@ 
 	function makeXmlFile($menu_srl)
 	{
 		// Return if there is no information when creating the xml file
-		if(!$menu_srl) return;
+		if(!$menu_srl) {
+			return;
+		}
 		// Get menu informaton
 		$args = new stdClass();
 		$args->menu_srl = $menu_srl;
 		$output = executeQuery('menu.getMenu', $args);
-		if(!$output->toBool() || !$output->data) return $output;
+		if(!$output->toBool() || !$output->data) {
+			return $output;
+		}
 		$site_srl = (int)$output->data->site_srl;
 
 		if($site_srl)
@@ -1773,7 +1868,9 @@ 
 		$args->menu_srl = $menu_srl;
 		$args->sort_index = 'listorder';
 		$output = executeQuery('menu.getMenuItems', $args);
-		if(!$output->toBool()) return;
+		if(!$output->toBool()) {
+			return;
+		}
 		// Specify the name of the cache file
 		$xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl);
 		$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl);
@@ -1787,7 +1884,9 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 		// Create a tree for loop
 		$list_count = count($list);
 		for($i=0;$i<$list_count;$i++)
@@ -1875,7 +1974,9 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, $domain)
 	{
-		if(!$source_node) return;
+		if(!$source_node) {
+			return;
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
@@ -1883,7 +1984,9 @@ 
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			if($menu_item_srl&&$tree[$menu_item_srl]) {
+				$child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			}
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
 			foreach($names as $key => $val)
@@ -1897,37 +2000,57 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = sprintf('"%s"', $url);
 			}
-			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-			else $normal_btn = '';
+			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) {
+				$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			} else {
+				$normal_btn = '';
+			}
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-			else $hover_btn = '';
+			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) {
+				$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			} else {
+				$hover_btn = '';
+			}
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-			else $active_btn = '';
+			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) {
+				$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			} else {
+				$active_btn = '';
+			}
 
 			$group_srls = $node->group_srls;
 
 			if($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
+				if($hover_btn) {
+					$hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn);
+				} else {
+					$hover_str = '';
+				}
+				if($active_btn) {
+					$active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn);
+				} else {
+					$active_str = '';
+				}
 				$link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type], ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>&quot; %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str);
-			}
-			else
+			} else
 			{
 				$link = '<?php print $_names[$lang_type]; ?>';
 			}
 			// If the value of node->group_srls exists
-			if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
-			else $group_check_code = "true";
+			if($group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
+			} else {
+				$group_check_code = "true";
+			}
 			$attribute = sprintf(
 				'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" desc="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
 				$menu_item_srl,
@@ -1950,8 +2073,11 @@ 
 				$link
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if($child_buff) {
+				$buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			} else {
+				$buff .=  sprintf('<node %s />', $attribute);
+			}
 		}
 		return $buff;
 	}
@@ -1970,15 +2096,20 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, $domain)
 	{
 		$output = array("buff"=>"", "url_list"=>array());
-		if(!$source_node) return $output;
+		if(!$source_node) {
+			return $output;
+		}
 
 		$oMenuAdminModel = getAdminModel('menu');
 
 		foreach($source_node as $menu_item_srl => $node)
 		{
 			// Get data from child nodes if exist.
-			if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
-			else $child_output = array("buff"=>"", "url_list"=>array());
+			if($menu_item_srl&&$tree[$menu_item_srl]) {
+				$child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
+			} else {
+				$child_output = array("buff"=>"", "url_list"=>array());
+			}
 
 			// List variables
 			$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
@@ -1988,8 +2119,7 @@ 
 				if(preg_match('/\{\$lang->menu_gnb(?:_sub)?\[\'([a-zA-Z_]+)\'\]\}/', $val) === 1)
 				{
 					$name_arr_str .= sprintf('"%s"=>"%s",', $key, $val);
-				}
-				else
+				} else
 				{
 					$name_arr_str .= sprintf('"%s"=>\'%s\',', $key, str_replace(array('\\','\''), array('\\\\','\\\''), removeHackTag($val)));
 				}
@@ -1997,11 +2127,16 @@ 
 			$name_str = sprintf('$_menu_names[%d] = array(%s); %s', $node->menu_item_srl, $name_arr_str, $child_output['name']);
 
 			// If url value is not empty in the current node, put the value into an array url_list
-			if($node->url) $child_output['url_list'][] = $node->url;
+			if($node->url) {
+				$child_output['url_list'][] = $node->url;
+			}
 			$output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
 			// If node->group_srls value exists
-			if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
-			else $group_check_code = "true";
+			if($node->group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
+			} else {
+				$group_check_code = "true";
+			}
 
 			// List variables
 			$href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
@@ -2010,8 +2145,9 @@ 
 			if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
 			{
 				$href = "getSiteUrl('$domain', '','mid','$node->url')";
+			} else {
+				$href = sprintf('"%s"', $url);
 			}
-			else $href = sprintf('"%s"', $url);
 			$is_shortcut = $node->is_shortcut;
 			$open_window = $node->open_window;
 			$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
@@ -2028,29 +2164,48 @@ 
 			$expand = $node->expand;
 
 			$normal_btn = $node->normal_btn;
-			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-			else $normal_btn = '';
+			if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) {
+				$normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+			} else {
+				$normal_btn = '';
+			}
 
 			$hover_btn = $node->hover_btn;
-			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-			else $hover_btn = '';
+			if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) {
+				$hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+			} else {
+				$hover_btn = '';
+			}
 
 			$active_btn = $node->active_btn;
-			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-			else $active_btn = '';
+			if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) {
+				$active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+			} else {
+				$active_btn = '';
+			}
 
 
 			$group_srls = $node->group_srls;
 
 			if($normal_btn)
 			{
-				if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
-				if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
+				if($hover_btn) {
+					$hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn);
+				} else {
+					$hover_str = '';
+				}
+				if($active_btn) {
+					$active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn);
+				} else {
+					$active_str = '';
+				}
 				$link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str);
-				if($active_btn) $link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
-				else $link_active = $link;
-			}
-			else
+				if($active_btn) {
+					$link_active = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $active_btn, $node->menu_item_srl, $hover_str);
+				} else {
+					$link_active = $link;
+				}
+			} else
 			{
 				$link_active = $link = sprintf('$_menu_names[%d][$lang_type]', $node->menu_item_srl);
 			}
@@ -2099,11 +2254,15 @@ 
 	 */
 	function updateMenuLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if(!count($menu_srl_list)) {
+			return;
+		}
 		// Delete the value of menu_srls
 		$args->menu_srls = implode(',',$menu_srl_list);
 		$output = executeQuery('menu.deleteMenuLayout', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$args->layout_srl = $layout_srl;
 		// Mapping menu_srls, layout_srl
@@ -2111,7 +2270,9 @@ 
 		{
 			$args->menu_srl = $menu_srl_list[$i];
 			$output = executeQuery('menu.insertMenuLayout', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 	}
 
@@ -2134,9 +2295,15 @@ 
 			$oMenuModel = getAdminModel('menu');
 			$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
 
-			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
-			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
-			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
+			if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) {
+				FileHandler::removeFile($itemInfo->normal_btn);
+			}
+			if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) {
+				FileHandler::removeFile($itemInfo->hover_btn);
+			}
+			if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) {
+				FileHandler::removeFile($itemInfo->active_btn);
+			}
 		}
 
 		$returnArray = array();

modules/board/board.api.php

Spacing +27 added lines, -27 removed lines

@@ -18,7 +18,7 @@ 
 	 * @brief notice list

 	 **/

 	function dispBoardNoticeList(&$oModule) {

-		 $oModule->add('notice_list',$this->arrangeContentList(Context::get('notice_list')));

+		 $oModule->add('notice_list', $this->arrangeContentList(Context::get('notice_list')));

 	}

 

 

@@ -29,11 +29,11 @@ 
 		$api_type = Context::get('api_type');

 		$document_list = $this->arrangeContentList(Context::get('document_list'));

 

-		if($api_type =='summary')

+		if ($api_type == 'summary')

 		{

 			$content_cut_size = Context::get('content_cut_size');

-			$content_cut_size = $content_cut_size?$content_cut_size:50;

-			foreach($document_list as $k=>$v)

+			$content_cut_size = $content_cut_size ? $content_cut_size : 50;

+			foreach ($document_list as $k=>$v)

 			{

 				$oDocument = new documentItem();

 				$oDocument->setAttribute($v, false);

@@ -42,8 +42,8 @@ 
 			}

 		}

 

-		$oModule->add('document_list',$document_list);

-		$oModule->add('page_navigation',Context::get('page_navigation'));

+		$oModule->add('document_list', $document_list);

+		$oModule->add('page_navigation', Context::get('page_navigation'));

 	}

 

 

@@ -51,7 +51,7 @@ 
 	 * @brief category list

 	 **/

 	function dispBoardCategoryList(&$oModule) {

-		$oModule->add('category_list',Context::get('category_list'));

+		$oModule->add('category_list', Context::get('category_list'));

 	}

 

 	/**

@@ -60,11 +60,11 @@ 
 	function dispBoardContentView(&$oModule) {

 		$oDocument = Context::get('oDocument');

 		$extra_vars = $oDocument->getExtraVars();
-		if($oDocument->isGranted())
+		if ($oDocument->isGranted())
 		{

-			$oDocument->add('extra_vars',$this->arrangeExtraVars($extra_vars));
+			$oDocument->add('extra_vars', $this->arrangeExtraVars($extra_vars));
 		}

-		$oModule->add('oDocument',$this->arrangeContent($oDocument));

+		$oModule->add('oDocument', $this->arrangeContent($oDocument));

 	}

 

 

@@ -73,7 +73,7 @@ 
 	 **/

 	function dispBoardContentFileList(&$oModule) {

 		$oDocument = Context::get('oDocument');
-		if($oDocument->isAccessible())
+		if ($oDocument->isAccessible())
 		{
 			$oModule->add('file_list', $this->arrangeFile(Context::get('file_list')));
 		}
@@ -88,20 +88,20 @@ 
 	 * @brief tag list

 	 **/

 	function dispBoardTagList(&$oModule) {

-		$oModule->add('tag_list',Context::get('tag_list'));

+		$oModule->add('tag_list', Context::get('tag_list'));

 	}

 

 	/**

 	 * @brief comments list

 	 **/

 	function dispBoardContentCommentList(&$oModule) {

-		$oModule->add('comment_list',$this->arrangeComment(Context::get('comment_list')));

+		$oModule->add('comment_list', $this->arrangeComment(Context::get('comment_list')));

 	}

 

 	function arrangeContentList($content_list) {

 		$output = array();

-		if(count($content_list)) {

-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);

+		if (count($content_list)) {

+			foreach ($content_list as $key => $val) $output[] = $this->arrangeContent($val);

 		}

 		return $output;

 	}

@@ -110,16 +110,16 @@ 
 	function arrangeContent($content) {

 		$oBoardView = getView('board');

 		$output = new stdClass;

-		if($content){

-			$output = $content->gets('document_srl','category_srl','member_srl','nick_name','title','content','tags','readed_count','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars','status');

+		if ($content) {

+			$output = $content->gets('document_srl', 'category_srl', 'member_srl', 'nick_name', 'title', 'content', 'tags', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'regdate', 'last_update', 'extra_vars', 'status');

 

-			if(!$oBoardView->grant->view)

+			if (!$oBoardView->grant->view)

 			{

 				unset($output->content);

 				unset($output->tags);

 				unset($output->extra_vars);

 			}
-			if(!$content->isAccessible())
+			if (!$content->isAccessible())
 			{
 				$output->content = Context::getLang('msg_is_secret');
 			}

@@ -137,11 +137,11 @@ 
 

 	function arrangeComment($comment_list) {

 		$output = array();

-		if(count($comment_list) > 0 ) {

-			foreach($comment_list as $key => $val){

+		if (count($comment_list) > 0) {

+			foreach ($comment_list as $key => $val) {

 				$item = null;

-				$item = $val->gets('comment_srl','parent_srl','depth','nick_name','content','is_secret','voted_count','blamed_count','regdate','last_update');

-				if(!$val->isAccessible())
+				$item = $val->gets('comment_srl', 'parent_srl', 'depth', 'nick_name', 'content', 'is_secret', 'voted_count', 'blamed_count', 'regdate', 'last_update');

+				if (!$val->isAccessible())
 				{
 					$item->content = Context::getLang('msg_is_secret');
 				}
@@ -154,8 +154,8 @@ 
 

 	function arrangeFile($file_list) {

 		$output = array();

-		if(count($file_list) > 0) {

-			foreach($file_list as $key => $val){

+		if (count($file_list) > 0) {

+			foreach ($file_list as $key => $val) {

 				$item = new stdClass;

 				$item->download_count = $val->download_count;

 				$item->source_filename = $val->source_filename;

@@ -169,8 +169,8 @@ 
 

 	function arrangeExtraVars($list) {

 		$output = array();

-		if(count($list)) {

-			foreach($list as $key => $val){

+		if (count($list)) {

+			foreach ($list as $key => $val) {

 				$item = new stdClass;

 				$item->name = $val->name;

 				$item->type = $val->type;

Braces +4 added lines, -3 removed lines

@@ -76,8 +76,7 @@ 
 		if($oDocument->isAccessible())
 		{
 			$oModule->add('file_list', $this->arrangeFile(Context::get('file_list')));
-		}
-		else
+		} else
 		{
 			$oModule->add('file_list', array());
 		}

@@ -101,7 +100,9 @@ 
 	function arrangeContentList($content_list) {

 		$output = array();

 		if(count($content_list)) {

-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);

+			foreach($content_list as $key => $val) {
+				$output[] = $this->arrangeContent($val);
+			}
 		}

 		return $output;

 	}

modules/board/board.view.php

Spacing +150 added lines, -150 removed lines

@@ -23,15 +23,15 @@ 
 		/**
 		 * setup the module general information
 		 **/
-		if($this->module_info->list_count)
+		if ($this->module_info->list_count)
 		{
 			$this->list_count = $this->module_info->list_count;
 		}
-		if($this->module_info->search_list_count)
+		if ($this->module_info->search_list_count)
 		{
 			$this->search_list_count = $this->module_info->search_list_count;
 		}
-		if($this->module_info->page_count)
+		if ($this->module_info->page_count)
 		{
 			$this->page_count = $this->module_info->page_count;
 		}
@@ -41,20 +41,20 @@ 
 		$oDocumentModel = getModel('document');
 
 		$statusList = $this->_getStatusNameList($oDocumentModel);
-		if(isset($statusList['SECRET']))
+		if (isset($statusList['SECRET']))
 		{
 			$this->module_info->secret = 'Y';
 		}
 
 		// use_category <=1.5.x, hide_category >=1.7.x
 		$count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl));
-		if($count_category)
+		if ($count_category)
 		{
-			if($this->module_info->hide_category)
+			if ($this->module_info->hide_category)
 			{
 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';
 			}
-			else if($this->module_info->use_category)
+			else if ($this->module_info->use_category)
 			{
 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';
 			}
@@ -74,10 +74,10 @@ 
 		 * check the consultation function, if the user is admin then swich off consultation function
 		 * if the user is not logged, then disppear write document/write comment./ view document
 		 **/
-		if($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)
+		if ($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)
 		{
 			$this->consultation = TRUE;
-			if(!Context::get('is_logged'))
+			if (!Context::get('is_logged'))
 			{
 				$this->grant->list = FALSE;
 				$this->grant->write_document = FALSE;
@@ -94,11 +94,11 @@ 
 		 * setup the template path based on the skin
 		 * the default skin is default
 		 **/
-		$template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
-		if(!is_dir($template_path)||!$this->module_info->skin)
+		$template_path = sprintf("%sskins/%s/", $this->module_path, $this->module_info->skin);
+		if (!is_dir($template_path) || !$this->module_info->skin)
 		{
 			$this->module_info->skin = 'default';
-			$template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
+			$template_path = sprintf("%sskins/%s/", $this->module_path, $this->module_info->skin);
 		}
 		$this->setTemplatePath($template_path);
 
@@ -114,7 +114,7 @@ 
 		 **/
 		if (is_array($extra_keys))
 		{
-			foreach($extra_keys as $val)
+			foreach ($extra_keys as $val)
 			{
 				$this->order_target[] = $val->eid;
 			}
@@ -127,9 +127,9 @@ 
 
 		// remove [document_srl]_cpage from get_vars
 		$args = Context::getRequestVars();
-		foreach($args as $name => $value)
+		foreach ($args as $name => $value)
 		{
-			if(preg_match('/[0-9]+_cpage/', $name))
+			if (preg_match('/[0-9]+_cpage/', $name))
 			{
 				Context::set($name, '', TRUE);
 				Context::set($name, $value);
@@ -145,7 +145,7 @@ 
 		/**
 		 * check the access grant (all the grant has been set by the module object)
 		 **/
-		if(!$this->grant->access || !$this->grant->list)
+		if (!$this->grant->access || !$this->grant->list)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -160,22 +160,22 @@ 
 		 * add extra vaiables to the search options
 		 **/
 		// use search options on the template (the search options key has been declared, based on the language selected)
-		foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
+		foreach ($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
 		$extra_keys = Context::get('extra_keys');
-		if($extra_keys)
+		if ($extra_keys)
 		{
-			foreach($extra_keys as $key => $val)
+			foreach ($extra_keys as $key => $val)
 			{
-				if($val->search == 'Y') $search_option['extra_vars'.$val->idx] = $val->name;
+				if ($val->search == 'Y') $search_option['extra_vars'.$val->idx] = $val->name;
 			}
 		}
 		// remove a search option that is not public in member config
 		$memberConfig = getModel('module')->getModuleConfig('member');
-		foreach($memberConfig->signupForm as $signupFormElement)
+		foreach ($memberConfig->signupForm as $signupFormElement)
 		{
-			if(in_array($signupFormElement->title, $search_option))
+			if (in_array($signupFormElement->title, $search_option))
 			{
-				if($signupFormElement->isPublic == 'N')
+				if ($signupFormElement->isPublic == 'N')
 					unset($search_option[$signupFormElement->name]);
 			}
 		}
@@ -183,7 +183,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$statusNameList = $this->_getStatusNameList($oDocumentModel);
-		if(count($statusNameList) > 0)
+		if (count($statusNameList) > 0)
 		{
 			Context::set('status_list', $statusNameList);
 		}
@@ -194,7 +194,7 @@ 
 		// list config, columnList setting
 		$oBoardModel = getModel('board');
 		$this->listConfig = $oBoardModel->getListConfig($this->module_info->module_srl);
-		if(!$this->listConfig) $this->listConfig = array();
+		if (!$this->listConfig) $this->listConfig = array();
 		$this->_makeListColumnList();
 
 		// display the notice list
@@ -218,12 +218,12 @@ 
 	/**
 	 * @brief display the category list
 	 **/
-	function dispBoardCategoryList(){
+	function dispBoardCategoryList() {
 		// check if the use_category option is enabled
-		if($this->module_info->use_category=='Y')
+		if ($this->module_info->use_category == 'Y')
 		{
 			// check the grant
-			if(!$this->grant->list)
+			if (!$this->grant->list)
 			{
 				Context::set('category_list', array());
 				return;
@@ -240,7 +240,7 @@ 
 	/**
 	 * @brief display the board conent view
 	 **/
-	function dispBoardContentView(){
+	function dispBoardContentView() {
 		// get the variable value
 		$document_srl = Context::get('document_srl');
 		$page = Context::get('page');
@@ -251,36 +251,36 @@ 
 		/**
 		 * if the document exists, then get the document information
 		 **/
-		if($document_srl)
+		if ($document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, true);
 
 			// if the document is existed
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				// if the module srl is not consistent
-				if($oDocument->get('module_srl')!=$this->module_info->module_srl )
+				if ($oDocument->get('module_srl') != $this->module_info->module_srl)
 				{
 					return $this->stop('msg_invalid_request');
 				}
 
 				// check the manage grant
-				if($this->grant->manager) $oDocument->setGrant();
+				if ($this->grant->manager) $oDocument->setGrant();
 
 				// if the consultation function is enabled, and the document is not a notice
-				if($this->consultation && !$oDocument->isNotice())
+				if ($this->consultation && !$oDocument->isNotice())
 				{
 					$logged_info = Context::get('logged_info');
-					if($oDocument->get('member_srl')!=$logged_info->member_srl)
+					if ($oDocument->get('member_srl') != $logged_info->member_srl)
 					{
 						$oDocument = $oDocumentModel->getDocument(0);
 					}
 				}
 
 				// if the document is TEMP saved, check Grant
-				if($oDocument->getStatus() == 'TEMP')
+				if ($oDocument->getStatus() == 'TEMP')
 				{
-					if(!$oDocument->isGranted())
+					if (!$oDocument->isGranted())
 					{
 						$oDocument = $oDocumentModel->getDocument(0);
 					}
@@ -290,7 +290,7 @@ 
 			else
 			{
 				// if the document is not existed, then alert a warning message
-				Context::set('document_srl','',true);
+				Context::set('document_srl', '', true);
 				$this->alertMessage('msg_not_founded');
 			}
 
@@ -306,12 +306,12 @@ 
 		/**
 		 *check the document view grant
 		 **/
-		if($oDocument->isExists())
+		if ($oDocument->isExists())
 		{
-			if(!$this->grant->view && !$oDocument->isGranted())
+			if (!$this->grant->view && !$oDocument->isGranted())
 			{
 				$oDocument = $oDocumentModel->getDocument(0);
-				Context::set('document_srl','',true);
+				Context::set('document_srl', '', true);
 				$this->alertMessage('msg_not_permitted');
 			}
 			else
@@ -320,15 +320,15 @@ 
 				Context::addBrowserTitle($oDocument->getTitleText());
 
 				// update the document view count (if the document is not secret)
-				if(!$oDocument->isSecret() || $oDocument->isGranted())
+				if (!$oDocument->isSecret() || $oDocument->isGranted())
 				{
 					$oDocument->updateReadedCount();
 				}
 
 				// disappear the document if it is secret
-				if($oDocument->isSecret() && !$oDocument->isGranted())
+				if ($oDocument->isSecret() && !$oDocument->isGranted())
 				{
-					$oDocument->add('content',Context::getLang('thisissecret'));
+					$oDocument->add('content', Context::getLang('thisissecret'));
 				}
 			}
 		}
@@ -348,11 +348,11 @@ 
 	/**
 	 * @brief  display the document file list (can be used by API)
 	 **/
-	function dispBoardContentFileList(){
+	function dispBoardContentFileList() {
 		/**
 		 * check the access grant (all the grant has been set by the module object)
 		 **/
-		if(!$this->grant->access)
+		if (!$this->grant->access)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -363,41 +363,41 @@ 
 		// Check if a permission for file download is granted
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
-		$file_module_config = $oModuleModel->getModulePartConfig('file',$this->module_srl);
+		$file_module_config = $oModuleModel->getModulePartConfig('file', $this->module_srl);
 		
 		$downloadGrantCount = 0;
-		if(is_array($file_module_config->download_grant))
+		if (is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach ($file_module_config->download_grant AS $value)
+				if ($value) $downloadGrantCount++;
 		}
 
-		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
+		if (is_array($file_module_config->download_grant) && $downloadGrantCount > 0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if (!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				$oModuleModel =& getModel('module');
+				$oModuleModel = & getModel('module');
 				$columnList = array('module_srl', 'site_srl');
 				$module_info = $oModuleModel->getModuleInfoByModuleSrl($this->module_srl, $columnList);
 
-				if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
+				if (!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
 				{
-					$oMemberModel =& getModel('member');
+					$oMemberModel = & getModel('member');
 					$member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
 
 					$is_permitted = false;
-					for($i=0;$i<count($file_module_config->download_grant);$i++)
+					for ($i = 0; $i < count($file_module_config->download_grant); $i++)
 					{
 						$group_srl = $file_module_config->download_grant[$i];
-						if($member_groups[$group_srl])
+						if ($member_groups[$group_srl])
 						{
 							$is_permitted = true;
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if (!$is_permitted) return $this->stop('msg_not_permitted_download');
 				}
 			}
 		}
@@ -406,7 +406,7 @@ 
 		$document_srl = Context::get('document_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		Context::set('oDocument', $oDocument);
-		Context::set('file_list',$oDocument->getUploadedFiles());
+		Context::set('file_list', $oDocument->getUploadedFiles());
 
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('file_list..source_filename');
@@ -415,7 +415,7 @@ 
 	/**
 	 * @brief display the document comment list (can be used by API)
 	 **/
-	function dispBoardContentCommentList(){
+	function dispBoardContentCommentList() {
 		// check document view grant
 		$this->dispBoardContentView();
 
@@ -425,26 +425,26 @@ 
 		$comment_list = $oDocument->getComments();
 
 		// setup the comment list
-		if(is_array($comment_list))
+		if (is_array($comment_list))
 		{
-			foreach($comment_list as $key => $val)
+			foreach ($comment_list as $key => $val)
 			{
-				if(!$val->isAccessible())
+				if (!$val->isAccessible())
 				{
-					$val->add('content',Context::getLang('thisissecret'));
+					$val->add('content', Context::getLang('thisissecret'));
 				}
 			}
 		}
-		Context::set('comment_list',$comment_list);
+		Context::set('comment_list', $comment_list);
 
 	}
 
 	/**
 	 * @brief display notice list (can be used by API)
 	 **/
-	function dispBoardNoticeList(){
+	function dispBoardNoticeList() {
 		// check the grant
-		if(!$this->grant->list)
+		if (!$this->grant->list)
 		{
 			Context::set('notice_list', array());
 			return;
@@ -460,15 +460,15 @@ 
 	/**
 	 * @brief display board content list
 	 **/
-	function dispBoardContentList(){
+	function dispBoardContentList() {
 		// check the grant
-		if(!$this->grant->list)
+		if (!$this->grant->list)
 		{
 			Context::set('document_list', array());
 			Context::set('total_count', 0);
 			Context::set('total_page', 1);
 			Context::set('page', 1);
-			Context::set('page_navigation', new PageHandler(0,0,1,10));
+			Context::set('page_navigation', new PageHandler(0, 0, 1, 10));
 			return;
 		}
 
@@ -486,17 +486,17 @@ 
 		$args->search_keyword = Context::get('search_keyword');
 
 		$search_option = Context::get('search_option');
-		if($search_option==FALSE)
+		if ($search_option == FALSE)
 		{
 			$search_option = $this->search_option;
 		}
-		if(isset($search_option[$args->search_target])==FALSE)
+		if (isset($search_option[$args->search_target]) == FALSE)
 		{
 			$args->search_target = '';
 		}
 
 		// if the category is enabled, then get the category
-		if($this->module_info->use_category=='Y')
+		if ($this->module_info->use_category == 'Y')
 		{
 			$args->category_srl = Context::get('category');
 		}
@@ -504,21 +504,21 @@ 
 		// setup the sort index and order index
 		$args->sort_index = Context::get('sort_index');
 		$args->order_type = Context::get('order_type');
-		if(!in_array($args->sort_index, $this->order_target))
+		if (!in_array($args->sort_index, $this->order_target))
 		{
-			$args->sort_index = $this->module_info->order_target?$this->module_info->order_target:'list_order';
+			$args->sort_index = $this->module_info->order_target ? $this->module_info->order_target : 'list_order';
 		}
-		if(!in_array($args->order_type, array('asc','desc')))
+		if (!in_array($args->order_type, array('asc', 'desc')))
 		{
-			$args->order_type = $this->module_info->order_type?$this->module_info->order_type:'asc';
+			$args->order_type = $this->module_info->order_type ? $this->module_info->order_type : 'asc';
 		}
 
 		// set the current page of documents
 		$document_srl = Context::get('document_srl');
-		if(!$args->page && $document_srl)
+		if (!$args->page && $document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if($oDocument->isExists() && !$oDocument->isNotice())
+			if ($oDocument->isExists() && !$oDocument->isNotice())
 			{
 				$page = $oDocumentModel->getDocumentPage($oDocument, $args);
 				Context::set('page', $page);
@@ -527,13 +527,13 @@ 
 		}
 
 		// setup the list count to be serach list count, if the category or search keyword has been set
-		if($args->category_srl || $args->search_keyword)
+		if ($args->category_srl || $args->search_keyword)
 		{
 			$args->list_count = $this->search_list_count;
 		}
 
 		// if the consultation function is enabled,  the get the logged user information
-		if($this->consultation)
+		if ($this->consultation)
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -561,18 +561,18 @@ 
 				'allow_trackback', 'notify_message', 'status', 'comment_status');
 		$this->columnList = array_intersect($configColumList, $tableColumnList);
 
-		if(in_array('summary', $configColumList)) array_push($this->columnList, 'content');
+		if (in_array('summary', $configColumList)) array_push($this->columnList, 'content');
 
 		// default column list add
 		$defaultColumn = array('document_srl', 'module_srl', 'category_srl', 'lang_code', 'member_srl', 'last_update', 'comment_count', 'trackback_count', 'uploaded_count', 'status', 'regdate', 'title_bold', 'title_color');
 
 		//TODO guestbook, blog style supports legacy codes.
-		if($this->module_info->skin == 'xe_guestbook' || $this->module_info->default_style == 'blog')
+		if ($this->module_info->skin == 'xe_guestbook' || $this->module_info->default_style == 'blog')
 		{
 			$defaultColumn = $tableColumnList;
 		}
 
-		if (in_array('last_post', $configColumList)){
+		if (in_array('last_post', $configColumList)) {
 			array_push($this->columnList, 'last_updater');
 		}
 
@@ -584,9 +584,9 @@ 
 		$this->columnList = array_unique(array_merge($this->columnList, $defaultColumn));
 
 		// add table name
-		foreach($this->columnList as $no => $value)
+		foreach ($this->columnList as $no => $value)
 		{
-			$this->columnList[$no] = 'documents.' . $value;
+			$this->columnList[$no] = 'documents.'.$value;
 		}
 	}
 
@@ -596,7 +596,7 @@ 
 	function dispBoardTagList()
 	{
 		// check if there is not grant fot view list, then alert an warning message
-		if(!$this->grant->list)
+		if (!$this->grant->list)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -610,14 +610,14 @@ 
 		$output = $oTagModel->getTagList($obj);
 
 		// automatically order
-		if(count($output->data))
+		if (count($output->data))
 		{
 			$numbers = array_keys($output->data);
 			shuffle($numbers);
 
-			if(count($output->data))
+			if (count($output->data))
 			{
-				foreach($numbers as $k => $v)
+				foreach ($numbers as $k => $v)
 				{
 					$tag_list[] = $output->data[$v];
 				}
@@ -638,7 +638,7 @@ 
 	function dispBoardWrite()
 	{
 		// check grant
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -648,10 +648,10 @@ 
 		/**
 		 * check if the category option is enabled not not
 		 **/
-		if($this->module_info->use_category=='Y')
+		if ($this->module_info->use_category == 'Y')
 		{
 			// get the user group information
-			if(Context::get('is_logged'))
+			if (Context::get('is_logged'))
 			{
 				$logged_info = Context::get('logged_info');
 				$group_srls = array_keys($logged_info->group_list);
@@ -664,19 +664,19 @@ 
 
 			// check the grant after obtained the category list
 			$normal_category_list = $oDocumentModel->getCategoryList($this->module_srl);
-			if(count($normal_category_list))
+			if (count($normal_category_list))
 			{
-				foreach($normal_category_list as $category_srl => $category)
+				foreach ($normal_category_list as $category_srl => $category)
 				{
 					$is_granted = TRUE;
-					if($category->group_srls)
+					if ($category->group_srls)
 					{
-						$category_group_srls = explode(',',$category->group_srls);
+						$category_group_srls = explode(',', $category->group_srls);
 						$is_granted = FALSE;
-						if(count(array_intersect($group_srls, $category_group_srls))) $is_granted = TRUE;
+						if (count(array_intersect($group_srls, $category_group_srls))) $is_granted = TRUE;
 
 					}
-					if($is_granted) $category_list[$category_srl] = $category;
+					if ($is_granted) $category_list[$category_srl] = $category;
 				}
 			}
 			Context::set('category_list', $category_list);
@@ -687,46 +687,46 @@ 
 		$oDocument = $oDocumentModel->getDocument(0, $this->grant->manager);
 		$oDocument->setDocument($document_srl);
 
-		if($oDocument->get('module_srl') == $oDocument->get('member_srl')) $savedDoc = TRUE;
+		if ($oDocument->get('module_srl') == $oDocument->get('member_srl')) $savedDoc = TRUE;
 		$oDocument->add('module_srl', $this->module_srl);
 
-		if($oDocument->isExists() && $this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($oDocument->isExists() && $this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return new Object(-1, 'msg_protect_content');
 		}
 
 		// if the document is not granted, then back to the password input form
 		$oModuleModel = getModel('module');
-		if($oDocument->isExists()&&!$oDocument->isGranted())
+		if ($oDocument->isExists() && !$oDocument->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
 
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
-			$point_config = $oModuleModel->getModulePartConfig('point',$this->module_srl);
+			$point_config = $oModuleModel->getModulePartConfig('point', $this->module_srl);
 			$logged_info = Context::get('logged_info');
 			$oPointModel = getModel('point');
 			$pointForInsert = $point_config["insert_document"];
-			if($pointForInsert < 0)
+			if ($pointForInsert < 0)
 			{
-				if( !$logged_info )
+				if (!$logged_info)
 				{
 					return $this->dispBoardMessage('msg_not_permitted');
 				}
-				else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert )< 0 )
+				else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert) < 0)
 				{
 					return $this->dispBoardMessage('msg_not_enough_point');
 				}
 			}
 		}
-		if(!$oDocument->get('status')) $oDocument->add('status', $oDocumentModel->getDefaultStatus());
+		if (!$oDocument->get('status')) $oDocument->add('status', $oDocumentModel->getDefaultStatus());
 
 		$statusList = $this->_getStatusNameList($oDocumentModel);
-		if(count($statusList) > 0) Context::set('status_list', $statusList);
+		if (count($statusList) > 0) Context::set('status_list', $statusList);
 
 		// get Document status config value
-		Context::set('document_srl',$document_srl);
+		Context::set('document_srl', $document_srl);
 		Context::set('oDocument', $oDocument);
 
 		// apply xml_js_filter on header
@@ -734,12 +734,12 @@ 
 		$oDocumentController->addXmlJsFilter($this->module_info->module_srl);
 
 		// if the document exists, then setup extra variabels on context
-		if($oDocument->isExists() && !$savedDoc) Context::set('extra_keys', $oDocument->getExtraVars());
+		if ($oDocument->isExists() && !$savedDoc) Context::set('extra_keys', $oDocument->getExtraVars());
 
 		/**
 		 * add JS filters
 		 **/
-		if(Context::get('logged_info')->is_admin=='Y') Context::addJsFilter($this->module_path.'tpl/filter', 'insert_admin.xml');
+		if (Context::get('logged_info')->is_admin == 'Y') Context::addJsFilter($this->module_path.'tpl/filter', 'insert_admin.xml');
 		else Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml');
 
 		$oSecurity = new Security();
@@ -751,14 +751,14 @@ 
 	function _getStatusNameList(&$oDocumentModel)
 	{
 		$resultList = array();
-		if(!empty($this->module_info->use_status))
+		if (!empty($this->module_info->use_status))
 		{
 			$statusNameList = $oDocumentModel->getStatusNameList();
 			$statusList = explode('|@|', $this->module_info->use_status);
 
-			if(is_array($statusList))
+			if (is_array($statusList))
 			{
-				foreach($statusList as $key => $value)
+				foreach ($statusList as $key => $value)
 				{
 					$resultList[$value] = $statusNameList[$value];
 				}
@@ -773,7 +773,7 @@ 
 	function dispBoardDelete()
 	{
 		// check grant
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -782,30 +782,30 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// if document exists, get the document information
-		if($document_srl)
+		if ($document_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 		}
 
 		// if the document is not existed, then back to the board content page
-		if(!$oDocument || !$oDocument->isExists())
+		if (!$oDocument || !$oDocument->isExists())
 		{
 			return $this->dispBoardContent();
 		}
 
 		// if the document is not granted, then back to the password input form
-		if(!$oDocument->isGranted())
+		if (!$oDocument->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
 
-		if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return $this->dispBoardMessage('msg_protect_content');
 		}
 
-		Context::set('oDocument',$oDocument);
+		Context::set('oDocument', $oDocument);
 
 		/**
 		 * add JS filters
@@ -823,7 +823,7 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -831,13 +831,13 @@ 
 		// get the document information
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
 
 		// Check allow comment
-		if(!$oDocument->allowComment())
+		if (!$oDocument->allowComment())
 		{
 			return $this->dispBoardMessage('msg_not_allow_comment');
 		}
@@ -849,9 +849,9 @@ 
 		$oComment->add('module_srl', $this->module_srl);
 
 		// setup document variables on context
-		Context::set('oDocument',$oDocument);
-		Context::set('oSourceComment',$oSourceComment);
-		Context::set('oComment',$oComment);
+		Context::set('oDocument', $oDocument);
+		Context::set('oSourceComment', $oSourceComment);
+		Context::set('oComment', $oComment);
 
 		/**
 		 * add JS filter
@@ -867,7 +867,7 @@ 
 	function dispBoardReplyComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -876,7 +876,7 @@ 
 		$parent_srl = Context::get('comment_srl');
 
 		// if the parent comment is not existed
-		if(!$parent_srl)
+		if (!$parent_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -886,11 +886,11 @@ 
 		$oSourceComment = $oCommentModel->getComment($parent_srl, $this->grant->manager);
 
 		// if the comment is not existed, opoup an error message
-		if(!$oSourceComment->isExists())
+		if (!$oSourceComment->isExists())
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
-		if(Context::get('document_srl') && $oSourceComment->get('document_srl') != Context::get('document_srl'))
+		if (Context::get('document_srl') && $oSourceComment->get('document_srl') != Context::get('document_srl'))
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
@@ -898,7 +898,7 @@ 
 		// Check allow comment
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($oSourceComment->get('document_srl'));
-		if(!$oDocument->allowComment())
+		if (!$oDocument->allowComment())
 		{
 			return $this->dispBoardMessage('msg_not_allow_comment');
 		}
@@ -909,9 +909,9 @@ 
 		$oComment->add('document_srl', $oSourceComment->get('document_srl'));
 
 		// setup comment variables
-		Context::set('oSourceComment',$oSourceComment);
-		Context::set('oComment',$oComment);
-		Context::set('module_srl',$this->module_info->module_srl);
+		Context::set('oSourceComment', $oSourceComment);
+		Context::set('oComment', $oComment);
+		Context::set('module_srl', $this->module_info->module_srl);
 
 		/**
 		 * add JS filters
@@ -927,7 +927,7 @@ 
 	function dispBoardModifyComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -937,7 +937,7 @@ 
 		$comment_srl = Context::get('comment_srl');
 
 		// if the comment is not existed
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -947,13 +947,13 @@ 
 		$oComment = $oCommentModel->getComment($comment_srl, $this->grant->manager);
 
 		// if the comment is not exited, alert an error message
-		if(!$oComment->isExists())
+		if (!$oComment->isExists())
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
 
 		// if the comment is not granted, then back to the password input form
-		if(!$oComment->isGranted())
+		if (!$oComment->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
@@ -976,7 +976,7 @@ 
 	function dispBoardDeleteComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -985,25 +985,25 @@ 
 		$comment_srl = Context::get('comment_srl');
 
 		// if the comment exists, then get the comment information
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl, $this->grant->manager);
 		}
 
 		// if the comment is not existed, then back to the board content page
-		if(!$oComment->isExists() )
+		if (!$oComment->isExists())
 		{
 			return $this->dispBoardContent();
 		}
 
 		// if the comment is not granted, then back to the password input form
-		if(!$oComment->isGranted())
+		if (!$oComment->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
 
-		Context::set('oComment',$oComment);
+		Context::set('oComment', $oComment);
 
 		/**
 		 * add JS filters
@@ -1020,7 +1020,7 @@ 
 	{
 		$oTrackbackModel = getModel('trackback');
 
-		if(!$oTrackbackModel)
+		if (!$oTrackbackModel)
 		{
 			return;
 		}
@@ -1034,7 +1034,7 @@ 
 		$trackback = $output->data;
 
 		// if no trackback, then display the board content
-		if(!$trackback)
+		if (!$trackback)
 		{
 			return $this->dispBoardContent();
 		}
@@ -1055,7 +1055,7 @@ 
 	function dispBoardMessage($msg_code)
 	{
 		$msg = Context::getLang($msg_code);
-		if(!$msg) $msg = $msg_code;
+		if (!$msg) $msg = $msg_code;
 		Context::set('message', $msg);
 		$this->setTemplateFile('message');
 	}
@@ -1066,8 +1066,8 @@ 
 	 **/
 	function alertMessage($message)
 	{
-		$script =  sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', Context::getLang($message));
-		Context::addHtmlFooter( $script );
+		$script = sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', Context::getLang($message));
+		Context::addHtmlFooter($script);
 	}
 
 }

modules/document/document.view.php

Doc Comments +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	/**
 	 * Document printing
 	 * I make it out to find the geulman;;
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function dispDocumentPrint()
 	{
@@ -52,7 +52,7 @@ 
 
 	/**
 	 * Preview
-	 * @return void
+	 * @return Object|null
 	 */
 	function dispDocumentPreview()
 	{
@@ -74,7 +74,7 @@ 
 
 	/**
 	 * Selected by the administrator for the document management
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function dispDocumentManageDocument()
 	{
@@ -155,7 +155,7 @@ 
 
 	/**
 	 * Document temp saved list
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function dispTempSavedList()
 	{

Spacing +22 added lines, -22 removed lines

@@ -36,16 +36,16 @@ 
 		$oDocumentModel = getModel('document');
 		// Creates an object for displaying the selected document
 		$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
-		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		if (!$oDocument->isExists()) return new Object(-1, 'msg_invalid_request');
 		// Check permissions
-		if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted');
+		if (!$oDocument->isAccessible()) return new Object(-1, 'msg_not_permitted');
 		// Information setting module
 		//Context::set('module_info', $module_info);	//module_info not use in UI
 		// Browser title settings
 		Context::setBrowserTitle($oDocument->getTitleText());
 		Context::set('oDocument', $oDocument);
 
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('print_page');
 	}
@@ -56,12 +56,12 @@ 
 	 */
 	function dispDocumentPreview()
 	{
-		if(!checkCSRF())
+		if (!checkCSRF())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		} 
 
-		if(Context::get('logged_info')->is_admin != 'Y')
+		if (Context::get('logged_info')->is_admin != 'Y')
 		{
 			Context::set('content', removeHackTag(Context::get('content')));
 		}
@@ -78,19 +78,19 @@ 
 	 */
 	function dispDocumentManageDocument()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		// Taken from a list of selected sessions
 		$flag_list = $_SESSION['document_management'];
-		if(count($flag_list))
+		if (count($flag_list))
 		{
-			foreach($flag_list as $key => $val)
+			foreach ($flag_list as $key => $val)
 			{
-				if(!is_bool($val)) continue;
+				if (!is_bool($val)) continue;
 				$document_srl_list[] = $key;
 			}
 		}
 
-		if(count($document_srl_list))
+		if (count($document_srl_list))
 		{
 			$oDocumentModel = getModel('document');
 			$document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
@@ -99,13 +99,13 @@ 
 
 		$oModuleModel = getModel('module');
 		// The combination of module categories list and the list of modules
-		if(count($module_list)>1) Context::set('module_list', $module_categories);
+		if (count($module_list) > 1) Context::set('module_list', $module_categories);
 
-		$module_srl=Context::get('module_srl');
-		Context::set('module_srl',$module_srl);
+		$module_srl = Context::get('module_srl');
+		Context::set('module_srl', $module_srl);
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		Context::set('mid',$module_info->mid);
-		Context::set('browser_title',$module_info->browser_title);
+		Context::set('mid', $module_info->mid);
+		Context::set('browser_title', $module_info->browser_title);
 
 		// Select Pop-up layout
 		$this->setLayoutPath('./common/tpl');
@@ -126,24 +126,24 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if (!$current_module_srl) return new Object();
 		}
 
 		$oModuleModel = getModel('module');
-		if($current_module_srl)
+		if ($current_module_srl)
 		{
 			$document_config = $oModuleModel->getModulePartConfig('document', $current_module_srl);
 		}
-		if(!$document_config)
+		if (!$document_config)
 		{
 			$document_config = new stdClass();
 		}
-		if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+		if (!isset($document_config->use_history)) $document_config->use_history = 'N';
 		Context::set('document_config', $document_config);
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -163,13 +163,13 @@ 
 
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 		// Get the saved document (module_srl is set to member_srl instead)
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
 		$args->member_srl = $logged_info->member_srl;
 		$args->statusList = array($this->getConfigStatus('temp'));
-		$args->page = (int)Context::get('page');
+		$args->page = (int) Context::get('page');
 		$args->list_count = 10;
 
 		$oDocumentModel = getModel('document');

classes/module/ModuleHandler.class.php

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;
@@ -222,9 +222,9 @@ 
 		$defaultUrlInfo = parse_url($dbInfo->default_url);
 		$defaultHost = $defaultUrlInfo['host'];
 
-		foreach($urls as $url)
+		foreach ($urls as $url)
 		{
-			if(empty($url))
+			if (empty($url))
 			{
 				continue;
 			}
@@ -232,29 +232,29 @@ 
 			$urlInfo = parse_url($url);
 			$host = $urlInfo['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);

classes/context/Context.class.php

Spacing +300 added lines, -300 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,7 +447,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
@@ -455,7 +455,7 @@ 
 		include($self::getConfigFile());
 
 		// 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;
@@ -473,7 +473,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"] .= '_';
 			}
@@ -485,33 +485,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);
 		}
 
@@ -582,10 +582,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);
@@ -603,17 +603,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);
@@ -622,7 +622,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);
@@ -641,56 +641,56 @@ 
 	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;
 				}
 
 				$oModuleModel = getModel('module');
-				$domain = $url_info['host'] . $url_info['path'];
-				if(substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
+				$domain = $url_info['host'].$url_info['path'];
+				if (substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
 				$site_info = $oModuleModel->getSiteInfoByDomain($domain);
 
-				if($site_info->site_srl)
+				if ($site_info->site_srl)
 				{
-				$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']);
+				$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']);
 				}
 				else
 				{
 					$redirect_url = $url;
 				}
-				header('location:' . $redirect_url);
+				header('location:'.$redirect_url);
 
 				return FALSE;
 			}
@@ -699,9 +699,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;
@@ -710,17 +710,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()));
 				$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;
 			}
 		}
@@ -747,7 +747,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -765,15 +765,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
 		{
@@ -789,7 +789,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -821,7 +821,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -848,30 +848,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);
@@ -892,24 +892,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);
@@ -924,9 +924,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();
 	}
 
@@ -938,22 +938,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;
 		}
@@ -995,11 +995,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -1015,7 +1015,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1043,17 +1043,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;
 			}
 		}
@@ -1072,11 +1072,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
@@ -1100,9 +1100,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);
 	}
 
 	/**
@@ -1113,7 +1113,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1122,9 +1122,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);
 		}
@@ -1155,7 +1155,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1195,7 +1195,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1208,30 +1208,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;
 			}
@@ -1240,7 +1240,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1251,20 +1251,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);
 			}
@@ -1278,7 +1278,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1286,7 +1286,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);
 		}
@@ -1299,13 +1299,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;
@@ -1317,12 +1317,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);
 		}
@@ -1337,10 +1337,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);
 			}
@@ -1350,20 +1350,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;
 			}
@@ -1371,7 +1371,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1390,32 +1390,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]);
 			}
@@ -1423,7 +1423,7 @@ 
 			{
 				$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())
 				{
 					if (is_array($result[$k]))
 					{
@@ -1435,7 +1435,7 @@ 
 					}
 				}
 
-				if(is_array($result[$k]))
+				if (is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
 				}
@@ -1467,17 +1467,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;
 				}
@@ -1487,9 +1487,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];
@@ -1521,16 +1521,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;
@@ -1545,7 +1545,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']);
@@ -1573,22 +1573,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;
 			}
@@ -1599,21 +1599,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 .= '/';
 				}
@@ -1623,10 +1623,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);
 			}
@@ -1638,13 +1638,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;
@@ -1655,7 +1655,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1672,17 +1672,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);
@@ -1702,8 +1702,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",
@@ -1720,66 +1720,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);
 		}
@@ -1788,16 +1788,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);
 	}
 
 	/**
@@ -1812,17 +1812,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);
 		}
@@ -1831,14 +1831,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;
@@ -1848,34 +1848,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']);
 			}
@@ -1883,17 +1883,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];
 	}
@@ -1910,16 +1910,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;
 		}
@@ -1935,7 +1935,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -1950,7 +1950,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -1958,7 +1958,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -1984,7 +1984,7 @@ 
 	function getRequestVars()
 	{
 		$self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -2001,13 +2001,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);
@@ -2025,16 +2025,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);
@@ -2053,7 +2053,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2070,7 +2070,7 @@ 
 	function getSSLActions()
 	{
 		$self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2097,12 +2097,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);
 		}
@@ -2121,13 +2121,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;
@@ -2197,12 +2197,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;
 				}
@@ -2267,9 +2267,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]);
 			}
@@ -2354,14 +2354,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;
 		}
@@ -2371,32 +2371,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;
@@ -2412,50 +2412,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');
 		}
 	}
 
@@ -2468,7 +2468,7 @@ 
 	function addHtmlHeader($header)
 	{
 		$self = self::getInstance();
-		$self->html_header .= "\n" . $header;
+		$self->html_header .= "\n".$header;
 	}
 
 	function clearHtmlHeader()
@@ -2520,7 +2520,7 @@ 
 	function addBodyHeader($header)
 	{
 		$self = self::getInstance();
-		$self->body_header .= "\n" . $header;
+		$self->body_header .= "\n".$header;
 	}
 
 	/**
@@ -2542,7 +2542,7 @@ 
 	function addHtmlFooter($footer)
 	{
 		$self = self::getInstance();
-		$self->html_footer .= ($self->Htmlfooter ? "\n" : '') . $footer;
+		$self->html_footer .= ($self->Htmlfooter ? "\n" : '').$footer;
 	}
 
 	/**
@@ -2563,7 +2563,7 @@ 
 	 */
 	function getConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/db.config.php';
+		return _XE_PATH_.'files/config/db.config.php';
 	}
 
 	/**
@@ -2573,7 +2573,7 @@ 
 	 */
 	function getFTPConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/ftp.config.php';
+		return _XE_PATH_.'files/config/ftp.config.php';
 	}
 
 	/**
@@ -2625,14 +2625,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;
 			}
@@ -2640,9 +2640,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2652,13 +2652,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 .= '/';
 		}
@@ -2673,13 +2673,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);
@@ -2699,7 +2699,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 +87 added lines, -102 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();
 		}
@@ -490,18 +491,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);
@@ -618,8 +623,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)
@@ -678,15 +682,16 @@ 
 
 				$oModuleModel = getModel('module');
 				$domain = $url_info['host'] . $url_info['path'];
-				if(substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
+				if(substr_compare($domain, '/', -1) === 0) {
+					$domain = substr($domain, 0, -1);
+				}
 				$site_info = $oModuleModel->getSiteInfoByDomain($domain);
 
 				if($site_info->site_srl)
 				{
 				$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']);
-				}
-				else
+				} else
 				{
 					$redirect_url = $url;
 				}
@@ -695,8 +700,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -713,8 +717,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()));
 				$origin_url = self::getRequestUrl();
@@ -774,8 +777,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -875,8 +877,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -892,7 +893,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -924,7 +927,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();
@@ -938,7 +943,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1074,12 +1081,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;
@@ -1101,8 +1110,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);
 	}
 
 	/**
@@ -1113,7 +1123,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1226,16 +1238,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;
 			}
@@ -1261,8 +1270,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1402,24 +1410,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;
 
@@ -1428,8 +1431,7 @@ 
 					if (is_array($result[$k]))
 					{
 						array_walk_recursive($result[$k], function(&$val) { $val = stripslashes($val); });
-					}
-					else
+					} else
 					{
 						$result[$k] = stripslashes($result[$k]);
 					}
@@ -1438,8 +1440,7 @@ 
 				if(is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
-				}
-				else
+				} else
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1484,8 +1485,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++)
 				{
@@ -1591,8 +1591,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1609,8 +1608,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)
@@ -1630,8 +1628,7 @@ 
 			{
 				array_shift($args_list);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
@@ -1658,8 +1655,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1731,8 +1727,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1750,25 +1745,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;
 			}
@@ -1825,8 +1818,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1855,8 +1847,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1874,20 +1865,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']);
 			}
@@ -2124,8 +2112,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);
 		}
@@ -2387,8 +2374,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;
 			}
@@ -2645,8 +2631,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}

classes/display/VirtualXMLDisplayHandler.php

Spacing +8 added lines, -8 removed lines

@@ -17,35 +17,35 @@
 		$request_url = Context::getRequestUri();
 		$output = new stdClass();
 
-		if(substr_compare($request_url, '/', -1) !== 0)
+		if (substr_compare($request_url, '/', -1) !== 0)
 		{
 			$request_url .= '/';
 		}
 
-		if($error === 0)
+		if ($error === 0)
 		{
-			if($message != 'success') $output->message = $message;
+			if ($message != 'success') $output->message = $message;
 
 			$output->url = ($redirect_url) ? $redirect_url : $request_uri;
 		}
 		else
 		{
-			if($message != 'fail') $output->message = $message;
+			if ($message != 'fail') $output->message = $message;
 		}
 
 		$html = array();
 		$html[] = '<!DOCTYPE html><html><head><title>Moved...</title><meta charset="utf-8" /><script>';
 
-		if($output->message)
+		if ($output->message)
 		{
-			$html[] = 'alert(' . json_encode($output->message, JSON_UNESCAPED_SLASHES) . ');';
+			$html[] = 'alert('.json_encode($output->message, JSON_UNESCAPED_SLASHES).');';
 		}
 
-		if($output->url)
+		if ($output->url)
 		{
 			$url = json_encode(preg_replace('/#(.+)$/i', '', $output->url), JSON_UNESCAPED_SLASHES);
 			$html[] = 'var win = (window.opener) ? window.opener : window.parent;';
-			$html[] = 'win.location.href = ' . $url;
+			$html[] = 'win.location.href = '.$url;
 			$html[] = 'if(window.opener) self.close();';
 		}
 

Braces +7 added lines, -4 removed lines

@@ -24,13 +24,16 @@
 
 		if($error === 0)
 		{
-			if($message != 'success') $output->message = $message;
+			if($message != 'success') {
+				$output->message = $message;
+			}
 
 			$output->url = ($redirect_url) ? $redirect_url : $request_uri;
-		}
-		else
+		} else
 		{
-			if($message != 'fail') $output->message = $message;
+			if($message != 'fail') {
+				$output->message = $message;
+			}
 		}
 
 		$html = array();