xpressengine / xe-core

config/func.inc.php

Doc Comments +21 added lines, -15 removed lines

@@ -74,7 +74,7 @@ 
  * @param string $module_name The module name to get a instance
  * @param string $type disp, proc, controller, class
  * @param string $kind admin, null
- * @return mixed Module instance
+ * @return ModuleObject Module instance
  */
 function getModule($module_name, $type = 'view', $kind = '')
 {
@@ -85,7 +85,7 @@ 
  * Create a controller instance of the module
  *
  * @param string $module_name The module name to get a controller instance
- * @return mixed Module controller instance
+ * @return ModuleObject Module controller instance
  */
 function getController($module_name)
 {
@@ -96,7 +96,7 @@ 
  * Create a admin controller instance of the module
  *
  * @param string $module_name The module name to get a admin controller instance
- * @return mixed Module admin controller instance
+ * @return ModuleObject Module admin controller instance
  */
 function getAdminController($module_name)
 {
@@ -107,7 +107,7 @@ 
  * Create a view instance of the module
  *
  * @param string $module_name The module name to get a view instance
- * @return mixed Module view instance
+ * @return ModuleObject Module view instance
  */
 function getView($module_name)
 {
@@ -118,7 +118,7 @@ 
  * Create a mobile instance of the module
  *
  * @param string $module_name The module name to get a mobile instance
- * @return mixed Module mobile instance
+ * @return ModuleObject Module mobile instance
  */
 function &getMobile($module_name)
 {
@@ -129,7 +129,7 @@ 
  * Create a admin view instance of the module
  *
  * @param string $module_name The module name to get a admin view instance
- * @return mixed Module admin view instance
+ * @return ModuleObject Module admin view instance
  */
 function getAdminView($module_name)
 {
@@ -140,7 +140,7 @@ 
  * Create a model instance of the module
  *
  * @param string $module_name The module name to get a model instance
- * @return mixed Module model instance
+ * @return ModuleObject Module model instance
  */
 function getModel($module_name)
 {
@@ -151,7 +151,7 @@ 
  * Create an admin model instance of the module
  *
  * @param string $module_name The module name to get a admin model instance
- * @return mixed Module admin model instance
+ * @return ModuleObject Module admin model instance
  */
 function getAdminModel($module_name)
 {
@@ -162,7 +162,7 @@ 
  * Create an api instance of the module
  *
  * @param string $module_name The module name to get a api instance
- * @return mixed Module api class instance
+ * @return ModuleObject Module api class instance
  */
 function getAPI($module_name)
 {
@@ -173,7 +173,7 @@ 
  * Create a wap instance of the module
  *
  * @param string $module_name The module name to get a wap instance
- * @return mixed Module wap class instance
+ * @return ModuleObject Module wap class instance
  */
 function getWAP($module_name)
 {
@@ -184,7 +184,7 @@ 
  * Create a class instance of the module
  *
  * @param string $module_name The module name to get a class instance
- * @return mixed Module class instance
+ * @return ModuleObject Module class instance
  */
 function getClass($module_name)
 {
@@ -490,7 +490,7 @@ 
  * Return if domain of the virtual site is url type or id type
  *
  * @param string $domain
- * @return bool
+ * @return integer
  */
 function isSiteID($domain)
 {
@@ -559,7 +559,7 @@ 
 /**
  * Get a time gap between server's timezone and XE's timezone
  *
- * @return int
+ * @return double
  */
 function zgap()
 {
@@ -797,7 +797,7 @@ 
  * Display $buff contents into the file ./files/_debug_message.php.
  * You can see the file on your prompt by command: tail-f./files/_debug_message.php
  *
- * @param mixed $debug_output Target object to be printed
+ * @param string $debug_output Target object to be printed
  * @param bool $display_option boolean Flag whether to print seperator (default:true)
  * @param string $file Target file name
  * @return void
@@ -904,7 +904,7 @@ 
 /**
  * @param string $type query, trigger
  * @param float $elapsed_time
- * @param object $obj
+ * @param stdClass $obj
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
@@ -1685,6 +1685,9 @@ 
 	}
 }
 
+/**
+ * @param string $key
+ */
 function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_url')
 {
 	if($requestKey != $dbKey)
@@ -1781,6 +1784,9 @@ 
 }
 
 
+/**
+ * @param string $str
+ */
 function isDefinedLangCode($str)
 {
 	return preg_match('!^\$user_lang->([a-z0-9\_]+)$!is', trim($str));

classes/security/UploadFileFilter.class.php

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 			return false;
 		}
 
-		if($mimetype)
+		if ($mimetype)
 		{
 			if (in_array($ext, array('jpg', 'jpeg', 'png', 'gif')) && $mimetype !== 'image')
 			{
@@ -166,7 +166,7 @@ 
 
 	protected static function _getMimetype($file, $trim_subtype = false)
 	{
-		if(!extension_loaded('fileinfo'))
+		if (!extension_loaded('fileinfo'))
 		{
 			return false;
 		}
@@ -175,7 +175,7 @@ 
 		$mime_type = finfo_file($finfo, $file);
 		finfo_close($finfo);
 
-		if($trim_subtype)
+		if ($trim_subtype)
 		{
 			$mime_type = strstr($mime_type, '/', true);
 		}

classes/context/Context.class.php

Spacing +314 added lines, -314 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');
@@ -342,11 +342,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();
@@ -354,15 +354,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();
 				}
@@ -374,7 +374,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);
@@ -382,28 +382,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
 			{
@@ -418,12 +418,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()));
 		}
@@ -448,7 +448,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
@@ -458,7 +458,7 @@ 
 		ob_end_clean();
 
 		// 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;
@@ -476,7 +476,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"] .= '_';
 			}
@@ -488,42 +488,42 @@ 
 			$oInstallController->makeConfigFile();
 		}
 
-		if(version_compare(PHP_VERSION, '7.0', '>='))
+		if (version_compare(PHP_VERSION, '7.0', '>='))
 		{
 			$db_info->master_db["db_type"] = preg_replace('/^mysql(_.+)?$/', 'mysqli$1', $db_info->master_db["db_type"]);
-			foreach($db_info->slave_db as &$slave_db_info)
+			foreach ($db_info->slave_db as &$slave_db_info)
 			{
 				$slave_db_info["db_type"] = preg_replace('/^mysql(_.+)?$/', 'mysqli$1', $slave_db_info["db_type"]);
 			}
 		}
 
-		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);
 		}
 
@@ -594,10 +594,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);
@@ -615,17 +615,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);
@@ -634,7 +634,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);
@@ -653,56 +653,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;
 			}
@@ -711,9 +711,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;
@@ -722,17 +722,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;
 			}
 		}
@@ -759,7 +759,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -777,15 +777,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
 		{
@@ -801,7 +801,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -833,7 +833,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -860,30 +860,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);
@@ -904,24 +904,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);
@@ -936,9 +936,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();
 	}
 
@@ -950,22 +950,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;
 		}
@@ -1007,11 +1007,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -1027,7 +1027,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1052,17 +1052,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;
 			}
 		}
@@ -1081,11 +1081,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
@@ -1109,9 +1109,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);
 	}
 
 	/**
@@ -1122,7 +1122,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1131,9 +1131,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);
 		}
@@ -1164,7 +1164,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1204,7 +1204,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1217,30 +1217,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, false, ($requestMethod == 'GET'));
 
-			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;
 			}
@@ -1249,7 +1249,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1260,20 +1260,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);
 			}
@@ -1287,7 +1287,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1295,7 +1295,7 @@ 
 		$params = array();
 		parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$key = htmlentities($key);
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
@@ -1309,13 +1309,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;
@@ -1327,12 +1327,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);
 		}
@@ -1347,10 +1347,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);
 			}
@@ -1360,20 +1360,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;
 			}
@@ -1381,7 +1381,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1400,42 +1400,42 @@ 
 	 */
 	function _filterRequestVar($key, $val, $do_stripslashes = true, $remove_hack = false)
 	{
-		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 = escape($k);
 			$result[$k] = $v;
 
-			if($remove_hack && !is_array($result[$k])) {
-				if(stripos($result[$k], '<script') || stripos($result[$k], 'lt;script') || stripos($result[$k], '%3Cscript'))
+			if ($remove_hack && !is_array($result[$k])) {
+				if (stripos($result[$k], '<script') || stripos($result[$k], 'lt;script') || stripos($result[$k], '%3Cscript'))
 				{
 					$result[$k] = escape($result[$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,]+$/', $result[$k]) ? (int) $result[$k] : $result[$k];
 			}
-			elseif(in_array($key, array('mid','search_keyword','search_target','xe_validator_id'))) {
+			elseif (in_array($key, array('mid', 'search_keyword', 'search_target', 'xe_validator_id'))) {
 				$result[$k] = escape($result[$k], false);
 			}
-			elseif($key === 'vid')
+			elseif ($key === 'vid')
 			{
 				$result[$k] = urlencode($result[$k]);
 			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			elseif (stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
 			}
 			else
 			{
-				if(in_array($k, array(
+				if (in_array($k, array(
 					'act',
 					'addon',
 					'cur_mid',
@@ -1456,7 +1456,7 @@ 
 					$result[$k] = urlencode(preg_replace("/[^a-z0-9-_]+/i", '', $result[$k]));
 				}
 
-				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]))
 					{
@@ -1468,7 +1468,7 @@ 
 					}
 				}
 
-				if(is_array($result[$k]))
+				if (is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
 				}
@@ -1477,7 +1477,7 @@ 
 					$result[$k] = trim($result[$k]);
 				}
 
-				if($remove_hack)
+				if ($remove_hack)
 				{
 					$result[$k] = escape($result[$k], false);
 				}
@@ -1505,18 +1505,18 @@ 
 	 */
 	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(!UploadFileFilter::check($tmp_name, $val['name']))
+				if (!UploadFileFilter::check($tmp_name, $val['name']))
 				{
 					unset($_FILES[$key]);
 					continue;
@@ -1530,7 +1530,7 @@ 
 				$files = array();
 				foreach ($tmp_name as $i => $j)
 				{
-					if(!UploadFileFilter::check($val['tmp_name'][$i], $val['name'][$i]))
+					if (!UploadFileFilter::check($val['tmp_name'][$i], $val['name'][$i]))
 					{
 						$files = array();
 						unset($_FILES[$key]);
@@ -1544,7 +1544,7 @@ 
 					$file['size'] = $val['size'][$i];
 					$files[] = $file;
 				}
-				if(count($files))
+				if (count($files))
 				{
 					self::set($key, $files, true);
 				}
@@ -1569,16 +1569,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;
@@ -1593,7 +1593,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']);
@@ -1621,22 +1621,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;
 			}
@@ -1647,21 +1647,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 .= '/';
 				}
@@ -1671,41 +1671,41 @@ 
 		$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);
 			}
 		}
-		elseif($_SERVER['REQUEST_METHOD'] == 'GET')
+		elseif ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
 		}
 		else
 		{
-			if(!!$self->get_vars->module) $get_vars['module'] = $self->get_vars->module;
-			if(!!$self->get_vars->mid) $get_vars['mid'] = $self->get_vars->mid;
-			if(!!$self->get_vars->act) $get_vars['act'] = $self->get_vars->act;
-			if(!!$self->get_vars->page) $get_vars['page'] = $self->get_vars->page;
-			if(!!$self->get_vars->search_target) $get_vars['search_target'] = $self->get_vars->search_target;
-			if(!!$self->get_vars->search_keyword) $get_vars['search_keyword'] = $self->get_vars->search_keyword;
-			if($get_vars['act'] == 'IS')
+			if (!!$self->get_vars->module) $get_vars['module'] = $self->get_vars->module;
+			if (!!$self->get_vars->mid) $get_vars['mid'] = $self->get_vars->mid;
+			if (!!$self->get_vars->act) $get_vars['act'] = $self->get_vars->act;
+			if (!!$self->get_vars->page) $get_vars['page'] = $self->get_vars->page;
+			if (!!$self->get_vars->search_target) $get_vars['search_target'] = $self->get_vars->search_target;
+			if (!!$self->get_vars->search_keyword) $get_vars['search_keyword'] = $self->get_vars->search_keyword;
+			if ($get_vars['act'] == 'IS')
 			{
-				if(!!$self->get_vars->is_keyword) $get_vars['is_keyword'] = $self->get_vars->is_keyword;
+				if (!!$self->get_vars->is_keyword) $get_vars['is_keyword'] = $self->get_vars->is_keyword;
 			}
 		}
 
 		// 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;
@@ -1716,7 +1716,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1733,17 +1733,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);
@@ -1763,8 +1763,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",
@@ -1781,66 +1781,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);
 		}
@@ -1849,16 +1849,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);
 	}
 
 	/**
@@ -1873,17 +1873,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);
 		}
@@ -1892,14 +1892,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;
@@ -1909,34 +1909,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']);
 			}
@@ -1944,17 +1944,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];
 	}
@@ -1971,16 +1971,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;
 		}
@@ -1996,7 +1996,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -2011,7 +2011,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -2019,7 +2019,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -2045,7 +2045,7 @@ 
 	function getRequestVars()
 	{
 		$self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -2062,13 +2062,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);
@@ -2086,16 +2086,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);
@@ -2114,7 +2114,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2131,7 +2131,7 @@ 
 	function getSSLActions()
 	{
 		$self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2158,12 +2158,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);
 		}
@@ -2182,13 +2182,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;
@@ -2258,12 +2258,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;
 				}
@@ -2328,9 +2328,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]);
 			}
@@ -2415,14 +2415,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;
 		}
@@ -2432,32 +2432,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;
@@ -2473,50 +2473,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');
 		}
 	}
 
@@ -2529,7 +2529,7 @@ 
 	function addHtmlHeader($header)
 	{
 		$self = self::getInstance();
-		$self->html_header .= "\n" . $header;
+		$self->html_header .= "\n".$header;
 	}
 
 	function clearHtmlHeader()
@@ -2581,7 +2581,7 @@ 
 	function addBodyHeader($header)
 	{
 		$self = self::getInstance();
-		$self->body_header .= "\n" . $header;
+		$self->body_header .= "\n".$header;
 	}
 
 	/**
@@ -2603,7 +2603,7 @@ 
 	function addHtmlFooter($footer)
 	{
 		$self = self::getInstance();
-		$self->html_footer .= ($self->Htmlfooter ? "\n" : '') . $footer;
+		$self->html_footer .= ($self->Htmlfooter ? "\n" : '').$footer;
 	}
 
 	/**
@@ -2624,7 +2624,7 @@ 
 	 */
 	function getConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/db.config.php';
+		return _XE_PATH_.'files/config/db.config.php';
 	}
 
 	/**
@@ -2634,7 +2634,7 @@ 
 	 */
 	function getFTPConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/ftp.config.php';
+		return _XE_PATH_.'files/config/ftp.config.php';
 	}
 
 	/**
@@ -2686,14 +2686,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;
 			}
@@ -2701,9 +2701,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2713,13 +2713,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 .= '/';
 		}
@@ -2734,13 +2734,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);
@@ -2760,7 +2760,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 +108 added lines, -109 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'];
 		}
@@ -342,7 +342,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
@@ -395,22 +397,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();
 		}
@@ -502,18 +503,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);
@@ -630,8 +635,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)
@@ -690,15 +694,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;
 				}
@@ -707,8 +712,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -725,8 +729,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();
@@ -786,8 +789,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -887,8 +889,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -904,7 +905,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -936,7 +939,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();
@@ -950,7 +955,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1083,12 +1090,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;
@@ -1110,8 +1119,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);
 	}
 
 	/**
@@ -1122,7 +1132,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1235,16 +1247,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;
 			}
@@ -1270,8 +1279,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1421,19 +1429,15 @@ 
 			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $result[$k]) ? (int) $result[$k] : $result[$k];
-			}
-			elseif(in_array($key, array('mid','search_keyword','search_target','xe_validator_id'))) {
+			} elseif(in_array($key, array('mid','search_keyword','search_target','xe_validator_id'))) {
 				$result[$k] = escape($result[$k], false);
-			}
-			elseif($key === 'vid')
+			} elseif($key === 'vid')
 			{
 				$result[$k] = urlencode($result[$k]);
-			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			} elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
-			}
-			else
+			} else
 			{
 				if(in_array($k, array(
 					'act',
@@ -1461,8 +1465,7 @@ 
 					if (is_array($result[$k]))
 					{
 						array_walk_recursive($result[$k], function(&$val) { $val = stripslashes($val); });
-					}
-					else
+					} else
 					{
 						$result[$k] = stripslashes($result[$k]);
 					}
@@ -1471,8 +1474,7 @@ 
 				if(is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
-				}
-				else
+				} else
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1524,8 +1526,7 @@ 
 				$val['name'] = escape($val['name'], FALSE);
 				$this->set($key, $val, TRUE);
 				$this->is_uploaded = TRUE;
-			}
-			else
+			} else
 			{
 				$files = array();
 				foreach ($tmp_name as $i => $j)
@@ -1639,8 +1640,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1657,8 +1657,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)
@@ -1678,23 +1677,35 @@ 
 			{
 				array_shift($args_list);
 			}
-		}
-		elseif($_SERVER['REQUEST_METHOD'] == 'GET')
+		} elseif($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
-		}
-		else
+		} else
 		{
-			if(!!$self->get_vars->module) $get_vars['module'] = $self->get_vars->module;
-			if(!!$self->get_vars->mid) $get_vars['mid'] = $self->get_vars->mid;
-			if(!!$self->get_vars->act) $get_vars['act'] = $self->get_vars->act;
-			if(!!$self->get_vars->page) $get_vars['page'] = $self->get_vars->page;
-			if(!!$self->get_vars->search_target) $get_vars['search_target'] = $self->get_vars->search_target;
-			if(!!$self->get_vars->search_keyword) $get_vars['search_keyword'] = $self->get_vars->search_keyword;
+			if(!!$self->get_vars->module) {
+				$get_vars['module'] = $self->get_vars->module;
+			}
+			if(!!$self->get_vars->mid) {
+				$get_vars['mid'] = $self->get_vars->mid;
+			}
+			if(!!$self->get_vars->act) {
+				$get_vars['act'] = $self->get_vars->act;
+			}
+			if(!!$self->get_vars->page) {
+				$get_vars['page'] = $self->get_vars->page;
+			}
+			if(!!$self->get_vars->search_target) {
+				$get_vars['search_target'] = $self->get_vars->search_target;
+			}
+			if(!!$self->get_vars->search_keyword) {
+				$get_vars['search_keyword'] = $self->get_vars->search_keyword;
+			}
 			if($get_vars['act'] == 'IS')
 			{
-				if(!!$self->get_vars->is_keyword) $get_vars['is_keyword'] = $self->get_vars->is_keyword;
+				if(!!$self->get_vars->is_keyword) {
+					$get_vars['is_keyword'] = $self->get_vars->is_keyword;
+				}
 			}
 		}
 
@@ -1719,8 +1730,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1792,8 +1802,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1811,25 +1820,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;
 			}
@@ -1886,8 +1893,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1916,8 +1922,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1935,20 +1940,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']);
 			}
@@ -2185,8 +2187,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);
 		}
@@ -2448,8 +2449,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;
 			}
@@ -2706,8 +2706,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}

classes/cache/CacheFile.class.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getInstance()
 	{
-		if(!$GLOBALS['__CacheFile__'])
+		if (!$GLOBALS['__CacheFile__'])
 		{
 			$GLOBALS['__CacheFile__'] = new CacheFile();
 		}
@@ -37,7 +37,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->cache_dir = _XE_PATH_ . $this->cache_dir;
+		$this->cache_dir = _XE_PATH_.$this->cache_dir;
 		FileHandler::makeDir($this->cache_dir);
 	}
 
@@ -50,7 +50,7 @@ 
 	function getCacheFileName($key)
 	{
 		$path_string = preg_replace("/[^a-z0-9-_:\.]+/i", '_', $key);
-		return $this->cache_dir . str_replace(':', DIRECTORY_SEPARATOR, $path_string) . '.php';
+		return $this->cache_dir.str_replace(':', DIRECTORY_SEPARATOR, $path_string).'.php';
 	}
 
 	/**
@@ -80,9 +80,9 @@ 
 		$content = array();
 		$content[] = '<?php';
 		$content[] = 'if(!defined(\'__XE__\')) { exit(); }';
-		$content[] = 'return \'' . $data . '\';';
+		$content[] = 'return \''.$data.'\';';
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $content));
-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}
@@ -99,9 +99,9 @@ 
 	{
 		$cache_file = $this->getCacheFileName($key);
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
-			if($modified_time > 0 && filemtime($cache_file) < $modified_time)
+			if ($modified_time > 0 && filemtime($cache_file) < $modified_time)
 			{
 				FileHandler::removeFile($cache_file);
 				return false;
@@ -122,12 +122,12 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		if(!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
+		if (!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && filemtime($cache_file) < $modified_time)
+		if ($modified_time > 0 && filemtime($cache_file) < $modified_time)
 		{
 			FileHandler::removeFile($cache_file);
 			return false;
@@ -147,7 +147,7 @@ 
 	function _delete($_key)
 	{
 		$cache_file = $this->getCacheFileName($_key);
-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}

classes/file/FileHandler.class.php

Spacing +142 added lines, -142 removed lines

@@ -17,9 +17,9 @@ 
 	 */
 	function getRealPath($source)
 	{
-		if(strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
+		if (strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
 		{
-			return _XE_PATH_ . substr($source, 2);
+			return _XE_PATH_.substr($source, 2);
 		}
 
 		return $source;
@@ -40,7 +40,7 @@ 
 	{
 		$source_dir = self::getRealPath($source_dir);
 		$target_dir = self::getRealPath($target_dir);
-		if(!is_dir($source_dir))
+		if (!is_dir($source_dir))
 		{
 			return FALSE;
 		}
@@ -48,44 +48,44 @@ 
 		// generate when no target exists
 		self::makeDir($target_dir);
 
-		if(substr($source_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($source_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$source_dir .= DIRECTORY_SEPARATOR;
 		}
 
-		if(substr($target_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($target_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$target_dir .= DIRECTORY_SEPARATOR;
 		}
 
 		$oDir = dir($source_dir);
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file{0} == '.')
+			if ($file{0} == '.')
 			{
 				continue;
 			}
 
-			if($filter && preg_match($filter, $file))
+			if ($filter && preg_match($filter, $file))
 			{
 				continue;
 			}
 
-			if(is_dir($source_dir . $file))
+			if (is_dir($source_dir.$file))
 			{
-				self::copyDir($source_dir . $file, $target_dir . $file, $type);
+				self::copyDir($source_dir.$file, $target_dir.$file, $type);
 			}
 			else
 			{
-				if($type == 'force')
+				if ($type == 'force')
 				{
-					@unlink($target_dir . $file);
+					@unlink($target_dir.$file);
 				}
 				else
 				{
-					if(!file_exists($target_dir . $file))
+					if (!file_exists($target_dir.$file))
 					{
-						@copy($source_dir . $file, $target_dir . $file);
+						@copy($source_dir.$file, $target_dir.$file);
 					}
 				}
 			}
@@ -110,12 +110,12 @@ 
 
 		self::makeDir($target_dir);
 
-		if($force == 'Y')
+		if ($force == 'Y')
 		{
-			@unlink($target_dir . DIRECTORY_SEPARATOR . $target);
+			@unlink($target_dir.DIRECTORY_SEPARATOR.$target);
 		}
 
-		@copy($source, $target_dir . DIRECTORY_SEPARATOR . $target);
+		@copy($source, $target_dir.DIRECTORY_SEPARATOR.$target);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	function readFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
+		if (($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
 		{
 			return;
 		}
@@ -149,12 +149,12 @@ 
 		self::makeDir($pathinfo['dirname']);
 
 		$flags = 0;
-		if(strtolower($mode) == 'a')
+		if (strtolower($mode) == 'a')
 		{
 			$flags = FILE_APPEND;
 		}
 
-		@file_put_contents($filename, $buff, $flags|LOCK_EX);
+		@file_put_contents($filename, $buff, $flags | LOCK_EX);
 		@chmod($filename, 0644);
 		self::clearStatCache($filename);
 		self::invalidateOpcache($filename);
@@ -194,7 +194,7 @@ 
 	 */
 	function moveFile($source, $target)
 	{
-		if(($source = self::exists($source)) !== FALSE)
+		if (($source = self::exists($source)) !== FALSE)
 		{
 			self::removeFile($target);
 			return self::rename($source, $target);
@@ -232,35 +232,35 @@ 
 		$path = self::getRealPath($path);
 		$output = array();
 
-		if(substr($path, -1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			$path .= '/';
 		}
 
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			return $output;
 		}
 
 		$files = scandir($path);
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if($file{0} == '.' || ($filter && !preg_match($filter, $file)))
+			if ($file{0} == '.' || ($filter && !preg_match($filter, $file)))
 			{
 				continue;
 			}
 
-			if($to_lower)
+			if ($to_lower)
 			{
 				$file = strtolower($file);
 			}
 
-			if($filter)
+			if ($filter)
 			{
 				$file = preg_replace($filter, '$1', $file);
 			}
 
-			if($concat_prefix)
+			if ($concat_prefix)
 			{
 				$file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
 			}
@@ -283,12 +283,12 @@ 
 	{
 		$path_string = preg_replace("/[^a-z0-9-_\\\\\/\.]+/i", '', $path_string);
 		$path_string = self::getRealPath($path_string);
-		if(self::exists($path_string) !== FALSE)
+		if (self::exists($path_string) !== FALSE)
 		{
 			return TRUE;
 		}
 
-		if(!ini_get('safe_mode'))
+		if (!ini_get('safe_mode'))
 		{
 			@mkdir($path_string, 0755, TRUE);
 			@chmod($path_string, 0755);
@@ -299,35 +299,35 @@ 
 			static $oFtp = NULL;
 
 			$ftp_info = Context::getFTPInfo();
-			if($oFtp == NULL)
+			if ($oFtp == NULL)
 			{
-				if(!Context::isFTPRegisted())
+				if (!Context::isFTPRegisted())
 				{
 					return;
 				}
 
-				require_once(_XE_PATH_ . 'libs/ftp.class.php');
+				require_once(_XE_PATH_.'libs/ftp.class.php');
 				$oFtp = new ftp();
-				if(!$ftp_info->ftp_host)
+				if (!$ftp_info->ftp_host)
 				{
 					$ftp_info->ftp_host = "127.0.0.1";
 				}
-				if(!$ftp_info->ftp_port)
+				if (!$ftp_info->ftp_port)
 				{
 					$ftp_info->ftp_port = 21;
 				}
-				if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+				if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 				{
 					return;
 				}
-				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;
 				}
 			}
 
-			if(!($ftp_path = $ftp_info->ftp_root_path))
+			if (!($ftp_path = $ftp_info->ftp_root_path))
 			{
 				$ftp_path = DIRECTORY_SEPARATOR;
 			}
@@ -336,19 +336,19 @@ 
 			$path_list = explode(DIRECTORY_SEPARATOR, $path_string);
 
 			$path = _XE_PATH_;
-			for($i = 0, $c = count($path_list); $i < $c; $i++)
+			for ($i = 0, $c = count($path_list); $i < $c; $i++)
 			{
-				if(!$path_list[$i])
+				if (!$path_list[$i])
 				{
 					continue;
 				}
 
-				$path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				$ftp_path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				if(!is_dir($path))
+				$path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				$ftp_path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				if (!is_dir($path))
 				{
 					$oFtp->ftp_mkdir($ftp_path);
-					$oFtp->ftp_site("CHMOD 777 " . $ftp_path);
+					$oFtp->ftp_site("CHMOD 777 ".$ftp_path);
 				}
 			}
 		}
@@ -364,23 +364,23 @@ 
 	 */
 	function removeDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(self::isDir($path))
+		if (self::isDir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeDir($target);
 				}
@@ -405,22 +405,22 @@ 
 	 */
 	function removeBlankDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
 		$files = array_diff(scandir($path), array('..', '.'));
 
-		if(count($files) < 1)
+		if (count($files) < 1)
 		{
 			rmdir($path);
 			return;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(($target = self::isDir($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+			if (($target = self::isDir($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 			{
 				continue;
 			}
@@ -439,23 +439,23 @@ 
 	 */
 	function removeFilesInDir($path)
 	{
-		if(($path = self::getRealPath($path)) === FALSE)
+		if (($path = self::getRealPath($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(is_dir($path))
+		if (is_dir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeFilesInDir($target);
 				}
@@ -467,7 +467,7 @@ 
 		}
 		else
 		{
-			if(self::exists($path)) unlink($path);
+			if (self::exists($path)) unlink($path);
 		}
 
 	}
@@ -481,22 +481,22 @@ 
 	 */
 	function filesize($size)
 	{
-		if(!$size)
+		if (!$size)
 		{
 			return '0Byte';
 		}
 
-		if($size === 1)
+		if ($size === 1)
 		{
 			return '1Byte';
 		}
 
-		if($size < 1024)
+		if ($size < 1024)
 		{
-			return $size . 'Bytes';
+			return $size.'Bytes';
 		}
 
-		if($size >= 1024 && $size < 1024 * 1024)
+		if ($size >= 1024 && $size < 1024 * 1024)
 		{
 			return sprintf("%0.1fKB", $size / 1024);
 		}
@@ -521,7 +521,7 @@ 
 	 */
 	function getRemoteResource($url, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array(), $request_config = array())
 	{
-		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));
 		$url = $IDN->encode($url);
 
@@ -531,7 +531,7 @@ 
 			require_once('HTTP/Request.php');
 
 			$parsed_url = parse_url(__PROXY_SERVER__);
-			if($parsed_url["host"] && $parsed_url["path"])
+			if ($parsed_url["host"] && $parsed_url["path"])
 			{
 				// Old style proxy server support (POST payload to proxy script)
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
@@ -543,7 +543,7 @@ 
 				$oRequest = new HTTP_Request($url);
 
 				// New style proxy server support (Use HTTP_Request2 native config format)
-				if($parsed_url['host'])
+				if ($parsed_url['host'])
 				{
 					$request_config['proxy_host'] = $parsed_url['host'];
 					$request_config['proxy_port'] = $parsed_url['port'] ? $parsed_url['port'] : '';
@@ -552,13 +552,13 @@ 
 					$request_config['proxy_type'] = $parsed_url['scheme'] ? $parsed_url['scheme'] : 'http';
 				}
 
-				if(count($request_config) && method_exists($oRequest, 'setConfig'))
+				if (count($request_config) && method_exists($oRequest, 'setConfig'))
 				{
-					foreach($request_config as $key=>$val)
+					foreach ($request_config as $key=>$val)
 					{
-						if($key === 'observers')
+						if ($key === 'observers')
 						{
-							foreach($val as $observer)
+							foreach ($val as $observer)
 							{
 								$oRequest->attach($observer);
 							}
@@ -569,58 +569,58 @@ 
 						}
 					}
 				}
-				if(method_exists($oRequest, 'setConfig'))
+				if (method_exists($oRequest, 'setConfig'))
 				{
-					if(extension_loaded('curl'))
+					if (extension_loaded('curl'))
 					{
 						$oRequest->setConfig('adapter', 'curl');
 					}
-					elseif(version_compare(PHP_VERSION, '5.6', '<'))
+					elseif (version_compare(PHP_VERSION, '5.6', '<'))
 					{
 						$oRequest->setConfig('ssl_verify_host', false);
 					}
-					if(file_exists(_XE_PATH_ . 'libs/cacert/cacert.pem'))
+					if (file_exists(_XE_PATH_.'libs/cacert/cacert.pem'))
 					{
-						$oRequest->setConfig('ssl_cafile', _XE_PATH_ . 'libs/cacert/cacert.pem');
+						$oRequest->setConfig('ssl_cafile', _XE_PATH_.'libs/cacert/cacert.pem');
 					}
 				}
 
-				if(count($headers) > 0)
+				if (count($headers) > 0)
 				{
-					foreach($headers as $key => $val)
+					foreach ($headers as $key => $val)
 					{
 						$oRequest->addHeader($key, $val);
 					}
 				}
 				$host = parse_url($url, PHP_URL_HOST);
-				if($cookies[$host])
+				if ($cookies[$host])
 				{
-					foreach($cookies[$host] as $key => $val)
+					foreach ($cookies[$host] as $key => $val)
 					{
 						$oRequest->addCookie($key, $val);
 					}
 				}
-				if(count($post_data) > 0)
+				if (count($post_data) > 0)
 				{
-					foreach($post_data as $key => $val)
+					foreach ($post_data as $key => $val)
 					{
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
+				if (!$content_type)
 					$oRequest->addHeader('Content-Type', 'text/html');
 				else
 					$oRequest->addHeader('Content-Type', $content_type);
 				$oRequest->setMethod($method);
-				if($body)
+				if ($body)
 					$oRequest->setBody($body);
 			}
 			
-			if(method_exists($oRequest, 'setConfig'))
+			if (method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
 			}
-			elseif(property_exists($oRequest, '_timeout'))
+			elseif (property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -630,25 +630,25 @@ 
 			$code = $oRequest->getResponseCode();
 			$header = $oRequest->getResponseHeader();
 			$response = $oRequest->getResponseBody();
-			if($c = $oRequest->getResponseCookies())
+			if ($c = $oRequest->getResponseCookies())
 			{
-				foreach($c as $k => $v)
+				foreach ($c as $k => $v)
 				{
 					$cookies[$host][$v['name']] = $v['value'];
 				}
 			}
 
-			if($code > 300 && $code < 399 && $header['location'])
+			if ($code > 300 && $code < 399 && $header['location'])
 			{
 				return self::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
 			}
 
-			if($code != 200)
+			if ($code != 200)
 			{
 				return;
 			}
 
-			if(isset($request_config['store_body']) && !$request_config['store_body'])
+			if (isset($request_config['store_body']) && !$request_config['store_body'])
 			{
 				return TRUE;
 			}
@@ -657,7 +657,7 @@ 
 				return $response;
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return NULL;
 		}
@@ -691,7 +691,7 @@ 
 			self::clearStatCache($target_filename);
 			self::invalidateOpcache($target_filename);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return FALSE;
 		}
@@ -708,7 +708,7 @@ 
 	function returnBytes($val)
 	{
 		$unit = strtoupper(substr($val, -1));
-		$val = (float)$val;
+		$val = (float) $val;
 
 		switch ($unit)
 		{
@@ -729,7 +729,7 @@ 
 	function checkMemoryLoadImage(&$imageInfo)
 	{
 		$memoryLimit = self::returnBytes(ini_get('memory_limit'));
-		if($memoryLimit == -1)
+		if ($memoryLimit == -1)
 		{
 			return true;
 		}
@@ -737,14 +737,14 @@ 
 		$K64 = 65536;
 		$TWEAKFACTOR = 2.0;
 		$channels = $imageInfo['channels'];
-		if(!$channels)
+		if (!$channels)
 		{
 			$channels = 6; //for png
 		}
 
-		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64 ) * $TWEAKFACTOR);
+		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64) * $TWEAKFACTOR);
 		$availableMemory = self::returnBytes(ini_get('memory_limit')) - memory_get_usage();
-		if($availableMemory < $memoryNeeded)
+		if ($availableMemory < $memoryNeeded)
 		{
 			return FALSE;
 		}
@@ -773,30 +773,30 @@ 
 		}
 
 		$target_file = self::getRealPath($target_file);
-		if(!$resize_width)
+		if (!$resize_width)
 		{
 			$resize_width = 100;
 		}
 
-		if(!$resize_height)
+		if (!$resize_height)
 		{
 			$resize_height = $resize_width;
 		}
 
 		// retrieve source image's information
 		$imageInfo = getimagesize($source_file);
-		if(!self::checkMemoryLoadImage($imageInfo))
+		if (!self::checkMemoryLoadImage($imageInfo))
 		{
 			return FALSE;
 		}
 
 		list($width, $height, $type, $attrs) = $imageInfo;
-		if($width < 1 || $height < 1)
+		if ($width < 1 || $height < 1)
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case '1' :
 				$type = 'gif';
@@ -814,7 +814,7 @@ 
 				return;
 		}
 
-		if(!$target_type)
+		if (!$target_type)
 		{
 			$target_type = $type;
 		}
@@ -825,7 +825,7 @@ 
 		$height_per = ($resize_height > 0 && $height >= $resize_height) ? $resize_height / $height : 1;
 
 		$per = NULL;
-		if($thumbnail_type == 'ratio')
+		if ($thumbnail_type == 'ratio')
 		{
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
@@ -838,30 +838,30 @@ 
 
 		// create temporary image with target size
 		$thumb = NULL;
-		if(function_exists('imagecreateTRUEcolor'))
+		if (function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
 		}
-		else if(function_exists('imagecreate'))
+		else if (function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
 
-		if(!$thumb)
+		if (!$thumb)
 		{
 			return FALSE;
 		}
 
-		if(function_exists('imagecolorallocatealpha') && $target_type == 'png' && $thumbnail_transparent)
+		if (function_exists('imagecolorallocatealpha') && $target_type == 'png' && $thumbnail_transparent)
 		{
 			imagefill($thumb, 0, 0, imagecolorallocatealpha($thumb, 0, 0, 0, 127));
 			
-			if(function_exists('imagesavealpha'))
+			if (function_exists('imagesavealpha'))
 			{
 				imagesavealpha($thumb, TRUE);
 			}
 
-			if(function_exists('imagealphablending'))
+			if (function_exists('imagealphablending'))
 			{
 				imagealphablending($thumb, TRUE);
 			}
@@ -873,37 +873,37 @@ 
 
 		// create temporary image having original type
 		$source = NULL;
-		switch($type)
+		switch ($type)
 		{
 			case 'gif' :
-				if(function_exists('imagecreatefromgif'))
+				if (function_exists('imagecreatefromgif'))
 				{
 					$source = @imagecreatefromgif($source_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagecreatefromjpeg'))
+				if (function_exists('imagecreatefromjpeg'))
 				{
 					$source = @imagecreatefromjpeg($source_file);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagecreatefrompng'))
+				if (function_exists('imagecreatefrompng'))
 				{
 					$source = @imagecreatefrompng($source_file);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagecreatefromwbmp'))
+				if (function_exists('imagecreatefromwbmp'))
 				{
 					$source = @imagecreatefromwbmp($source_file);
 				}
 				break;
 		}
 
-		if(!$source)
+		if (!$source)
 		{
 			imagedestroy($thumb);
 			return FALSE;
@@ -915,13 +915,13 @@ 
 
 		$x = 0;
 		$y = 0;
-		if($thumbnail_type == 'crop')
+		if ($thumbnail_type == 'crop')
 		{
 			$x = (int) ($resize_width / 2 - $new_width / 2);
 			$y = (int) ($resize_height / 2 - $new_height / 2);
 		}
 
-		if(function_exists('imagecopyresampled'))
+		if (function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -935,30 +935,30 @@ 
 
 		// write into the file
 		$output = NULL;
-		switch($target_type)
+		switch ($target_type)
 		{
 			case 'gif' :
-				if(function_exists('imagegif'))
+				if (function_exists('imagegif'))
 				{
 					$output = imagegif($thumb, $target_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagejpeg'))
+				if (function_exists('imagejpeg'))
 				{
 					$output = imagejpeg($thumb, $target_file, 100);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagepng'))
+				if (function_exists('imagepng'))
 				{
 					$output = imagepng($thumb, $target_file, 9);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagewbmp'))
+				if (function_exists('imagewbmp'))
 				{
 					$output = imagewbmp($thumb, $target_file, 100);
 				}
@@ -968,7 +968,7 @@ 
 		imagedestroy($thumb);
 		imagedestroy($source);
 
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
@@ -986,12 +986,12 @@ 
 	 */
 	function readIniFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE)
+		if (($filename = self::exists($filename)) === FALSE)
 		{
 			return FALSE;
 		}
 		$arr = parse_ini_file($filename, TRUE);
-		if(is_array($arr) && count($arr) > 0)
+		if (is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
 		}
@@ -1017,7 +1017,7 @@ 
 	 */
 	function writeIniFile($filename, $arr)
 	{
-		if(!is_array($arr) || count($arr) == 0)
+		if (!is_array($arr) || count($arr) == 0)
 		{
 			return FALSE;
 		}
@@ -1034,19 +1034,19 @@ 
 	function _makeIniBuff($arr)
 	{
 		$return = array();
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			// section
-			if(is_array($val))
+			if (is_array($val))
 			{
 				$return[] = sprintf("[%s]", $key);
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
 			}
-			else if(is_object($val))
+			else if (is_object($val))
 			{
 				continue;
 			}
@@ -1121,15 +1121,15 @@ 
 	function isWritableDir($path)
 	{
 		$path = self::getRealPath($path);
-		if(is_dir($path)==FALSE)
+		if (is_dir($path) == FALSE)
 		{
 			return FALSE;
 		}
 
-		$checkFile = $path . '/_CheckWritableDir';
+		$checkFile = $path.'/_CheckWritableDir';
 
 		$fp = fopen($checkFile, 'w');
-		if(!is_resource($fp))
+		if (!is_resource($fp))
 		{
 			return FALSE;
 		}
@@ -1147,7 +1147,7 @@ 
 	 **/
 	static public function clearStatCache($target, $include = false)
 	{
-		if(is_array($target))
+		if (is_array($target))
 		{
 			array_map('self::clearStatCache', $target);
 			return;
@@ -1155,7 +1155,7 @@ 
 
 		$target = self::getRealPath($target);
 
-		if($include && self::isDir($target))
+		if ($include && self::isDir($target))
 		{
 			self::clearStatCache(self::readDir($target, '', false, true), $include);
 		}
@@ -1173,27 +1173,27 @@ 
 	{
 		static $opcache = null;
 
-		if($opcache === null)
+		if ($opcache === null)
 		{
 			$opcache = (function_exists('opcache_get_status') && function_exists('opcache_invalidate'));
 		}
 
-		if($opcache === false)
+		if ($opcache === false)
 		{
 			return;
 		}
 
-		if(is_array($target))
+		if (is_array($target))
 		{
 			array_map('self::invalidateOpcache', $target);
 			return;
 		}
 
-		if(substr($target, -4) === '.php')
+		if (substr($target, -4) === '.php')
 		{
 			opcache_invalidate(self::getRealPath($target), $force);
 		}
-		else if($path = self::isDir($target))
+		else if ($path = self::isDir($target))
 		{
 			self::invalidateOpcache(self::readDir($path, '', false, true));
 		}

modules/widget/widget.model.php

Spacing +50 added lines, -50 removed lines

@@ -21,7 +21,7 @@ 
 	function getWidgetPath($widget_name)
 	{
 		$path = sprintf('./widgets/%s/', $widget_name);
-		if(is_dir($path)) return $path;
+		if (is_dir($path)) return $path;
 
 		return "";
 	}
@@ -32,7 +32,7 @@ 
 	function getWidgetStylePath($widgetStyle_name)
 	{
 		$path = sprintf('./widgetstyles/%s/', $widgetStyle_name);
-		if(is_dir($path)) return $path;
+		if (is_dir($path)) return $path;
 
 		return "";
 	}
@@ -58,17 +58,17 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgets');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// The name of the widget
 			$widget = $searched_list[$i];
 			// Wanted information on the Widget
 			$widget_info = $this->getWidgetInfo($widget);
 
-			if(!$widget_info)
+			if (!$widget_info)
 			{
 				$widget_info = new stdClass();
 			}
@@ -101,10 +101,10 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgetstyles');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// The name of the widget
 			$widgetStyle = $searched_list[$i];
@@ -124,14 +124,14 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$widget_path = $this->getWidgetPath($widget);
-		if(!$widget_path) return;
+		if (!$widget_path) return;
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%sconf/info.xml", $widget_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 		// If the problem by comparing the cache file and include the return variable $widget_info
-		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
+		$cache_file = sprintf(_XE_PATH_.'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
 
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (file_exists($cache_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			@include($cache_file);
 			return $widget_info;
@@ -140,11 +140,11 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widget;
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		$buff = '$widget_info = new stdClass;';
 
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// Title of the widget, version
 			$buff .= sprintf('$widget_info->widget = %s;', var_export($widget, true));
@@ -161,10 +161,10 @@ 
 			$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
 			$buff .= sprintf('$widget_info->widget_title = $widget_title;');
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
-			for($i=0; $i < count($author_list); $i++)
+			for ($i = 0; $i < count($author_list); $i++)
 			{
 				$buff .= '$widget_info->author['.$i.'] = new stdClass;';
 				$buff .= sprintf('$widget_info->author['.$i.']->name = %s;', var_export($author_list[$i]->name->body, true));
@@ -193,29 +193,29 @@ 
 		}
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-		foreach($extra_var_groups as $group)
+		if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+		if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		foreach ($extra_var_groups as $group)
 		{
 			$extra_vars = $group->var;
-			if(!is_array($group->var)) $extra_vars = array($group->var);
+			if (!is_array($group->var)) $extra_vars = array($group->var);
 
-			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
+			if ($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
 			{
 				$extra_var_count = count($extra_vars);
 
 				$buff .= sprintf('$widget_info->extra_var_count = %s;', var_export($extra_var_count, true));
-				for($i=0;$i<$extra_var_count;$i++)
+				for ($i = 0; $i < $extra_var_count; $i++)
 				{
 					unset($var);
 					unset($options);
 					$var = $extra_vars[$i];
 
-					$id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
-					$name = $var->name->body?$var->name->body:$var->title->body;
-					$type = $var->attrs->type?$var->attrs->type:$var->type->body;
+					$id = $var->attrs->id ? $var->attrs->id : $var->attrs->name;
+					$name = $var->name->body ? $var->name->body : $var->title->body;
+					$type = $var->attrs->type ? $var->attrs->type : $var->type->body;
 					$buff .= sprintf('$widget_info->extra_var->%s = new stdClass;', $id);
-					if($type =='filebox')
+					if ($type == 'filebox')
 					{
 						$buff .= sprintf('$widget_info->extra_var->%s->filter = %s;', $id, var_export($var->type->attrs->filter, true));
 						$buff .= sprintf('$widget_info->extra_var->%s->allow_multiple = %s;', $id, var_export($var->type->attrs->allow_multiple, true));
@@ -228,20 +228,20 @@ 
 					$buff .= sprintf('$widget_info->extra_var->%s->description = %s;', $id, var_export($var->description->body, true));
 
 					$options = $var->options;
-					if(!$options) continue;
+					if (!$options) continue;
 
-					if(!is_array($options)) $options = array($options);
+					if (!is_array($options)) $options = array($options);
 					$options_count = count($options);
-					for($j=0;$j<$options_count;$j++)
+					for ($j = 0; $j < $options_count; $j++)
 					{
 						$buff .= sprintf('$widget_info->extra_var->%s->options[%s] = %s;', $id, var_export($options[$j]->value->body, true), var_export($options[$j]->name->body, true));
 
-						if($options[$j]->attrs->default && $options[$j]->attrs->default=='true')
+						if ($options[$j]->attrs->default && $options[$j]->attrs->default == 'true')
 						{
 							$buff .= sprintf('$widget_info->extra_var->%s->default_options[%s] = true;', var_export($id, $options[$j]->value->body, true));
 						}
 
-						if($options[$j]->attrs->init && $options[$j]->attrs->init=='true')
+						if ($options[$j]->attrs->init && $options[$j]->attrs->init == 'true')
 						{
 							$buff .= sprintf('$widget_info->extra_var->%s->init_options[%s] = true;', $id, var_export($options[$j]->value->body, true));
 						}
@@ -253,7 +253,7 @@ 
 		$buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
 		FileHandler::writeFile($cache_file, $buff);
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if (file_exists($cache_file)) @include($cache_file);
 		return $widget_info;
 	}
 
@@ -265,13 +265,13 @@ 
 	{
 		$widget = escape($widgetStyle);
 		$widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
-		if(!$widgetStyle_path) return;
+		if (!$widgetStyle_path) return;
 		$xml_file = sprintf("%sskin.xml", $widgetStyle_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 		// If the problem by comparing the cache file and include the return variable $widgetStyle_info
-		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
+		$cache_file = sprintf(_XE_PATH_.'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
 
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (file_exists($cache_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			@include($cache_file);
 			return $widgetStyle_info;
@@ -280,7 +280,7 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widgetstyle;
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
@@ -300,15 +300,15 @@ 
 		$buff[] = sprintf('$widgetStyle_info->license_link = %s;', var_export($xml_obj->license->attrs->link, true));
 
 		// preview
-		if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
-		$preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
-		if(file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = %s;', var_export($preview_file, true));
+		if (!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
+		$preview_file = sprintf("%s%s", $widgetStyle_path, $xml_obj->preview->body);
+		if (file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = %s;', var_export($preview_file, true));
 
 		// Author information
-		if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+		if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 		else $author_list = $xml_obj->author;
 
-		foreach($author_list as $idx => $author)
+		foreach ($author_list as $idx => $author)
 		{
 			$buff[] = sprintf('$widgetStyle_info->author[%d] = new stdClass();', $idx);
 			$buff[] = sprintf('$widgetStyle_info->author[%d]->name = %s;', $idx, var_export($author->name->body, true));
@@ -318,18 +318,18 @@ 
 
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+		if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
 		$extra_var_count = 0;
 		$buff[] = sprintf('$widgetStyle_info->extra_var = new stdClass();', $extra_var_count);
-		foreach($extra_var_groups as $group)
+		foreach ($extra_var_groups as $group)
 		{
 			$extra_vars = (!is_array($group->var)) ? array($group->var) : $group->var;
 
-			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
+			if ($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
 			{
-				foreach($extra_vars as $var)
+				foreach ($extra_vars as $var)
 				{
 					$extra_var_count++;
 					$id = ($var->attrs->id) ? $var->attrs->id : $var->attrs->name;
@@ -340,7 +340,7 @@ 
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->group = %s;', $id, var_export($group->title->body, true));
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->name = %s;', $id, var_export($name, true));
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->type = %s;', $id, var_export($type, true));
-					if($type =='filebox')
+					if ($type == 'filebox')
 					{
 						$buff[] = sprintf('$widgetStyle_info->extra_var->%s->filter = %s;', $id, var_export($var->attrs->filter, true));
 						$buff[] = sprintf('$widgetStyle_info->extra_var->%s->allow_multiple = %s;', $id, var_export($var->attrs->allow_multiple, true));
@@ -348,10 +348,10 @@ 
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->value = $vars->%s;', $id, $id);
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->description = %s;', $id, var_export($var->description->body, true));
 
-					if($var->options)
+					if ($var->options)
 					{
 						$var_options = (!is_array($var->options)) ? array($var->options) : $var->options;
-						foreach($var_options as $option_item)
+						foreach ($var_options as $option_item)
 						{
 							$buff[] = sprintf('$widgetStyle_info->extra_var->%s->options[%s] = %s;', $id, var_export($option_item->value->body, true), var_export($option_item->name->body, true));
 						}
@@ -363,7 +363,7 @@ 
 
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $buff));
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if (file_exists($cache_file)) @include($cache_file);
 
 		return $widgetStyle_info;
 	}

Braces +74 added lines, -27 removed lines

@@ -21,7 +21,9 @@ 
 	function getWidgetPath($widget_name)
 	{
 		$path = sprintf('./widgets/%s/', $widget_name);
-		if(is_dir($path)) return $path;
+		if(is_dir($path)) {
+			return $path;
+		}
 
 		return "";
 	}
@@ -32,7 +34,9 @@ 
 	function getWidgetStylePath($widgetStyle_name)
 	{
 		$path = sprintf('./widgetstyles/%s/', $widgetStyle_name);
-		if(is_dir($path)) return $path;
+		if(is_dir($path)) {
+			return $path;
+		}
 
 		return "";
 	}
@@ -58,7 +62,9 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgets');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
 		for($i=0;$i<$searched_count;$i++)
@@ -101,7 +107,9 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgetstyles');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
 		for($i=0;$i<$searched_count;$i++)
@@ -124,10 +132,14 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$widget_path = $this->getWidgetPath($widget);
-		if(!$widget_path) return;
+		if(!$widget_path) {
+			return;
+		}
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%sconf/info.xml", $widget_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 		// If the problem by comparing the cache file and include the return variable $widget_info
 		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
 
@@ -140,7 +152,9 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widget;
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		$buff = '$widget_info = new stdClass;';
 
@@ -161,8 +175,11 @@ 
 			$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
 			$buff .= sprintf('$widget_info->widget_title = $widget_title;');
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			for($i=0; $i < count($author_list); $i++)
 			{
@@ -171,8 +188,7 @@ 
 				$buff .= sprintf('$widget_info->author['.$i.']->email_address = %s;', var_export($author_list[$i]->attrs->email_address, true));
 				$buff .= sprintf('$widget_info->author['.$i.']->homepage = %s;', var_export($author_list[$i]->attrs->link, true));
 			}
-		}
-		else
+		} else
 		{
 			// Title of the widget, version
 			$buff .= sprintf('$widget_info->widget = %s;', var_export($widget, true));
@@ -193,12 +209,18 @@ 
 		}
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		if(!$extra_var_groups) {
+			$extra_var_groups = $xml_obj->extra_vars;
+		}
+		if(!is_array($extra_var_groups)) {
+			$extra_var_groups = array($extra_var_groups);
+		}
 		foreach($extra_var_groups as $group)
 		{
 			$extra_vars = $group->var;
-			if(!is_array($group->var)) $extra_vars = array($group->var);
+			if(!is_array($group->var)) {
+				$extra_vars = array($group->var);
+			}
 
 			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
 			{
@@ -228,9 +250,13 @@ 
 					$buff .= sprintf('$widget_info->extra_var->%s->description = %s;', $id, var_export($var->description->body, true));
 
 					$options = $var->options;
-					if(!$options) continue;
+					if(!$options) {
+						continue;
+					}
 
-					if(!is_array($options)) $options = array($options);
+					if(!is_array($options)) {
+						$options = array($options);
+					}
 					$options_count = count($options);
 					for($j=0;$j<$options_count;$j++)
 					{
@@ -253,7 +279,9 @@ 
 		$buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
 		FileHandler::writeFile($cache_file, $buff);
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if(file_exists($cache_file)) {
+			@include($cache_file);
+		}
 		return $widget_info;
 	}
 
@@ -265,9 +293,13 @@ 
 	{
 		$widget = escape($widgetStyle);
 		$widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
-		if(!$widgetStyle_path) return;
+		if(!$widgetStyle_path) {
+			return;
+		}
 		$xml_file = sprintf("%sskin.xml", $widgetStyle_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 		// If the problem by comparing the cache file and include the return variable $widgetStyle_info
 		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
 
@@ -280,7 +312,9 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widgetstyle;
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
@@ -300,13 +334,20 @@ 
 		$buff[] = sprintf('$widgetStyle_info->license_link = %s;', var_export($xml_obj->license->attrs->link, true));
 
 		// preview
-		if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
+		if(!$xml_obj->preview->body) {
+			$xml_obj->preview->body = 'preview.jpg';
+		}
 		$preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
-		if(file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = %s;', var_export($preview_file, true));
+		if(file_exists($preview_file)) {
+			$buff[] = sprintf('$widgetStyle_info->preview = %s;', var_export($preview_file, true));
+		}
 
 		// Author information
-		if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-		else $author_list = $xml_obj->author;
+		if(!is_array($xml_obj->author)) {
+			$author_list[] = $xml_obj->author;
+		} else {
+			$author_list = $xml_obj->author;
+		}
 
 		foreach($author_list as $idx => $author)
 		{
@@ -318,8 +359,12 @@ 
 
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		if(!$extra_var_groups) {
+			$extra_var_groups = $xml_obj->extra_vars;
+		}
+		if(!is_array($extra_var_groups)) {
+			$extra_var_groups = array($extra_var_groups);
+		}
 
 		$extra_var_count = 0;
 		$buff[] = sprintf('$widgetStyle_info->extra_var = new stdClass();', $extra_var_count);
@@ -363,7 +408,9 @@ 
 
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $buff));
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if(file_exists($cache_file)) {
+			@include($cache_file);
+		}
 
 		return $widgetStyle_info;
 	}

modules/board/board.view.php

Spacing +153 added lines, -153 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(abs($oDocument->get('member_srl')) != $logged_info->member_srl)
+					if (abs($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;
 		}
 
@@ -482,23 +482,23 @@ 
 		$args->page_count = $this->page_count;
 
 		// get the search target and keyword
-		if($this->grant->view) {
+		if ($this->grant->view) {
 			$args->search_target = Context::get('search_target');
 			$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');
 		}
@@ -506,21 +506,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);
@@ -529,21 +529,21 @@ 
 		}
 
 		// 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;
 
-			if($this->module_info->use_anonymous === 'Y')
+			if ($this->module_info->use_anonymous === 'Y')
 			{
 				unset($args->member_srl);
-				$args->member_srls = $logged_info->member_srl . ',' . $logged_info->member_srl * -1;
+				$args->member_srls = $logged_info->member_srl.','.$logged_info->member_srl * -1;
 			}
 		}
 
@@ -569,18 +569,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');
 		}
 
@@ -592,9 +592,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;
 		}
 	}
 
@@ -604,7 +604,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');
 		}
@@ -618,14 +618,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];
 				}
@@ -646,7 +646,7 @@ 
 	function dispBoardWrite()
 	{
 		// check grant
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -656,10 +656,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);
@@ -672,19 +672,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);
@@ -695,46 +695,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 BaseObject(-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
@@ -742,12 +742,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();
@@ -759,14 +759,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];
 				}
@@ -781,7 +781,7 @@ 
 	function dispBoardDelete()
 	{
 		// check grant
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -790,30 +790,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
@@ -831,7 +831,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');
 		}
@@ -839,13 +839,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');
 		}
@@ -857,9 +857,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
@@ -875,7 +875,7 @@ 
 	function dispBoardReplyComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -884,7 +884,7 @@ 
 		$parent_srl = Context::get('comment_srl');
 
 		// if the parent comment is not existed
-		if(!$parent_srl)
+		if (!$parent_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -894,11 +894,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');
 		}
@@ -906,7 +906,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');
 		}
@@ -917,9 +917,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
@@ -935,7 +935,7 @@ 
 	function dispBoardModifyComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -945,7 +945,7 @@ 
 		$comment_srl = Context::get('comment_srl');
 
 		// if the comment is not existed
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -955,13 +955,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');
 		}
@@ -984,7 +984,7 @@ 
 	function dispBoardDeleteComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -993,25 +993,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
@@ -1028,7 +1028,7 @@ 
 	{
 		$oTrackbackModel = getModel('trackback');
 
-		if(!$oTrackbackModel)
+		if (!$oTrackbackModel)
 		{
 			return;
 		}
@@ -1042,7 +1042,7 @@ 
 		$trackback = $output->data;
 
 		// if no trackback, then display the board content
-		if(!$trackback)
+		if (!$trackback)
 		{
 			return $this->dispBoardContent();
 		}
@@ -1063,7 +1063,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');
 	}
@@ -1074,8 +1074,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/addon/addon.admin.model.php

Spacing +53 added lines, -53 removed lines

@@ -27,7 +27,7 @@ 
 	function getAddonPath($addon_name)
 	{
 		$class_path = sprintf('./addons/%s/', $addon_name);
-		if(is_dir($class_path))
+		if (is_dir($class_path))
 		{
 			return $class_path;
 		}
@@ -44,7 +44,7 @@ 
 		$addonList = $this->getAddonList(0, 'site');
 
 		$oAutoinstallModel = getModel('autoinstall');
-		foreach($addonList as $key => $addon)
+		foreach ($addonList as $key => $addon)
 		{
 			// get easyinstall remove url
 			$packageSrl = $oAutoinstallModel->getPackageSrlByPath($addon->path);
@@ -55,7 +55,7 @@ 
 			$addonList[$key]->need_update = $package[$packageSrl]->need_update;
 
 			// get easyinstall update url
-			if($addonList[$key]->need_update == 'Y')
+			if ($addonList[$key]->need_update == 'Y')
 			{
 				$addonList[$key]->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
 			}
@@ -78,7 +78,7 @@ 
 		// Downloaded and installed add-on to the list of Wanted
 		$searched_list = FileHandler::readDir('./addons', '/^([a-zA-Z0-9_]+)$/');
 		$searched_count = count($searched_list);
-		if(!$searched_count)
+		if (!$searched_count)
 		{
 			return;
 		}
@@ -87,11 +87,11 @@ 
 
 		$oAddonAdminController = getAdminController('addon');
 
-		for($i = 0; $i < $searched_count; $i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// Add the name of
 			$addon_name = $searched_list[$i];
-			if($addon_name == "smartphone")
+			if ($addon_name == "smartphone")
 			{
 				continue;
 			}
@@ -100,7 +100,7 @@ 
 			// Wanted information on the add-on
 			$info = $this->getAddonInfoXml($addon_name, $site_srl, $gtype);
 			
-			if(!$info) $info = new stdClass();
+			if (!$info) $info = new stdClass();
 
 			$info->addon = $addon_name;
 			$info->path = $path;
@@ -108,7 +108,7 @@ 
 			$info->mactivated = FALSE;
 			$info->fixed = FALSE;
 			// Check if a permossion is granted entered in DB
-			if(!in_array($addon_name, array_keys($inserted_addons)))
+			if (!in_array($addon_name, array_keys($inserted_addons)))
 			{
 				// If not, type in the DB type (model, perhaps because of the hate doing this haneungeo .. ㅡ. ㅜ)
 				$oAddonAdminController->doInsert($addon_name, $site_srl, $type);
@@ -116,15 +116,15 @@ 
 			}
 			else
 			{
-				if($inserted_addons[$addon_name]->is_used == 'Y')
+				if ($inserted_addons[$addon_name]->is_used == 'Y')
 				{
 					$info->activated = TRUE;
 				}
-				if($inserted_addons[$addon_name]->is_used_m == 'Y')
+				if ($inserted_addons[$addon_name]->is_used_m == 'Y')
 				{
 					$info->mactivated = TRUE;
 				}
-				if($gtype == 'global' && $inserted_addons[$addon_name]->is_fixed == 'Y')
+				if ($gtype == 'global' && $inserted_addons[$addon_name]->is_fixed == 'Y')
 				{
 					$info->fixed = TRUE;
 				}
@@ -147,14 +147,14 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$addon_path = $this->getAddonPath($addon);
-		if(!$addon_path)
+		if (!$addon_path)
 		{
 			return;
 		}
 
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%sconf/info.xml", FileHandler::getRealpath($addon_path));
-		if(!file_exists($xml_file))
+		if (!file_exists($xml_file))
 		{
 			return;
 		}
@@ -163,7 +163,7 @@ 
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->addon;
 
-		if(!$xml_obj)
+		if (!$xml_obj)
 		{
 			return;
 		}
@@ -171,7 +171,7 @@ 
 		// DB is set to bring history
 		$db_args = new stdClass();
 		$db_args->addon = $addon;
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			$output = executeQuery('addon.getAddonInfo', $db_args);
 		}
@@ -183,7 +183,7 @@ 
 		$extra_vals = unserialize($output->data->extra_vars);
 
 		$addon_info = new stdClass();
-		if($extra_vals->mid_list)
+		if ($extra_vals->mid_list)
 		{
 			$addon_info->mid_list = $extra_vals->mid_list;
 		}
@@ -192,13 +192,13 @@ 
 			$addon_info->mid_list = array();
 		}
 
-		if($extra_vals->xe_run_method)
+		if ($extra_vals->xe_run_method)
 		{
 			$addon_info->xe_run_method = $extra_vals->xe_run_method;
 		}
 
 		// Add information
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// addon format v0.2
 			$date_obj = new stdClass();
@@ -213,7 +213,7 @@ 
 			$addon_info->license = $xml_obj->license->body;
 			$addon_info->license_link = $xml_obj->license->attrs->link;
 
-			if(!is_array($xml_obj->author))
+			if (!is_array($xml_obj->author))
 			{
 				$author_list = array();
 				$author_list[] = $xml_obj->author;
@@ -224,7 +224,7 @@ 
 			}
 
 			$addon_info->author = array();
-			foreach($author_list as $author)
+			foreach ($author_list as $author)
 			{
 				$author_obj = new stdClass();
 				$author_obj->name = $author->name->body;
@@ -234,39 +234,39 @@ 
 			}
 
 			// Expand the variable order
-			if($xml_obj->extra_vars)
+			if ($xml_obj->extra_vars)
 			{
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups)
+				if (!$extra_var_groups)
 				{
 					$extra_var_groups = $xml_obj->extra_vars;
 				}
-				if(!is_array($extra_var_groups))
+				if (!is_array($extra_var_groups))
 				{
 					$extra_var_groups = array($extra_var_groups);
 				}
 
-				foreach($extra_var_groups as $group)
+				foreach ($extra_var_groups as $group)
 				{
 					$extra_vars = $group->var;
-					if(!is_array($group->var))
+					if (!is_array($group->var))
 					{
 						$extra_vars = array($group->var);
 					}
 
-					foreach($extra_vars as $key => $val)
+					foreach ($extra_vars as $key => $val)
 					{
-						if(!$val)
+						if (!$val)
 						{
 							continue;
 						}
 
 						$obj = new stdClass();
-						if(!$val->attrs)
+						if (!$val->attrs)
 						{
 							$val->attrs = new stdClass();
 						}
-						if(!$val->attrs->type)
+						if (!$val->attrs->type)
 						{
 							$val->attrs->type = 'text';
 						}
@@ -276,26 +276,26 @@ 
 						$obj->title = $val->title->body;
 						$obj->type = $val->attrs->type;
 						$obj->description = $val->description->body;
-						if($obj->name)
+						if ($obj->name)
 						{
 							$obj->value = $extra_vals->{$obj->name};
 						}
-						if(strpos($obj->value, '|@|') != FALSE)
+						if (strpos($obj->value, '|@|') != FALSE)
 						{
 							$obj->value = explode('|@|', $obj->value);
 						}
-						if($obj->type == 'mid_list' && !is_array($obj->value))
+						if ($obj->type == 'mid_list' && !is_array($obj->value))
 						{
 							$obj->value = array($obj->value);
 						}
 
 						// 'Select'type obtained from the option list.
-						if($val->options && !is_array($val->options))
+						if ($val->options && !is_array($val->options))
 						{
 							$val->options = array($val->options);
 						}
 
-						for($i = 0, $c = count($val->options); $i < $c; $i++)
+						for ($i = 0, $c = count($val->options); $i < $c; $i++)
 						{
 							$obj->options[$i] = new stdClass();
 							$obj->options[$i]->title = $val->options[$i]->title->body;
@@ -328,30 +328,30 @@ 
 			$addon_info->author = array();
 			$addon_info->author[] = $author_obj;
 
-			if($xml_obj->extra_vars)
+			if ($xml_obj->extra_vars)
 			{
 				// Expand the variable order
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups)
+				if (!$extra_var_groups)
 				{
 					$extra_var_groups = $xml_obj->extra_vars;
 				}
-				if(!is_array($extra_var_groups))
+				if (!is_array($extra_var_groups))
 				{
 					$extra_var_groups = array($extra_var_groups);
 				}
-				foreach($extra_var_groups as $group)
+				foreach ($extra_var_groups as $group)
 				{
 					$extra_vars = $group->var;
-					if(!is_array($group->var))
+					if (!is_array($group->var))
 					{
 						$extra_vars = array($group->var);
 					}
 
 					$addon_info->extra_vars = array();
-					foreach($extra_vars as $key => $val)
+					foreach ($extra_vars as $key => $val)
 					{
-						if(!$val)
+						if (!$val)
 						{
 							continue;
 						}
@@ -363,26 +363,26 @@ 
 						$obj->title = $val->title->body;
 						$obj->type = $val->type->body ? $val->type->body : 'text';
 						$obj->description = $val->description->body;
-						if($obj->name)
+						if ($obj->name)
 						{
 							$obj->value = $extra_vals->{$obj->name};
 						}
-						if(strpos($obj->value, '|@|') != false)
+						if (strpos($obj->value, '|@|') != false)
 						{
 							$obj->value = explode('|@|', $obj->value);
 						}
-						if($obj->type == 'mid_list' && !is_array($obj->value))
+						if ($obj->type == 'mid_list' && !is_array($obj->value))
 						{
 							$obj->value = array($obj->value);
 						}
 						// 'Select'type obtained from the option list.
-						if($val->options && !is_array($val->options))
+						if ($val->options && !is_array($val->options))
 						{
 							$val->options = array($val->options);
 						}
 
 						$obj->options = array();
-						for($i = 0, $c = count($val->options); $i < $c; $i++)
+						for ($i = 0, $c = count($val->options); $i < $c; $i++)
 						{
 							$obj->options[$i]->title = $val->options[$i]->title->body;
 							$obj->options[$i]->value = $val->options[$i]->value->body;
@@ -406,7 +406,7 @@ 
 	{
 		$args = new stdClass();
 		$args->list_order = 'addon';
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			$output = executeQueryArray('addon.getAddons', $args);
 		}
@@ -415,14 +415,14 @@ 
 			$args->site_srl = $site_srl;
 			$output = executeQueryArray('addon.getSiteAddons', $args);
 		}
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}
 
 		$activated_count = count($output->data);
 		$addon_list = array();
-		for($i = 0; $i < $activated_count; $i++)
+		for ($i = 0; $i < $activated_count; $i++)
 		{
 			$addon = $output->data[$i];
 			$addon_list[$addon->addon] = $addon;
@@ -443,9 +443,9 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
-			if($type == "pc")
+			if ($type == "pc")
 			{
 				$output = executeQuery('addon.getAddonIsActivated', $args);
 			}
@@ -457,7 +457,7 @@ 
 		else
 		{
 			$args->site_srl = $site_srl;
-			if($type == "pc")
+			if ($type == "pc")
 			{
 				$output = executeQuery('addon.getSiteAddonIsActivated', $args);
 			}
@@ -466,7 +466,7 @@ 
 				$output = executeQuery('addon.getSiteMAddonIsActivated', $args);
 			}
 		}
-		if($output->data->count > 0)
+		if ($output->data->count > 0)
 		{
 			return TRUE;
 		}

modules/layout/layout.model.php

Spacing +148 added lines, -148 removed lines

@@ -31,21 +31,21 @@ 
 	 * @param array $columnList
 	 * @return array layout lists in site
 	 */
-	function getLayoutList($site_srl = 0, $layout_type="P", $columnList = array())
+	function getLayoutList($site_srl = 0, $layout_type = "P", $columnList = array())
 	{
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$args->layout_type = $layout_type;
 		$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
 
-		foreach($output->data as $no => &$val)
+		foreach ($output->data as $no => &$val)
 		{
-			if(!$this->isExistsLayoutFile($val->layout, $layout_type))
+			if (!$this->isExistsLayoutFile($val->layout, $layout_type))
 			{
 				unset($output->data[$no]);
 			}
@@ -53,7 +53,7 @@ 
 
 		$oLayoutAdminModel = getAdminModel('layout');
 		$siteDefaultLayoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($layout_type, $site_srl);
-		if($siteDefaultLayoutSrl)
+		if ($siteDefaultLayoutSrl)
 		{
 			$siteDefaultLayoutInfo = $this->getlayout($siteDefaultLayoutSrl);
 			$newLayout = sprintf('%s, %s', $siteDefaultLayoutInfo->title, $siteDefaultLayoutInfo->layout);
@@ -80,24 +80,24 @@ 
 		$layoutList = $this->getLayoutInstanceList($siteSrl, $layoutType);
 		$thumbs = array();
 
-		foreach($layoutList as $key => $val)
+		foreach ($layoutList as $key => $val)
 		{
-			if($thumbs[$val->layouts])
+			if ($thumbs[$val->layouts])
 			{
 				$val->thumbnail = $thumbs[$val->layouts];
 				continue;
 			}
 
 			$token = explode('|@|', $val->layout);
-			if(count($token) == 2)
+			if (count($token) == 2)
 			{
-				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]);
+				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png', $token[0], $token[1]);
 			}
 			else
 			{
-				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png' , $val->layout);
+				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png', $val->layout);
 			}
-			if(is_readable($thumbnailPath))
+			if (is_readable($thumbnailPath))
 			{
 				$val->thumbnail = $thumbnailPath;
 			}
@@ -123,7 +123,7 @@ 
 		if (!$siteSrl)
 		{
 			$siteModuleInfo = Context::get('site_module_info');
-			$siteSrl = (int)$siteModuleInfo->site_srl;
+			$siteSrl = (int) $siteModuleInfo->site_srl;
 		}
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
@@ -133,11 +133,11 @@ 
 
 		// Create instance name list
 		$instanceList = array();
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $no => $iInfo)
+			foreach ($output->data as $no => $iInfo)
 			{
-				if($this->isExistsLayoutFile($iInfo->layout, $layoutType))
+				if ($this->isExistsLayoutFile($iInfo->layout, $layoutType))
 				{
 					$instanceList[] = $iInfo->layout;
 				}
@@ -152,18 +152,18 @@ 
 		$downloadedList = array();
 		$titleList = array();
 		$_downloadedList = $this->getDownloadedLayoutList($layoutType);
-		if(is_array($_downloadedList))
+		if (is_array($_downloadedList))
 		{
-			foreach($_downloadedList as $dLayoutInfo)
+			foreach ($_downloadedList as $dLayoutInfo)
 			{
 				$downloadedList[$dLayoutInfo->layout] = $dLayoutInfo->layout;
 				$titleList[$dLayoutInfo->layout] = $dLayoutInfo->title;
 			}
 		}
 
-		if($layout)
+		if ($layout)
 		{
-			if(count($instanceList) < 1 && $downloadedList[$layout])
+			if (count($instanceList) < 1 && $downloadedList[$layout])
 			{
 				$insertArgs = new stdClass();
 				$insertArgs->site_srl = $siteSrl;
@@ -181,7 +181,7 @@ 
 		{
 			// Get downloaded name list have no instance
 			$noInstanceList = array_diff($downloadedList, $instanceList);
-			foreach($noInstanceList as $layoutName)
+			foreach ($noInstanceList as $layoutName)
 			{
 				$insertArgs = new stdClass();
 				$insertArgs->site_srl = $siteSrl;
@@ -197,15 +197,15 @@ 
 		}
 
 		// If create layout instance, reload instance list
-		if($isCreateInstance)
+		if ($isCreateInstance)
 		{
 			$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $no => $iInfo)
+				foreach ($output->data as $no => $iInfo)
 				{
-					if(!$this->isExistsLayoutFile($iInfo->layout, $layoutType))
+					if (!$this->isExistsLayoutFile($iInfo->layout, $layoutType))
 					{
 						unset($output->data[$no]);
 					}
@@ -226,28 +226,28 @@ 
 	function isExistsLayoutFile($layout, $layoutType)
 	{
 		//TODO If remove a support themes, remove this codes also.
-		if($layoutType == 'P')
+		if ($layoutType == 'P')
 		{
-			$pathPrefix = _XE_PATH_ . 'layouts/';
-			$themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s';
+			$pathPrefix = _XE_PATH_.'layouts/';
+			$themePathFormat = _XE_PATH_.'themes/%s/layouts/%s';
 		}
 		else
 		{
-			$pathPrefix = _XE_PATH_ . 'm.layouts/';
-			$themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s';
+			$pathPrefix = _XE_PATH_.'m.layouts/';
+			$themePathFormat = _XE_PATH_.'themes/%s/m.layouts/%s';
 		}
 
-		if(strpos($layout, '|@|') !== FALSE)
+		if (strpos($layout, '|@|') !== FALSE)
 		{
 			list($themeName, $layoutName) = explode('|@|', $layout);
 			$path = sprintf($themePathFormat, $themeName, $layoutName);
 		}
 		else
 		{
-			$path = $pathPrefix . $layout;
+			$path = $pathPrefix.$layout;
 		}
 
-		return is_readable($path . '/layout.html');
+		return is_readable($path.'/layout.html');
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		// Return xml file informaton after listing up the layout and extra_vars
 		$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
@@ -275,7 +275,7 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args, $columnList);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return;
 		}
@@ -292,15 +292,15 @@ 
 	function getLayoutPath($layout_name = "", $layout_type = "P")
 	{
 		$layout_parse = explode('|@|', $layout_name);
-		if(count($layout_parse) > 1)
+		if (count($layout_parse) > 1)
 		{
 			$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
 		}
-		else if($layout_name == 'faceoff')
+		else if ($layout_name == 'faceoff')
 		{
 			$class_path = './modules/layout/faceoff/';
 		}
-		else if($layout_type == "M")
+		else if ($layout_type == "M")
 		{
 			$class_path = sprintf("./m.layouts/%s/", $layout_name);
 		}
@@ -308,7 +308,7 @@ 
 		{
 			$class_path = sprintf('./layouts/%s/', $layout_name);
 		}
-		if(is_dir($class_path)) return $class_path;
+		if (is_dir($class_path)) return $class_path;
 		return "";
 	}
 
@@ -326,24 +326,24 @@ 
 		// Get a list of downloaded layout and installed layout
 		$searched_list = $this->_getInstalledLayoutDirectories($layout_type);
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 
 		// natcasesort($searched_list);
 		// Return information for looping searched list of layouts
 		$list = array();
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// Name of the layout
 			$layout = $searched_list[$i];
 			// Get information of the layout
 			$layout_info = $this->getLayoutInfo($layout, null, $layout_type);
 
-			if(!$layout_info)
+			if (!$layout_info)
 			{
 				continue;
 			}
 
-			if($withAutoinstallInfo)
+			if ($withAutoinstallInfo)
 			{
 				// get easyinstall remove url
 				$packageSrl = $oAutoinstallModel->getPackageSrlByPath($layout_info->path);
@@ -354,7 +354,7 @@ 
 				$layout_info->need_update = $package[$packageSrl]->need_update;
 
 				// get easyinstall update url
-				if($layout_info->need_update)
+				if ($layout_info->need_update)
 				{
 					$layout_info->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
 				}
@@ -371,12 +371,12 @@ 
 	 */
 	function sortLayoutByTitle($a, $b)
 	{
-		if(!$a->title)
+		if (!$a->title)
 		{
 			$a->title = $a->layout;
 		}
 
-		if(!$b->title)
+		if (!$b->title)
 		{
 			$b->title = $b->layout;
 		}
@@ -384,7 +384,7 @@ 
 		$aTitle = strtolower($a->title);
 		$bTitle = strtolower($b->title);
 
-		if($aTitle == $bTitle)
+		if ($aTitle == $bTitle)
 		{
 			return 0;
 		}
@@ -410,7 +410,7 @@ 
 	 */
 	function _getInstalledLayoutDirectories($layoutType = 'P')
 	{
-		if($layoutType == 'M')
+		if ($layoutType == 'M')
 		{
 			$directory = './m.layouts';
 			$globalValueKey = 'MOBILE_LAYOUT_DIRECTOIES';
@@ -421,7 +421,7 @@ 
 			$globalValueKey = 'PC_LAYOUT_DIRECTORIES';
 		}
 
-		if($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
+		if ($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
 
 		$searchedList = FileHandler::readDir($directory);
 		if (!$searchedList) $searchedList = array();
@@ -440,7 +440,7 @@ 
 	 */
 	function getLayoutInfo($layout, $info = null, $layout_type = "P")
 	{
-		if($info)
+		if ($info)
 		{
 			$layout_title = $info->title;
 			$layout = $info->layout;
@@ -448,35 +448,35 @@ 
 			$site_srl = $info->site_srl;
 			$vars = unserialize($info->extra_vars);
 
-			if($info->module_srl)
+			if ($info->module_srl)
 			{
-				$layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/','',$info->layout_path);
+				$layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/', '', $info->layout_path);
 				$xml_file = sprintf('%sskin.xml', $layout_path);
 			}
 		}
 
 		// Get a path of the requested module. Return if not exists.
-		if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
-		if(!is_dir($layout_path)) return;
+		if (!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
+		if (!is_dir($layout_path)) return;
 
 		// Read the xml file for module skin information
-		if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
-		if(!file_exists($xml_file))
+		if (!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
+		if (!file_exists($xml_file))
 		{
 			$layout_info = new stdClass;
 			$layout_info->title = $layout;
 			$layout_info->layout = $layout;
 			$layout_info->path = $layout_path;
 			$layout_info->layout_title = $layout_title;
-			if(!$layout_info->layout_type)
+			if (!$layout_info->layout_type)
 			{
-				$layout_info->layout_type =  $layout_type;
+				$layout_info->layout_type = $layout_type;
 			}
 			return $layout_info;
 		}
 
 		// Include the cache file if it is valid and then return $layout_info variable
-		if(!$layout_srl)
+		if (!$layout_srl)
 		{
 			$cache_file = $this->getLayoutCache($layout, Context::getLangType(), $layout_type);
 		}
@@ -485,22 +485,22 @@ 
 			$cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
 		}
 
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (file_exists($cache_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			include($cache_file);
 
-			if($layout_info->extra_var && $vars)
+			if ($layout_info->extra_var && $vars)
 			{
-				foreach($vars as $key => $value)
+				foreach ($vars as $key => $value)
 				{
-					if(!$layout_info->extra_var->{$key} && !$layout_info->{$key})
+					if (!$layout_info->extra_var->{$key} && !$layout_info->{$key})
 					{
 						$layout_info->{$key} = $value;
 					}
 				}
 			}
 
-			if(!$layout_info->title)
+			if (!$layout_info->title)
 			{
 				$layout_info->title = $layout;
 			}
@@ -511,16 +511,16 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 
-		if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
-		elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
+		if ($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
+		elseif ($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
 
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		$buff = array();
 		$buff[] = '$layout_info = new stdClass;';
 		$buff[] = sprintf('$layout_info->site_srl = %d;', $site_srl);
 
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// Layout title, version and other information
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -540,11 +540,11 @@ 
 			$buff[] = sprintf('$layout_info->layout_type = %s;', var_export($layout_type, true));
 
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
 			$buff[] = '$layout_info->author = array();';
-			for($i=0, $c=count($author_list); $i<$c; $i++)
+			for ($i = 0, $c = count($author_list); $i < $c; $i++)
 			{
 				$buff[] = sprintf('$layout_info->author[%d] = new stdClass;', $i);
 				$buff[] = sprintf('$layout_info->author[%d]->name = %s;', $i, var_export($author_list[$i]->name->body, true));
@@ -554,22 +554,22 @@ 
 
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
 			$buff[] = '$layout_info->extra_var = new stdClass;';
 			$extra_var_count = 0;
-			foreach($extra_var_groups as $group)
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
 					$count = count($extra_vars);
 					$extra_var_count += $count;
 					
-					for($i=0;$i<$count;$i++)
+					for ($i = 0; $i < $count; $i++)
 					{
 						unset($var, $options);
 						$var = $extra_vars[$i];
@@ -583,23 +583,23 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->description = %s;', $name, var_export($var->description->body, true));
 
 						$options = $var->options;
-						if(!$options) continue;
-						if(!is_array($options)) $options = array($options);
+						if (!$options) continue;
+						if (!is_array($options)) $options = array($options);
 
 						$buff[] = sprintf('$layout_info->extra_var->%s->options = array();', $var->attrs->name);
 						$options_count = count($options);
 						$thumbnail_exist = false;
-						for($j=0; $j < $options_count; $j++)
+						for ($j = 0; $j < $options_count; $j++)
 						{
 							$buff[] = sprintf('$layout_info->extra_var->%s->options[%s] = new stdClass;', $var->attrs->name, var_export($options[$j]->attrs->value, true));
 							$thumbnail = $options[$j]->attrs->src;
-							if($thumbnail)
+							if ($thumbnail)
 							{
 								$thumbnail = $layout_path.$thumbnail;
-								if(file_exists($thumbnail))
+								if (file_exists($thumbnail))
 								{
 									$buff[] = sprintf('$layout_info->extra_var->%s->options[%s]->thumbnail = %s;', $var->attrs->name, var_export($options[$j]->attrs->value, true), var_export($thumbnail, true));
-									if(!$thumbnail_exist)
+									if (!$thumbnail_exist)
 									{
 										$buff[] = sprintf('$layout_info->extra_var->%s->thumbnail_exist = true;', $var->attrs->name);
 										$thumbnail_exist = true;
@@ -613,26 +613,26 @@ 
 			}
 			$buff[] = sprintf('$layout_info->extra_var_count = %d;', $extra_var_count);
 			// Menu
-			if($xml_obj->menus->menu)
+			if ($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if (!is_array($menus)) $menus = array($menus);
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = %d;', $menu_count);
 				$buff[] = '$layout_info->menu = new stdClass;';
-				for($i=0;$i<$menu_count;$i++)
+				for ($i = 0; $i < $menu_count; $i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
+					if ($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
 					$buff[] = sprintf('$layout_info->menu->%s = new stdClass;', $name);
-					$buff[] = sprintf('$layout_info->menu->%s->name = %s;',$name, var_export($menus[$i]->attrs->name, true));
-					$buff[] = sprintf('$layout_info->menu->%s->title = %s;',$name, var_export($menus[$i]->title->body, true));
-					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = %s;',$name, var_export($menus[$i]->attrs->maxdepth, true));
+					$buff[] = sprintf('$layout_info->menu->%s->name = %s;', $name, var_export($menus[$i]->attrs->name, true));
+					$buff[] = sprintf('$layout_info->menu->%s->title = %s;', $name, var_export($menus[$i]->title->body, true));
+					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = %s;', $name, var_export($menus[$i]->attrs->maxdepth, true));
 
 					$buff[] = sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";', $name, $name);
 				}
 			}
 		}
@@ -655,19 +655,19 @@ 
 			$buff[] = sprintf('$layout_info->author[0]->homepage = %s;', var_export($xml_obj->author->attrs->link, true));
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-			foreach($extra_var_groups as $group)
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
 					$extra_var_count = count($extra_vars);
 
 					$buff[] = sprintf('$layout_info->extra_var_count = %d;', $extra_var_count);
-					for($i=0;$i<$extra_var_count;$i++)
+					for ($i = 0; $i < $extra_var_count; $i++)
 					{
 						unset($var, $options);
 						$var = $extra_vars[$i];
@@ -680,11 +680,11 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->description = %s;', $name, var_export($var->description->body, true));
 
 						$options = $var->options;
-						if(!$options) continue;
+						if (!$options) continue;
 
-						if(!is_array($options)) $options = array($options);
+						if (!is_array($options)) $options = array($options);
 						$options_count = count($options);
-						for($j=0;$j<$options_count;$j++)
+						for ($j = 0; $j < $options_count; $j++)
 						{
 							$buff[] = sprintf('$layout_info->extra_var->%s->options[%s]->val = %s;', $var->attrs->name, var_export($options[$j]->value->body, true), var_export($options[$j]->title->body, true));
 						}
@@ -692,23 +692,23 @@ 
 				}
 			}
 			// Menu
-			if($xml_obj->menus->menu)
+			if ($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if (!is_array($menus)) $menus = array($menus);
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = %d;', $menu_count);
-				for($i=0;$i<$menu_count;$i++)
+				for ($i = 0; $i < $menu_count; $i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
-					$buff[] = sprintf('$layout_info->menu->%s->name = %s;',$name, var_export($name, true));
-					$buff[] = sprintf('$layout_info->menu->%s->title = %s;',$name, var_export($menus[$i]->title->body, true));
-					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = %s;',$name, var_export($menus[$i]->maxdepth->body, true));
+					if ($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
+					$buff[] = sprintf('$layout_info->menu->%s->name = %s;', $name, var_export($name, true));
+					$buff[] = sprintf('$layout_info->menu->%s->title = %s;', $name, var_export($menus[$i]->title->body, true));
+					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = %s;', $name, var_export($menus[$i]->maxdepth->body, true));
 					$buff[] = sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";', $name, $name);
 				}
 			}
 		}
@@ -718,15 +718,15 @@ 
 		$layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl);
 		$header_script = trim($layout_config->header_script);
 
-		if($header_script)
+		if ($header_script)
 		{
 			$buff[] = sprintf(' $layout_info->header_script = %s; ', var_export($header_script, true));
 		}
 
-		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); ' . join(PHP_EOL, $buff));
-		if(FileHandler::exists($cache_file)) include($cache_file);
+		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); '.join(PHP_EOL, $buff));
+		if (FileHandler::exists($cache_file)) include($cache_file);
 
-		if(!$layout_info->title)
+		if (!$layout_info->title)
 		{
 			$layout_info->title = $layout;
 		}
@@ -750,12 +750,12 @@ 
 	 * @param string $layout_name
 	 * @return array
 	 */
-	function getUserLayoutIniConfig($layout_srl, $layout_name=null)
+	function getUserLayoutIniConfig($layout_srl, $layout_name = null)
 	{
 		$file = $this->getUserLayoutIni($layout_srl);
-		if($layout_name && FileHandler::exists($file) === FALSE)
+		if ($layout_name && FileHandler::exists($file) === FALSE)
 		{
-			FileHandler::copyFile($this->getDefaultLayoutIni($layout_name),$this->getUserLayoutIni($layout_srl));
+			FileHandler::copyFile($this->getDefaultLayoutIni($layout_name), $this->getUserLayoutIni($layout_srl));
 		}
 
 		return FileHandler::readIniFile($file);
@@ -768,7 +768,7 @@ 
 	 */
 	function getUserLayoutPath($layout_srl)
 	{
-		return sprintf("./files/faceOff/%s", getNumberingPath($layout_srl,3));
+		return sprintf("./files/faceOff/%s", getNumberingPath($layout_srl, 3));
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 	 */
 	function getUserLayoutImagePath($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'images/';
+		return $this->getUserLayoutPath($layout_srl).'images/';
 	}
 
 	/**
@@ -788,7 +788,7 @@ 
 	 */
 	function getUserLayoutCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'layout.css';
+		return $this->getUserLayoutPath($layout_srl).'layout.css';
 	}
 
 	/**
@@ -798,7 +798,7 @@ 
 	 */
 	function getUserLayoutFaceOffCss($layout_srl)
 	{
-		if($this->useUserLayoutTemp == 'temp') return;
+		if ($this->useUserLayoutTemp == 'temp') return;
 		return $this->_getUserLayoutFaceOffCss($layout_srl);
 	}
 
@@ -809,7 +809,7 @@ 
 	 */
 	function _getUserLayoutFaceOffCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'faceoff.css';
+		return $this->getUserLayoutPath($layout_srl).'faceoff.css';
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 */
 	function getUserLayoutTempFaceOffCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.faceoff.css';
+		return $this->getUserLayoutPath($layout_srl).'tmp.faceoff.css';
 	}
 
 	/**
@@ -829,11 +829,11 @@ 
 	 */
 	function getUserLayoutHtml($layout_srl)
 	{
-		$src = $this->getUserLayoutPath($layout_srl). 'layout.html';
-		if($this->useUserLayoutTemp == 'temp')
+		$src = $this->getUserLayoutPath($layout_srl).'layout.html';
+		if ($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempHtml($layout_srl);
-			if(FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src,$temp);
+			if (FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src, $temp);
 			return $temp;
 		}
 
@@ -847,7 +847,7 @@ 
 	 */
 	function getUserLayoutTempHtml($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.layout.html';
+		return $this->getUserLayoutPath($layout_srl).'tmp.layout.html';
 	}
 
 	/**
@@ -857,11 +857,11 @@ 
 	 */
 	function getUserLayoutIni($layout_srl)
 	{
-		$src = $this->getUserLayoutPath($layout_srl). 'layout.ini';
-		if($this->useUserLayoutTemp == 'temp')
+		$src = $this->getUserLayoutPath($layout_srl).'layout.ini';
+		if ($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempIni($layout_srl);
-			if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+			if (!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src, $temp);
 			return $temp;
 		}
 
@@ -875,7 +875,7 @@ 
 	 */
 	function getUserLayoutTempIni($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.layout.ini';
+		return $this->getUserLayoutPath($layout_srl).'tmp.layout.ini';
 	}
 
 	/**
@@ -885,9 +885,9 @@ 
 	 * @param string $lang_type
 	 * @return string
 	 */
-	function getUserLayoutCache($layout_srl,$lang_type)
+	function getUserLayoutCache($layout_srl, $lang_type)
 	{
-		return $this->getUserLayoutPath($layout_srl). "{$lang_type}.cache.php";
+		return $this->getUserLayoutPath($layout_srl)."{$lang_type}.cache.php";
 	}
 
 	/**
@@ -896,15 +896,15 @@ 
 	 * @param string $lang_type
 	 * @return string
 	 */
-	function getLayoutCache($layout_name,$lang_type,$layout_type='P')
+	function getLayoutCache($layout_name, $lang_type, $layout_type = 'P')
 	{
-		if($layout_type=='P')
+		if ($layout_type == 'P')
 		{
-			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name, $lang_type);
 		}
 		else
 		{
-			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name, $lang_type);
 		}
 	}
 
@@ -915,7 +915,7 @@ 
 	 */
 	function getDefaultLayoutIni($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'layout.ini';
+		return $this->getDefaultLayoutPath($layout_name).'layout.ini';
 	}
 
 	/**
@@ -925,7 +925,7 @@ 
 	 */
 	function getDefaultLayoutHtml($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'layout.html';
+		return $this->getDefaultLayoutPath($layout_name).'layout.html';
 	}
 
 	/**
@@ -935,7 +935,7 @@ 
 	 */
 	function getDefaultLayoutCss($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'css/layout.css';
+		return $this->getDefaultLayoutPath($layout_name).'css/layout.css';
 	}
 
 	/**
@@ -964,7 +964,7 @@ 
 	 * @param string $flag (default 'temp')
 	 * @return void
 	 */
-	function setUseUserLayoutTemp($flag='temp')
+	function setUseUserLayoutTemp($flag = 'temp')
 	{
 		$this->useUserLayoutTemp = $flag;
 	}
@@ -998,11 +998,11 @@ 
 		);
 
 		$image_path = $this->getUserLayoutImagePath($layout_srl);
-		$image_list = FileHandler::readDir($image_path,'/(.*(?:jpg|jpeg|gif|bmp|png)$)/i');
+		$image_list = FileHandler::readDir($image_path, '/(.*(?:jpg|jpeg|gif|bmp|png)$)/i');
 
-		foreach($image_list as $image)
+		foreach ($image_list as $image)
 		{
-			$file_list[] = 'images/' . $image;
+			$file_list[] = 'images/'.$image;
 		}
 		return $file_list;
 	}
@@ -1020,20 +1020,20 @@ 
 		Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
 		// CSS generated in the layout manager
 		$faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
-		if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
+		if ($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
 		// CSS output for the widget
 		Context::loadFile($this->module_path.'/tpl/css/widget.css', true);
-		if($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
+		if ($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
 		else Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
 		// Different page displayed upon user's permission
 		$logged_info = Context::get('logged_info');
 		// Display edit button for faceoff layout
-		if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
+		if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
 		{
-			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
+			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('', 'mid', Context::get('mid'), 'act', 'dispLayoutAdminLayoutModify', 'delete_tmp', 'Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
 		}
 		// Display menu when editing the faceOff page
-		if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
+		if (Context::get('act') == 'dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
 		{
 			$oTemplate = &TemplateHandler::getInstance();
 			Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu'));

Braces +115 added lines, -61 removed lines

@@ -92,16 +92,14 @@ 
 			if(count($token) == 2)
 			{
 				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]);
-			}
-			else
+			} else
 			{
 				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png' , $val->layout);
 			}
 			if(is_readable($thumbnailPath))
 			{
 				$val->thumbnail = $thumbnailPath;
-			}
-			else
+			} else
 			{
 				$val->thumbnail = sprintf('./modules/layout/tpl/img/noThumbnail.png');
 			}
@@ -140,8 +138,7 @@ 
 				if($this->isExistsLayoutFile($iInfo->layout, $layoutType))
 				{
 					$instanceList[] = $iInfo->layout;
-				}
-				else
+				} else
 				{
 					unset($output->data[$no]);
 				}
@@ -176,8 +173,7 @@ 
 				$oLayoutAdminController->insertLayout($insertArgs);
 				$isCreateInstance = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			// Get downloaded name list have no instance
 			$noInstanceList = array_diff($downloadedList, $instanceList);
@@ -230,8 +226,7 @@ 
 		{
 			$pathPrefix = _XE_PATH_ . 'layouts/';
 			$themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s';
-		}
-		else
+		} else
 		{
 			$pathPrefix = _XE_PATH_ . 'm.layouts/';
 			$themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s';
@@ -241,8 +236,7 @@ 
 		{
 			list($themeName, $layoutName) = explode('|@|', $layout);
 			$path = sprintf($themePathFormat, $themeName, $layoutName);
-		}
-		else
+		} else
 		{
 			$path = $pathPrefix . $layout;
 		}
@@ -262,7 +256,9 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		// Return xml file informaton after listing up the layout and extra_vars
 		$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
@@ -295,20 +291,19 @@ 
 		if(count($layout_parse) > 1)
 		{
 			$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
-		}
-		else if($layout_name == 'faceoff')
+		} else if($layout_name == 'faceoff')
 		{
 			$class_path = './modules/layout/faceoff/';
-		}
-		else if($layout_type == "M")
+		} else if($layout_type == "M")
 		{
 			$class_path = sprintf("./m.layouts/%s/", $layout_name);
-		}
-		else
+		} else
 		{
 			$class_path = sprintf('./layouts/%s/', $layout_name);
 		}
-		if(is_dir($class_path)) return $class_path;
+		if(is_dir($class_path)) {
+			return $class_path;
+		}
 		return "";
 	}
 
@@ -321,12 +316,16 @@ 
 	 */
 	function getDownloadedLayoutList($layout_type = "P", $withAutoinstallInfo = false)
 	{
-		if ($withAutoinstallInfo) $oAutoinstallModel = getModel('autoinstall');
+		if ($withAutoinstallInfo) {
+			$oAutoinstallModel = getModel('autoinstall');
+		}
 
 		// Get a list of downloaded layout and installed layout
 		$searched_list = $this->_getInstalledLayoutDirectories($layout_type);
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 
 		// natcasesort($searched_list);
 		// Return information for looping searched list of layouts
@@ -414,17 +413,20 @@ 
 		{
 			$directory = './m.layouts';
 			$globalValueKey = 'MOBILE_LAYOUT_DIRECTOIES';
-		}
-		else
+		} else
 		{
 			$directory = './layouts';
 			$globalValueKey = 'PC_LAYOUT_DIRECTORIES';
 		}
 
-		if($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
+		if($GLOBALS[$globalValueKey]) {
+			return $GLOBALS[$globalValueKey];
+		}
 
 		$searchedList = FileHandler::readDir($directory);
-		if (!$searchedList) $searchedList = array();
+		if (!$searchedList) {
+			$searchedList = array();
+		}
 		$GLOBALS[$globalValueKey] = $searchedList;
 
 		return $searchedList;
@@ -456,11 +458,17 @@ 
 		}
 
 		// Get a path of the requested module. Return if not exists.
-		if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
-		if(!is_dir($layout_path)) return;
+		if(!$layout_path) {
+			$layout_path = $this->getLayoutPath($layout, $layout_type);
+		}
+		if(!is_dir($layout_path)) {
+			return;
+		}
 
 		// Read the xml file for module skin information
-		if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
+		if(!$xml_file) {
+			$xml_file = sprintf("%sconf/info.xml", $layout_path);
+		}
 		if(!file_exists($xml_file))
 		{
 			$layout_info = new stdClass;
@@ -479,8 +487,7 @@ 
 		if(!$layout_srl)
 		{
 			$cache_file = $this->getLayoutCache($layout, Context::getLangType(), $layout_type);
-		}
-		else
+		} else
 		{
 			$cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
 		}
@@ -511,10 +518,15 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 
-		if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
-		elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
+		if($tmp_xml_obj->layout) {
+			$xml_obj = $tmp_xml_obj->layout;
+		} elseif($tmp_xml_obj->skin) {
+			$xml_obj = $tmp_xml_obj->skin;
+		}
 
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		$buff = array();
 		$buff[] = '$layout_info = new stdClass;';
@@ -540,8 +552,11 @@ 
 			$buff[] = sprintf('$layout_info->layout_type = %s;', var_export($layout_type, true));
 
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			$buff[] = '$layout_info->author = array();';
 			for($i=0, $c=count($author_list); $i<$c; $i++)
@@ -554,8 +569,12 @@ 
 
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if(!$extra_var_groups) {
+				$extra_var_groups = $xml_obj->extra_vars;
+			}
+			if(!is_array($extra_var_groups)) {
+				$extra_var_groups = array($extra_var_groups);
+			}
 
 			$buff[] = '$layout_info->extra_var = new stdClass;';
 			$extra_var_count = 0;
@@ -564,7 +583,9 @@ 
 				$extra_vars = $group->var;
 				if($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if(!is_array($extra_vars)) {
+						$extra_vars = array($extra_vars);
+					}
 
 					$count = count($extra_vars);
 					$extra_var_count += $count;
@@ -583,8 +604,12 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->description = %s;', $name, var_export($var->description->body, true));
 
 						$options = $var->options;
-						if(!$options) continue;
-						if(!is_array($options)) $options = array($options);
+						if(!$options) {
+							continue;
+						}
+						if(!is_array($options)) {
+							$options = array($options);
+						}
 
 						$buff[] = sprintf('$layout_info->extra_var->%s->options = array();', $var->attrs->name);
 						$options_count = count($options);
@@ -616,7 +641,9 @@ 
 			if($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if(!is_array($menus)) {
+					$menus = array($menus);
+				}
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = %d;', $menu_count);
@@ -624,7 +651,9 @@ 
 				for($i=0;$i<$menu_count;$i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
+					if($menus[$i]->attrs->default == "true") {
+						$buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
+					}
 					$buff[] = sprintf('$layout_info->menu->%s = new stdClass;', $name);
 					$buff[] = sprintf('$layout_info->menu->%s->name = %s;',$name, var_export($menus[$i]->attrs->name, true));
 					$buff[] = sprintf('$layout_info->menu->%s->title = %s;',$name, var_export($menus[$i]->title->body, true));
@@ -635,8 +664,7 @@ 
 					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
 				}
 			}
-		}
-		else
+		} else
 		{
 			// Layout title, version and other information
 			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -655,14 +683,20 @@ 
 			$buff[] = sprintf('$layout_info->author[0]->homepage = %s;', var_export($xml_obj->author->attrs->link, true));
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if(!$extra_var_groups) {
+				$extra_var_groups = $xml_obj->extra_vars;
+			}
+			if(!is_array($extra_var_groups)) {
+				$extra_var_groups = array($extra_var_groups);
+			}
 			foreach($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
 				if($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if(!is_array($extra_vars)) {
+						$extra_vars = array($extra_vars);
+					}
 
 					$extra_var_count = count($extra_vars);
 
@@ -680,9 +714,13 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->description = %s;', $name, var_export($var->description->body, true));
 
 						$options = $var->options;
-						if(!$options) continue;
+						if(!$options) {
+							continue;
+						}
 
-						if(!is_array($options)) $options = array($options);
+						if(!is_array($options)) {
+							$options = array($options);
+						}
 						$options_count = count($options);
 						for($j=0;$j<$options_count;$j++)
 						{
@@ -695,14 +733,18 @@ 
 			if($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if(!is_array($menus)) {
+					$menus = array($menus);
+				}
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = %d;', $menu_count);
 				for($i=0;$i<$menu_count;$i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
+					if($menus[$i]->attrs->default == "true") {
+						$buff[] = sprintf('$layout_info->default_menu = %s;', var_export($name, true));
+					}
 					$buff[] = sprintf('$layout_info->menu->%s->name = %s;',$name, var_export($name, true));
 					$buff[] = sprintf('$layout_info->menu->%s->title = %s;',$name, var_export($menus[$i]->title->body, true));
 					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = %s;',$name, var_export($menus[$i]->maxdepth->body, true));
@@ -724,7 +766,9 @@ 
 		}
 
 		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); ' . join(PHP_EOL, $buff));
-		if(FileHandler::exists($cache_file)) include($cache_file);
+		if(FileHandler::exists($cache_file)) {
+			include($cache_file);
+		}
 
 		if(!$layout_info->title)
 		{
@@ -798,7 +842,9 @@ 
 	 */
 	function getUserLayoutFaceOffCss($layout_srl)
 	{
-		if($this->useUserLayoutTemp == 'temp') return;
+		if($this->useUserLayoutTemp == 'temp') {
+			return;
+		}
 		return $this->_getUserLayoutFaceOffCss($layout_srl);
 	}
 
@@ -833,7 +879,9 @@ 
 		if($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempHtml($layout_srl);
-			if(FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src,$temp);
+			if(FileHandler::exists($temp) === FALSE) {
+				FileHandler::copyFile($src,$temp);
+			}
 			return $temp;
 		}
 
@@ -861,7 +909,9 @@ 
 		if($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempIni($layout_srl);
-			if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+			if(!file_exists(FileHandler::getRealPath($temp))) {
+				FileHandler::copyFile($src,$temp);
+			}
 			return $temp;
 		}
 
@@ -901,8 +951,7 @@ 
 		if($layout_type=='P')
 		{
 			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
-		}
-		else
+		} else
 		{
 			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
 		}
@@ -1020,11 +1069,16 @@ 
 		Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
 		// CSS generated in the layout manager
 		$faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
-		if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
+		if($faceoff_layout_css) {
+			Context::addCSSFile($faceoff_layout_css);
+		}
 		// CSS output for the widget
 		Context::loadFile($this->module_path.'/tpl/css/widget.css', true);
-		if($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
-		else Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
+		if($layout_info->extra_var->colorset->value == 'black') {
+			Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
+		} else {
+			Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
+		}
 		// Different page displayed upon user's permission
 		$logged_info = Context::get('logged_info');
 		// Display edit button for faceoff layout