xpressengine / xe-core

classes/db/DBMysqli_innodb.class.php

Braces +15 added lines, -20 removed lines

@@ -23,7 +23,9 @@ 
 	function DBMysqli_innodb($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -51,8 +53,7 @@ 
 							, $connection["db_password"]
 							, $connection["db_database"]
 							, $connection["db_port"]);
-		}
-		else
+		} else
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -92,8 +93,7 @@ 
 		if(!$transactionLevel)
 		{
 			$this->_query("begin");
-		}
-		else
+		} else
 		{
 			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 		}
@@ -114,8 +114,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			mysqli_rollback($connection);
 			$this->setQueryLog( array("query"=>"rollback") );
@@ -267,8 +266,7 @@ 
 					$params[] = $v;
 					$types .= $type;
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $value;
 				$types .= $type;
@@ -307,10 +305,12 @@ 
 		$longtext_exists = false;
 		foreach($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if(isset($resultArray[$field->name])) {
+				// When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
 				$field->name = 'repeat_' . $field->name;
 			}
+			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
@@ -359,8 +359,7 @@ 
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
-		}
-		else
+		} else
 		{
 			$output = $rows;
 		}
@@ -370,8 +369,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -512,8 +510,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -535,12 +532,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;
 			}

Spacing +62 added lines, -62 removed lines

@@ -23,7 +23,7 @@ 
 	function DBMysqli_innodb($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	function __connect($connection)
 	{
 		// Attempt to connect
-		if($connection["db_port"])
+		if ($connection["db_port"])
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -60,7 +60,7 @@ 
 							, $connection["db_database"]);
 		}
 		$error = mysqli_connect_errno();
-		if($error)
+		if ($error)
 		{
 			$this->setError($error, mysqli_connect_error());
 			return;
@@ -89,13 +89,13 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
 			$this->_query("begin");
 		}
 		else
 		{
-			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
+			$this->_query("SAVEPOINT SP".$transactionLevel, $connection);
 		}
 		return true;
 	}
@@ -111,14 +111,14 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
+			$this->_query("ROLLBACK TO SP".$point, $connection);
 		}
 		else
 		{
 			mysqli_rollback($connection);
-			$this->setQueryLog( array("query"=>"rollback") );
+			$this->setQueryLog(array("query"=>"rollback"));
 		}
 		return true;
 	}
@@ -132,7 +132,7 @@ 
 	{
 		$connection = $this->_getConnection('master');
 		mysqli_commit($connection);
-		$this->setQueryLog( array("query"=>"commit") );
+		$this->setQueryLog(array("query"=>"commit"));
 		return true;
 	}
 
@@ -145,11 +145,11 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			$connection = $this->_getConnection('master');
 			$string = mysqli_escape_string($connection, $string);
@@ -166,23 +166,23 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			// 1. Prepare query
 			$stmt = mysqli_prepare($connection, $query);
-			if($stmt)
+			if ($stmt)
 			{
 				$types = '';
 				$params = array();
 				$this->_prepareQueryParameters($types, $params);
 
-				if(!empty($params))
+				if (!empty($params))
 				{
 					$args[0] = $stmt;
 					$args[1] = $types;
 
 					$i = 2;
-					foreach($params as $key => $param)
+					foreach ($params as $key => $param)
 					{
 						$copy[$key] = $param;
 						$args[$i++] = &$copy[$key];
@@ -190,18 +190,18 @@ 
 
 					// 2. Bind parameters
 					$status = call_user_func_array('mysqli_stmt_bind_param', $args);
-					if(!$status)
+					if (!$status)
 					{
-						$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection));
+						$this->setError(-1, "Invalid arguments: $query".mysqli_error($connection));
 					}
 				}
 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection));
+					$this->setError(-1, "Prepared statement failed: $query".mysqli_error($connection));
 				}
 
 				// Return stmt for other processing - like retrieving resultset (_fetch)
@@ -213,7 +213,7 @@ 
 		$result = mysqli_query($connection, $query);
 		// Error Check
 		$error = mysqli_error($connection);
-		if($error)
+		if ($error)
 		{
 			$this->setError(mysqli_errno($connection), $error);
 		}
@@ -232,23 +232,23 @@ 
 	{
 		$types = '';
 		$params = array();
-		if(!$this->param)
+		if (!$this->param)
 		{
 			return;
 		}
 
-		foreach($this->param as $k => $o)
+		foreach ($this->param as $k => $o)
 		{
 			$value = $o->getUnescapedValue();
 			$type = $o->getType();
 
 			// Skip column names -> this should be concatenated to query string
-			if($o->isColumnName())
+			if ($o->isColumnName())
 			{
 				continue;
 			}
 
-			switch($type)
+			switch ($type)
 			{
 				case 'number' :
 					$type = 'i';
@@ -260,9 +260,9 @@ 
 					$type = 's';
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
 					$params[] = $v;
 					$types .= $type;
@@ -284,12 +284,12 @@ 
 	 */
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_fetch($result, $arrayIndexEndValue);
 		}
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -305,25 +305,25 @@ 
 		 * MYSQLI_TYPE for longtext is 252
 		 */
 		$longtext_exists = false;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if (isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
-				$field->name = 'repeat_' . $field->name;
+				$field->name = 'repeat_'.$field->name;
 			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
 			$resultArray[$field->name] = &$row[$field->name];
 
-			if($field->type == 252)
+			if ($field->type == 252)
 			{
 				$longtext_exists = true;
 			}
 		}
 		$resultArray = array_merge(array($stmt), $resultArray);
 
-		if($longtext_exists)
+		if ($longtext_exists)
 		{
 			mysqli_stmt_store_result($stmt);
 		}
@@ -331,17 +331,17 @@ 
 		call_user_func_array('mysqli_stmt_bind_result', $resultArray);
 
 		$rows = array();
-		while(mysqli_stmt_fetch($stmt))
+		while (mysqli_stmt_fetch($stmt))
 		{
 			$resultObject = new stdClass();
 
-			foreach($resultArray as $key => $value)
+			foreach ($resultArray as $key => $value)
 			{
-				if($key === 0)
+				if ($key === 0)
 				{
 					continue; // Skip stmt object
 				}
-				if(strpos($key, 'repeat_'))
+				if (strpos($key, 'repeat_'))
 				{
 					$key = substr($key, 6);
 				}
@@ -353,9 +353,9 @@ 
 
 		mysqli_stmt_close($stmt);
 
-		if($arrayIndexEndValue)
+		if ($arrayIndexEndValue)
 		{
-			foreach($rows as $row)
+			foreach ($rows as $row)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -365,9 +365,9 @@ 
 			$output = $rows;
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -388,7 +388,7 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeInsertAct($queryObject);
 		}
@@ -406,7 +406,7 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeUpdateAct($queryObject);
 		}
@@ -424,7 +424,7 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeDeleteAct($queryObject);
 		}
@@ -445,7 +445,7 @@ 
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeSelectAct($queryObject, $connection);
 		}
@@ -503,13 +503,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;
 		}
@@ -518,7 +518,7 @@ 
 			$columns = $xml_obj->table->column;
 		}
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -530,47 +530,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;
 		}

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)
 	{

classes/frontendfile/FrontEndFileHandler.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -394,7 +394,7 @@
 	 * Arrage css index
 	 *
 	 * @param string $dirName First directory  name of css path
-	 * @param array $file file info.
+	 * @param stdClass $file file info.
 	 * @return void
 	 */
 	function _arrangeCssIndex($dirName, &$file)

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * Check SSL
 	 *
 	 * @return bool If using ssl returns true, otherwise returns false.
-     * @deprecated
+	 * @deprecated
 	 */
 	function isSsl()
 	{

Braces +15 added lines, -20 removed lines

@@ -108,15 +108,13 @@ 
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
-		}
-		else if($file->fileExtension == 'js')
+		} else if($file->fileExtension == 'js')
 		{
 			if($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
-			}
-			else
+			} else
 			{
 				$map = &$this->jsHeadMap;
 				$mapIndex = &$this->jsHeadMapIndex;
@@ -174,8 +172,7 @@ 
 				{
 					$file->fileName = $minifiedFileName;
 				}
-			}
-			else
+			} else
 			{
 				// Remove .min
 				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
@@ -195,8 +192,7 @@ 
 				$file->media = 'all';
 			}
 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
-		}
-		else if($file->fileExtension == 'js')
+		} else if($file->fileExtension == 'js')
 		{
 			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
 		}
@@ -223,8 +219,7 @@ 
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
 			}
-		}
-		else
+		} else
 		{
 			if(isset($this->jsHeadMapIndex[$file->key]))
 			{
@@ -286,7 +281,9 @@ 
 				}
 				if($file->query)
 				{
-					if($query) $query .= '&';
+					if($query) {
+						$query .= '&';
+					}
 					$query .= $file->query;
 				}
 				$query = ($query) ? '?' . $query : '';
@@ -315,8 +312,7 @@ 
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
-		}
-		else
+		} else
 		{
 			$map = &$this->jsBodyMap;
 			$mapIndex = &$this->jsBodyMapIndex;
@@ -336,7 +332,9 @@ 
 				}
 				if($file->query)
 				{
-					if($query) $query .= '&';
+					if($query) {
+						$query .= '&';
+					}
 					$query .= $file->query;
 				}
 				$query = ($query) ? '?' . $query : '';
@@ -375,8 +373,7 @@ 
 		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
 			$path = './' . $path;
-		}
-		elseif(!strncmp($path, '//', 2))
+		} elseif(!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
@@ -407,13 +404,11 @@ 
 			if($script_path == '/' || $script_path == '\\')
 			{
 				$path = '/' . substr($path, 2);
-			}
-			else
+			} else
 			{
 				$path = $script_path . substr($path, 2);
 			}
-		}
-		else if(strpos($file, '../') === 0)
+		} else if(strpos($file, '../') === 0)
 		{
 			$path = $this->_normalizeFilePath($script_path . $path);
 		}

Spacing +55 added lines, -55 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function isSsl()
 	{
-		if(!is_null(self::$isSSL))
+		if (!is_null(self::$isSSL))
 		{
 			return self::$isSSL;
 		}
@@ -88,30 +88,30 @@ 
 	 * */
 	function loadFile($args)
 	{
-		if(!is_array($args))
+		if (!is_array($args))
 		{
 			$args = array($args);
 		}
 		$file = $this->getFileInfo($args[0], $args[2], $args[1]);
 
 		$availableExtension = array('css' => 1, 'js' => 1);
-		if(!isset($availableExtension[$file->fileExtension]))
+		if (!isset($availableExtension[$file->fileExtension]))
 		{
 			return;
 		}
 
 		$file->index = (int) $args[3];
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$map = &$this->cssMap;
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			if($args[1] == 'body')
+			if ($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
@@ -124,7 +124,7 @@ 
 		}
 
 		(is_null($file->index)) ? $file->index = 0 : $file->index = $file->index;
-		if(!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
+		if (!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
 		{
 			$this->unloadFile($args[0], $args[2], $args[1]);
 			$map[$file->index][$file->key] = $file;
@@ -144,14 +144,14 @@ 
 	{
 		static $existsInfo = array();
 
-		if(isset($existsInfo[$existsKey]))
+		if (isset($existsInfo[$existsKey]))
 		{
 			return $existsInfo[$existsKey];
 		}
 
 		$fileName = preg_replace('/(?:[\/]{3,})(.*)/', '//$1', $fileName);
 		$url_info = parse_url($fileName);
-		$pathInfo = pathinfo(str_replace('?' . $url_info['query'], '', $fileName));
+		$pathInfo = pathinfo(str_replace('?'.$url_info['query'], '', $fileName));
 
 		$file = new stdClass();
 		$file->fileName = basename($url_info['path']);
@@ -164,14 +164,14 @@ 
 		$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));
 		$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);
 
-		if(!$file->external)
+		if (!$file->external)
 		{
-			if(!__DEBUG__ && __XE_VERSION_STABLE__)
+			if (!__DEBUG__ && __XE_VERSION_STABLE__)
 			{
 				// if no debug mode, load minifed file
 				$minifiedFileName = implode('.', array($file->fileNameNoExt, 'min', $file->fileExtension));
 				$minifiedRealPath = implode('/', array($file->fileRealPath, $minifiedFileName));
-				if(file_exists($minifiedRealPath))
+				if (file_exists($minifiedRealPath))
 				{
 					$file->fileName = $minifiedFileName;
 				}
@@ -179,7 +179,7 @@ 
 			else
 			{
 				// Remove .min
-				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
+				if (file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
 				{
 					$file->fileName = $file->keyName;
 				}
@@ -188,18 +188,18 @@ 
 
 		$file->targetIe = $targetIe;
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$file->media = $media;
-			if(!$file->media)
+			if (!$file->media)
 			{
 				$file->media = 'all';
 			}
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe."\t".$file->media;
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe;
 		}
 
 		return $file;
@@ -217,9 +217,9 @@ 
 	{
 		$file = $this->getFileInfo($fileName, $targetIe, $media);
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
-			if(isset($this->cssMapIndex[$file->key]))
+			if (isset($this->cssMapIndex[$file->key]))
 			{
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
@@ -227,12 +227,12 @@ 
 		}
 		else
 		{
-			if(isset($this->jsHeadMapIndex[$file->key]))
+			if (isset($this->jsHeadMapIndex[$file->key]))
 			{
 				$index = $this->jsHeadMapIndex[$file->key];
 				unset($this->jsHeadMap[$index][$file->key], $this->jsHeadMapIndex[$file->key]);
 			}
-			if(isset($this->jsBodyMapIndex[$file->key]))
+			if (isset($this->jsBodyMapIndex[$file->key]))
 			{
 				$index = $this->jsBodyMapIndex[$file->key];
 				unset($this->jsBodyMap[$index][$file->key], $this->jsBodyMapIndex[$file->key]);
@@ -248,13 +248,13 @@ 
 	 */
 	function unloadAllFiles($type = 'all')
 	{
-		if($type == 'css' || $type == 'all')
+		if ($type == 'css' || $type == 'all')
 		{
 			$this->cssMap = array();
 			$this->cssMapIndex = array();
 		}
 
-		if($type == 'js' || $type == 'all')
+		if ($type == 'js' || $type == 'all')
 		{
 			$this->jsHeadMap = array();
 			$this->jsBodyMap = array();
@@ -276,23 +276,23 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'media' => $file->media,
@@ -313,9 +313,9 @@ 
 	function getJsFileList($type = 'head')
 	{
 		$ignore = array('modernizr.js', 'common.js', 'js_app.js', 'xml2json.js', 'xml_handler.js', 'xml_js_filter.js');
-		$pathCommonJs = getScriptPath() . 'common/js';
+		$pathCommonJs = getScriptPath().'common/js';
 
-		if($type == 'head')
+		if ($type == 'head')
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
@@ -329,31 +329,31 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
-				if((!__DEBUG__ && __XE_VERSION_STABLE__) && $file->filePath === $pathCommonJs)
+				if ((!__DEBUG__ && __XE_VERSION_STABLE__) && $file->filePath === $pathCommonJs)
 				{
-					if(in_array($file->fileName, $ignore))
+					if (in_array($file->fileName, $ignore))
 					{
 						continue;
 					}
 				}
 
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'targetie' => $file->targetIe
@@ -384,18 +384,18 @@ 
 	 */
 	function _normalizeFilePath($path)
 	{
-		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
+		if (strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
-			$path = './' . $path;
+			$path = './'.$path;
 		}
-		elseif(!strncmp($path, '//', 2))
+		elseif (!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
 
 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);
 
-		while(strpos($path, '/../'))
+		while (strpos($path, '/../'))
 		{
 			$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);
 		}
@@ -414,20 +414,20 @@ 
 		$path = $this->_normalizeFilePath($path);
 		$script_path = getScriptPath();
 
-		if(strpos($path, './') === 0)
+		if (strpos($path, './') === 0)
 		{
-			if($script_path == '/' || $script_path == '\\')
+			if ($script_path == '/' || $script_path == '\\')
 			{
-				$path = '/' . substr($path, 2);
+				$path = '/'.substr($path, 2);
 			}
 			else
 			{
-				$path = $script_path . substr($path, 2);
+				$path = $script_path.substr($path, 2);
 			}
 		}
-		else if(strpos($file, '../') === 0)
+		else if (strpos($file, '../') === 0)
 		{
-			$path = $this->_normalizeFilePath($script_path . $path);
+			$path = $this->_normalizeFilePath($script_path.$path);
 		}
 
 		return $path;
@@ -442,7 +442,7 @@ 
 	 */
 	function _arrangeCssIndex($dirName, &$file)
 	{
-		if($file->index !== 0)
+		if ($file->index !== 0)
 		{
 			return;
 		}

modules/counter/counter.admin.view.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// set the template path
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 	}
 
 	/**
@@ -28,9 +28,9 @@ 
 	function dispCounterAdminIndex()
 	{
 		// set today's if no date is given
-		$selected_date = (int)Context::get('selected_date');
+		$selected_date = (int) Context::get('selected_date');
 
-		if(!$selected_date)
+		if (!$selected_date)
 		{
 			$selected_date = date("Ymd");
 		}
@@ -50,7 +50,7 @@ 
 		// get data by time, day, month, and year
 		$type = Context::get('type');
 
-		if(!$type)
+		if (!$type)
 		{
 			$type = 'day';
 			Context::set('type', $type);

modules/comment/comment.admin.view.php

Spacing +9 added lines, -9 removed lines

@@ -52,7 +52,7 @@ 
 		// get a list by using comment->getCommentList. 
 		$oCommentModel = getModel('comment');
 		$secretNameList = $oCommentModel->getSecretNameList();
-		$columnList = array('comment_srl', 'document_srl','module_srl','is_secret', 'status', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress', 'voted_count', 'blamed_count');
+		$columnList = array('comment_srl', 'document_srl', 'module_srl', 'is_secret', 'status', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress', 'voted_count', 'blamed_count');
 		$output = $oCommentModel->getTotalCommentList($args, $columnList);
 
 		// $modules = $oCommentModel->getDistinctModules();
@@ -70,20 +70,20 @@ 
 		$oModuleModel = getModel('module');
 		$module_list = array();
 		$mod_srls = array();
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
 			$mod_srls[] = $val->module_srl;
 		}
 		$mod_srls = array_unique($mod_srls);
 		// Module List
 		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
+		if ($mod_srls_count)
 		{
 			$columnList = array('module_srl', 'mid', 'browser_title');
 			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
+			if ($module_output && is_array($module_output))
 			{
-				foreach($module_output as $module)
+				foreach ($module_output as $module)
 				{
 					$module_list[$module->module_srl] = $module;
 				}
@@ -95,7 +95,7 @@ 
 		$security->encodeHTML('search_target', 'search_keyword');
 
 		// set the template 
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('comment_list');
 	}
 
@@ -117,11 +117,11 @@ 
 		$declared_output = executeQuery('comment.getDeclaredList', $args);
 		$oCommentModel = getModel('comment');
 
-		if($declared_output->data && count($declared_output->data))
+		if ($declared_output->data && count($declared_output->data))
 		{
 			$comment_list = array();
 
-			foreach($declared_output->data as $key => $comment)
+			foreach ($declared_output->data as $key => $comment)
 			{
 				$comment_list[$key] = new commentItem();
 				$comment_list[$key]->setAttribute($comment);
@@ -139,7 +139,7 @@ 
 		Context::set('page_navigation', $declared_output->page_navigation);
 		Context::set('secret_name_list', $secretNameList);
 		// set the template
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('declared_list');
 	}
 

libs/PEAR.1.9/HTTP/Request.php

Spacing +4 added lines, -4 removed lines

@@ -18,28 +18,28 @@
 	}
 
 	public function getResponseCode() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getStatus();
 		}
 	}
 
 	public function getResponseHeader() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getHeader();	
 		}
 	}
 
 	public function getResponseBody() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getBody();
 		}
 	}
 
 	public function getResponseCookies() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getCookies();
 		}

modules/session/session.model.php

Spacing +17 added lines, -17 removed lines

@@ -21,14 +21,14 @@ 
 
 	function read($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if (!$session_key || !$this->session_started) return;
 
 		$args = new stdClass();
 		$args->session_key = $session_key;
 		$columnList = array('session_key', 'cur_mid', 'val');
 		$output = executeQuery('session.getSession', $args, $columnList);
 
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return '';
 		}
@@ -46,47 +46,47 @@ 
 	 */
 	function getLoggedMembers($args)
 	{
-		if(!$args->site_srl)
+		if (!$args->site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$args->site_srl = (int)$site_module_info->site_srl;
+			$args->site_srl = (int) $site_module_info->site_srl;
 		}
-		if(!$args->list_count) $args->list_count = 20;
-		if(!$args->page) $args->page = 1;
-		if(!$args->period_time) $args->period_time = 3;
-		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME'] - $args->period_time*60);
+		if (!$args->list_count) $args->list_count = 20;
+		if (!$args->page) $args->page = 1;
+		if (!$args->period_time) $args->period_time = 3;
+		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME'] - $args->period_time * 60);
 
 		$output = executeQueryArray('session.getLoggedMembers', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$member_srls = array();
 		$member_keys = array();
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$member_srls[$key] = $val->member_srl;
 				$member_keys[$val->member_srl] = $key;
 			}
 		}
 
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
-			if(!in_array($logged_info->member_srl, $member_srls))
+			if (!in_array($logged_info->member_srl, $member_srls))
 			{
 				$member_srls[0] = $logged_info->member_srl;
 				$member_keys[$logged_info->member_srl] = 0;
 			}
 		}
 
-		if(!count($member_srls)) return $output;
+		if (!count($member_srls)) return $output;
 
-		$member_args->member_srl = implode(',',$member_srls);
+		$member_args->member_srl = implode(',', $member_srls);
 		$member_output = executeQueryArray('member.getMembers', $member_args);
-		if($member_output->data)
+		if ($member_output->data)
 		{
-			foreach($member_output->data as $key => $val)
+			foreach ($member_output->data as $key => $val)
 			{
 				$output->data[$member_keys[$val->member_srl]] = $val;
 			}

Braces +18 added lines, -6 removed lines

@@ -21,7 +21,9 @@ 
 
 	function read($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if(!$session_key || !$this->session_started) {
+			return;
+		}
 
 		$args = new stdClass();
 		$args->session_key = $session_key;
@@ -51,13 +53,21 @@ 
 			$site_module_info = Context::get('site_module_info');
 			$args->site_srl = (int)$site_module_info->site_srl;
 		}
-		if(!$args->list_count) $args->list_count = 20;
-		if(!$args->page) $args->page = 1;
-		if(!$args->period_time) $args->period_time = 3;
+		if(!$args->list_count) {
+			$args->list_count = 20;
+		}
+		if(!$args->page) {
+			$args->page = 1;
+		}
+		if(!$args->period_time) {
+			$args->period_time = 3;
+		}
 		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME'] - $args->period_time*60);
 
 		$output = executeQueryArray('session.getLoggedMembers', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$member_srls = array();
 		$member_keys = array();
@@ -80,7 +90,9 @@ 
 			}
 		}
 
-		if(!count($member_srls)) return $output;
+		if(!count($member_srls)) {
+			return $output;
+		}
 
 		$member_args->member_srl = implode(',',$member_srls);
 		$member_output = executeQueryArray('member.getMembers', $member_args);

modules/point/point.model.php

Spacing +36 added lines, -36 removed lines

@@ -24,28 +24,28 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if($this->pointList[$member_srl]) return true;
+		if ($this->pointList[$member_srl]) return true;
 
 		// Get from file cache
-		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
+		$path = sprintf(_XE_PATH_.'files/member_extra_info/point/%s', getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
-		if(file_exists($cache_filename))
+		if (file_exists($cache_filename))
 		{
-			if(!$this->pointList[$member_srl])
+			if (!$this->pointList[$member_srl])
 				$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
 			return true;
 		}
 
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$output = executeQuery('point.getPoint', $args);
-		if($output->data->member_srl == $member_srl)
+		if ($output->data->member_srl == $member_srl)
 		{
-			if(!$this->pointList[$member_srl])
+			if (!$this->pointList[$member_srl])
 			{
-				$this->pointList[$member_srl] = (int)$output->data->point;
+				$this->pointList[$member_srl] = (int) $output->data->point;
 				FileHandler::makeDir($path);
-				FileHandler::writeFile($cache_filename, (int)$output->data->point);
+				FileHandler::writeFile($cache_filename, (int) $output->data->point);
 			}
 			return true;
 		}
@@ -60,25 +60,25 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
+		if (!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
 
 		// Get from file cache
-		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
+		$path = sprintf(_XE_PATH_.'files/member_extra_info/point/%s', getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 
-		if(!$from_db && file_exists($cache_filename))
+		if (!$from_db && file_exists($cache_filename))
 			return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
 
 		// Get from the DB
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$output = executeQuery('point.getPoint', $args);
 
-		if(isset($output->data->member_srl))
+		if (isset($output->data->member_srl))
 		{
-			$point = (int)$output->data->point;
+			$point = (int) $output->data->point;
 			$this->pointList[$member_srl] = $point;
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if (!is_dir($path)) FileHandler::makeDir($path);
 			FileHandler::writeFile($cache_filename, $point);
 			return $point;
 		}
@@ -91,8 +91,8 @@ 
 	function getLevel($point, $level_step)
 	{
 		$level_count = count($level_step);
-		for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
-		$level --;
+		for ($level = 0; $level <= $level_count; $level++) if ($point < $level_step[$level]) break;
+		$level--;
 		return $level;
 	}
 
@@ -103,20 +103,20 @@ 
 	{
 		$member_srls = Context::get('member_srls');
 		$member_srls = array_unique(explode(',', $member_srls));
-		if(!count($member_srls))
+		if (!count($member_srls))
 		{
 			return;
 		}
 
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
 			return;
 		}
 
-		if(!getModel('module')->isSiteAdmin($logged_info))
+		if (!getModel('module')->isSiteAdmin($logged_info))
 		{
-			if(in_array($logged_info->member_srl, $member_srls))
+			if (in_array($logged_info->member_srl, $member_srls))
 			{
 				$member_srls = array($logged_info->member_srl);
 			}
@@ -130,7 +130,7 @@ 
 		$config = $oModuleModel->getModuleConfig('point');
 
 		$info = array();
-		foreach($member_srls as $v)
+		foreach ($member_srls as $v)
 		{
 			$obj = new stdClass;
 			$obj->point = $this->getPoint($v);
@@ -139,7 +139,7 @@ 
 			$info[] = $obj;
 		}
 
-		$this->add('point_info',$info);
+		$this->add('point_info', $info);
 	}
 
 
@@ -149,37 +149,37 @@ 
 	function getMemberList($args = null, $columnList = array())
 	{
 		// Arrange the search options
-		$args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
-		$args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+		$args->is_admin = Context::get('is_admin') == 'Y' ? 'Y' : '';
+		$args->is_denied = Context::get('is_denied') == 'Y' ? 'Y' : '';
 		$args->selected_group_srl = Context::get('selected_group_srl');
 
 		$search_target = trim(Context::get('search_target'));
 		$search_keyword = trim(Context::get('search_keyword'));
 
 		// if search keyword is emtpy, show all list
-		if(!$search_keyword)
+		if (!$search_keyword)
 		{
 			unset($args->is_admin, $args->is_denied, $args->selected_group_srl, $search_target);
 		}
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_nick_name = $search_keyword;
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -194,7 +194,7 @@ 
 			}
 		}
 		// If there is a selected_group_srl, change the "query id" (for table join)
-		if($args->selected_group_srl)
+		if ($args->selected_group_srl)
 		{
 			$query_id = 'point.getMemberListWithinGroup';
 		}
@@ -205,12 +205,12 @@ 
 
 		$output = executeQuery($query_id, $args, $columnList);
 
-		if($output->total_count)
+		if ($output->total_count)
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
 
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$output->data[$key]->level = $this->getLevel($val->point, $config->level_step);
 			}

Braces +32 added lines, -16 removed lines

@@ -24,15 +24,18 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if($this->pointList[$member_srl]) return true;
+		if($this->pointList[$member_srl]) {
+			return true;
+		}
 
 		// Get from file cache
 		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 		if(file_exists($cache_filename))
 		{
-			if(!$this->pointList[$member_srl])
-				$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+			if(!$this->pointList[$member_srl]) {
+							$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+			}
 			return true;
 		}
 
@@ -60,14 +63,17 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
+		if(!$from_db && $this->pointList[$member_srl]) {
+			return $this->pointList[$member_srl];
+		}
 
 		// Get from file cache
 		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 
-		if(!$from_db && file_exists($cache_filename))
-			return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+		if(!$from_db && file_exists($cache_filename)) {
+					return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+		}
 
 		// Get from the DB
 		$args =new stdClass();
@@ -78,7 +84,9 @@ 
 		{
 			$point = (int)$output->data->point;
 			$this->pointList[$member_srl] = $point;
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if(!is_dir($path)) {
+				FileHandler::makeDir($path);
+			}
 			FileHandler::writeFile($cache_filename, $point);
 			return $point;
 		}
@@ -91,7 +99,9 @@ 
 	function getLevel($point, $level_step)
 	{
 		$level_count = count($level_step);
-		for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
+		for($level=0;$level<=$level_count;$level++) {
+			if($point < $level_step[$level]) break;
+		}
 		$level --;
 		return $level;
 	}
@@ -119,8 +129,7 @@ 
 			if(in_array($logged_info->member_srl, $member_srls))
 			{
 				$member_srls = array($logged_info->member_srl);
-			}
-			else
+			} else
 			{
 				return;
 			}
@@ -167,19 +176,27 @@ 
 			switch($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_nick_name = $search_keyword;
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -197,8 +214,7 @@ 
 		if($args->selected_group_srl)
 		{
 			$query_id = 'point.getMemberListWithinGroup';
-		}
-		else
+		} else
 		{
 			$query_id = 'point.getMemberList';
 		}

classes/display/XMLDisplayHandler.php

Spacing +5 added lines, -5 removed lines

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

Braces +2 added lines, -4 removed lines

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

classes/display/VirtualXMLDisplayHandler.php

Spacing +8 added lines, -8 removed lines

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

Braces +7 added lines, -4 removed lines

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