xpressengine / xe-core

classes/cache/CacheHandler.class.php

Braces +7 added lines, -14 removed lines

@@ -63,37 +63,30 @@
 				if($info->use_object_cache == 'apc')
 				{
 					$type = 'apc';
-				}
-				else if(substr($info->use_object_cache, 0, 8) == 'memcache')
+				} else if(substr($info->use_object_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_object_cache;
-				}
-				else if($info->use_object_cache == 'wincache')
+				} else if($info->use_object_cache == 'wincache')
 				{
 					$type = 'wincache';
-				}
-				else if($info->use_object_cache == 'file')
+				} else if($info->use_object_cache == 'file')
 				{
 					$type = 'file';
-				}
-				else if($always_use_file)
+				} else if($always_use_file)
 				{
 					$type = 'file';
 				}
-			}
-			else if($target == 'template')
+			} else if($target == 'template')
 			{
 				if($info->use_template_cache == 'apc')
 				{
 					$type = 'apc';
-				}
-				else if(substr($info->use_template_cache, 0, 8) == 'memcache')
+				} else if(substr($info->use_template_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_template_cache;
-				}
-				else if($info->use_template_cache == 'wincache')
+				} else if($info->use_template_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}

Doc Comments +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 	 * @param string $key Cache key
 	 * @param int $modified_time 	Unix time of data modified.
 	 * 								If stored time is older then modified time, return false.
-	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 * @return boolean Return false on failure or older then modified time. Return the string associated with the $key on success.
 	 */
 	function get($key, $modified_time = 0)
 	{
@@ -297,7 +297,7 @@ 
 	 * @param string $key Cache key
 	 * @param int $modified_time 	Unix time of data modified.
 	 * 								If stored time is older then modified time, return false.
-	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 * @return boolean Return false on failure or older then modified time. Return the string associated with the $key on success.
 	 */
 	function get($key, $modified_time = 0)
 	{

Spacing +26 added lines, -26 removed lines

@@ -30,8 +30,8 @@ 
 	 */
 	function &getInstance($target = 'object', $info = null, $always_use_file = false)
 	{
-		$cache_handler_key = $target . ($always_use_file ? '_file' : '');
-		if(!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key])
+		$cache_handler_key = $target.($always_use_file ? '_file' : '');
+		if (!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key])
 		{
 			$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key] = new CacheHandler($target, $info, $always_use_file);
 		}
@@ -51,61 +51,61 @@ 
 	 */
 	function __construct($target, $info = null, $always_use_file = false)
 	{
-		if(!$info)
+		if (!$info)
 		{
 			$info = Context::getDBInfo();
 		}
 
-		if($info)
+		if ($info)
 		{
-			if($target == 'object')
+			if ($target == 'object')
 			{
-				if($info->use_object_cache == 'apc')
+				if ($info->use_object_cache == 'apc')
 				{
 					$type = 'apc';
 				}
-				else if(substr($info->use_object_cache, 0, 8) == 'memcache')
+				else if (substr($info->use_object_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_object_cache;
 				}
-				else if($info->use_object_cache == 'wincache')
+				else if ($info->use_object_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}
-				else if($info->use_object_cache == 'file')
+				else if ($info->use_object_cache == 'file')
 				{
 					$type = 'file';
 				}
-				else if($always_use_file)
+				else if ($always_use_file)
 				{
 					$type = 'file';
 				}
 			}
-			else if($target == 'template')
+			else if ($target == 'template')
 			{
-				if($info->use_template_cache == 'apc')
+				if ($info->use_template_cache == 'apc')
 				{
 					$type = 'apc';
 				}
-				else if(substr($info->use_template_cache, 0, 8) == 'memcache')
+				else if (substr($info->use_template_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_template_cache;
 				}
-				else if($info->use_template_cache == 'wincache')
+				else if ($info->use_template_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}
 			}
 
-			if($type)
+			if ($type)
 			{
-				$class = 'Cache' . ucfirst($type);
+				$class = 'Cache'.ucfirst($type);
 				include_once sprintf('%sclasses/cache/%s.class.php', _XE_PATH_, $class);
 				$this->handler = call_user_func(array($class, 'getInstance'), $url);
 				$this->keyGroupVersions = $this->handler->get('key_group_versions', 0);
-				if(!$this->keyGroupVersions)
+				if (!$this->keyGroupVersions)
 				{
 					$this->keyGroupVersions = array();
 					$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
@@ -121,7 +121,7 @@ 
 	 */
 	function isSupport()
 	{
-		if($this->handler && $this->handler->isSupport())
+		if ($this->handler && $this->handler->isSupport())
 		{
 			return true;
 		}
@@ -139,7 +139,7 @@ 
 	{
 		$key = str_replace('/', ':', $key);
 
-		return __XE_VERSION__ . ':' . $key;
+		return __XE_VERSION__.':'.$key;
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -174,7 +174,7 @@ 
 	 */
 	function put($key, $obj, $valid_time = 0)
 	{
-		if(!$this->handler && !$key)
+		if (!$this->handler && !$key)
 		{
 			return false;
 		}
@@ -192,7 +192,7 @@ 
 	 */
 	function delete($key)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -212,7 +212,7 @@ 
 	 */
 	function isValid($key, $modified_time = 0)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -229,7 +229,7 @@ 
 	 */
 	function truncate()
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -255,13 +255,13 @@ 
 	 */
 	function getGroupKey($keyGroupName, $key)
 	{
-		if(!$this->keyGroupVersions[$keyGroupName])
+		if (!$this->keyGroupVersions[$keyGroupName])
 		{
 			$this->keyGroupVersions[$keyGroupName] = 1;
 			$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
 		}
 
-		return 'cache_group_' . $this->keyGroupVersions[$keyGroupName] . ':' . $keyGroupName . ':' . $key;
+		return 'cache_group_'.$this->keyGroupVersions[$keyGroupName].':'.$keyGroupName.':'.$key;
 	}
 
 	/**

classes/context/Context.class.php

Indentation +1 added lines, -1 removed lines

@@ -1094,7 +1094,7 @@
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+		if(!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);

Doc Comments +10 added lines, -9 removed lines

@@ -157,7 +157,7 @@ 
 	/**
 	 * returns static context object (Singleton). It's to use Context without declaration of an object
 	 *
-	 * @return object Instance
+	 * @return Context Instance
 	 */
 	function &getInstance()
 	{
@@ -891,6 +891,7 @@ 
 	 * Evaluation of xml language file
 	 *
 	 * @param string Path of the language file
+	 * @param string $path
 	 * @return void
 	 */
 	function _evalxmlLang($path)
@@ -1030,7 +1031,7 @@ 
 	/**
 	 * Convert strings of variables in $source_object into UTF-8
 	 *
-	 * @param object $source_obj Conatins strings to convert
+	 * @param stdClass $source_obj Conatins strings to convert
 	 * @return object converted object
 	 */
 	function convertEncoding($source_obj)
@@ -1065,11 +1066,11 @@ 
 	/**
 	 * Check flag
 	 *
-	 * @param mixed $val
+	 * @param boolean $val
 	 * @param string $key
 	 * @param mixed $charset charset
 	 * @see arrayConvWalkCallback will replaced array_walk_recursive in >=PHP5
-	 * @return void
+	 * @return null|boolean
 	 */
 	function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
@@ -1935,7 +1936,7 @@ 
 	 *
 	 * @param string $key Key
 	 * @param mixed $val Value
-	 * @param mixed $set_to_get_vars If not FALSE, Set to get vars.
+	 * @param integer $set_to_get_vars If not FALSE, Set to get vars.
 	 * @return void
 	 */
 	function set($key, $val, $set_to_get_vars = 0)
@@ -1977,7 +1978,7 @@ 
 	/**
 	 * Get one more vars in object vars with given arguments(key1, key2, key3,...)
 	 *
-	 * @return object
+	 * @return null|stdClass
 	 */
 	function gets()
 	{
@@ -2050,7 +2051,7 @@ 
 	/**
 	 * Register if actions are to be encrypted by SSL. Those actions are sent to https in common/js/xml_handler.js
 	 *
-	 * @param string $action act name
+	 * @param string[] $action_array
 	 * @return void
 	 */
 	function addSSLActions($action_array)
@@ -2221,7 +2222,7 @@ 
 	 * @param string $file File name with path
 	 * @param string $optimized optimized (That seems to not use)
 	 * @param string $targetie target IE
-	 * @param string $index index
+	 * @param integer $index index
 	 * @param string $type Added position. (head:<head>..</head>, body:<body>..</body>)
 	 * @param bool $isRuleset Use ruleset
 	 * @param string $autoPath If path not readed, set the path automatically.
@@ -2331,7 +2332,7 @@ 
 	 * @param string $optimized optimized (That seems to not use)
 	 * @param string $media Media query
 	 * @param string $targetie target IE
-	 * @param string $index index
+	 * @param integer $index index
 	 * @return void
 	 *
 	 */

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'];
 		}
@@ -341,7 +341,9 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if($sess = $_POST[session_name()]) {
+			session_id($sess);
+		}
 		session_start();
 
 		// set authentication information in Context and session
@@ -394,22 +396,21 @@ 
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif($val)
+					} elseif($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
-			}
-			else
+				if($url) {
+					$current_url .= '?' . join('&', $url);
+				}
+			} else
 			{
 				$current_url = $this->getUrl();
 			}
-		}
-		else
+		} else
 		{
 			$current_url = self::getRequestUri();
 		}
@@ -492,18 +493,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);
@@ -620,8 +625,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)
@@ -680,15 +684,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;
 				}
@@ -697,8 +702,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -715,8 +719,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();
@@ -776,8 +779,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -877,8 +879,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -894,7 +895,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -926,7 +929,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();
@@ -940,7 +945,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1073,12 +1080,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;
@@ -1100,8 +1109,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);
 	}
 
 	/**
@@ -1112,7 +1122,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1225,16 +1237,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;
 			}
@@ -1260,8 +1269,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1409,19 +1417,15 @@ 
 			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
-			}
-			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($v, false);
-			}
-			elseif($key === 'vid')
+			} elseif($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
-			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			} elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
-			}
-			else
+			} else
 			{
 				$result[$k] = $v;
 
@@ -1430,8 +1434,7 @@ 
 					if (is_array($result[$k]))
 					{
 						array_walk_recursive($result[$k], function(&$val) { $val = stripslashes($val); });
-					}
-					else
+					} else
 					{
 						$result[$k] = stripslashes($result[$k]);
 					}
@@ -1440,8 +1443,7 @@ 
 				if(is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
-				}
-				else
+				} else
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1491,8 +1493,7 @@ 
 				$val['name'] = htmlspecialchars($val['name'], ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 				$this->set($key, $val, TRUE);
 				$this->is_uploaded = TRUE;
-			}
-			else
+			} else
 			{
 				$files = array();
 				foreach ($tmp_name as $i => $j)
@@ -1606,8 +1607,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1624,8 +1624,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)
@@ -1645,23 +1644,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;
+				}
 			}
 		}
 
@@ -1686,8 +1697,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1759,8 +1769,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1778,25 +1787,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;
 			}
@@ -1853,8 +1860,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1883,8 +1889,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1902,20 +1907,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']);
 			}
@@ -2152,8 +2154,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);
 		}
@@ -2415,8 +2416,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;
 			}
@@ -2673,8 +2673,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}

Spacing +313 added lines, -313 removed lines

@@ -162,7 +162,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance = null;
-		if(!$theInstance)
+		if (!$theInstance)
 		{
 			$theInstance = new Context();
 		}
@@ -182,10 +182,10 @@ 
 
 		// include ssl action cache file
 		$this->sslActionCacheFile = FileHandler::getRealPath($this->sslActionCacheFile);
-		if(is_readable($this->sslActionCacheFile))
+		if (is_readable($this->sslActionCacheFile))
 		{
 			require($this->sslActionCacheFile);
-			if(isset($sslActions))
+			if (isset($sslActions))
 			{
 				$this->ssl_actions = $sslActions;
 			}
@@ -201,12 +201,12 @@ 
 	function init()
 	{
 		// fix missing HTTP_RAW_POST_DATA in PHP 5.6 and above
-		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
+		if (!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
 		{
 			$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
 
 			// If content is not XML JSON, unset
-			if(!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
+			if (!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
 			{
 				unset($GLOBALS['HTTP_RAW_POST_DATA']);
 			}
@@ -228,11 +228,11 @@ 
 		$this->_setUploadedArgument();
 
 		$this->loadDBInfo();
-		if($this->db_info->use_sitelock == 'Y')
+		if ($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if (is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
 
-			if(!IpFilter::filter($whitelist))
+			if (!IpFilter::filter($whitelist))
 			{
 				$title = ($this->db_info->sitelock_title) ? $this->db_info->sitelock_title : 'Maintenance in progress...';
 				$message = $this->db_info->sitelock_message;
@@ -242,52 +242,52 @@ 
 				define('_XE_SITELOCK_MESSAGE_', $message);
 
 				header("HTTP/1.1 403 Forbidden");
-				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
+				if (FileHandler::exists(_XE_PATH_.'common/tpl/sitelock.user.html'))
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
+					include _XE_PATH_.'common/tpl/sitelock.user.html';
 				}
 				else
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.html';
+					include _XE_PATH_.'common/tpl/sitelock.html';
 				}
 				exit;
 			}
 		}
 
 		// If XE is installed, get virtual site information
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$site_module_info = $oModuleModel->getDefaultMid();
 
-			if(!isset($site_module_info))
+			if (!isset($site_module_info))
 			{
 				$site_module_info = new stdClass();
 			}
 
 			// if site_srl of site_module_info is 0 (default site), compare the domain to default_url of db_config
-			if($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
+			if ($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
 			{
 				$site_module_info->domain = $this->db_info->default_url;
 			}
 
 			$this->set('site_module_info', $site_module_info);
-			if($site_module_info->site_srl && isSiteID($site_module_info->domain))
+			if ($site_module_info->site_srl && isSiteID($site_module_info->domain))
 			{
 				$this->set('vid', $site_module_info->domain, TRUE);
 			}
 
-			if(!isset($this->db_info))
+			if (!isset($this->db_info))
 			{
 				$this->db_info = new stdClass();
 			}
 
 			$this->db_info->lang_type = $site_module_info->default_language;
-			if(!$this->db_info->lang_type)
+			if (!$this->db_info->lang_type)
 			{
 				$this->db_info->lang_type = 'en';
 			}
-			if(!$this->db_info->use_db_session)
+			if (!$this->db_info->use_db_session)
 			{
 				$this->db_info->use_db_session = 'N';
 			}
@@ -297,30 +297,30 @@ 
 		$lang_supported = $this->loadLangSelected();
 
 		// Retrieve language type set in user's cookie
-		if($this->lang_type = $this->get('l'))
+		if ($this->lang_type = $this->get('l'))
 		{
-			if($_COOKIE['lang_type'] != $this->lang_type)
+			if ($_COOKIE['lang_type'] != $this->lang_type)
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000);
 			}
 		}
-		elseif($_COOKIE['lang_type'])
+		elseif ($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
 
 		// If it's not exists, follow default language type set in db_info
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = $this->db_info->lang_type;
 		}
 
 		// if still lang_type has not been set or has not-supported type , set as English.
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = 'en';
 		}
-		if(is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
+		if (is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
 		{
 			$this->lang_type = 'en';
 		}
@@ -329,10 +329,10 @@ 
 		$this->setLangType($this->lang_type);
 
 		// load module module's language file according to language setting
-		$this->loadLang(_XE_PATH_ . 'modules/module/lang');
+		$this->loadLang(_XE_PATH_.'modules/module/lang');
 
 		// set session handler
-		if(self::isInstalled() && $this->db_info->use_db_session == 'Y')
+		if (self::isInstalled() && $this->db_info->use_db_session == 'Y')
 		{
 			$oSessionModel = getModel('session');
 			$oSessionController = getController('session');
@@ -341,11 +341,11 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if ($sess = $_POST[session_name()]) session_id($sess);
 		session_start();
 
 		// set authentication information in Context and session
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$oModuleModel->loadModuleExtends();
@@ -353,15 +353,15 @@ 
 			$oMemberModel = getModel('member');
 			$oMemberController = getController('member');
 
-			if($oMemberController && $oMemberModel)
+			if ($oMemberController && $oMemberModel)
 			{
 				// if signed in, validate it.
-				if($oMemberModel->isLogged())
+				if ($oMemberModel->isLogged())
 				{
 					$oMemberController->setSessionInfo();
 				}
 				// check auto sign-in
-				elseif($_COOKIE['xeak'])
+				elseif ($_COOKIE['xeak'])
 				{
 					$oMemberController->doAutologin();
 				}
@@ -373,7 +373,7 @@ 
 
 		// load common language file
 		$this->lang = &$GLOBALS['lang'];
-		$this->loadLang(_XE_PATH_ . 'common/lang/');
+		$this->loadLang(_XE_PATH_.'common/lang/');
 
 		// check if using rewrite module
 		$this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE);
@@ -381,28 +381,28 @@ 
 		// set locations for javascript use
 		$url = array();
 		$current_url = self::getRequestUri();
-		if($_SERVER['REQUEST_METHOD'] == 'GET')
+		if ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
-			if($this->get_vars)
+			if ($this->get_vars)
 			{
 				$url = array();
-				foreach($this->get_vars as $key => $val)
+				foreach ($this->get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
-							$url[] = $key . '[' . $k . ']=' . urlencode($v);
+							$url[] = $key.'['.$k.']='.urlencode($v);
 						}
 					}
-					elseif($val)
+					elseif ($val)
 					{
-						$url[] = $key . '=' . urlencode($val);
+						$url[] = $key.'='.urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
+				if ($url) $current_url .= '?'.join('&', $url);
 			}
 			else
 			{
@@ -417,12 +417,12 @@ 
 		$this->set('current_url', $current_url);
 		$this->set('request_uri', self::getRequestUri());
 
-		if(strpos($current_url, 'xn--') !== FALSE)
+		if (strpos($current_url, 'xn--') !== FALSE)
 		{
 			$this->set('current_url', self::decodeIdna($current_url));
 		}
 
-		if(strpos(self::getRequestUri(), 'xn--') !== FALSE)
+		if (strpos(self::getRequestUri(), 'xn--') !== FALSE)
 		{
 			$this->set('request_uri', self::decodeIdna(self::getRequestUri()));
 		}
@@ -447,7 +447,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
@@ -457,7 +457,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;
@@ -475,7 +475,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"] .= '_';
 			}
@@ -487,42 +487,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);
 		}
 
@@ -593,10 +593,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);
@@ -614,17 +614,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);
@@ -633,7 +633,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);
@@ -652,56 +652,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;
 			}
@@ -710,9 +710,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;
@@ -721,17 +721,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;
 			}
 		}
@@ -758,7 +758,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -776,15 +776,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
 		{
@@ -800,7 +800,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -832,7 +832,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -859,30 +859,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);
@@ -903,24 +903,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);
@@ -935,9 +935,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();
 	}
 
@@ -949,22 +949,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;
 		}
@@ -1006,11 +1006,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -1026,7 +1026,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1051,17 +1051,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;
 			}
 		}
@@ -1080,11 +1080,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
@@ -1108,9 +1108,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);
 	}
 
 	/**
@@ -1121,7 +1121,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1130,9 +1130,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);
 		}
@@ -1163,7 +1163,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1203,7 +1203,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1216,30 +1216,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;
 			}
@@ -1248,7 +1248,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1259,20 +1259,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);
 			}
@@ -1286,7 +1286,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1294,7 +1294,7 @@ 
 		$params = array();
 		parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
 		}
@@ -1307,13 +1307,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;
@@ -1325,12 +1325,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);
 		}
@@ -1345,10 +1345,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);
 			}
@@ -1358,20 +1358,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;
 			}
@@ -1379,7 +1379,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1398,16 +1398,16 @@ 
 	 */
 	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)
 		{
-			if($remove_hack && !is_array($v)) {
-				if(stripos($v, '<script') || stripos($v, 'lt;script') || stripos($v, '%3Cscript'))
+			if ($remove_hack && !is_array($v)) {
+				if (stripos($v, '<script') || stripos($v, 'lt;script') || stripos($v, '%3Cscript'))
 				{
 					$result[$k] = escape($v);
 					continue;
@@ -1415,18 +1415,18 @@ 
 			}
 
 			$k = htmlentities($k);
-			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
+			if ($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
 			}
-			elseif(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($v, false);
 			}
-			elseif($key === 'vid')
+			elseif ($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
 			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			elseif (stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
 			}
@@ -1434,7 +1434,7 @@ 
 			{
 				$result[$k] = $v;
 
-				if($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
+				if ($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
 				{
 					if (is_array($result[$k]))
 					{
@@ -1446,7 +1446,7 @@ 
 					}
 				}
 
-				if(is_array($result[$k]))
+				if (is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
 				}
@@ -1455,7 +1455,7 @@ 
 					$result[$k] = trim($result[$k]);
 				}
 
-				if($remove_hack)
+				if ($remove_hack)
 				{
 					$result[$k] = escape($result[$k], false);
 				}
@@ -1483,17 +1483,17 @@ 
 	 */
 	function _setUploadedArgument()
 	{
-		if($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
+		if ($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
 		{
 			return;
 		}
 
-		foreach($_FILES as $key => $val)
+		foreach ($_FILES as $key => $val)
 		{
 			$tmp_name = $val['tmp_name'];
-			if(!is_array($tmp_name))
+			if (!is_array($tmp_name))
 			{
-				if(!UploadFileFilter::check($tmp_name, $val['name']))
+				if (!UploadFileFilter::check($tmp_name, $val['name']))
 				{
 					continue;
 				}
@@ -1506,7 +1506,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]);
@@ -1520,7 +1520,7 @@ 
 					$file['size'] = $val['size'][$i];
 					$files[] = $file;
 				}
-				if(count($files))
+				if (count($files))
 				{
 					self::set($key, $files, true);
 				}
@@ -1545,16 +1545,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;
@@ -1569,7 +1569,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']);
@@ -1597,22 +1597,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;
 			}
@@ -1623,21 +1623,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 .= '/';
 				}
@@ -1647,41 +1647,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;
@@ -1692,7 +1692,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1709,17 +1709,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);
@@ -1739,8 +1739,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",
@@ -1757,66 +1757,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);
 		}
@@ -1825,16 +1825,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);
 	}
 
 	/**
@@ -1849,17 +1849,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);
 		}
@@ -1868,14 +1868,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;
@@ -1885,34 +1885,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']);
 			}
@@ -1920,17 +1920,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];
 	}
@@ -1947,16 +1947,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;
 		}
@@ -1972,7 +1972,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -1987,7 +1987,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -1995,7 +1995,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -2021,7 +2021,7 @@ 
 	function getRequestVars()
 	{
 		$self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -2038,13 +2038,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);
@@ -2062,16 +2062,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);
@@ -2090,7 +2090,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2107,7 +2107,7 @@ 
 	function getSSLActions()
 	{
 		$self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2134,12 +2134,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);
 		}
@@ -2158,13 +2158,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;
@@ -2234,12 +2234,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;
 				}
@@ -2304,9 +2304,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]);
 			}
@@ -2391,14 +2391,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;
 		}
@@ -2408,32 +2408,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;
@@ -2449,50 +2449,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');
 		}
 	}
 
@@ -2505,7 +2505,7 @@ 
 	function addHtmlHeader($header)
 	{
 		$self = self::getInstance();
-		$self->html_header .= "\n" . $header;
+		$self->html_header .= "\n".$header;
 	}
 
 	function clearHtmlHeader()
@@ -2557,7 +2557,7 @@ 
 	function addBodyHeader($header)
 	{
 		$self = self::getInstance();
-		$self->body_header .= "\n" . $header;
+		$self->body_header .= "\n".$header;
 	}
 
 	/**
@@ -2579,7 +2579,7 @@ 
 	function addHtmlFooter($footer)
 	{
 		$self = self::getInstance();
-		$self->html_footer .= ($self->Htmlfooter ? "\n" : '') . $footer;
+		$self->html_footer .= ($self->Htmlfooter ? "\n" : '').$footer;
 	}
 
 	/**
@@ -2600,7 +2600,7 @@ 
 	 */
 	function getConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/db.config.php';
+		return _XE_PATH_.'files/config/db.config.php';
 	}
 
 	/**
@@ -2610,7 +2610,7 @@ 
 	 */
 	function getFTPConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/ftp.config.php';
+		return _XE_PATH_.'files/config/ftp.config.php';
 	}
 
 	/**
@@ -2662,14 +2662,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;
 			}
@@ -2677,9 +2677,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2689,13 +2689,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 .= '/';
 		}
@@ -2710,13 +2710,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);
@@ -2736,7 +2736,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;
 	}
 
 }

classes/db/DB.class.php

Indentation +1 added lines, -1 removed lines

@@ -470,7 +470,7 @@
 	 * set query debug log
 	 * @param array $log values set query debug
 	 * @return void
-	*/
+	 */
 	function setQueryLog($log)
 	{
 		$GLOBALS['__db_queries__'][] = $log;

Doc Comments +8 added lines, -8 removed lines

@@ -490,7 +490,7 @@ 
 
 	/**
 	 * Returns object of error info
-	 * @return object object of error
+	 * @return BaseObject object of error
 	 */
 	function getError()
 	{
@@ -667,7 +667,7 @@ 
 	 * Returns counter cache data
 	 * @param array|string $tables tables to get data
 	 * @param string $condition condition to get data
-	 * @return int count of cache data
+	 * @return boolean count of cache data
 	 */
 	function getCountCache($tables, $condition)
 	{
@@ -727,7 +727,7 @@ 
 	 * @param array|string $tables tables to save data
 	 * @param string $condition condition to save data
 	 * @param int $count count of cache data to save
-	 * @return void
+	 * @return boolean
 	 */
 	function putCountCache($tables, $condition, $count = 0)
 	{
@@ -809,7 +809,7 @@ 
 
 	/**
 	 * Return select query string
-	 * @param object $query
+	 * @param BaseObject $query
 	 * @param boolean $with_values
 	 * @return string
 	 */
@@ -903,7 +903,7 @@ 
 
 	/**
 	 * Return delete query string
-	 * @param object $query
+	 * @param BaseObject $query
 	 * @param boolean $with_values
 	 * @param boolean $with_priority
 	 * @return string
@@ -935,7 +935,7 @@ 
 
 	/**
 	 * Return update query string
-	 * @param object $query
+	 * @param BaseObject $query
 	 * @param boolean $with_values
 	 * @param boolean $with_priority
 	 * @return string
@@ -967,7 +967,7 @@ 
 
 	/**
 	 * Return insert query string
-	 * @param object $query
+	 * @param BaseObject $query
 	 * @param boolean $with_values
 	 * @param boolean $with_priority
 	 * @return string
@@ -1238,7 +1238,7 @@ 
 	 * DB Connect
 	 * this method is protected
 	 * @param array $connection
-	 * @return void
+	 * @return resource
 	 */
 	function __connect($connection)
 	{

Braces +13 added lines, -21 removed lines

@@ -318,8 +318,7 @@ 
 		if(!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
-		}
-		else
+		} else
 		{
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
@@ -327,8 +326,7 @@ 
 		if(!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
-		}
-		else
+		} else
 		{
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
@@ -362,8 +360,7 @@ 
 		if($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
-		}
-		else
+		} else
 		{
 			return $this->slave_db[$indx]["is_connected"] ? TRUE : FALSE;
 		}
@@ -441,8 +438,7 @@ 
 				$buff[] = print_r($log, TRUE);
 				@file_put_contents($debug_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
 			}
-		}
-		else
+		} else
 		{
 			$log['result'] = 'Success';
 		}
@@ -531,8 +527,7 @@ 
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
-			}
-			elseif(count($id_args) == 3)
+			} elseif(count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
@@ -606,7 +601,9 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if(!in_array($type, array('master','slave'))) {
+			$type = 'slave';
+		}
 
 		if(!file_exists($cache_file))
 		{
@@ -652,8 +649,7 @@ 
 		if($this->isError())
 		{
 			$output = $this->getError();
-		}
-		else if(!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
+		} else if(!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
 		{
 			$output = new BaseObject();
 		}
@@ -1068,8 +1064,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}
@@ -1164,8 +1159,7 @@ 
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
-		}
-		else
+		} else
 		{
 			$this->transactionNestedLevel--;
 		}
@@ -1225,8 +1219,7 @@ 
 		)
 		{
 			$this->slave_db[0] = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$this->slave_db = $db_info->slave_db;
 		}
@@ -1279,8 +1272,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}

Spacing +110 added lines, -110 removed lines

@@ -141,24 +141,24 @@ 
 	 */
 	function getInstance($db_type = NULL)
 	{
-		if(!$db_type)
+		if (!$db_type)
 		{
 			$db_type = Context::getDBType();
 		}
-		if(!$db_type && Context::isInstalled())
+		if (!$db_type && Context::isInstalled())
 		{
 			return new BaseObject(-1, 'msg_db_not_setted');
 		}
 
-		if(!isset($GLOBALS['__DB__']))
+		if (!isset($GLOBALS['__DB__']))
 		{
 			$GLOBALS['__DB__'] = array();
 		}
-		if(!isset($GLOBALS['__DB__'][$db_type]))
+		if (!isset($GLOBALS['__DB__'][$db_type]))
 		{
-			$class_name = 'DB' . ucfirst($db_type);
-			$class_file = _XE_PATH_ . "classes/db/$class_name.class.php";
-			if(!file_exists($class_file))
+			$class_name = 'DB'.ucfirst($db_type);
+			$class_file = _XE_PATH_."classes/db/$class_name.class.php";
+			if (!file_exists($class_file))
 			{
 				return new BaseObject(-1, 'msg_db_not_setted');
 			}
@@ -187,8 +187,8 @@ 
 	 */
 	function __construct()
 	{
-		$this->count_cache_path = _XE_PATH_ . $this->count_cache_path;
-		$this->cache_file = _XE_PATH_ . $this->cache_file;
+		$this->count_cache_path = _XE_PATH_.$this->count_cache_path;
+		$this->cache_file = _XE_PATH_.$this->cache_file;
 	}
 
 	/**
@@ -210,18 +210,18 @@ 
 	 */
 	public static function getEnableList()
 	{
-		if(!self::$supported_list)
+		if (!self::$supported_list)
 		{
 			$oDB = new DB();
 			self::$supported_list = $oDB->_getSupportedList();
 		}
 
 		$enableList = array();
-		if(is_array(self::$supported_list))
+		if (is_array(self::$supported_list))
 		{
-			foreach(self::$supported_list AS $key => $value)
+			foreach (self::$supported_list AS $key => $value)
 			{
-				if($value->enable)
+				if ($value->enable)
 				{
 					$enableList[] = $value;
 				}
@@ -237,18 +237,18 @@ 
 	 */
 	public static function getDisableList()
 	{
-		if(!self::$supported_list)
+		if (!self::$supported_list)
 		{
 			$oDB = new DB();
 			self::$supported_list = $oDB->_getSupportedList();
 		}
 
 		$disableList = array();
-		if(is_array(self::$supported_list))
+		if (is_array(self::$supported_list))
 		{
-			foreach(self::$supported_list AS $key => $value)
+			foreach (self::$supported_list AS $key => $value)
 			{
-				if(!$value->enable)
+				if (!$value->enable)
 				{
 					$disableList[] = $value;
 				}
@@ -265,24 +265,24 @@ 
 	function _getSupportedList()
 	{
 		static $get_supported_list = '';
-		if(is_array($get_supported_list))
+		if (is_array($get_supported_list))
 		{
 			self::$supported_list = $get_supported_list;
 			return self::$supported_list;
 		}
 		$get_supported_list = array();
-		$db_classes_path = _XE_PATH_ . "classes/db/";
+		$db_classes_path = _XE_PATH_."classes/db/";
 		$filter = "/^DB([^\.]+)\.class\.php/i";
 		$supported_list = FileHandler::readDir($db_classes_path, $filter, TRUE);
 
 		// after creating instance of class, check is supported
-		for($i = 0; $i < count($supported_list); $i++)
+		for ($i = 0; $i < count($supported_list); $i++)
 		{
 			$db_type = $supported_list[$i];
 
 			$class_name = sprintf("DB%s%s", strtoupper(substr($db_type, 0, 1)), strtolower(substr($db_type, 1)));
-			$class_file = sprintf(_XE_PATH_ . "classes/db/%s.class.php", $class_name);
-			if(!file_exists($class_file))
+			$class_file = sprintf(_XE_PATH_."classes/db/%s.class.php", $class_name);
+			if (!file_exists($class_file))
 			{
 				continue;
 			}
@@ -291,7 +291,7 @@ 
 			require_once($class_file);
 			$oDB = new $class_name(FALSE);
 
-			if(!$oDB)
+			if (!$oDB)
 			{
 				continue;
 			}
@@ -315,7 +315,7 @@ 
 	 */
 	function _sortDBMS($a, $b)
 	{
-		if(!isset($this->priority_dbms[$a->db_type]))
+		if (!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
 		}
@@ -324,7 +324,7 @@ 
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
 
-		if(!isset($this->priority_dbms[$b->db_type]))
+		if (!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
 		}
@@ -333,7 +333,7 @@ 
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
 
-		if($priority_a == $priority_b)
+		if ($priority_a == $priority_b)
 		{
 			return 0;
 		}
@@ -359,7 +359,7 @@ 
 	 */
 	function isConnected($type = 'master', $indx = 0)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
 		}
@@ -388,7 +388,7 @@ 
 	 */
 	function actFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -409,14 +409,14 @@ 
 
 		$bt = version_compare(PHP_VERSION, '5.3.6', '>=') ? debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) : debug_backtrace();
 
-		foreach($bt as $no => $call)
+		foreach ($bt as $no => $call)
 		{
-			if($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
+			if ($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
 			{
 				$call_no = $no;
 				$call_no++;
 				$log['called_file'] = $bt[$call_no]['file'].':'.$bt[$call_no]['line'];
-				$log['called_file'] = str_replace(_XE_PATH_ , '', $log['called_file']);
+				$log['called_file'] = str_replace(_XE_PATH_, '', $log['called_file']);
 				$call_no++;
 				$log['called_method'] = $bt[$call_no]['class'].$bt[$call_no]['type'].$bt[$call_no]['function'];
 				break;
@@ -424,22 +424,22 @@ 
 		}
 
 		// leave error log if an error occured (if __DEBUG_DB_OUTPUT__ is defined)
-		if($this->isError())
+		if ($this->isError())
 		{
 			$log['result'] = 'Failed';
 			$log['errno'] = $this->errno;
 			$log['errstr'] = $this->errstr;
 
-			if(__DEBUG_DB_OUTPUT__ == 1)
+			if (__DEBUG_DB_OUTPUT__ == 1)
 			{
-				$debug_file = _XE_PATH_ . "files/_debug_db_query.php";
+				$debug_file = _XE_PATH_."files/_debug_db_query.php";
 				$buff = array();
-				if(!file_exists($debug_file))
+				if (!file_exists($debug_file))
 				{
-					$buff[] = '<?php exit(); ?' . '>';
+					$buff[] = '<?php exit(); ?'.'>';
 				}
 				$buff[] = print_r($log, TRUE);
-				@file_put_contents($debug_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
+				@file_put_contents($debug_file, implode("\n", $buff)."\n\n", FILE_APPEND | LOCK_EX);
 			}
 		}
 		else
@@ -452,7 +452,7 @@ 
 		$log_args = new stdClass;
 		$log_args->query = $this->query;
 		$log_args->query_id = $this->query_id;
-		$log_args->caller = $log['called_method'] . '() in ' . $log['called_file'];
+		$log_args->caller = $log['called_method'].'() in '.$log['called_file'];
 		$log_args->connection = $log['connection'];
 		writeSlowlog('query', $elapsed_time, $log_args);
 	}
@@ -510,11 +510,11 @@ 
 	{
 		static $cache_file = array();
 
-		if(!$query_id)
+		if (!$query_id)
 		{
 			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
-		if(!$this->db_type)
+		if (!$this->db_type)
 		{
 			return;
 		}
@@ -523,20 +523,20 @@ 
 
 		$this->query_id = $query_id;
 
-		if(!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
+		if (!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
 		{
 			$id_args = explode('.', $query_id);
-			if(count($id_args) == 2)
+			if (count($id_args) == 2)
 			{
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
 			}
-			elseif(count($id_args) == 3)
+			elseif (count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
-				if(!isset($typeList[$target]))
+				if (!isset($typeList[$target]))
 				{
 					$this->actDBClassFinish();
 					return;
@@ -544,14 +544,14 @@ 
 				$module = $id_args[1];
 				$id = $id_args[2];
 			}
-			if(!$target || !$module || !$id)
+			if (!$target || !$module || !$id)
 			{
 				$this->actDBClassFinish();
 				return new BaseObject(-1, 'msg_invalid_queryid');
 			}
 
 			$xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
-			if(!file_exists($xml_file))
+			if (!file_exists($xml_file))
 			{
 				$this->actDBClassFinish();
 				return new BaseObject(-1, 'msg_invalid_queryid');
@@ -579,13 +579,13 @@ 
 		$cache_file = sprintf('%s%s%s.%s.%s.cache.php', _XE_PATH_, $this->cache_file, $query_id, __ZBXE_VERSION__, $this->db_type);
 
 		$cache_time = -1;
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$cache_time = filemtime($cache_file);
 		}
 
 		// if there is no cache file or is not new, find original xml query file and parse it
-		if($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_ . 'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php'))
+		if ($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_.'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_.'classes/xml/XmlQueryParser.class.php'))
 		{
 			$oParser = new XmlQueryParser();
 			$oParser->parse($query_id, $xml_file, $cache_file);
@@ -606,27 +606,27 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if (!in_array($type, array('master', 'slave'))) $type = 'slave';
 
-		if(!file_exists($cache_file))
+		if (!file_exists($cache_file))
 		{
 			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
 
-		if($source_args)
+		if ($source_args)
 		{
 			$args = clone $source_args;
 		}
 
 		$output = include($cache_file);
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool())
+		if ((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool())
 		{
 			return $output;
 		}
 
 		// execute appropriate query
-		switch($output->getAction())
+		switch ($output->getAction())
 		{
 			case 'insert' :
 			case 'insert-select' :
@@ -649,11 +649,11 @@ 
 				break;
 		}
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			$output = $this->getError();
 		}
-		else if(!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
+		else if (!is_a($output, 'BaseObject') && !is_subclass_of($output, 'BaseObject'))
 		{
 			$output = new BaseObject();
 		}
@@ -799,7 +799,7 @@ 
 	 */
 	function dropTable($table_name)
 	{
-		if(!$table_name)
+		if (!$table_name)
 		{
 			return;
 		}
@@ -816,59 +816,59 @@ 
 	function getSelectSql($query, $with_values = TRUE)
 	{
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$select = 'SELECT ' . $select;
+		$select = 'SELECT '.$select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$from = ' FROM ' . $from;
+		$from = ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$tableObjects = $query->getTables();
 		$index_hint_list = '';
-		foreach($tableObjects as $tableObject)
+		foreach ($tableObjects as $tableObject)
 		{
-			if(is_a($tableObject, 'CubridTableWithHint'))
+			if (is_a($tableObject, 'CubridTableWithHint'))
 			{
-				$index_hint_list .= $tableObject->getIndexHintString() . ', ';
+				$index_hint_list .= $tableObject->getIndexHintString().', ';
 			}
 		}
 		$index_hint_list = substr($index_hint_list, 0, -2);
-		if($index_hint_list != '')
+		if ($index_hint_list != '')
 		{
-			$index_hint_list = 'USING INDEX ' . $index_hint_list;
+			$index_hint_list = 'USING INDEX '.$index_hint_list;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
-			$groupBy = ' GROUP BY ' . $groupBy;
+			$groupBy = ' GROUP BY '.$groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
-			$orderBy = ' ORDER BY ' . $orderBy;
+			$orderBy = ' ORDER BY '.$orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
-			$limit = ' LIMIT ' . $limit;
+			$limit = ' LIMIT '.$limit;
 		}
 
-		return $select . ' ' . $from . ' ' . $where . ' ' . $index_hint_list . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+		return $select.' '.$from.' '.$where.' '.$index_hint_list.' '.$groupBy.' '.$orderBy.' '.$limit;
 	}
 
 	/**
@@ -886,7 +886,7 @@ 
 	{
 		$new_update_columns = array();
 		$click_count_columns = $queryObject->getClickCountColumns();
-		foreach($click_count_columns as $click_count_column)
+		foreach ($click_count_columns as $click_count_column)
 		{
 			$click_count_column_name = $click_count_column->column_name;
 
@@ -918,16 +918,16 @@ 
 		$sql .= $tables[0]->getAlias();
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
-		$sql .= ' FROM ' . $from;
+		$sql .= ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$sql .= ' WHERE ' . $where;
+			$sql .= ' WHERE '.$where;
 		}
 
 		return $sql;
@@ -943,26 +943,26 @@ 
 	function getUpdateSql($query, $with_values = TRUE, $with_priority = FALSE)
 	{
 		$columnsList = $query->getUpdateString($with_values);
-		if($columnsList == '')
+		if ($columnsList == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
 
 		$tables = $query->getFromString($with_values);
-		if($tables == '')
+		if ($tables == '')
 		{
 			return new BaseObject(-1, "Invalid query");
 		}
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$priority = $with_priority ? $query->getPriority() : '';
 
-		return "UPDATE $priority $tables SET $columnsList " . $where;
+		return "UPDATE $priority $tables SET $columnsList ".$where;
 	}
 
 	/**
@@ -1000,27 +1000,27 @@ 
 	 */
 	function _getConnection($type = 'master', $indx = NULL)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
-			if(!$this->master_db['is_connected'])
+			if (!$this->master_db['is_connected'])
 			{
 				$this->_connect($type);
 			}
-			$this->connection = 'Master ' . $this->master_db['db_hostname'];
+			$this->connection = 'Master '.$this->master_db['db_hostname'];
 			return $this->master_db["resource"];
 		}
 
-		if($indx === NULL)
+		if ($indx === NULL)
 		{
 			$indx = $this->_getSlaveConnectionStringIndex($type);
 		}
 
-		if(!$this->slave_db[$indx]['is_connected'])
+		if (!$this->slave_db[$indx]['is_connected'])
 		{
 			$this->_connect($type, $indx);
 		}
 
-		$this->connection = 'Slave ' . $this->slave_db[$indx]['db_hostname'];
+		$this->connection = 'Slave '.$this->slave_db[$indx]['db_hostname'];
 		return $this->slave_db[$indx]["resource"];
 	}
 
@@ -1030,11 +1030,11 @@ 
 	 */
 	function _dbInfoExists()
 	{
-		if(!$this->master_db)
+		if (!$this->master_db)
 		{
 			return FALSE;
 		}
-		if(count($this->slave_db) === 0)
+		if (count($this->slave_db) === 0)
 		{
 			return FALSE;
 		}
@@ -1060,12 +1060,12 @@ 
 	 */
 	function close($type = 'master', $indx = 0)
 	{
-		if(!$this->isConnected($type, $indx))
+		if (!$this->isConnected($type, $indx))
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1096,12 +1096,12 @@ 
 	 */
 	function begin()
 	{
-		if(!$this->isConnected())
+		if (!$this->isConnected())
 		{
 			return;
 		}
 
-		if($this->_begin($this->transactionNestedLevel))
+		if ($this->_begin($this->transactionNestedLevel))
 		{
 			$this->transaction_started = TRUE;
 			$this->transactionNestedLevel++;
@@ -1124,15 +1124,15 @@ 
 	 */
 	function rollback()
 	{
-		if(!$this->isConnected() || !$this->transaction_started)
+		if (!$this->isConnected() || !$this->transaction_started)
 		{
 			return;
 		}
-		if($this->_rollback($this->transactionNestedLevel))
+		if ($this->_rollback($this->transactionNestedLevel))
 		{
 			$this->transactionNestedLevel--;
 
-			if(!$this->transactionNestedLevel)
+			if (!$this->transactionNestedLevel)
 			{
 				$this->transaction_started = FALSE;
 			}
@@ -1156,11 +1156,11 @@ 
 	 */
 	function commit($force = FALSE)
 	{
-		if(!$force && (!$this->isConnected() || !$this->transaction_started))
+		if (!$force && (!$this->isConnected() || !$this->transaction_started))
 		{
 			return;
 		}
-		if($this->transactionNestedLevel == 1 && $this->_commit())
+		if ($this->transactionNestedLevel == 1 && $this->_commit())
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
@@ -1192,7 +1192,7 @@ 
 	 */
 	function _query($query, $connection = NULL)
 	{
-		if($connection == NULL)
+		if ($connection == NULL)
 		{
 			$connection = $this->_getConnection('master');
 		}
@@ -1217,7 +1217,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$this->master_db = $db_info->master_db;
-		if($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
+		if ($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
 				&& $db_info->master_db["db_port"] == $db_info->slave_db[0]["db_port"]
 				&& $db_info->master_db["db_userid"] == $db_info->slave_db[0]["db_userid"]
 				&& $db_info->master_db["db_password"] == $db_info->slave_db[0]["db_password"]
@@ -1265,18 +1265,18 @@ 
 	 */
 	function _connect($type = 'master', $indx = 0)
 	{
-		if($this->isConnected($type, $indx))
+		if ($this->isConnected($type, $indx))
 		{
 			return;
 		}
 
 		// Ignore if no DB information exists
-		if(!$this->_dbInfoExists())
+		if (!$this->_dbInfoExists())
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1286,7 +1286,7 @@ 
 		}
 
 		$result = $this->__connect($connection);
-		if($result === NULL || $result === FALSE)
+		if ($result === NULL || $result === FALSE)
 		{
 			$connection["is_connected"] = FALSE;
 			return;
@@ -1297,7 +1297,7 @@ 
 		$connection["is_connected"] = TRUE;
 
 		// Save connection info for db logs
-		$this->connection = ucfirst($type) . ' ' . $connection["db_hostname"];
+		$this->connection = ucfirst($type).' '.$connection["db_hostname"];
 
 		// regist $this->close callback
 		register_shutdown_function(array($this, "close"));
@@ -1322,7 +1322,7 @@ 
 	 */
 	function actDBClassFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -1345,7 +1345,7 @@ 
 	function getParser($force = FALSE)
 	{
 		static $dbParser = NULL;
-		if(!$dbParser || $force)
+		if (!$dbParser || $force)
 		{
 			$oDB = DB::getInstance();
 			$dbParser = $oDB->getParser();

classes/editor/EditorHandler.class.php

Spacing +2 added lines, -2 removed lines

@@ -20,12 +20,12 @@
 	{
 		Context::set('component_info', $info);
 
-		if(!$info->extra_vars)
+		if (!$info->extra_vars)
 		{
 			return;
 		}
 
-		foreach($info->extra_vars as $key => $val)
+		foreach ($info->extra_vars as $key => $val)
 		{
 			$this->{$key} = trim($val->value);
 		}

classes/extravar/Extravar.class.php

Braces +7 added lines, -14 removed lines

@@ -215,12 +215,10 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				} elseif(strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
-				}
-				elseif(strpos($value, ',') !== FALSE)
+				} elseif(strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
@@ -238,16 +236,13 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				} elseif(strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
-				}
-				elseif(strpos($value, ',') !== FALSE)
+				} elseif(strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
-				}
-				else
+				} else
 				{
 					$values = array($value);
 				}
@@ -263,12 +258,10 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== false)
+				} elseif(strpos($value, '|@|') !== false)
 				{
 					$values = explode('|@|', $value);
-				}
-				else
+				} else
 				{
 					$values = array($value);
 				}

Spacing +66 added lines, -66 removed lines

@@ -51,12 +51,12 @@ 
 	 */
 	function setExtraVarKeys($extra_keys)
 	{
-		if(!is_array($extra_keys) || count($extra_keys) < 1)
+		if (!is_array($extra_keys) || count($extra_keys) < 1)
 		{
 			return;
 		}
 
-		foreach($extra_keys as $val)
+		foreach ($extra_keys as $val)
 		{
 			$obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value, $val->eid);
 			$this->keys[$val->idx] = $obj;
@@ -159,7 +159,7 @@ 
 	 */
 	function __construct($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null, $eid = '')
 	{
-		if(!$idx)
+		if (!$idx)
 		{
 			return;
 		}
@@ -197,36 +197,36 @@ 
 	function _getTypeValue($type, $value)
 	{
 		$value = trim($value);
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'homepage' :
-				if($value && !preg_match('/^([a-z]+):\/\//i', $value))
+				if ($value && !preg_match('/^([a-z]+):\/\//i', $value))
 				{
-					$value = 'http://' . $value;
+					$value = 'http://'.$value;
 				}
 				return htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
 			case 'tel' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -235,15 +235,15 @@ 
 			case 'checkbox' :
 			case 'radio' :
 			case 'select' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
@@ -253,18 +253,18 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
 				return $values;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== false)
+				elseif (strpos($value, '|@|') !== false)
 				{
 					$values = explode('|@|', $value);
 				}
@@ -274,7 +274,7 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -308,10 +308,10 @@ 
 	{
 		$value = $this->_getTypeValue($this->type, $this->value);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'homepage' :
-				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40) . '...' . substr($value, -10) : $value)) : "";
+				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40).'...'.substr($value, -10) : $value)) : "";
 
 			case 'email_address' :
 				return ($value) ? sprintf('<a href="mailto:%s">%s</a>', $value, $value) : "";
@@ -328,14 +328,14 @@ 
 			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(',', $value);
 				}
 				return $value;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(' ', $value);
 				}
@@ -360,77 +360,77 @@ 
 		$name = $this->name;
 		$value = $this->_getTypeValue($this->type, $this->value);
 		$default = $this->_getTypeValue($this->type, $this->default);
-		$column_name = 'extra_vars' . $this->idx;
-		$tmp_id = $column_name . '-' . $id_num++;
+		$column_name = 'extra_vars'.$this->idx;
+		$tmp_id = $column_name.'-'.$id_num++;
 
 		$buff = array();
-		switch($type)
+		switch ($type)
 		{
 			// Homepage
 			case 'homepage' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="homepage" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="homepage" />';
 				break;
 			// Email Address
 			case 'email_address' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="email_address" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="email_address" />';
 				break;
 			// Phone Number
 			case 'tel' :
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[0] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[0].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[1].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[2].'" size="4" maxlength="4" class="tel" />';
 				break;
 			// textarea
 			case 'textarea' :
-				$buff[] = '<textarea name="' . $column_name . '" rows="8" cols="42">' . $value . '</textarea>';
+				$buff[] = '<textarea name="'.$column_name.'" rows="8" cols="42">'.$value.'</textarea>';
 				break;
 			// multiple choice
 			case 'checkbox' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] ='  <li><input type="checkbox" name="' . $column_name . '[]" id="' . $tmp_id . '" value="' . htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '" ' . $checked . ' /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '  <li><input type="checkbox" name="'.$column_name.'[]" id="'.$tmp_id.'" value="'.htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'" '.$checked.' /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
 			// single choice
 			case 'select' :
-				$buff[] = '<select name="' . $column_name . '" class="select">';
-				foreach($default as $v)
+				$buff[] = '<select name="'.$column_name.'" class="select">';
+				foreach ($default as $v)
 				{
 					$selected = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$selected = ' selected="selected"';
 					}
-					$buff[] = '  <option value="' . $v . '" ' . $selected . '>' . $v . '</option>';
+					$buff[] = '  <option value="'.$v.'" '.$selected.'>'.$v.'</option>';
 				}
 				$buff[] = '</select>';
 				break;
 			// radio
 			case 'radio' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] = '<li><input type="radio" name="' . $column_name . '" id="' . $tmp_id . '" ' . $checked . ' value="' . $v . '"  class="radio" /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '<li><input type="radio" name="'.$column_name.'" id="'.$tmp_id.'" '.$checked.' value="'.$v.'"  class="radio" /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
@@ -439,44 +439,44 @@ 
 				// datepicker javascript plugin load
 				Context::loadJavascriptPlugin('ui.datepicker');
 
-				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
-				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
-				$buff[] =	'<script type="text/javascript">';
+				$buff[] = '<input type="hidden" name="'.$column_name.'" value="'.$value.'" />'; 
+				$buff[] = '<input type="text" id="date_'.$column_name.'" value="'.zdate($value, 'Y-m-d').'" class="date" />';
+				$buff[] = '<input type="button" value="'.Context::getLang('cmd_delete').'" class="btn" id="dateRemover_'.$column_name.'" />';
+				$buff[] = '<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
-				$buff[] =	'(function($){';
-				$buff[] =	'$(function(){';
-				$buff[] =	'  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
-				$buff[] =	'    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
-				$buff[] =	'  };';
-				$buff[] =	'  $.extend(option,$.datepicker.regional[\'' . Context::getLangType() . '\']);';
-				$buff[] =	'  $("#date_' . $column_name . '").datepicker(option);';
-				$buff[] =	'  $("#date_' . $column_name . '").datepicker("option", "dateFormat", "yy-mm-dd");';
-				$buff[] =	'  $("#dateRemover_' . $column_name . '").click(function(){';
-				$buff[] =	'    $(this).siblings("input").val("");';
-				$buff[] =	'    return false;';
-				$buff[] =	'  })';
-				$buff[] =	'});';
-				$buff[] =	'})(jQuery);';
+				$buff[] = '(function($){';
+				$buff[] = '$(function(){';
+				$buff[] = '  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
+				$buff[] = '    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
+				$buff[] = '  };';
+				$buff[] = '  $.extend(option,$.datepicker.regional[\''.Context::getLangType().'\']);';
+				$buff[] = '  $("#date_'.$column_name.'").datepicker(option);';
+				$buff[] = '  $("#date_'.$column_name.'").datepicker("option", "dateFormat", "yy-mm-dd");';
+				$buff[] = '  $("#dateRemover_'.$column_name.'").click(function(){';
+				$buff[] = '    $(this).siblings("input").val("");';
+				$buff[] = '    return false;';
+				$buff[] = '  })';
+				$buff[] = '});';
+				$buff[] = '})(jQuery);';
 				$buff[] = '//]]>';
 				$buff[] = '</script>';
 				break;
 			// address
 			case "kr_zip" :
-				if(($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel , 'getKrzipCodeSearchHtml' ))
+				if (($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel, 'getKrzipCodeSearchHtml'))
 				{
-					$buff[] =  $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
+					$buff[] = $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
 				}
 				break;
 			// General text
 			default :
-				$buff[] =' <input type="text" name="' . $column_name . '" value="' . ($value ? $value : $default) . '" class="text" />';
+				$buff[] = ' <input type="text" name="'.$column_name.'" value="'.($value ? $value : $default).'" class="text" />';
 		}
-		if($this->desc)
+		if ($this->desc)
 		{
 			$oModuleController = getController('module');
 			$oModuleController->replaceDefinedLangCode($this->desc);
-			$buff[] = '<p>' . htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '</p>';
+			$buff[] = '<p>'.htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'</p>';
 		}
 		
 		return join(PHP_EOL, $buff);

classes/file/FileObject.class.php

Braces +1 added lines, -2 removed lines

@@ -136,8 +136,7 @@
 		if($this->fp != NULL)
 		{
 			return $this->path;
-		}
-		else
+		} else
 		{
 			return NULL;
 		}

Spacing +8 added lines, -8 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	function __construct($path, $mode)
 	{
-		if($path != NULL)
+		if ($path != NULL)
 		{
 			$this->Open($path, $mode);
 		}
@@ -51,7 +51,7 @@ 
 	function append($file_name)
 	{
 		$target = new FileObject($file_name, "r");
-		while(!$target->feof())
+		while (!$target->feof())
 		{
 			$readstr = $target->read();
 			$this->write($readstr);
@@ -89,11 +89,11 @@ 
 	function write($str)
 	{
 		$len = strlen($str);
-		if(!$str || $len <= 0)
+		if (!$str || $len <= 0)
 		{
 			return FALSE;
 		}
-		if(!$this->fp)
+		if (!$this->fp)
 		{
 			return FALSE;
 		}
@@ -112,12 +112,12 @@ 
 	 */
 	function open($path, $mode)
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			$this->close();
 		}
 		$this->fp = fopen($path, $mode);
-		if(!is_resource($this->fp))
+		if (!is_resource($this->fp))
 		{
 			$this->fp = NULL;
 			return FALSE;
@@ -133,7 +133,7 @@ 
 	 */
 	function getPath()
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			return $this->path;
 		}
@@ -150,7 +150,7 @@ 
 	 */
 	function close()
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			fclose($this->fp);
 			$this->fp = NULL;

classes/mail/Mail.class.php

Braces +12 added lines, -24 removed lines

@@ -151,8 +151,7 @@ 
 		if($this->isVaildMailAddress($account_name))
 		{
 			$this->Username = $account_name;
-		}
-		else
+		} else
 		{
 			$this->Username = $account_name . '@gmail.com';
 		}
@@ -190,8 +189,7 @@ 
 			$this->IsSMTP();
 			$this->AltBody = "To view the message, please use an HTML compatible email viewer!";
 			return TRUE;
-		}
-		else
+		} else
 		{
 			$this->IsMail();
 			return FALSE;
@@ -246,8 +244,7 @@ 
 		{
 			$this->sender_name = $name;
 			$this->sender_email = $email;
-		}
-		else
+		} else
 		{
 			$this->SetFrom($email, $name);
 		}
@@ -280,8 +277,7 @@ 
 		{
 			$this->receiptor_name = $name;
 			$this->receiptor_email = $email;
-		}
-		else
+		} else
 		{
 			$this->AddAddress($email, $name);
 		}
@@ -312,8 +308,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->title = $title;
-		}
-		else
+		} else
 		{
 			$this->Subject = $title;
 		}
@@ -340,8 +335,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->bcc = $bcc;
-		}
-		else
+		} else
 		{
 			$this->AddBCC($bcc);
 		}
@@ -380,8 +374,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->replyTo = $replyTo;
-		}
-		else
+		} else
 		{
 			$this->AddReplyTo($replyTo);
 		}
@@ -399,8 +392,7 @@ 
 		if($this->Mailer == "mail")
 		{
 			$this->content = $content;
-		}
-		else
+		} else
 		{
 			$this->MsgHTML($content);
 		}
@@ -486,8 +478,7 @@ 
 				$this->body = implode("", $res);
 				$this->body .= "--" . $boundary . "--";
 			}
-		}
-		else
+		} else
 		{
 			if(count($this->attachments) > 0)
 			{
@@ -578,8 +569,7 @@ 
 				return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers, $this->additional_params);
 			}
 			return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers);
-		}
-		else
+		} else
 		{
 			$this->procAttachments();
 			return parent::Send();
@@ -604,8 +594,7 @@ 
 			if(checkdnsrr($host, "MX") || checkdnsrr($host, "A"))
 			{
 				return TRUE;
-			}
-			else
+			} else
 			{
 				return FALSE;
 			}
@@ -624,8 +613,7 @@ 
 		if(preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address))
 		{
 			return $email_address;
-		}
-		else
+		} else
 		{
 			return '';
 		}

Spacing +79 added lines, -79 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
+require_once _XE_PATH_."libs/phpmailer/phpmailer.php";
 
 /**
  * Mailing class for XpressEngine
@@ -148,13 +148,13 @@ 
 		$this->SMTPSecure = "tls";
 		$this->Host = 'smtp.gmail.com';
 		$this->Port = '587';
-		if($this->isVaildMailAddress($account_name))
+		if ($this->isVaildMailAddress($account_name))
 		{
 			$this->Username = $account_name;
 		}
 		else
 		{
-			$this->Username = $account_name . '@gmail.com';
+			$this->Username = $account_name.'@gmail.com';
 		}
 		$this->Password = $account_passwd;
 		$this->IsSMTP();
@@ -180,12 +180,12 @@ 
 		$this->Password = $pass;
 		$this->Port = $port;
 
-		if($secure == 'ssl' || $secure == 'tls')
+		if ($secure == 'ssl' || $secure == 'tls')
 		{
 			$this->SMTPSecure = $secure;
 		}
 
-		if(($this->SMTPAuth !== NULL && $this->Host !== NULL && $this->Username !== NULL && $this->Password !== NULL) || ($this->SMTPAuth === NULL && $this->Host !== NULL))
+		if (($this->SMTPAuth !== NULL && $this->Host !== NULL && $this->Username !== NULL && $this->Password !== NULL) || ($this->SMTPAuth === NULL && $this->Host !== NULL))
 		{
 			$this->IsSMTP();
 			$this->AltBody = "To view the message, please use an HTML compatible email viewer!";
@@ -242,7 +242,7 @@ 
 	 */
 	function setSender($name, $email)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->sender_name = $name;
 			$this->sender_email = $email;
@@ -260,9 +260,9 @@ 
 	 */
 	function getSender()
 	{
-		if(!stristr(PHP_OS, 'win') && $this->sender_name)
+		if (!stristr(PHP_OS, 'win') && $this->sender_name)
 		{
-			return sprintf("%s <%s>", '=?utf-8?b?' . base64_encode($this->sender_name) . '?=', $this->sender_email);
+			return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->sender_name).'?=', $this->sender_email);
 		}
 		return $this->sender_email;
 	}
@@ -276,7 +276,7 @@ 
 	 */
 	function setReceiptor($name, $email)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->receiptor_name = $name;
 			$this->receiptor_email = $email;
@@ -294,9 +294,9 @@ 
 	 */
 	function getReceiptor()
 	{
-		if(!stristr(PHP_OS, 'win') && $this->receiptor_name && $this->receiptor_name != $this->receiptor_email)
+		if (!stristr(PHP_OS, 'win') && $this->receiptor_name && $this->receiptor_name != $this->receiptor_email)
 		{
-			return sprintf("%s <%s>", '=?utf-8?b?' . base64_encode($this->receiptor_name) . '?=', $this->receiptor_email);
+			return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->receiptor_name).'?=', $this->receiptor_email);
 		}
 		return $this->receiptor_email;
 	}
@@ -309,7 +309,7 @@ 
 	 */
 	function setTitle($title)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->title = $title;
 		}
@@ -326,7 +326,7 @@ 
 	 */
 	function getTitle()
 	{
-		return '=?utf-8?b?' . base64_encode($this->title) . '?=';
+		return '=?utf-8?b?'.base64_encode($this->title).'?=';
 	}
 
 	/**
@@ -337,7 +337,7 @@ 
 	 */
 	function setBCC($bcc)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->bcc = $bcc;
 		}
@@ -377,7 +377,7 @@ 
 	 */
 	function setReplyTo($replyTo)
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->replyTo = $replyTo;
 		}
@@ -396,7 +396,7 @@ 
 	function setContent($content)
 	{
 		$content = preg_replace_callback('/<img([^>]+)>/i', array($this, 'replaceResourceRealPath'), $content);
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
 			$this->content = $content;
 		}
@@ -415,7 +415,7 @@ 
 	 */
 	function replaceResourceRealPath($matches)
 	{
-		return preg_replace('/src=(["\']?)files/i', 'src=$1' . Context::getRequestUri() . 'files', $matches[0]);
+		return preg_replace('/src=(["\']?)files/i', 'src=$1'.Context::getRequestUri().'files', $matches[0]);
 	}
 
 	/**
@@ -456,42 +456,42 @@ 
 	 */
 	function procAttachments()
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
-			if(count($this->attachments) > 0)
+			if (count($this->attachments) > 0)
 			{
-				$this->body = $this->header . $this->body;
-				$boundary = '----==' . uniqid(rand(), TRUE);
-				$this->header = "Content-Type: multipart/mixed;" . $this->eol . "\tboundary=\"" . $boundary . "\"" . $this->eol . $this->eol;
-				$this->body = "--" . $boundary . $this->eol . $this->body . $this->eol . $this->eol;
+				$this->body = $this->header.$this->body;
+				$boundary = '----=='.uniqid(rand(), TRUE);
+				$this->header = "Content-Type: multipart/mixed;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
+				$this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
 				$res = array();
 				$res[] = $this->body;
-				foreach($this->attachments as $filename => $attachment)
+				foreach ($this->attachments as $filename => $attachment)
 				{
 					$type = $this->returnMIMEType($filename);
 					$file_handler = new FileHandler();
 					$file_str = $file_handler->readFile($attachment);
 					$chunks = chunk_split(base64_encode($file_str));
 					$tempBody = sprintf(
-							"--" . $boundary . $this->eol .
-							"Content-Type: %s;" . $this->eol .
-							"\tname=\"%s\"" . $this->eol .
-							"Content-Transfer-Encoding: base64" . $this->eol .
-							"Content-Description: %s" . $this->eol .
-							"Content-Disposition: attachment;" . $this->eol .
-							"\tfilename=\"%s\"" . $this->eol . $this->eol .
-							"%s" . $this->eol . $this->eol, $type, $filename, $filename, $filename, $chunks);
+							"--".$boundary.$this->eol.
+							"Content-Type: %s;".$this->eol.
+							"\tname=\"%s\"".$this->eol.
+							"Content-Transfer-Encoding: base64".$this->eol.
+							"Content-Description: %s".$this->eol.
+							"Content-Disposition: attachment;".$this->eol.
+							"\tfilename=\"%s\"".$this->eol.$this->eol.
+							"%s".$this->eol.$this->eol, $type, $filename, $filename, $filename, $chunks);
 					$res[] = $tempBody;
 				}
 				$this->body = implode("", $res);
-				$this->body .= "--" . $boundary . "--";
+				$this->body .= "--".$boundary."--";
 			}
 		}
 		else
 		{
-			if(count($this->attachments) > 0)
+			if (count($this->attachments) > 0)
 			{
-				foreach($this->attachments as $filename => $attachment)
+				foreach ($this->attachments as $filename => $attachment)
 				{
 					parent::AddAttachment($attachment);
 				}
@@ -506,33 +506,33 @@ 
 	 */
 	function procCidAttachments()
 	{
-		if(count($this->cidAttachments) > 0)
+		if (count($this->cidAttachments) > 0)
 		{
-			$this->body = $this->header . $this->body;
-			$boundary = '----==' . uniqid(rand(), TRUE);
-			$this->header = "Content-Type: multipart/relative;" . $this->eol . "\ttype=\"multipart/alternative\";" . $this->eol . "\tboundary=\"" . $boundary . "\"" . $this->eol . $this->eol;
-			$this->body = "--" . $boundary . $this->eol . $this->body . $this->eol . $this->eol;
+			$this->body = $this->header.$this->body;
+			$boundary = '----=='.uniqid(rand(), TRUE);
+			$this->header = "Content-Type: multipart/relative;".$this->eol."\ttype=\"multipart/alternative\";".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
+			$this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
 			$res = array();
 			$res[] = $this->body;
-			foreach($this->cidAttachments as $cid => $attachment)
+			foreach ($this->cidAttachments as $cid => $attachment)
 			{
 				$filename = basename($attachment);
 				$type = $this->returnMIMEType(FileHandler::getRealPath($attachment));
 				$file_str = FileHandler::readFile($attachment);
 				$chunks = chunk_split(base64_encode($file_str));
 				$tempBody = sprintf(
-						"--" . $boundary . $this->eol .
-						"Content-Type: %s;" . $this->eol .
-						"\tname=\"%s\"" . $this->eol .
-						"Content-Transfer-Encoding: base64" . $this->eol .
-						"Content-ID: <%s>" . $this->eol .
-						"Content-Description: %s" . $this->eol .
-						"Content-Location: %s" . $this->eol . $this->eol .
-						"%s" . $this->eol . $this->eol, $type, $filename, $cid, $filename, $filename, $chunks);
+						"--".$boundary.$this->eol.
+						"Content-Type: %s;".$this->eol.
+						"\tname=\"%s\"".$this->eol.
+						"Content-Transfer-Encoding: base64".$this->eol.
+						"Content-ID: <%s>".$this->eol.
+						"Content-Description: %s".$this->eol.
+						"Content-Location: %s".$this->eol.$this->eol.
+						"%s".$this->eol.$this->eol, $type, $filename, $cid, $filename, $filename, $chunks);
 				$res[] = $tempBody;
 			}
 			$this->body = implode("", $res);
-			$this->body .= "--" . $boundary . "--";
+			$this->body .= "--".$boundary."--";
 		}
 	}
 
@@ -543,37 +543,37 @@ 
 	 */
 	function send()
 	{
-		if($this->Mailer == "mail")
+		if ($this->Mailer == "mail")
 		{
-			$boundary = '----==' . uniqid(rand(), TRUE);
+			$boundary = '----=='.uniqid(rand(), TRUE);
 			$this->eol = $GLOBALS['_qmail_compatibility'] == "Y" ? "\n" : "\r\n";
-			$this->header = "Content-Type: multipart/alternative;" . $this->eol . "\tboundary=\"" . $boundary . "\"" . $this->eol . $this->eol;
+			$this->header = "Content-Type: multipart/alternative;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
 			$this->body = sprintf(
-					"--%s" . $this->eol .
-					"Content-Type: text/plain; charset=utf-8; format=flowed" . $this->eol .
-					"Content-Transfer-Encoding: base64" . $this->eol .
-					"Content-Disposition: inline" . $this->eol . $this->eol .
-					"%s" .
-					"--%s" . $this->eol .
-					"Content-Type: text/html; charset=utf-8" . $this->eol .
-					"Content-Transfer-Encoding: base64" . $this->eol .
-					"Content-Disposition: inline" . $this->eol . $this->eol .
-					"%s" .
-					"--%s--" .
+					"--%s".$this->eol.
+					"Content-Type: text/plain; charset=utf-8; format=flowed".$this->eol.
+					"Content-Transfer-Encoding: base64".$this->eol.
+					"Content-Disposition: inline".$this->eol.$this->eol.
+					"%s".
+					"--%s".$this->eol.
+					"Content-Type: text/html; charset=utf-8".$this->eol.
+					"Content-Transfer-Encoding: base64".$this->eol.
+					"Content-Disposition: inline".$this->eol.$this->eol.
+					"%s".
+					"--%s--".
 					"", $boundary, $this->getPlainContent(), $boundary, $this->getHTMLContent(), $boundary
 			);
 			$this->procCidAttachments();
 			$this->procAttachments();
 			$headers = sprintf(
-					"From: %s" . $this->eol .
-					"%s" .
-					"%s" .
-					"%s" .
-					"%s" .
-					"MIME-Version: 1.0" . $this->eol . "", $this->getSender(), $this->messageId ? ("Message-ID: <" . $this->messageId . ">" . $this->eol) : "", $this->replyTo ? ("Reply-To: <" . $this->replyTo . ">" . $this->eol) : "", $this->bcc ? ("Bcc: " . $this->bcc . $this->eol) : "", $this->references ? ("References: <" . $this->references . ">" . $this->eol . "In-Reply-To: <" . $this->references . ">" . $this->eol) : ""
+					"From: %s".$this->eol.
+					"%s".
+					"%s".
+					"%s".
+					"%s".
+					"MIME-Version: 1.0".$this->eol."", $this->getSender(), $this->messageId ? ("Message-ID: <".$this->messageId.">".$this->eol) : "", $this->replyTo ? ("Reply-To: <".$this->replyTo.">".$this->eol) : "", $this->bcc ? ("Bcc: ".$this->bcc.$this->eol) : "", $this->references ? ("References: <".$this->references.">".$this->eol."In-Reply-To: <".$this->references.">".$this->eol) : ""
 			);
 			$headers .= $this->header;
-			if($this->additional_params)
+			if ($this->additional_params)
 			{
 				return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers, $this->additional_params);
 			}
@@ -594,14 +594,14 @@ 
 	 */
 	function checkMailMX($email_address)
 	{
-		if(!Mail::isVaildMailAddress($email_address))
+		if (!Mail::isVaildMailAddress($email_address))
 		{
 			return FALSE;
 		}
 		list($user, $host) = explode("@", $email_address);
-		if(function_exists('checkdnsrr'))
+		if (function_exists('checkdnsrr'))
 		{
-			if(checkdnsrr($host, "MX") || checkdnsrr($host, "A"))
+			if (checkdnsrr($host, "MX") || checkdnsrr($host, "A"))
 			{
 				return TRUE;
 			}
@@ -621,7 +621,7 @@ 
 	 */
 	function isVaildMailAddress($email_address)
 	{
-		if(preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address))
+		if (preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address))
 		{
 			return $email_address;
 		}
@@ -640,7 +640,7 @@ 
 	function returnMIMEType($filename)
 	{
 		preg_match("|\.([a-z0-9]{2,4})$|i", $filename, $fileSuffix);
-		switch(strtolower($fileSuffix[1]))
+		switch (strtolower($fileSuffix[1]))
 		{
 			case "js" :
 				return "application/x-javascript";
@@ -654,7 +654,7 @@ 
 			case "gif" :
 			case "bmp" :
 			case "tiff" :
-				return "image/" . strtolower($fileSuffix[1]);
+				return "image/".strtolower($fileSuffix[1]);
 			case "css" :
 				return "text/css";
 			case "xml" :
@@ -708,11 +708,11 @@ 
 			case "swf" :
 				return "application/x-shockwave-flash";
 			default :
-				if(function_exists("mime_content_type"))
+				if (function_exists("mime_content_type"))
 				{
 					$fileSuffix = mime_content_type($filename);
 				}
-				return "unknown/" . trim($fileSuffix[0], ".");
+				return "unknown/".trim($fileSuffix[0], ".");
 		}
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	/**
 	 * Constructor function
 	 *
-	 * @return void
+	 * @return string
 	 */
 	function __construct()
 	{

classes/page/PageHandler.class.php

Spacing +5 added lines, -5 removed lines

@@ -39,18 +39,18 @@ 
 		$this->point = 0;
 
 		$first_page = $cur_page - (int) ($page_count / 2);
-		if($first_page < 1)
+		if ($first_page < 1)
 		{
 			$first_page = 1;
 		}
 
-		if($total_page > $page_count && $first_page + $page_count - 1 > $total_page)
+		if ($total_page > $page_count && $first_page + $page_count - 1 > $total_page)
 		{
 			$first_page -= $first_page + $page_count - 1 - $total_page;
 		}
 
 		$last_page = $total_page;
-		if($last_page > $total_page)
+		if ($last_page > $total_page)
 		{
 			$last_page = $total_page;
 		}
@@ -58,7 +58,7 @@ 
 		$this->first_page = $first_page;
 		$this->last_page = $last_page;
 
-		if($total_page < $this->page_count)
+		if ($total_page < $this->page_count)
 		{
 			$this->page_count = $total_page;
 		}
@@ -71,7 +71,7 @@ 
 	function getNextPage()
 	{
 		$page = $this->first_page + $this->point++;
-		if($this->point > $this->page_count || $page > $this->last_page)
+		if ($this->point > $this->page_count || $page > $this->last_page)
 		{
 			$page = 0;
 		}

classes/security/IpFilter.class.php

Spacing +10 added lines, -10 removed lines

@@ -5,24 +5,24 @@ 
 {
 	public function filter($ip_list, $ip = NULL)
 	{
-		if(!$ip) $ip = $_SERVER['REMOTE_ADDR'];
+		if (!$ip) $ip = $_SERVER['REMOTE_ADDR'];
 		$long_ip = ip2long($ip);
-		foreach($ip_list as $filter_ip)
+		foreach ($ip_list as $filter_ip)
 		{	
 			$range = explode('-', $filter_ip);
-			if(!$range[1]) // single address type
+			if (!$range[1]) // single address type
 			{
 				$star_pos = strpos($filter_ip, '*');
-				if($star_pos !== FALSE ) // wild card exist 
+				if ($star_pos !== FALSE) // wild card exist 
 				{
-					if(strncmp($filter_ip, $ip, $star_pos)===0) return true;
+					if (strncmp($filter_ip, $ip, $star_pos) === 0) return true;
 				}
-				else if(strcmp($filter_ip, $ip)===0)
+				else if (strcmp($filter_ip, $ip) === 0)
 				{
 					return true;
 				}
 			}
-			else if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
+			else if (ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
 			{
 				return true;
 			}
@@ -74,12 +74,12 @@ 
 					)
 				)
 			$/";
-		$regex = str_replace(array("\r\n", "\n", "\r","\t"," "), '', $regex);
+		$regex = str_replace(array("\r\n", "\n", "\r", "\t", " "), '', $regex);
 		
-		foreach($ip_list as $i => $ip)
+		foreach ($ip_list as $i => $ip)
 		{
 			preg_match($regex, $ip, $matches);
-			if(!count($matches)) return false;
+			if (!count($matches)) return false;
 		}
 		
 		return true;

Braces +13 added lines, -7 removed lines

@@ -5,24 +5,28 @@ 
 {
 	public function filter($ip_list, $ip = NULL)
 	{
-		if(!$ip) $ip = $_SERVER['REMOTE_ADDR'];
+		if(!$ip) {
+			$ip = $_SERVER['REMOTE_ADDR'];
+		}
 		$long_ip = ip2long($ip);
 		foreach($ip_list as $filter_ip)
 		{	
 			$range = explode('-', $filter_ip);
-			if(!$range[1]) // single address type
+			if(!$range[1]) {
+				// single address type
 			{
 				$star_pos = strpos($filter_ip, '*');
-				if($star_pos !== FALSE ) // wild card exist 
+			}
+				if($star_pos !== FALSE ) {
+					// wild card exist 
 				{
 					if(strncmp($filter_ip, $ip, $star_pos)===0) return true;
 				}
-				else if(strcmp($filter_ip, $ip)===0)
+				} else if(strcmp($filter_ip, $ip)===0)
 				{
 					return true;
 				}
-			}
-			else if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
+			} else if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
 			{
 				return true;
 			}
@@ -79,7 +83,9 @@ 
 		foreach($ip_list as $i => $ip)
 		{
 			preg_match($regex, $ip, $matches);
-			if(!count($matches)) return false;
+			if(!count($matches)) {
+				return false;
+			}
 		}
 		
 		return true;