xpressengine / xe-core

addons/captcha/captcha.addon.php

Doc Comments +3 added lines

@@ -275,6 +275,9 @@
 			exit();
 		}
 
+		/**
+		 * @param string $string
+		 */
 		function createCaptchaAudio($string)
 		{
 			$data = '';

Braces +8 added lines, -6 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if(!defined("__XE__")) {
+	exit();
+}
 
 /**
  * @file captcha.addon.php
@@ -74,8 +76,7 @@ 
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
 					}
-				}
-				else
+				} else
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
@@ -205,8 +206,7 @@ 
 
 					$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
 					imagecolortransparent($im[$i + 1], $background_color);
-				}
-				else
+				} else
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 4), $str, $text_color);
 				}
@@ -304,7 +304,9 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if(!in_array(Context::get('act'), $this->target_acts)) {
+				return true;
+			}
 
 			if($_SESSION['captcha_authed'])
 			{

Spacing +43 added lines, -43 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if (!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
@@ -9,7 +9,7 @@ 
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonCaptcha', false))
+if (!class_exists('AddonCaptcha', false))
 {
 	class AddonCaptcha
 	{
@@ -24,7 +24,7 @@ 
 
 		function before_module_proc()
 		{
-			if($this->addon_info->act_type == 'everytime' && $_SESSION['captcha_authed'])
+			if ($this->addon_info->act_type == 'everytime' && $_SESSION['captcha_authed'])
 			{
 				unset($_SESSION['captcha_authed']);
 			}
@@ -33,19 +33,19 @@ 
 		function before_module_init(&$ModuleHandler)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
+			if ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
 			{
 				return false;
 			}
-			if($this->addon_info->target != 'all' && Context::get('is_logged'))
+			if ($this->addon_info->target != 'all' && Context::get('is_logged'))
 			{
 				return false;
 			}
-			if($_SESSION['XE_VALIDATOR_ERROR'] == -1)
+			if ($_SESSION['XE_VALIDATOR_ERROR'] == -1)
 			{
 				$_SESSION['captcha_authed'] = false;
 			}
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
@@ -54,13 +54,13 @@ 
 
 			$this->target_acts = array('procBoardInsertDocument', 'procBoardInsertComment', 'procIssuetrackerInsertIssue', 'procIssuetrackerInsertHistory', 'procTextyleInsertComment');
 
-			if(Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
+			if (Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
 			{
-				if($type == 'inline')
+				if ($type == 'inline')
 				{
-					if(!$this->compareCaptcha())
+					if (!$this->compareCaptcha())
 					{
-						Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
+						Context::loadLang(_XE_PATH_.'addons/captcha/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
 						$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
 						$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
@@ -72,16 +72,16 @@ 
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
-						captchaTargetAct.push("' . implode('","', $this->target_acts) . '");
+						captchaTargetAct.push("' . implode('","', $this->target_acts).'");
 						</script>');
 					Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true);
 				}
 			}
 
 			// compare session when calling actions such as writing a post or a comment on the board/issue tracker module
-			if(!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
+			if (!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
 			{
-				Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
+				Context::loadLang(_XE_PATH_.'addons/captcha/lang');
 				$ModuleHandler->error = "captcha_denied";
 			}
 
@@ -91,7 +91,7 @@ 
 		function createKeyword()
 		{
 			$type = Context::get('captchaType');
-			if($type == 'inline' && $_SESSION['captcha_keyword'])
+			if ($type == 'inline' && $_SESSION['captcha_keyword'])
 			{
 				return;
 			}
@@ -104,19 +104,19 @@ 
 
 		function before_module_init_setCaptchaSession()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
 			// Load language files
-			Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
+			Context::loadLang(_XE_PATH_.'addons/captcha/lang');
 			// Generate keywords
 			$this->createKeyword();
 
 			$target = Context::getLang('target_captcha');
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -133,11 +133,11 @@ 
 
 		function before_module_init_captchaImage()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
-			if(Context::get('renew'))
+			if (Context::get('renew'))
 			{
 				$this->createKeyword();
 			}
@@ -159,7 +159,7 @@ 
 		function createCaptchaImage($string)
 		{
 			$arr = array();
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$arr[] = $string{$i};
 			}
@@ -181,7 +181,7 @@ 
 			shuffle($deg);
 
 			// Create an image for each letter
-			foreach($arr as $i => $str)
+			foreach ($arr as $i => $str)
 			{
 				$im[$i + 1] = @imagecreate($w, $h);
 				$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
@@ -191,7 +191,7 @@ 
 				$ran = range(1, 20);
 				shuffle($ran);
 
-				if(function_exists('imagerotate'))
+				if (function_exists('imagerotate'))
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 8), $str, $text_color);
 					$im[$i + 1] = imagerotate($im[$i + 1], array_pop($deg), 0);
@@ -206,7 +206,7 @@ 
 			}
 
 			// Combine images of each character
-			for($i = 1, $c = count($im); $i<$c; $i++)
+			for ($i = 1, $c = count($im); $i < $c; $i++)
 			{
 				imagecopy($im[0], $im[$i], (($w + 2) * ($i - 1)), 0, 0, 0, $w, $h);
 				imagedestroy($im[$i]);
@@ -218,7 +218,7 @@ 
 			imagecopyresized($big, $im[0], 0, 0, 0, 0, ($w + 2) * $big_count * $c, $h * $big_count, ($w + 2) * $c, $h);
 			imagedestroy($im[0]);
 
-			if(function_exists('imageantialias'))
+			if (function_exists('imageantialias'))
 			{
 				imageantialias($big, true);
 			}
@@ -230,7 +230,7 @@ 
 			$h = $h * $big_count;
 			$d = array_pop($deg);
 
-			for($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
+			for ($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
 			{
 				imageline($big, 0, $i + $d, $w, $i, $line_color);
 			}
@@ -238,7 +238,7 @@ 
 			$x = range(0, ($w - 10));
 			shuffle($x);
 
-			for($i = 0; $i < 200; $i++)
+			for ($i = 0; $i < 200; $i++)
 			{
 				imagesetpixel($big, $x[$i] % $w, $x[$i + 1] % $h, $line_color);
 			}
@@ -248,7 +248,7 @@ 
 
 		function before_module_init_captchaAudio()
 		{
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return false;
 			}
@@ -260,8 +260,8 @@ 
 			header("Content-Disposition: attachment; filename=\"captcha_audio.mp3\"");
 			header('Cache-Control: no-store, no-cache, must-revalidate');
 			header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
-			header('Content-Length: ' . strlen($data));
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s').'GMT');
+			header('Content-Length: '.strlen($data));
 
 			echo $data;
 			Context::close();
@@ -272,17 +272,17 @@ 
 		{
 			$data = '';
 			$_audio = './addons/captcha/audio/F_%s.mp3';
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$_data = FileHandler::readFile(sprintf($_audio, $string{$i}));
 
 				$start = rand(5, 68); // Random start in 4-byte header and 64 byte data
 				$datalen = strlen($_data) - $start - 256; // Last unchanged 256 bytes
 
-				for($j = $start; $j < $datalen; $j+=64)
+				for ($j = $start; $j < $datalen; $j += 64)
 				{
 					$ch = ord($_data{$j});
-					if($ch < 9 || $ch > 119)
+					if ($ch < 9 || $ch > 119)
 					{
 						continue;
 					}
@@ -297,14 +297,14 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if (!in_array(Context::get('act'), $this->target_acts)) return true;
 
-			if($_SESSION['captcha_authed'])
+			if ($_SESSION['captcha_authed'])
 			{
 				return true;
 			}
 
-			if(strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
+			if (strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
 			{
 				$_SESSION['captcha_authed'] = true;
 				return true;
@@ -317,14 +317,14 @@ 
 
 		function before_module_init_captchaCompare()
 		{
-			if(!$this->compareCaptcha())
+			if (!$this->compareCaptcha())
 			{
 				return false;
 			}
 
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
@@ -339,7 +339,7 @@ 
 			unset($_SESSION['captcha_authed']);
 			$this->createKeyword();
 
-			$swfURL = getUrl() . 'addons/captcha/swf/play.swf';
+			$swfURL = getUrl().'addons/captcha/swf/play.swf';
 			Context::unloadFile('./addons/captcha/captcha.min.js');
 			Context::loadFile(array('./addons/captcha/inline_captcha.js', 'body'));
 
@@ -377,18 +377,18 @@ 
 
 $oAddonCaptcha = &$GLOBALS['__AddonCaptcha__'];
 
-if(method_exists($oAddonCaptcha, $called_position))
+if (method_exists($oAddonCaptcha, $called_position))
 {
-	if(!call_user_func_array(array(&$oAddonCaptcha, $called_position), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonCaptcha, $called_position), array(&$this)))
 	{
 		return false;
 	}
 }
 
 $addon_act = Context::get('captcha_action');
-if($addon_act && method_exists($oAddonCaptcha, $called_position . '_' . $addon_act))
+if ($addon_act && method_exists($oAddonCaptcha, $called_position.'_'.$addon_act))
 {
-	if(!call_user_func_array(array(&$oAddonCaptcha, $called_position . '_' . $addon_act), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonCaptcha, $called_position.'_'.$addon_act), array(&$this)))
 	{
 		return false;
 	}

classes/db/DBMysql_innodb.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	 * opt : notnull, default, size\n
 	 * index : primary key, index, unique\n
 	 * @param string $xml_doc xml schema contents
-	 * @return void|object
+	 * @return null|false
 	 */
 	function _createTable($xml_doc)
 	{

Spacing +24 added lines, -24 removed lines

@@ -23,7 +23,7 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -55,13 +55,13 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
 			$this->_query("START TRANSACTION", $connection);
 		}
 		else
 		{
-			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
+			$this->_query("SAVEPOINT SP".$transactionLevel, $connection);
 		}
 		return true;
 	}
@@ -77,9 +77,9 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
+			$this->_query("ROLLBACK TO SP".$point, $connection);
 		}
 		else
 		{
@@ -109,14 +109,14 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if(!$connection)
+		if (!$connection)
 		{
 			exit('XE cannot handle DB connection.');
 		}
 		// Run the query statement
 		$result = @mysql_query($query, $connection);
 		// Error Check
-		if(mysql_error($connection))
+		if (mysql_error($connection))
 		{
 			$this->setError(mysql_errno($connection), mysql_error($connection));
 		}
@@ -140,13 +140,13 @@ 
 		$xml_obj = $oXml->parse($xml_doc);
 		// Create a table schema
 		$table_name = $xml_obj->table->attrs->name;
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
-		$table_name = $this->prefix . $table_name;
+		$table_name = $this->prefix.$table_name;
 
-		if(!is_array($xml_obj->table->column))
+		if (!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
 		}
@@ -155,7 +155,7 @@ 
 			$columns = $xml_obj->table->column;
 		}
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -167,47 +167,47 @@ 
 			$default = $column->attrs->default;
 			$auto_increment = $column->attrs->auto_increment;
 
-			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
+			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '('.$size.')' : '', isset($default) ? "default '".$default."'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
 
-			if($primary_key)
+			if ($primary_key)
 			{
 				$primary_list[] = $name;
 			}
-			else if($unique)
+			else if ($unique)
 			{
 				$unique_list[$unique][] = $name;
 			}
-			else if($index)
+			else if ($index)
 			{
 				$index_list[$index][] = $name;
 			}
 		}
 
-		if(count($primary_list))
+		if (count($primary_list))
 		{
-			$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
+			$column_schema[] = sprintf("primary key (%s)", '`'.implode($primary_list, '`,`').'`');
 		}
 
-		if(count($unique_list))
+		if (count($unique_list))
 		{
-			foreach($unique_list as $key => $val)
+			foreach ($unique_list as $key => $val)
 			{
-				$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
+				$column_schema[] = sprintf("unique %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
-		if(count($index_list))
+		if (count($index_list))
 		{
-			foreach($index_list as $key => $val)
+			foreach ($index_list as $key => $val)
 			{
-				$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
+				$column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
+		if (!$output)
 		{
 			return false;
 		}

Braces +8 added lines, -11 removed lines

@@ -23,7 +23,9 @@ 
 	function __construct($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -58,8 +60,7 @@ 
 		if(!$transactionLevel)
 		{
 			$this->_query("START TRANSACTION", $connection);
-		}
-		else
+		} else
 		{
 			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 		}
@@ -80,8 +81,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			$this->_query("ROLLBACK", $connection);
 		}
@@ -149,8 +149,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -172,12 +171,10 @@ 
 			if($primary_key)
 			{
 				$primary_list[] = $name;
-			}
-			else if($unique)
+			} else if($unique)
 			{
 				$unique_list[$unique][] = $name;
-			}
-			else if($index)
+			} else if($index)
 			{
 				$index_list[$index][] = $name;
 			}

classes/db/queryparts/Query.class.php

Doc Comments +3 added lines

@@ -251,6 +251,9 @@
 		return $this->orderby;
 	}
 
+	/**
+	 * @param integer $limit
+	 */
 	function setLimit($limit = NULL)
 	{
 		if(!isset($limit))

Braces +5 added lines, -5 removed lines

@@ -378,8 +378,7 @@ 
 				if($column->isSubquery())
 				{
 					$select[] = $column->toString($with_values) . ' as ' . $column->getAlias();
-				}
-				else
+				} else
 				{
 					$select[] = $column->getExpression($with_values);
 				}
@@ -403,7 +402,9 @@ 
 			}
 		}
 
-		if(!$update) return;
+		if(!$update) {
+			return;
+		}
 		return trim(implode($update, ', '));
 	}
 
@@ -465,8 +466,7 @@ 
 			if($table->isJoinTable() || !$simple_table_count)
 			{
 				$from .= $table->toString($with_values) . ' ';
-			}
-			else
+			} else
 			{
 				$from .= ', ' . $table->toString($with_values) . ' ';
 			}

Spacing +70 added lines, -70 removed lines

@@ -108,7 +108,7 @@ 
 		$this->action = $action;
 		$this->priority = $priority;
 
-		if(!isset($tables))
+		if (!isset($tables))
 		{
 			return;
 		}
@@ -144,12 +144,12 @@ 
 	function setColumnList($columnList)
 	{
 		$this->columnList = $columnList;
-		if(count($this->columnList) > 0)
+		if (count($this->columnList) > 0)
 		{
 			$selectColumns = array();
 			$dbParser = DB::getParser();
 
-			foreach($this->columnList as $columnName)
+			foreach ($this->columnList as $columnName)
 			{
 				$columnName = $dbParser->escapeColumn($columnName);
 				$selectColumns[] = new SelectExpression($columnName);
@@ -161,13 +161,13 @@ 
 
 	function setColumns($columns)
 	{
-		if(!isset($columns) || count($columns) === 0)
+		if (!isset($columns) || count($columns) === 0)
 		{
 			$this->columns = array(new StarExpression());
 			return;
 		}
 
-		if(!is_array($columns))
+		if (!is_array($columns))
 		{
 			$columns = array($columns);
 		}
@@ -177,14 +177,14 @@ 
 
 	function setTables($tables)
 	{
-		if(!isset($tables) || count($tables) === 0)
+		if (!isset($tables) || count($tables) === 0)
 		{
 			$this->setError(TRUE);
 			$this->setMessage("You must provide at least one table for the query.");
 			return;
 		}
 
-		if(!is_array($tables))
+		if (!is_array($tables))
 		{
 			$tables = array($tables);
 		}
@@ -200,18 +200,18 @@ 
 	function setConditions($conditions)
 	{
 		$this->conditions = array();
-		if(!isset($conditions) || count($conditions) === 0)
+		if (!isset($conditions) || count($conditions) === 0)
 		{
 			return;
 		}
-		if(!is_array($conditions))
+		if (!is_array($conditions))
 		{
 			$conditions = array($conditions);
 		}
 
-		foreach($conditions as $conditionGroup)
+		foreach ($conditions as $conditionGroup)
 		{
-			if($conditionGroup->show())
+			if ($conditionGroup->show())
 			{
 				$this->conditions[] = $conditionGroup;
 			}
@@ -220,11 +220,11 @@ 
 
 	function setGroups($groups)
 	{
-		if(!isset($groups) || count($groups) === 0)
+		if (!isset($groups) || count($groups) === 0)
 		{
 			return;
 		}
-		if(!is_array($groups))
+		if (!is_array($groups))
 		{
 			$groups = array($groups);
 		}
@@ -234,11 +234,11 @@ 
 
 	function setOrder($order)
 	{
-		if(!isset($order) || count($order) === 0)
+		if (!isset($order) || count($order) === 0)
 		{
 			return;
 		}
-		if(!is_array($order))
+		if (!is_array($order))
 		{
 			$order = array($order);
 		}
@@ -253,7 +253,7 @@ 
 
 	function setLimit($limit = NULL)
 	{
-		if(!isset($limit))
+		if (!isset($limit))
 		{
 			return;
 		}
@@ -354,9 +354,9 @@ 
 	function getClickCountColumns()
 	{
 		$click_count_columns = array();
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show() && is_a($column, 'ClickCountExpression'))
+			if ($column->show() && is_a($column, 'ClickCountExpression'))
 			{
 				$click_count_columns[] = $column;
 			}
@@ -371,13 +371,13 @@ 
 	 */
 	function getSelectString($with_values = TRUE)
 	{
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show())
+			if ($column->show())
 			{
-				if($column->isSubquery())
+				if ($column->isSubquery())
 				{
-					$select[] = $column->toString($with_values) . ' as ' . $column->getAlias();
+					$select[] = $column->toString($with_values).' as '.$column->getAlias();
 				}
 				else
 				{
@@ -395,15 +395,15 @@ 
 	 */
 	function getUpdateString($with_values = TRUE)
 	{
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show())
+			if ($column->show())
 			{
 				$update[] = $column->getExpression($with_values);
 			}
 		}
 
-		if(!$update) return;
+		if (!$update) return;
 		return trim(implode($update, ', '));
 	}
 
@@ -416,11 +416,11 @@ 
 	{
 		$columnsList = '';
 		// means we have insert-select
-		if($this->subquery)
+		if ($this->subquery)
 		{
-			foreach($this->columns as $column)
+			foreach ($this->columns as $column)
 			{
-				$columnsList .= $column->getColumnName() . ', ';
+				$columnsList .= $column->getColumnName().', ';
 			}
 			$columnsList = substr($columnsList, 0, -2);
 			$selectStatement = $this->subquery->toString($with_values);
@@ -429,12 +429,12 @@ 
 		}
 
 		$valuesList = '';
-		foreach($this->columns as $column)
+		foreach ($this->columns as $column)
 		{
-			if($column->show())
+			if ($column->show())
 			{
-				$columnsList .= $column->getColumnName() . ', ';
-				$valuesList .= $column->getValue($with_values) . ', ';
+				$columnsList .= $column->getColumnName().', ';
+				$valuesList .= $column->getValue($with_values).', ';
 			}
 		}
 		$columnsList = substr($columnsList, 0, -2);
@@ -460,25 +460,25 @@ 
 	{
 		$from = '';
 		$simple_table_count = 0;
-		foreach($this->tables as $table)
+		foreach ($this->tables as $table)
 		{
-			if($table->isJoinTable() || !$simple_table_count)
+			if ($table->isJoinTable() || !$simple_table_count)
 			{
-				$from .= $table->toString($with_values) . ' ';
+				$from .= $table->toString($with_values).' ';
 			}
 			else
 			{
-				$from .= ', ' . $table->toString($with_values) . ' ';
+				$from .= ', '.$table->toString($with_values).' ';
 			}
 
-			if(is_a($table, 'Subquery'))
+			if (is_a($table, 'Subquery'))
 			{
-				$from .= $table->getAlias() ? ' as ' . $table->getAlias() . ' ' : ' ';
+				$from .= $table->getAlias() ? ' as '.$table->getAlias().' ' : ' ';
 			}
 
 			$simple_table_count++;
 		}
-		if(trim($from) == '')
+		if (trim($from) == '')
 		{
 			return '';
 		}
@@ -496,9 +496,9 @@ 
 		$where = '';
 		$condition_count = 0;
 
-		foreach($this->conditions as $conditionGroup)
+		foreach ($this->conditions as $conditionGroup)
 		{
-			if($condition_count === 0)
+			if ($condition_count === 0)
 			{
 				$conditionGroup->setPipe("");
 			}
@@ -507,26 +507,26 @@ 
 			$condition_count++;
 		}
 
-		if($with_optimization &&
+		if ($with_optimization &&
 				(strstr($this->getOrderByString(), 'list_order') || strstr($this->getOrderByString(), 'update_order')))
 		{
 
-			if($condition_count !== 0)
+			if ($condition_count !== 0)
 			{
-				$where = '(' . $where . ') ';
+				$where = '('.$where.') ';
 			}
 
-			foreach($this->orderby as $order)
+			foreach ($this->orderby as $order)
 			{
 				$colName = $order->getColumnName();
-				if(strstr($colName, 'list_order') || strstr($colName, 'update_order'))
+				if (strstr($colName, 'list_order') || strstr($colName, 'update_order'))
 				{
 					$opt_condition = new ConditionWithoutArgument($colName, 2100000000, 'less', 'and');
-					if($condition_count === 0)
+					if ($condition_count === 0)
 					{
 						$opt_condition->setPipe("");
 					}
-					$where .= $opt_condition->toString($with_values) . ' ';
+					$where .= $opt_condition->toString($with_values).' ';
 					$condition_count++;
 				}
 			}
@@ -542,9 +542,9 @@ 
 	function getGroupByString()
 	{
 		$groupBy = '';
-		if($this->groups)
+		if ($this->groups)
 		{
-			if($this->groups[0] !== "")
+			if ($this->groups[0] !== "")
 			{
 				$groupBy = implode(', ', $this->groups);
 			}
@@ -558,16 +558,16 @@ 
 	 */
 	function getOrderByString()
 	{
-		if(!$this->_orderByString)
+		if (!$this->_orderByString)
 		{
-			if(count($this->orderby) === 0)
+			if (count($this->orderby) === 0)
 			{
 				return '';
 			}
 			$orderBy = '';
-			foreach($this->orderby as $order)
+			foreach ($this->orderby as $order)
 			{
-				$orderBy .= $order->toString() . ', ';
+				$orderBy .= $order->toString().', ';
 			}
 			$orderBy = substr($orderBy, 0, -2);
 			$this->_orderByString = $orderBy;
@@ -587,7 +587,7 @@ 
 	function getLimitString()
 	{
 		$limit = '';
-		if(count($this->limit) > 0)
+		if (count($this->limit) > 0)
 		{
 			$limit = '';
 			$limit .= $this->limit->toString();
@@ -606,19 +606,19 @@ 
 	 */
 	function getArguments()
 	{
-		if(!isset($this->arguments))
+		if (!isset($this->arguments))
 		{
 			$this->arguments = array();
 
 			// Join table arguments
-			if(count($this->tables) > 0)
+			if (count($this->tables) > 0)
 			{
-				foreach($this->tables as $table)
+				foreach ($this->tables as $table)
 				{
-					if($table->isJoinTable() || is_a($table, 'Subquery'))
+					if ($table->isJoinTable() || is_a($table, 'Subquery'))
 					{
 						$args = $table->getArguments();
-						if($args)
+						if ($args)
 						{
 							$this->arguments = array_merge($this->arguments, $args);
 						}
@@ -628,14 +628,14 @@ 
 
 			// Column arguments
 			// The if is for delete statements, all others must have columns
-			if(count($this->columns) > 0)
+			if (count($this->columns) > 0)
 			{
-				foreach($this->columns as $column)
+				foreach ($this->columns as $column)
 				{
-					if($column->show())
+					if ($column->show())
 					{
 						$args = $column->getArguments();
-						if($args)
+						if ($args)
 						{
 							$this->arguments = array_merge($this->arguments, $args);
 						}
@@ -644,12 +644,12 @@ 
 			}
 
 			// Condition arguments
-			if(count($this->conditions) > 0)
+			if (count($this->conditions) > 0)
 			{
-				foreach($this->conditions as $conditionGroup)
+				foreach ($this->conditions as $conditionGroup)
 				{
 					$args = $conditionGroup->getArguments();
-					if(count($args) > 0)
+					if (count($args) > 0)
 					{
 						$this->arguments = array_merge($this->arguments, $args);
 					}
@@ -657,12 +657,12 @@ 
 			}
 
 			// Navigation arguments
-			if(count($this->orderby) > 0)
+			if (count($this->orderby) > 0)
 			{
-				foreach($this->orderby as $order)
+				foreach ($this->orderby as $order)
 				{
 					$args = $order->getArguments();
-					if(count($args) > 0)
+					if (count($args) > 0)
 					{
 						$this->arguments = array_merge($this->arguments, $args);
 					}

classes/display/DisplayHandler.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -133,7 +133,7 @@ 
 	 * Print debugging message to designated output source depending on the value set to __DEBUG_OUTPUT_. \n
 	 * This method only functions when __DEBUG__ variable is set to 1.
 	 * __DEBUG_OUTPUT__ == 0, messages are written in ./files/_debug_message.php
-	 * @return void
+	 * @return null|string
 	 */
 	function _debugOutput()
 	{
@@ -358,6 +358,7 @@ 
 
 	/**
 	 * print a HTTP HEADER for HTML, which is encoded in UTF-8
+	 * @param integer $code
 	 * @return void
 	 */
 	function _printHttpStatusCode($code)

Spacing +43 added lines, -43 removed lines

@@ -25,7 +25,7 @@ 
 	function printContent(&$oModule)
 	{
 		// Check if the gzip encoding supported
-		if(
+		if (
 				(defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
 				strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE &&
 				extension_loaded('zlib') &&
@@ -36,23 +36,23 @@ 
 		}
 
 		// Extract contents to display by the request method
-		if(Context::get('xeVirtualRequestMethod') == 'xml')
+		if (Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		else if (Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
-			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
 		}
-		else if(Context::getRequestMethod() == 'JSON')
+		else if (Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		else if (Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
 		}
@@ -70,9 +70,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if (file_exists($addon_file)) include($addon_file);
 
-		if(method_exists($handler, "prepareToPrint"))
+		if (method_exists($handler, "prepareToPrint"))
 		{
 			$handler->prepareToPrint($output);
 		}
@@ -80,17 +80,17 @@ 
 		// header output
 
 		$httpStatusCode = $oModule->getHttpStatusCode();
-		if($httpStatusCode && $httpStatusCode != 200)
+		if ($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
 		}
 		else
 		{
-			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
+			if (Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
 			}
-			else if(Context::getResponseMethod() != 'HTML')
+			else if (Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
 			}
@@ -106,13 +106,13 @@ 
 
 		// disable gzip if output already exists
 		ob_flush();
-		if(headers_sent())
+		if (headers_sent())
 		{
 			$this->gz_enabled = FALSE;
 		}
 
 		// enable gzip using zlib extension
-		if($this->gz_enabled)
+		if ($this->gz_enabled)
 		{
 			ini_set('zlib.output_compression', true);
 		}
@@ -133,7 +133,7 @@ 
 	 */
 	function _debugOutput()
 	{
-		if(!__DEBUG__)
+		if (!__DEBUG__)
 		{
 			return;
 		}
@@ -141,32 +141,32 @@ 
 		$end = getMicroTime();
 
 		// Firebug console output
-		if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+		if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 		{
 			static $firephp;
-			if(!isset($firephp))
+			if (!isset($firephp))
 			{
 				$firephp = FirePHP::getInstance(true);
 			}
 
-			if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+			if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 			{
 				$firephp->fb('Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php', 'The IP address is not allowed.');
 				return;
 			}
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
 				$firephp->fb(
 						array(
-							'Request / Response info >>> ' . $_SERVER['REQUEST_METHOD'] . ' / ' . Context::getResponseMethod(),
+							'Request / Response info >>> '.$_SERVER['REQUEST_METHOD'].' / '.Context::getResponseMethod(),
 							array(
 								array('Request URI', 'Request method', 'Response method', 'Response contents size', 'Memory peak usage'),
 								array(
 									sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING'] ? '?' : '', $_SERVER['QUERY_STRING']),
 									$_SERVER['REQUEST_METHOD'],
 									Context::getResponseMethod(),
-									$this->content_size . ' byte',
+									$this->content_size.' byte',
 									FileHandler::filesize(memory_get_peak_usage())
 								)
 							)
@@ -175,7 +175,7 @@ 
 				);
 				$firephp->fb(
 						array(
-							'Elapsed time >>> Total : ' . sprintf('%0.5f sec', $end - __StartTime__),
+							'Elapsed time >>> Total : '.sprintf('%0.5f sec', $end - __StartTime__),
 							array(array('DB queries', 'class file load', 'Template compile', 'XmlParse compile', 'PHP', 'Widgets', 'Trans Content'),
 								array(
 									sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
@@ -193,16 +193,16 @@ 
 			}
 
 			// display DB query history
-			if((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
+			if ((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
 			{
 				$queries_output = array(array('Result/'.PHP_EOL.'Elapsed time', 'Query ID', 'Query'));
-				foreach($GLOBALS['__db_queries__'] as $query)
+				foreach ($GLOBALS['__db_queries__'] as $query)
 				{
-					$queries_output[] = array($query['result'] . PHP_EOL . sprintf('%0.5f', $query['elapsed_time']), str_replace(_XE_PATH_, '', $query['called_file']) . PHP_EOL . $query['called_method'] . '()' . PHP_EOL . $query['query_id'], $query['query']);
+					$queries_output[] = array($query['result'].PHP_EOL.sprintf('%0.5f', $query['elapsed_time']), str_replace(_XE_PATH_, '', $query['called_file']).PHP_EOL.$query['called_method'].'()'.PHP_EOL.$query['query_id'], $query['query']);
 				}
 				$firephp->fb(
 						array(
-							'DB Queries >>> ' . count($GLOBALS['__db_queries__']) . ' Queries, ' . sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
+							'DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
 							$queries_output
 						),
 						'TABLE'
@@ -215,9 +215,9 @@ 
 
 			$buff = array();
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
@@ -248,21 +248,21 @@ 
 				$buff[] = sprintf("\tTrans Content \t\t\t\t\t: %0.5f sec", $GLOBALS['__trans_content_elapsed__']);
 			}
 			// DB Logging
-			if(__DEBUG__ & 4)
+			if (__DEBUG__ & 4)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
 
-				if($GLOBALS['__db_queries__'])
+				if ($GLOBALS['__db_queries__'])
 				{
 					$buff[] = sprintf("\n- DB Queries : %d Queries. %0.5f sec", count($GLOBALS['__db_queries__']), $GLOBALS['__db_elapsed_time__']);
 					$num = 0;
 
-					foreach($GLOBALS['__db_queries__'] as $query)
+					foreach ($GLOBALS['__db_queries__'] as $query)
 					{
-						if($query['result'] == 'Success')
+						if ($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
 						}
@@ -279,30 +279,30 @@ 
 			}
 
 			// Output in HTML comments
-			if($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
+			if ($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
 			{
 				$buff = implode("\r\n", $buff);
 				$buff = sprintf("[%s %s:%d]\r\n%s", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
 
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					$buff = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
 				}
 
-				return "<!--\r\n" . $buff . "\r\n-->";
+				return "<!--\r\n".$buff."\r\n-->";
 			}
 
 			// Output to a file
-			if($buff && __DEBUG_OUTPUT__ == 0)
+			if ($buff && __DEBUG_OUTPUT__ == 0)
 			{
-				$debug_file = _XE_PATH_ . 'files/_debug_message.php';
+				$debug_file = _XE_PATH_.'files/_debug_message.php';
 				$buff = implode(PHP_EOL, $buff);
 				$buff = sprintf("[%s]\n%s", date('Y-m-d H:i:s'), print_r($buff, true));
 
-				$buff = str_repeat('=', 80) . "\n" . $buff . "\n" . str_repeat('-', 80);
-				$buff = "\n<?php\n/*" . $buff . "*/\n?>\n";
+				$buff = str_repeat('=', 80)."\n".$buff."\n".str_repeat('-', 80);
+				$buff = "\n<?php\n/*".$buff."*/\n?>\n";
 
-				if (!@file_put_contents($debug_file, $buff, FILE_APPEND|LOCK_EX))
+				if (!@file_put_contents($debug_file, $buff, FILE_APPEND | LOCK_EX))
 				{
 					return;
 				}
@@ -318,7 +318,7 @@ 
 	{
 		header("Content-Type: text/xml; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
@@ -332,7 +332,7 @@ 
 	{
 		header("Content-Type: text/html; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
@@ -346,7 +346,7 @@ 
 	{
 		header("Content-Type: text/html; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");

Braces +12 added lines, -19 removed lines

@@ -39,24 +39,20 @@ 
 		if(Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		} else if(Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
 			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
-		}
-		else if(Context::getRequestMethod() == 'JSON')
+		} else if(Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		} else if(Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
-		}
-		else
+		} else
 		{
 			$handler = new HTMLDisplayHandler();
 		}
@@ -70,7 +66,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if(file_exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(method_exists($handler, "prepareToPrint"))
 		{
@@ -83,18 +81,15 @@ 
 		if($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
-		}
-		else
+		} else
 		{
 			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
-			}
-			else if(Context::getResponseMethod() != 'HTML')
+			} else if(Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
-			}
-			else
+			} else
 			{
 				$this->_printHTMLHeader();
 			}
@@ -209,8 +204,7 @@ 
 				);
 			}
 			// dislpay the file and HTML comments
-		}
-		else
+		} else
 		{
 
 			$buff = array();
@@ -265,8 +259,7 @@ 
 						if($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
-						}
-						else
+						} else
 						{
 							$query_result = sprintf("Query $s : %d\n\t\t\t   %s", $query['result'], $query['errno'], $query['errstr']);
 						}

classes/display/HTMLDisplayHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -370,7 +370,7 @@
 	/**
 	 * add given .css or .js file names in widget code to Context
 	 * @param array $matches
-	 * @return void
+	 * @return string|null
 	 */
 	function _transMeta($matches)
 	{

Spacing +52 added lines, -52 removed lines

@@ -19,9 +19,9 @@ 
 
 		$template_path = $oModule->getTemplatePath();
 
-		if(!is_dir($template_path))
+		if (!is_dir($template_path))
 		{
-			if($oModule->module_info->module == $oModule->module)
+			if ($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
 			}
@@ -30,17 +30,17 @@ 
 				$skin = $oModule->module_config->skin;
 			}
 
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
 			{
-				if($skin && is_string($skin))
+				if ($skin && is_string($skin))
 				{
 					$theme_skin = explode('|@|', $skin);
 					$template_path = $oModule->getTemplatePath();
-					if(count($theme_skin) == 2)
+					if (count($theme_skin) == 2)
 					{
 						$theme_path = sprintf('./themes/%s', $theme_skin[0]);
 						// FIXME $theme_path $theme_path $theme_path ??
-						if(substr($theme_path, 0, strlen($theme_path)) != $theme_path)
+						if (substr($theme_path, 0, strlen($theme_path)) != $theme_path)
 						{
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
@@ -61,16 +61,16 @@ 
 		$output = $oTemplate->compile($template_path, $tpl_file);
 
 		// add .x div for adminitration pages
-		if(Context::getResponseMethod() == 'HTML')
+		if (Context::getResponseMethod() == 'HTML')
 		{
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
 			{
-				$output = '<div class="x">' . $output . '</div>';
+				$output = '<div class="x">'.$output.'</div>';
 			}
 
-			if(Context::get('layout') != 'none')
+			if (Context::get('layout') != 'none')
 			{
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$start = getMicroTime();
 				}
@@ -88,11 +88,11 @@ 
 				$layout_srl = $layout_info->layout_srl;
 
 				// compile if connected to the layout
-				if($layout_srl > 0)
+				if ($layout_srl > 0)
 				{
 
 					// handle separately if the layout is faceoff
-					if($layout_info && $layout_info->type == 'faceoff')
+					if ($layout_info && $layout_info->type == 'faceoff')
 					{
 						$oLayoutModel->doActivateFaceOff($layout_info);
 						Context::set('layout_info', $layout_info);
@@ -101,16 +101,16 @@ 
 					// search if the changes CSS exists in the admin layout edit window
 					$edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
 
-					if(FileHandler::exists($edited_layout_css))
+					if (FileHandler::exists($edited_layout_css))
 					{
 						Context::loadFile(array($edited_layout_css, 'all', '', 100));
 					}
 				}
-				if(!$layout_path)
+				if (!$layout_path)
 				{
 					$layout_path = './common/tpl';
 				}
-				if(!$layout_file)
+				if (!$layout_file)
 				{
 					$layout_file = 'default_layout';
 				}
@@ -118,7 +118,7 @@ 
 
 				// if popup_layout, remove admin bar.
 				$realLayoutPath = FileHandler::getRealPath($layout_path);
-				if(substr_compare($realLayoutPath, '/', -1) !== 0)
+				if (substr_compare($realLayoutPath, '/', -1) !== 0)
 				{
 					$realLayoutPath .= '/';
 				}
@@ -126,12 +126,12 @@ 
 				$pathInfo = pathinfo($layout_file);
 				$onlyLayoutFile = $pathInfo['filename'];
 
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start;
 				}
 
-				if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
+				if (stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
 				{
 					Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
 				}
@@ -147,12 +147,12 @@ 
 	 */
 	function prepareToPrint(&$output)
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -170,20 +170,20 @@ 
 		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)-->/is', array($this, '_transMeta'), $output);
 
 		// handles a relative path generated by using the rewrite module
-		if(Context::isAllowRewrite())
+		if (Context::isAllowRewrite())
 		{
 			$url = parse_url(Context::getRequestUri());
 			$real_path = $url['path'];
 
 			$pattern = '/src=("|\'){1}(?:\.\/)?((?:files\/(?:attach|cache|faceOff|member_extra_info|thumbnails)|addons|common|(?:m\.)?layouts|modules|widgets|widgetstyle)\/[^"\']+)("|\'){1}/s';
-			$output = preg_replace($pattern, 'src=$1' . $real_path . '$2$3', $output);
+			$output = preg_replace($pattern, 'src=$1'.$real_path.'$2$3', $output);
 
 			$pattern = '/href=("|\'){1}(\?[^"\']+)/s';
-			$output = preg_replace($pattern, 'href=$1' . $real_path . '$2', $output);
+			$output = preg_replace($pattern, 'href=$1'.$real_path.'$2', $output);
 
-			if(Context::get('vid'))
+			if (Context::get('vid'))
 			{
-				$pattern = '/\/' . Context::get('vid') . '\?([^=]+)=/is';
+				$pattern = '/\/'.Context::get('vid').'\?([^=]+)=/is';
 				$output = preg_replace($pattern, '/?$1=', $output);
 			}
 		}
@@ -191,18 +191,18 @@ 
 		// prevent the 2nd request due to url(none) of the background-image
 		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
 
-		if(is_array(Context::get('INPUT_ERROR')))
+		if (is_array(Context::get('INPUT_ERROR')))
 		{
 			$INPUT_ERROR = Context::get('INPUT_ERROR');
 			$keys = array_keys($INPUT_ERROR);
-			$keys = '(' . implode('|', $keys) . ')';
+			$keys = '('.implode('|', $keys).')';
 
-			$output = preg_replace_callback('@(<input)([^>]*?)\sname="' . $keys . '"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
-			$output = preg_replace_callback('@<select[^>]*\sname="' . $keys . '".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
-			$output = preg_replace_callback('@<textarea[^>]*\sname="' . $keys . '".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
+			$output = preg_replace_callback('@(<input)([^>]*?)\sname="'.$keys.'"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
+			$output = preg_replace_callback('@<select[^>]*\sname="'.$keys.'".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
+			$output = preg_replace_callback('@<textarea[^>]*\sname="'.$keys.'".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__trans_content_elapsed__'] = getMicroTime() - $start;
 		}
@@ -220,7 +220,7 @@ 
 		// convert the final layout
 		Context::set('content', $output);
 		$oTemplate = TemplateHandler::getInstance();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
@@ -245,16 +245,16 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 
-		$str = $match[1] . $match[2] . ' name="' . $match[3] . '"' . $match[4];
+		$str = $match[1].$match[2].' name="'.$match[3].'"'.$match[4];
 
 		// get type
 		$type = 'text';
-		if(preg_match('/\stype="([a-z]+)"/i', $str, $m))
+		if (preg_match('/\stype="([a-z]+)"/i', $str, $m))
 		{
 			$type = strtolower($m[1]);
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'text':
 			case 'hidden':
@@ -272,7 +272,7 @@ 
 			case 'number':
 			case 'range':
 			case 'color':
-				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str) . ' value="' . htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '"';
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'"';
 				break;
 			case 'password':
 				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
@@ -280,14 +280,14 @@ 
 			case 'radio':
 			case 'checkbox':
 				$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);
-				if(@preg_match('@\s(?i:value)="' . $INPUT_ERROR[$match[3]] . '"@', $str))
+				if (@preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str))
 				{
 					$str .= ' checked="checked"';
 				}
 				break;
 		}
 
-		return $str . ' />';
+		return $str.' />';
 	}
 
 	/**
@@ -304,14 +304,14 @@ 
 		preg_match_all('@<option[^>]*\svalue="([^"]*)".+</option>@isU', $matches[0], $m);
 
 		$key = array_search($INPUT_ERROR[$matches[1]], $m[1]);
-		if($key === FALSE)
+		if ($key === FALSE)
 		{
 			return $matches[0];
 		}
 
 		$m[0][$key] = preg_replace('@(\svalue=".*?")@is', '$1 selected="selected"', $m[0][$key]);
 
-		return $mm[0] . implode('', $m[0]) . '</select>';
+		return $mm[0].implode('', $m[0]).'</select>';
 	}
 
 	/**
@@ -323,7 +323,7 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 		preg_match('@<textarea.*?>@is', $matches[0], $mm);
-		return $mm[0] . $INPUT_ERROR[$matches[1]] . '</textarea>';
+		return $mm[0].$INPUT_ERROR[$matches[1]].'</textarea>';
 	}
 
 	/**
@@ -334,7 +334,7 @@ 
 	 */
 	function _moveStyleToHeader($matches)
 	{
-		if(isset($matches[1]) && stristr($matches[1], 'scoped'))
+		if (isset($matches[1]) && stristr($matches[1], 'scoped'))
 		{
 			return $matches[0];
 		}
@@ -370,7 +370,7 @@ 
 	 */
 	function _transMeta($matches)
 	{
-		if($matches[1])
+		if ($matches[1])
 		{
 			return '';
 		}
@@ -387,7 +387,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -1110000), true);
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', 'gte IE 9', -1100000), true);
@@ -400,7 +400,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 			}
@@ -415,7 +415,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 			}
@@ -426,9 +426,9 @@ 
 		}
 
 		// for admin page, add admin css
-		if(Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
+		if (Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
 		{
-			if(__DEBUG__ || !__XE_VERSION_STABLE__)
+			if (__DEBUG__ || !__XE_VERSION_STABLE__)
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -460,7 +460,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/modernizr.js', 'head', '', -1000000), true);
@@ -472,7 +472,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.css', '', '', -10000000), true);
@@ -488,7 +488,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.min.css', '', '', -10000000), true);

Braces +11 added lines, -22 removed lines

@@ -24,8 +24,7 @@ 
 			if($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
-			}
-			else
+			} else
 			{
 				$skin = $oModule->module_config->skin;
 			}
@@ -45,13 +44,11 @@ 
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
 					}
-				}
-				else
+				} else
 				{
 					$template_path = $oModule->getTemplatePath();
 				}
-			}
-			else
+			} else
 			{
 				$template_path = $oModule->getTemplatePath();
 			}
@@ -224,8 +221,7 @@ 
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
-		}
-		else
+		} else
 		{
 			$this->_loadJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'common_layout');
@@ -403,13 +399,11 @@ 
 			if(!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.css', '', '', -10000000), true);
 			}
-		}
-		else
+		} else
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.min.js', 'head', 'lt IE 9', -1110000), true);
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -1100000), true);
@@ -418,8 +412,7 @@ 
 			if(!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 			}
@@ -437,8 +430,7 @@ 
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.bootstrap.css', '', '', 1), true);
 				$oContext->loadFile(array('./modules/admin/tpl/js/jquery.tmpl.js', '', '', 1), true);
 				$oContext->loadFile(array('./modules/admin/tpl/js/jquery.jstree.js', '', '', 1), true);
-			}
-			else
+			} else
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.min.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -476,14 +468,12 @@ 
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.css', '', '', -10000000), true);
 				$oContext->unloadFile(array('./common/css/mobile.css', '', '', -10000000), true);
 			}
-		}
-		else
+		} else
 		{
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
@@ -492,8 +482,7 @@ 
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.min.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 				$oContext->unloadFile(array('./common/css/mobile.min.css', '', '', -10000000), true);

classes/httprequest/XEHttpRequest.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
 	/**
 	 * Mether to add key/value pair to the HTTP request header
-	 * @param int|string $key HTTP header element
+	 * @param string $key HTTP header element
 	 * @param string $value value string for HTTP header element
 	 * @return void
 	 */

Braces +2 added lines, -4 removed lines

@@ -97,8 +97,7 @@ 
 		if(FALSE && is_callable('curl_init'))
 		{
 			return $this->sendWithCurl($target, $method, $timeout, $post_vars);
-		}
-		else
+		} else
 		{
 			return $this->sendWithSock($target, $method, $timeout, $post_vars);
 		}
@@ -179,8 +178,7 @@ 
 				{
 					$body .= fgets($sock, $chunk_size+1);
 				}
-			}
-			else
+			} else
 			{
 				$body .= fgets($sock, 512);
 			}

Spacing +23 added lines, -23 removed lines

@@ -41,7 +41,7 @@ 
 	 * constructor
 	 * @return void
 	 */
-	function __construct($host, $port, $scheme='')
+	function __construct($host, $port, $scheme = '')
 	{
 		$this->m_host = $host;
 		$this->m_port = $port;
@@ -76,11 +76,11 @@ 
 		$this->addToHeader('Connection', 'close');
 
 		$method = strtoupper($method);
-		if(!$allow_methods)
+		if (!$allow_methods)
 		{
 			$allow_methods = explode(' ', 'GET POST PUT');
 		}
-		if(!in_array($method, $allow_methods))
+		if (!in_array($method, $allow_methods))
 		{
 			$method = $allow_methods[0];
 		}
@@ -89,12 +89,12 @@ 
 		$timout = max((int) $timeout, 0);
 
 		// list of post variables
-		if(!is_array($post_vars))
+		if (!is_array($post_vars))
 		{
 			$post_vars = array();
 		}
 
-		if(FALSE && is_callable('curl_init'))
+		if (FALSE && is_callable('curl_init'))
 		{
 			return $this->sendWithCurl($target, $method, $timeout, $post_vars);
 		}
@@ -117,30 +117,30 @@ 
 		static $crlf = "\r\n";
 
 		$scheme = '';
-		if($this->m_scheme=='https')
+		if ($this->m_scheme == 'https')
 		{
 			$scheme = 'ssl://';
 		}
 
-		$sock = @fsockopen($scheme . $this->m_host, $this->m_port, $errno, $errstr, $timeout);
-		if(!$sock)
+		$sock = @fsockopen($scheme.$this->m_host, $this->m_port, $errno, $errstr, $timeout);
+		if (!$sock)
 		{
 			return new BaseObject(-1, 'socket_connect_failed');
 		}
 
 		$headers = $this->m_headers + array();
-		if(!isset($headers['Accept-Encoding']))
+		if (!isset($headers['Accept-Encoding']))
 		{
 			$headers['Accept-Encoding'] = 'identity';
 		}
 
 		// post body
 		$post_body = '';
-		if($method == 'POST' && count($post_vars))
+		if ($method == 'POST' && count($post_vars))
 		{
-			foreach($post_vars as $key => $value)
+			foreach ($post_vars as $key => $value)
 			{
-				$post_body .= urlencode($key) . '=' . urlencode($value) . '&';
+				$post_body .= urlencode($key).'='.urlencode($value).'&';
 			}
 			$post_body = substr($post_body, 0, -1);
 
@@ -149,35 +149,35 @@ 
 		}
 
 		$request = "$method $target HTTP/1.1$crlf";
-		foreach($headers as $equiv => $content)
+		foreach ($headers as $equiv => $content)
 		{
 			$request .= "$equiv: $content$crlf";
 		}
-		$request .= $crlf . $post_body;
+		$request .= $crlf.$post_body;
 		fwrite($sock, $request);
 
 		list($httpver, $code, $status) = preg_split('/ +/', rtrim(fgets($sock)), 3);
 
 		// read response headers
 		$is_chunked = FALSE;
-		while(strlen(trim($line = fgets($sock))))
+		while (strlen(trim($line = fgets($sock))))
 		{
 			list($equiv, $content) = preg_split('/ *: */', rtrim($line), 2);
-			if(!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked')
+			if (!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked')
 			{
 				$is_chunked = TRUE;
 			}
 		}
 
 		$body = '';
-		while(!feof($sock))
+		while (!feof($sock))
 		{
-			if($is_chunked)
+			if ($is_chunked)
 			{
 				$chunk_size = hexdec(fgets($sock));
-				if($chunk_size)
+				if ($chunk_size)
 				{
-					$body .= fgets($sock, $chunk_size+1);
+					$body .= fgets($sock, $chunk_size + 1);
 				}
 			}
 			else
@@ -219,7 +219,7 @@ 
 		curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
 
-		switch($method)
+		switch ($method)
 		{
 			case 'GET': curl_setopt($ch, CURLOPT_HTTPGET, true);
 				break;
@@ -232,7 +232,7 @@ 
 		}
 
 		$arr_headers = array();
-		foreach($headers as $key => $value)
+		foreach ($headers as $key => $value)
 		{
 			$arr_headers[] = "$key: $value";
 		}
@@ -240,7 +240,7 @@ 
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $arr_headers);
 
 		$body = curl_exec($ch);
-		if(curl_errno($ch))
+		if (curl_errno($ch))
 		{
 			return new BaseObject(-1, 'socket_connect_failed');
 		}

classes/module/ModuleHandler.class.php

Doc Comments +5 added lines, -1 removed lines

@@ -112,7 +112,7 @@ 
 
 	/**
 	 * Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
-	 * @return boolean true: OK, false: redirected
+	 * @return string|boolean true: OK, false: redirected
 	 * */
 	function init()
 	{
@@ -1128,6 +1128,10 @@ 
 		return $GLOBALS['_loaded_module'][$module][$type][$kind];
 	}
 
+	/**
+	 * @param string $type
+	 * @param string $kind
+	 */
 	function _getModuleFilePath($module, $type, $kind, &$classPath, &$highClassFile, &$classFile, &$instanceName)
 	{
 		$classPath = ModuleHandler::getModulePath($module);

Indentation +4 added lines, -4 removed lines

@@ -59,10 +59,10 @@
 		$this->mid = $mid ? $mid : Context::get('mid');
 		$this->document_srl = $document_srl ? (int) $document_srl : (int) Context::get('document_srl');
 		$this->module_srl = $module_srl ? (int) $module_srl : (int) Context::get('module_srl');
-        if($entry = Context::get('entry'))
-        {
-            $this->entry = Context::convertEncodingStr($entry);
-        }
+		if($entry = Context::get('entry'))
+		{
+			$this->entry = Context::convertEncodingStr($entry);
+		}
 
 		// Validate variables to prevent XSS
 		$isInvalid = NULL;

Braces +30 added lines, -45 removed lines

@@ -115,7 +115,9 @@ 
 		$called_position = 'before_module_init';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? 'mobile' : 'pc');
-		if(file_exists($addon_file)) include($addon_file);
+		if(file_exists($addon_file)) {
+			include($addon_file);
+		}
 	}
 
 	public static function xeErrorLog($errnumber, $errormassage, $errorfile, $errorline, $errorcontext)
@@ -257,8 +259,7 @@ 
 			if(!$module_info)
 			{
 				unset($this->document_srl);
-			}
-			else
+			} else
 			{
 				// If it exists, compare mid based on the module information
 				// if mids are not matching, set it as the document's mid
@@ -270,8 +271,7 @@ 
 						$this->mid = $module_info->mid;
 						header('location:' . getNotEncodedSiteUrl($site_module_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl));
 						return FALSE;
-					}
-					else
+					} else
 					{
 						$this->mid = $module_info->mid;
 						Context::set('mid', $this->mid);
@@ -322,15 +322,13 @@ 
 				$site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
 				$redirect_url = getNotEncodedSiteUrl($site_info->domain, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
 				// If it's called from a virtual site, though it's not a module of the virtual site
-			}
-			else
+			} else
 			{
 				$db_info = Context::getDBInfo();
 				if(!$db_info->default_url)
 				{
 					return Context::getLang('msg_default_url_is_not_defined');
-				}
-				else
+				} else
 				{
 					$redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry'));
 				}
@@ -355,8 +353,7 @@ 
 			{
 				$oLayoutAdminModel = getAdminModel('layout');
 				$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$layoutSrl = $module_info->{$targetSrl};
 			}
@@ -490,8 +487,7 @@ 
 			if(!$allowedMethod)
 			{
 				$allowedMethodList[0] = 'POST';
-			}
-			else
+			} else
 			{
 				$allowedMethodList = explode('|', strtoupper($allowedMethod));
 			}
@@ -551,8 +547,7 @@ 
 				Mobile::setMobile(FALSE);
 				$oModule = $this->getModuleInstance($this->module, $type, $kind);
 			}
-		}
-		else
+		} else
 		{
 			// create a module instance
 			$oModule = $this->getModuleInstance($this->module, $type, $kind);
@@ -606,8 +601,7 @@ 
 					$forward->ruleset = $xml_info->action->{$this->act}->ruleset;
 					$forward->meta_noindex = $xml_info->action->{$this->act}->meta_noindex;
 					$forward->act = $this->act;
-				}
-				else
+				} else
 				{
 					$this->error = 'msg_invalid_request';
 					$oMessageObject = ModuleHandler::getModuleInstance('message', $display_mode);
@@ -659,8 +653,7 @@ 
 					if(!$allowedMethod)
 					{
 						$allowedMethodList[0] = 'POST';
-					}
-					else
+					} else
 					{
 						$allowedMethodList = explode('|', strtoupper($allowedMethod));
 					}
@@ -688,8 +681,7 @@ 
 						Mobile::setMobile(FALSE);
 						$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 					}
-				}
-				else
+				} else
 				{
 					$oModule = $this->getModuleInstance($forward->module, $type, $kind);
 				}
@@ -719,8 +711,7 @@ 
 							$oModule->setLayoutPath("./modules/admin/tpl");
 							$oModule->setLayoutFile("layout.html");
 						}
-					}
-					else
+					} else
 					{
 						$this->_setInputErrorToContext();
 
@@ -744,8 +735,7 @@ 
 						$oMessageObject->setMessage($this->error);
 						$oMessageObject->dispMessage();
 						return $oMessageObject;
-					}
-					else
+					} else
 					{
 						if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager')
 						{
@@ -759,12 +749,10 @@ 
 						}
 					}
 				}
-			}
-			else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
+			} else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
 			{
 				$this->act = $xml_info->default_index_act;
-			}
-			else
+			} else
 			{
 				$this->error = 'msg_invalid_request';
 				$oModule->setError(-1);
@@ -866,7 +854,9 @@ 
 			$message = $oModule->getMessage();
 			$messageType = $oModule->getMessageType();
 			$redirectUrl = $oModule->getRedirectUrl();
-			if($messageType == 'error') debugPrint($message, 'ERROR');
+			if($messageType == 'error') {
+				debugPrint($message, 'ERROR');
+			}
 
 			if(!$procResult)
 			{
@@ -876,8 +866,7 @@ 
 					$redirectUrl = Context::get('error_return_url');
 				}
 				$this->_setInputValueToSession();
-			}
-			else
+			} else
 			{
 
 			}
@@ -1025,8 +1014,7 @@ 
 					$oModule->setTemplatePath($oMessageObject->getTemplatePath());
 					$oModule->setTemplateFile($oMessageObject->getTemplateFile());
 					// Otherwise, set message instance as the target module
-				}
-				else
+				} else
 				{
 					$oModule = $oMessageObject;
 				}
@@ -1038,8 +1026,7 @@ 
 			if(Mobile::isFromMobilePhone())
 			{
 				$layout_srl = $oModule->module_info->mlayout_srl;
-			}
-			else
+			} else
 			{
 				$layout_srl = $oModule->module_info->layout_srl;
 			}
@@ -1098,8 +1085,7 @@ 
 									$menu->xml_file = str_replace('.xml.php', $homeMenuSrl . '.xml.php', $menu->xml_file);
 									$menu->php_file = str_replace('.php', $homeMenuSrl . '.php', $menu->php_file);
 									$layout_info->menu->{$menu_id}->menu_srl = $homeMenuSrl;
-								}
-								else
+								} else
 								{
 									$menu->xml_file = str_replace($menu->menu_srl, $homeMenuSrl, $menu->xml_file);
 									$menu->php_file = str_replace($menu->menu_srl, $homeMenuSrl, $menu->php_file);
@@ -1136,8 +1122,7 @@ 
 				if($kind == 'admin')
 				{
 					$oModule->setLayoutFile('popup_layout');
-				}
-				else
+				} else
 				{
 					$oModule->setLayoutPath('common/tpl');
 					$oModule->setLayoutFile('default_layout');
@@ -1271,13 +1256,11 @@ 
 		{
 			$instanceName = '%s';
 			$classFile = '%s%s.%s.php';
-		}
-		elseif($kind == 'admin' && array_search($type, $types) < 3)
+		} elseif($kind == 'admin' && array_search($type, $types) < 3)
 		{
 			$instanceName = '%sAdmin%s';
 			$classFile = '%s%s.admin.%s.php';
-		}
-		else
+		} else
 		{
 			$instanceName = '%s%s';
 			$classFile = '%s%s.%s.php';
@@ -1340,7 +1323,9 @@ 
 			$slowlog->caller = $trigger_name . '.' . $called_position;
 			$slowlog->called = $module . '.' . $called_method;
 			$slowlog->called_extension = $module;
-			if($trigger_name != 'XE.writeSlowlog') writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			if($trigger_name != 'XE.writeSlowlog') {
+				writeSlowlog('trigger', $elapsed_time_trigger, $slowlog);
+			}
 
 			if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
 			{

Spacing +179 added lines, -179 removed lines

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

classes/module/ModuleObject.class.php

Doc Comments +4 added lines, -1 removed lines

@@ -141,7 +141,7 @@ 
 
 	/**
 	 * sett to set module information
-	 * @param object $module_info object containing module information
+	 * @param stdClass $module_info object containing module information
 	 * @param object $xml_info object containing module description
 	 * @return void
 	 * */
@@ -247,6 +247,7 @@ 
 	/**
 	 * set the file name of the template file
 	 * @param string name of file
+	 * @param string $filename
 	 * @return void
 	 * */
 	function setTemplateFile($filename)
@@ -270,6 +271,7 @@ 
 	/**
 	 * set the directory path of the template directory
 	 * @param string path of template directory.
+	 * @param string $path
 	 * @return void
 	 * */
 	function setTemplatePath($path)
@@ -325,6 +327,7 @@ 
 	/**
 	 * set the file name of the layout file
 	 * @param string name of file
+	 * @param string $filename
 	 * @return void
 	 * */
 	function setLayoutFile($filename)

Spacing +41 added lines, -41 removed lines

@@ -44,9 +44,9 @@ 
 	 * */
 	function setModulePath($path)
 	{
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
-			$path.='/';
+			$path .= '/';
 		}
 		$this->module_path = $path;
 	}
@@ -60,12 +60,12 @@ 
 	function setRedirectUrl($url = './', $output = NULL)
 	{
 		$ajaxRequestMethod = array_flip($this->ajaxRequestMethod);
-		if(!isset($ajaxRequestMethod[Context::getRequestMethod()]))
+		if (!isset($ajaxRequestMethod[Context::getRequestMethod()]))
 		{
 			$this->add('redirect_url', $url);
 		}
 
-		if($output !== NULL && is_object($output))
+		if ($output !== NULL && is_object($output))
 		{
 			return $output;
 		}
@@ -110,7 +110,7 @@ 
 	{
 		$type = $this->get('message_type');
 		$typeList = array('error' => 1, 'info' => 1, 'update' => 1);
-		if(!isset($typeList[$type]))
+		if (!isset($typeList[$type]))
 		{
 			$type = $this->getError() ? 'error' : 'info';
 		}
@@ -161,10 +161,10 @@ 
 		$oModuleModel = getModel('module');
 		// permission settings. access, manager(== is_admin) are fixed and privilege name in XE
 		$module_srl = Context::get('module_srl');
-		if(!$module_info->mid && !is_array($module_srl) && preg_match('/^([0-9]+)$/', $module_srl))
+		if (!$module_info->mid && !is_array($module_srl) && preg_match('/^([0-9]+)$/', $module_srl))
 		{
 			$request_module = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-			if($request_module->module_srl == $module_srl)
+			if ($request_module->module_srl == $module_srl)
 			{
 				$grant = $oModuleModel->getGrant($request_module, $logged_info);
 			}
@@ -173,7 +173,7 @@ 
 		{
 			$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
 			// have at least access grant
-			if(substr_count($this->act, 'Member') || substr_count($this->act, 'Communication'))
+			if (substr_count($this->act, 'Member') || substr_count($this->act, 'Communication'))
 			{
 				$grant->access = 1;
 			}
@@ -181,24 +181,24 @@ 
 		// display no permission if the current module doesn't have an access privilege
 		//if(!$grant->access) return $this->stop("msg_not_permitted");
 		// checks permission and action if you don't have an admin privilege
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			// get permission types(guest, member, manager, root) of the currently requested action
 			$permission_target = $xml_info->permission->{$this->act};
 			// check manager if a permission in module.xml otherwise action if no permission
-			if(!$permission_target && substr_count($this->act, 'Admin'))
+			if (!$permission_target && substr_count($this->act, 'Admin'))
 			{
 				$permission_target = 'manager';
 			}
 			// Check permissions
-			switch($permission_target)
+			switch ($permission_target)
 			{
 				case 'root' :
 				case 'manager' :
 					$this->stop('msg_is_not_administrator');
 					return;
 				case 'member' :
-					if(!$is_logged)
+					if (!$is_logged)
 					{
 						$this->stop('msg_not_permitted_act');
 						return;
@@ -213,7 +213,7 @@ 
 
 		$this->module_config = $oModuleModel->getModuleConfig($this->module, $module_info->site_srl);
 
-		if(method_exists($this, 'init'))
+		if (method_exists($this, 'init'))
 		{
 			$this->init();
 		}
@@ -251,7 +251,7 @@ 
 	 * */
 	function setTemplateFile($filename)
 	{
-		if(isset($filename) && substr_compare($filename, '.html', -5) !== 0)
+		if (isset($filename) && substr_compare($filename, '.html', -5) !== 0)
 		{
 			$filename .= '.html';
 		}
@@ -274,14 +274,14 @@ 
 	 * */
 	function setTemplatePath($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
+		if ((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
-			$path = './' . $path;
+			$path = './'.$path;
 		}
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -304,9 +304,9 @@ 
 	 * */
 	function setEditedLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if (!$filename) return;
 
-		if(substr_compare($filename, '.html', -5) !== 0)
+		if (substr_compare($filename, '.html', -5) !== 0)
 		{
 			$filename .= '.html';
 		}
@@ -329,9 +329,9 @@ 
 	 * */
 	function setLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if (!$filename) return;
 
-		if(substr_compare($filename, '.html', -5) !== 0)
+		if (substr_compare($filename, '.html', -5) !== 0)
 		{
 			$filename .= '.html';
 		}
@@ -353,13 +353,13 @@ 
 	 * */
 	function setLayoutPath($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
+		if ((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
-			$path = './' . $path;
+			$path = './'.$path;
 		}
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -382,7 +382,7 @@ 
 	function proc()
 	{
 		// pass if stop_proc is true
-		if($this->stop_proc)
+		if ($this->stop_proc)
 		{
 			debugPrint($this->message, 'ERROR');
 			return FALSE;
@@ -390,7 +390,7 @@ 
 
 		// trigger call
 		$triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'before', $this);
-		if(!$triggerOutput->toBool())
+		if (!$triggerOutput->toBool())
 		{
 			$this->setError($triggerOutput->getError());
 			$this->setMessage($triggerOutput->getMessage());
@@ -401,12 +401,12 @@ 
 		$called_position = 'before_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if (FileHandler::exists($addon_file)) include($addon_file);
 
-		if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act))
+		if (isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act))
 		{
 			// Check permissions
-			if($this->module_srl && !$this->grant->access)
+			if ($this->module_srl && !$this->grant->access)
 			{
 				$this->stop("msg_not_permitted_act");
 				return FALSE;
@@ -415,21 +415,21 @@ 
 			// integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
 			$is_default_skin = ((!Mobile::isFromMobilePhone() && $this->module_info->is_skin_fix == 'N') || (Mobile::isFromMobilePhone() && $this->module_info->is_mskin_fix == 'N'));
 			$usedSkinModule = !($this->module == 'page' && ($this->module_info->page_type == 'OUTSIDE' || $this->module_info->page_type == 'WIDGET'));
-			if($usedSkinModule && $is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false && $this->module == $this->module_info->module)
+			if ($usedSkinModule && $is_default_skin && $this->module != 'admin' && strpos($this->act, 'Admin') === false && $this->module == $this->module_info->module)
 			{
 				$dir = (Mobile::isFromMobilePhone()) ? 'm.skins' : 'skins';
 				$valueName = (Mobile::isFromMobilePhone()) ? 'mskin' : 'skin';
 				$oModuleModel = getModel('module');
 				$skinType = (Mobile::isFromMobilePhone()) ? 'M' : 'P';
 				$skinName = $oModuleModel->getModuleDefaultSkin($this->module, $skinType);
-				if($this->module == 'page')
+				if ($this->module == 'page')
 				{
 					$this->module_info->{$valueName} = $skinName;
 				}
 				else
 				{
 					$isTemplatPath = (strpos($this->getTemplatePath(), '/tpl/') !== FALSE);
-					if(!$isTemplatPath)
+					if (!$isTemplatPath)
 					{
 						$this->setTemplatePath(sprintf('%s%s/%s/', $this->module_path, $dir, $skinName));
 					}
@@ -449,7 +449,7 @@ 
 
 		// trigger call
 		$triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'after', $this);
-		if(!$triggerOutput->toBool())
+		if (!$triggerOutput->toBool())
 		{
 			$this->setError($triggerOutput->getError());
 			$this->setMessage($triggerOutput->getMessage());
@@ -460,25 +460,25 @@ 
 		$called_position = 'after_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if (FileHandler::exists($addon_file)) include($addon_file);
 
-		if(is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject'))
+		if (is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject'))
 		{
 			$this->setError($output->getError());
 			$this->setMessage($output->getMessage());
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return FALSE;
 			}
 		}
 		// execute api methods of the module if view action is and result is XMLRPC or JSON
-		if($this->module_info->module_type == 'view' || $this->module_info->module_type == 'mobile')
+		if ($this->module_info->module_type == 'view' || $this->module_info->module_type == 'mobile')
 		{
-			if(Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON')
+			if (Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON')
 			{
 				$oAPI = getAPI($this->module_info->module, 'api');
-				if(method_exists($oAPI, $this->act))
+				if (method_exists($oAPI, $this->act))
 				{
 					$oAPI->{$this->act}($this);
 				}

Braces +21 added lines, -12 removed lines

@@ -168,8 +168,7 @@ 
 			{
 				$grant = $oModuleModel->getGrant($request_module, $logged_info);
 			}
-		}
-		else
+		} else
 		{
 			$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
 			// have at least access grant
@@ -274,7 +273,9 @@ 
 	 * */
 	function setTemplatePath($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
@@ -304,7 +305,9 @@ 
 	 * */
 	function setEditedLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if(!$filename) {
+			return;
+		}
 
 		if(substr_compare($filename, '.html', -5) !== 0)
 		{
@@ -329,7 +332,9 @@ 
 	 * */
 	function setLayoutFile($filename)
 	{
-		if(!$filename) return;
+		if(!$filename) {
+			return;
+		}
 
 		if(substr_compare($filename, '.html', -5) !== 0)
 		{
@@ -353,7 +358,9 @@ 
 	 * */
 	function setLayoutPath($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if((strlen($path) >= 1 && substr_compare($path, '/', 0, 1) !== 0) && (strlen($path) >= 2 && substr_compare($path, './', 0, 2) !== 0))
 		{
@@ -401,7 +408,9 @@ 
 		$called_position = 'before_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if(FileHandler::exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act))
 		{
@@ -425,8 +434,7 @@ 
 				if($this->module == 'page')
 				{
 					$this->module_info->{$valueName} = $skinName;
-				}
-				else
+				} else
 				{
 					$isTemplatPath = (strpos($this->getTemplatePath(), '/tpl/') !== FALSE);
 					if(!$isTemplatPath)
@@ -441,8 +449,7 @@ 
 			Context::set('module_info', $this->module_info);
 			// Run
 			$output = $this->{$this->act}();
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -460,7 +467,9 @@ 
 		$called_position = 'after_module_proc';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(FileHandler::exists($addon_file)) include($addon_file);
+		if(FileHandler::exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject'))
 		{

classes/security/EmbedFilter.class.php

Doc Comments +5 added lines, -4 removed lines

@@ -295,6 +295,7 @@ 
 
 	/**
 	 * Check the content.
+	 * @param string $content
 	 * @return void
 	 */
 	function check(&$content)
@@ -487,7 +488,7 @@ 
 
 	/**
 	 * Check white domain in object data attribute or embed src attribute.
-	 * @return string
+	 * @return boolean
 	 */
 	function isWhiteDomain($urlAttribute)
 	{
@@ -506,7 +507,7 @@ 
 
 	/**
 	 * Check white domain in iframe src attribute.
-	 * @return string
+	 * @return boolean
 	 */
 	function isWhiteIframeDomain($urlAttribute)
 	{
@@ -525,7 +526,7 @@ 
 
 	/**
 	 * Check white mime type in object type attribute or embed type attribute.
-	 * @return string
+	 * @return boolean
 	 */
 	function isWhiteMimetype($mimeType)
 	{
@@ -590,7 +591,7 @@ 
 
 	/**
 	 * Make white domain list cache file from xml config file.
-	 * @param $whitelist array
+	 * @param stdClass $whitelist array
 	 * @return void
 	 */
 	function _makeWhiteDomainList($whitelist = NULL)

Braces +11 added lines, -12 removed lines

@@ -563,14 +563,12 @@ 
 				}
 				$this->allowscriptaccessList[count($this->allowscriptaccessList) - 1]--;
 			}
-		}
-		else if($m[1] == 'embed')
+		} else if($m[1] == 'embed')
 		{
 			if(stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
-			}
-			else
+			} else
 			{
 				$m[0] = preg_replace('/\<embed/i', '<embed allowscriptaccess="never"', $m[0]);
 			}
@@ -627,8 +625,7 @@ 
 			{
 				$whiteUrlList = $whitelist->object;
 				$whiteIframeUrlList = $whitelist->iframe;
-			}
-			else
+			} else
 			{
 				$xmlBuff = FileHandler::readFile($this->whiteUrlXmlFile);
 
@@ -636,8 +633,12 @@ 
 				$domainListObj = $xmlParser->parse($xmlBuff);
 				$embedDomainList = $domainListObj->whiteurl->embed->domain;
 				$iframeDomainList = $domainListObj->whiteurl->iframe->domain;
-				if(!is_array($embedDomainList)) $embedDomainList = array();
-				if(!is_array($iframeDomainList)) $iframeDomainList = array();
+				if(!is_array($embedDomainList)) {
+					$embedDomainList = array();
+				}
+				if(!is_array($iframeDomainList)) {
+					$iframeDomainList = array();
+				}
 
 				foreach($embedDomainList AS $key => $value)
 				{
@@ -648,8 +649,7 @@ 
 						{
 							$whiteUrlList[] = $value->body;
 						}
-					}
-					else
+					} else
 					{
 						$whiteUrlList[] = $patternList->body;
 					}
@@ -664,8 +664,7 @@ 
 						{
 							$whiteIframeUrlList[] = $value->body;
 						}
-					}
-					else
+					} else
 					{
 						$whiteIframeUrlList[] = $patternList->body;
 					}

Spacing +65 added lines, -65 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-include _XE_PATH_ . 'classes/security/phphtmlparser/src/htmlparser.inc';
+include _XE_PATH_.'classes/security/phphtmlparser/src/htmlparser.inc';
 
 class EmbedFilter
 {
@@ -276,7 +276,7 @@ 
 	 */
 	function getInstance()
 	{
-		if(!isset($GLOBALS['__EMBEDFILTER_INSTANCE__']))
+		if (!isset($GLOBALS['__EMBEDFILTER_INSTANCE__']))
 		{
 			$GLOBALS['__EMBEDFILTER_INSTANCE__'] = new EmbedFilter();
 		}
@@ -316,9 +316,9 @@ 
 	{
 		preg_match_all('/<\s*object\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$objectTagList = $m[0];
-		if($objectTagList)
+		if ($objectTagList)
 		{
-			foreach($objectTagList AS $key => $objectTag)
+			foreach ($objectTagList AS $key => $objectTag)
 			{
 				$isWhiteDomain = true;
 				$isWhiteMimetype = true;
@@ -326,21 +326,21 @@ 
 				$ext = '';
 
 				$parser = new HtmlParser($objectTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if(is_array($parser->iNodeAttributes))
+					if (is_array($parser->iNodeAttributes))
 					{
-						foreach($parser->iNodeAttributes AS $attrName => $attrValue)
+						foreach ($parser->iNodeAttributes AS $attrName => $attrValue)
 						{
 							// data url check
-							if($attrValue && strtolower($attrName) == 'data')
+							if ($attrValue && strtolower($attrName) == 'data')
 							{
 								$ext = strtolower(substr(strrchr($attrValue, "."), 1));
 								$isWhiteDomain = $this->isWhiteDomain($attrValue);
 							}
 
 							// mime type check
-							if(strtolower($attrName) == 'type' && $attrValue)
+							if (strtolower($attrName) == 'type' && $attrValue)
 							{
 								$isWhiteMimetype = $this->isWhiteMimetype($attrValue);
 							}
@@ -348,7 +348,7 @@ 
 					}
 				}
 
-				if(!$isWhiteDomain || !$isWhiteMimetype)
+				if (!$isWhiteDomain || !$isWhiteMimetype)
 				{
 					$content = str_replace($objectTag, htmlspecialchars($objectTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 				}
@@ -364,9 +364,9 @@ 
 	{
 		preg_match_all('/<\s*embed\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$embedTagList = $m[0];
-		if($embedTagList)
+		if ($embedTagList)
 		{
-			foreach($embedTagList AS $key => $embedTag)
+			foreach ($embedTagList AS $key => $embedTag)
 			{
 				$isWhiteDomain = TRUE;
 				$isWhiteMimetype = TRUE;
@@ -374,21 +374,21 @@ 
 				$ext = '';
 
 				$parser = new HtmlParser($embedTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if(is_array($parser->iNodeAttributes))
+					if (is_array($parser->iNodeAttributes))
 					{
-						foreach($parser->iNodeAttributes AS $attrName => $attrValue)
+						foreach ($parser->iNodeAttributes AS $attrName => $attrValue)
 						{
 							// src url check
-							if($attrValue && strtolower($attrName) == 'src')
+							if ($attrValue && strtolower($attrName) == 'src')
 							{
 								$ext = strtolower(substr(strrchr($attrValue, "."), 1));
 								$isWhiteDomain = $this->isWhiteDomain($attrValue);
 							}
 
 							// mime type check
-							if(strtolower($attrName) == 'type' && $attrValue)
+							if (strtolower($attrName) == 'type' && $attrValue)
 							{
 								$isWhiteMimetype = $this->isWhiteMimetype($attrValue);
 							}
@@ -396,7 +396,7 @@ 
 					}
 				}
 
-				if(!$isWhiteDomain || !$isWhiteMimetype)
+				if (!$isWhiteDomain || !$isWhiteMimetype)
 				{
 					$content = str_replace($embedTag, htmlspecialchars($embedTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 				}
@@ -415,22 +415,22 @@ 
 
 		preg_match_all('/<\s*iframe\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$iframeTagList = $m[0];
-		if($iframeTagList)
+		if ($iframeTagList)
 		{
-			foreach($iframeTagList AS $key => $iframeTag)
+			foreach ($iframeTagList AS $key => $iframeTag)
 			{
 				$isWhiteDomain = TRUE;
 				$ext = '';
 
 				$parser = new HtmlParser($iframeTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if(is_array($parser->iNodeAttributes))
+					if (is_array($parser->iNodeAttributes))
 					{
-						foreach($parser->iNodeAttributes AS $attrName => $attrValue)
+						foreach ($parser->iNodeAttributes AS $attrName => $attrValue)
 						{
 							// src url check
-							if(strtolower($attrName) == 'src' && $attrValue)
+							if (strtolower($attrName) == 'src' && $attrValue)
 							{
 								$ext = strtolower(substr(strrchr($attrValue, "."), 1));
 								$isWhiteDomain = $this->isWhiteIframeDomain($attrValue);
@@ -439,7 +439,7 @@ 
 					}
 				}
 
-				if(!$isWhiteDomain)
+				if (!$isWhiteDomain)
 				{
 					$content = str_replace($iframeTag, htmlspecialchars($iframeTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 				}
@@ -455,26 +455,26 @@ 
 	{
 		preg_match_all('/<\s*param\s*[^>]+(?:\/?>?)/is', $content, $m);
 		$paramTagList = $m[0];
-		if($paramTagList)
+		if ($paramTagList)
 		{
-			foreach($paramTagList AS $key => $paramTag)
+			foreach ($paramTagList AS $key => $paramTag)
 			{
 				$isWhiteDomain = TRUE;
 				$isWhiteExt = TRUE;
 				$ext = '';
 
 				$parser = new HtmlParser($paramTag);
-				while($parser->parse())
+				while ($parser->parse())
 				{
-					if($parser->iNodeAttributes['name'] && $parser->iNodeAttributes['value'])
+					if ($parser->iNodeAttributes['name'] && $parser->iNodeAttributes['value'])
 					{
 						$name = strtolower($parser->iNodeAttributes['name']);
-						if($name == 'movie' || $name == 'src' || $name == 'href' || $name == 'url' || $name == 'source')
+						if ($name == 'movie' || $name == 'src' || $name == 'href' || $name == 'url' || $name == 'source')
 						{
 							$ext = strtolower(substr(strrchr($parser->iNodeAttributes['value'], "."), 1));
 							$isWhiteDomain = $this->isWhiteDomain($parser->iNodeAttributes['value']);
 
-							if(!$isWhiteDomain)
+							if (!$isWhiteDomain)
 							{
 								$content = str_replace($paramTag, htmlspecialchars($paramTag, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), $content);
 							}
@@ -491,11 +491,11 @@ 
 	 */
 	function isWhiteDomain($urlAttribute)
 	{
-		if(is_array($this->whiteUrlList))
+		if (is_array($this->whiteUrlList))
 		{
-			foreach($this->whiteUrlList AS $key => $value)
+			foreach ($this->whiteUrlList AS $key => $value)
 			{
-				if(preg_match('@^' . preg_quote($value) . '@i', $urlAttribute))
+				if (preg_match('@^'.preg_quote($value).'@i', $urlAttribute))
 				{
 					return TRUE;
 				}
@@ -510,11 +510,11 @@ 
 	 */
 	function isWhiteIframeDomain($urlAttribute)
 	{
-		if(is_array($this->whiteIframeUrlList))
+		if (is_array($this->whiteIframeUrlList))
 		{
-			foreach($this->whiteIframeUrlList AS $key => $value)
+			foreach ($this->whiteIframeUrlList AS $key => $value)
 			{
-				if(preg_match('@^' . preg_quote($value) . '@i', $urlAttribute))
+				if (preg_match('@^'.preg_quote($value).'@i', $urlAttribute))
 				{
 					return TRUE;
 				}
@@ -529,7 +529,7 @@ 
 	 */
 	function isWhiteMimetype($mimeType)
 	{
-		if(isset($this->mimeTypeList[$mimeType]))
+		if (isset($this->mimeTypeList[$mimeType]))
 		{
 			return TRUE;
 		}
@@ -538,7 +538,7 @@ 
 
 	function isWhiteExt($ext)
 	{
-		if(isset($this->extList[$ext]))
+		if (isset($this->extList[$ext]))
 		{
 			return TRUE;
 		}
@@ -547,26 +547,26 @@ 
 
 	function _checkAllowScriptAccess($m)
 	{
-		if($m[1] == 'object')
+		if ($m[1] == 'object')
 		{
 			$this->allowscriptaccessList[] = 1;
 		}
 
-		if($m[1] == 'param')
+		if ($m[1] == 'param')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = '<param name="allowscriptaccess" value="never"';
-				if(substr($m[0], -1) == '/')
+				if (substr($m[0], -1) == '/')
 				{
 					$m[0] .= '/';
 				}
 				$this->allowscriptaccessList[count($this->allowscriptaccessList) - 1]--;
 			}
 		}
-		else if($m[1] == 'embed')
+		else if ($m[1] == 'embed')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
 			}
@@ -580,9 +580,9 @@ 
 
 	function _addAllowScriptAccess($m)
 	{
-		if($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
+		if ($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
 		{
-			$m[0] = $m[0] . '<param name="allowscriptaccess" value="never"></param>';
+			$m[0] = $m[0].'<param name="allowscriptaccess" value="never"></param>';
 		}
 		$this->allowscriptaccessKey++;
 		return $m[0];
@@ -599,31 +599,31 @@ 
 		$whiteUrlCacheFile = FileHandler::getRealPath($this->whiteUrlCacheFile);
 
 		$isMake = FALSE;
-		if(!file_exists($whiteUrlCacheFile))
+		if (!file_exists($whiteUrlCacheFile))
 		{
 			$isMake = TRUE;
 		}
-		if(file_exists($whiteUrlCacheFile) && filemtime($whiteUrlCacheFile) < filemtime($whiteUrlXmlFile))
+		if (file_exists($whiteUrlCacheFile) && filemtime($whiteUrlCacheFile) < filemtime($whiteUrlXmlFile))
 		{
 			$isMake = TRUE;
 		}
 
-		if(gettype($whitelist) == 'array' && gettype($whitelist['object']) == 'array' && gettype($whitelist['iframe']) == 'array')
+		if (gettype($whitelist) == 'array' && gettype($whitelist['object']) == 'array' && gettype($whitelist['iframe']) == 'array')
 		{
 			$isMake = FALSE;
 		}
 
-		if(isset($whitelist) && gettype($whitelist) == 'object')
+		if (isset($whitelist) && gettype($whitelist) == 'object')
 		{
 			$isMake = TRUE;
 		}
 
-		if($isMake)
+		if ($isMake)
 		{
 			$whiteUrlList = array();
 			$whiteIframeUrlList = array();
 
-			if(gettype($whitelist->object) == 'array' && gettype($whitelist->iframe) == 'array')
+			if (gettype($whitelist->object) == 'array' && gettype($whitelist->iframe) == 'array')
 			{
 				$whiteUrlList = $whitelist->object;
 				$whiteIframeUrlList = $whitelist->iframe;
@@ -636,15 +636,15 @@ 
 				$domainListObj = $xmlParser->parse($xmlBuff);
 				$embedDomainList = $domainListObj->whiteurl->embed->domain;
 				$iframeDomainList = $domainListObj->whiteurl->iframe->domain;
-				if(!is_array($embedDomainList)) $embedDomainList = array();
-				if(!is_array($iframeDomainList)) $iframeDomainList = array();
+				if (!is_array($embedDomainList)) $embedDomainList = array();
+				if (!is_array($iframeDomainList)) $iframeDomainList = array();
 
-				foreach($embedDomainList AS $key => $value)
+				foreach ($embedDomainList AS $key => $value)
 				{
 					$patternList = $value->pattern;
-					if(is_array($patternList))
+					if (is_array($patternList))
 					{
-						foreach($patternList AS $key => $value)
+						foreach ($patternList AS $key => $value)
 						{
 							$whiteUrlList[] = $value->body;
 						}
@@ -655,12 +655,12 @@ 
 					}
 				}
 
-				foreach($iframeDomainList AS $key => $value)
+				foreach ($iframeDomainList AS $key => $value)
 				{
 					$patternList = $value->pattern;
-					if(is_array($patternList))
+					if (is_array($patternList))
 					{
-						foreach($patternList AS $key => $value)
+						foreach ($patternList AS $key => $value)
 						{
 							$whiteIframeUrlList[] = $value->body;
 						}
@@ -674,12 +674,12 @@ 
 
 			$db_info = Context::getDBInfo();
 
-			if($db_info->embed_white_object)
+			if ($db_info->embed_white_object)
 			{
 				$whiteUrlList = array_merge($whiteUrlList, $db_info->embed_white_object);
 			}
 
-			if($db_info->embed_white_iframe)
+			if ($db_info->embed_white_iframe)
 			{
 				$whiteIframeUrlList = array_merge($whiteIframeUrlList, $db_info->embed_white_iframe);
 			}
@@ -691,8 +691,8 @@ 
 
 			$buff = array();
 			$buff[] = '<?php if(!defined("__XE__")) exit();';
-			$buff[] = '$whiteUrlList = ' . var_export($whiteUrlList, TRUE) . ';';
-			$buff[] = '$whiteIframeUrlList = ' . var_export($whiteIframeUrlList, TRUE) . ';';
+			$buff[] = '$whiteUrlList = '.var_export($whiteUrlList, TRUE).';';
+			$buff[] = '$whiteIframeUrlList = '.var_export($whiteIframeUrlList, TRUE).';';
 
 			FileHandler::writeFile($this->whiteUrlCacheFile, implode(PHP_EOL, $buff));
 		}