xpressengine / xe-core

classes/cache/CacheWincache.class.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 	 */
 	function getInstance($opt = null)
 	{
-		if(!$GLOBALS['__CacheWincache__'])
+		if (!$GLOBALS['__CacheWincache__'])
 		{
 			$GLOBALS['__CacheWincache__'] = new CacheWincache();
 		}
@@ -59,7 +59,7 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
@@ -78,13 +78,13 @@ 
 	{
 		$_key = md5(_XE_PATH_ . $key);
 		$obj = wincache_ucache_get($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 		unset($obj[1]);
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;
@@ -105,12 +105,12 @@ 
 	{
 		$_key = md5(_XE_PATH_ . $key);
 		$obj = wincache_ucache_get($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;

classes/db/DB.class.php

Braces +13 added lines, -21 removed lines

@@ -327,8 +327,7 @@ 
 		if(!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
-		}
-		else
+		} else
 		{
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
@@ -336,8 +335,7 @@ 
 		if(!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
-		}
-		else
+		} else
 		{
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
@@ -371,8 +369,7 @@ 
 		if($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
-		}
-		else
+		} else
 		{
 			return $this->slave_db[$indx]["is_connected"] ? TRUE : FALSE;
 		}
@@ -450,8 +447,7 @@ 
 				$buff[] = print_r($log, TRUE);
 				@file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
 			}
-		}
-		else
+		} else
 		{
 			$log['result'] = 'Success';
 		}
@@ -540,8 +536,7 @@ 
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
-			}
-			elseif(count($id_args) == 3)
+			} elseif(count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
@@ -615,7 +610,9 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if(!in_array($type, array('master','slave'))) {
+			$type = 'slave';
+		}
 
 		if(!file_exists($cache_file))
 		{
@@ -661,8 +658,7 @@ 
 		if($this->isError())
 		{
 			$output = $this->getError();
-		}
-		else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
+		} else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
 		{
 			$output = new Object();
 		}
@@ -1077,8 +1073,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}
@@ -1173,8 +1168,7 @@ 
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
-		}
-		else
+		} else
 		{
 			$this->transactionNestedLevel--;
 		}
@@ -1234,8 +1228,7 @@ 
 		)
 		{
 			$this->slave_db[0] = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$this->slave_db = $db_info->slave_db;
 		}
@@ -1288,8 +1281,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}

Indentation +1 added lines, -1 removed lines

@@ -1284,7 +1284,7 @@
 	/**
 	 * Delete cached group data
 	 * @return void
-	*/
+	 */
 	function _deleteMemberGroupCache($site_srl = 0)
 	{
 		//remove from cache

Spacing +87 added lines, -87 removed lines

@@ -141,24 +141,24 @@ 
 	 */
 	function &getInstance($db_type = NULL)
 	{
-		if(!$db_type)
+		if (!$db_type)
 		{
 			$db_type = Context::getDBType();
 		}
-		if(!$db_type && Context::isInstalled())
+		if (!$db_type && Context::isInstalled())
 		{
 			return new Object(-1, 'msg_db_not_setted');
 		}
 
-		if(!isset($GLOBALS['__DB__']))
+		if (!isset($GLOBALS['__DB__']))
 		{
 			$GLOBALS['__DB__'] = array();
 		}
-		if(!isset($GLOBALS['__DB__'][$db_type]))
+		if (!isset($GLOBALS['__DB__'][$db_type]))
 		{
 			$class_name = 'DB' . ucfirst($db_type);
 			$class_file = _XE_PATH_ . "classes/db/$class_name.class.php";
-			if(!file_exists($class_file))
+			if (!file_exists($class_file))
 			{
 				return new Object(-1, 'msg_db_not_setted');
 			}
@@ -212,18 +212,18 @@ 
 	{
 		is_a($this, 'DB') ? $self = $this : $self = self::getInstance();
 		
-		if(!$self->supported_list)
+		if (!$self->supported_list)
 		{
 			$oDB = new DB();
 			$self->supported_list = $oDB->_getSupportedList();
 		}
 
 		$enableList = array();
-		if(is_array($self->supported_list))
+		if (is_array($self->supported_list))
 		{
-			foreach($self->supported_list AS $key => $value)
+			foreach ($self->supported_list AS $key => $value)
 			{
-				if($value->enable)
+				if ($value->enable)
 				{
 					$enableList[] = $value;
 				}
@@ -241,18 +241,18 @@ 
 	{
 		is_a($this, 'DB') ? $self = $this : $self = self::getInstance();
 		
-		if(!$self->supported_list)
+		if (!$self->supported_list)
 		{
 			$oDB = new DB();
 			$self->supported_list = $oDB->_getSupportedList();
 		}
 
 		$disableList = array();
-		if(is_array($self->supported_list))
+		if (is_array($self->supported_list))
 		{
-			foreach($self->supported_list AS $key => $value)
+			foreach ($self->supported_list AS $key => $value)
 			{
-				if(!$value->enable)
+				if (!$value->enable)
 				{
 					$disableList[] = $value;
 				}
@@ -269,7 +269,7 @@ 
 	function _getSupportedList()
 	{
 		static $get_supported_list = '';
-		if(is_array($get_supported_list))
+		if (is_array($get_supported_list))
 		{
 			$this->supported_list = $get_supported_list;
 			return $this->supported_list;
@@ -280,13 +280,13 @@ 
 		$supported_list = FileHandler::readDir($db_classes_path, $filter, TRUE);
 
 		// after creating instance of class, check is supported
-		for($i = 0; $i < count($supported_list); $i++)
+		for ($i = 0; $i < count($supported_list); $i++)
 		{
 			$db_type = $supported_list[$i];
 
 			$class_name = sprintf("DB%s%s", strtoupper(substr($db_type, 0, 1)), strtolower(substr($db_type, 1)));
 			$class_file = sprintf(_XE_PATH_ . "classes/db/%s.class.php", $class_name);
-			if(!file_exists($class_file))
+			if (!file_exists($class_file))
 			{
 				continue;
 			}
@@ -295,7 +295,7 @@ 
 			require_once($class_file);
 			$oDB = new $class_name();
 
-			if(!$oDB)
+			if (!$oDB)
 			{
 				continue;
 			}
@@ -319,7 +319,7 @@ 
 	 */
 	function _sortDBMS($a, $b)
 	{
-		if(!isset($this->priority_dbms[$a->db_type]))
+		if (!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
 		}
@@ -328,7 +328,7 @@ 
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
 
-		if(!isset($this->priority_dbms[$b->db_type]))
+		if (!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
 		}
@@ -337,7 +337,7 @@ 
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
 
-		if($priority_a == $priority_b)
+		if ($priority_a == $priority_b)
 		{
 			return 0;
 		}
@@ -363,7 +363,7 @@ 
 	 */
 	function isConnected($type = 'master', $indx = 0)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
 		}
@@ -392,7 +392,7 @@ 
 	 */
 	function actFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -413,37 +413,37 @@ 
 
 		$bt = version_compare(PHP_VERSION, '5.3.6', '>=') ? debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) : debug_backtrace();
 
-		foreach($bt as $no => $call)
+		foreach ($bt as $no => $call)
 		{
-			if($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
+			if ($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
 			{
 				$call_no = $no;
 				$call_no++;
-				$log['called_file'] = $bt[$call_no]['file'].':'.$bt[$call_no]['line'];
-				$log['called_file'] = str_replace(_XE_PATH_ , '', $log['called_file']);
+				$log['called_file'] = $bt[$call_no]['file'] . ':' . $bt[$call_no]['line'];
+				$log['called_file'] = str_replace(_XE_PATH_, '', $log['called_file']);
 				$call_no++;
-				$log['called_method'] = $bt[$call_no]['class'].$bt[$call_no]['type'].$bt[$call_no]['function'];
+				$log['called_method'] = $bt[$call_no]['class'] . $bt[$call_no]['type'] . $bt[$call_no]['function'];
 				break;
 			}
 		}
 
 		// leave error log if an error occured (if __DEBUG_DB_OUTPUT__ is defined)
-		if($this->isError())
+		if ($this->isError())
 		{
 			$log['result'] = 'Failed';
 			$log['errno'] = $this->errno;
 			$log['errstr'] = $this->errstr;
 
-			if(__DEBUG_DB_OUTPUT__ == 1)
+			if (__DEBUG_DB_OUTPUT__ == 1)
 			{
 				$debug_file = _XE_PATH_ . "files/_debug_db_query.php";
 				$buff = array();
-				if(!file_exists($debug_file))
+				if (!file_exists($debug_file))
 				{
 					$buff[] = '<?php exit(); ?' . '>';
 				}
 				$buff[] = print_r($log, TRUE);
-				@file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
+				@file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND | LOCK_EX);
 			}
 		}
 		else
@@ -514,11 +514,11 @@ 
 	{
 		static $cache_file = array();
 
-		if(!$query_id)
+		if (!$query_id)
 		{
 			return new Object(-1, 'msg_invalid_queryid');
 		}
-		if(!$this->db_type)
+		if (!$this->db_type)
 		{
 			return;
 		}
@@ -527,20 +527,20 @@ 
 
 		$this->query_id = $query_id;
 
-		if(!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
+		if (!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
 		{
 			$id_args = explode('.', $query_id);
-			if(count($id_args) == 2)
+			if (count($id_args) == 2)
 			{
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
 			}
-			elseif(count($id_args) == 3)
+			elseif (count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
-				if(!isset($typeList[$target]))
+				if (!isset($typeList[$target]))
 				{
 					$this->actDBClassFinish();
 					return;
@@ -548,14 +548,14 @@ 
 				$module = $id_args[1];
 				$id = $id_args[2];
 			}
-			if(!$target || !$module || !$id)
+			if (!$target || !$module || !$id)
 			{
 				$this->actDBClassFinish();
 				return new Object(-1, 'msg_invalid_queryid');
 			}
 
 			$xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
-			if(!file_exists($xml_file))
+			if (!file_exists($xml_file))
 			{
 				$this->actDBClassFinish();
 				return new Object(-1, 'msg_invalid_queryid');
@@ -583,13 +583,13 @@ 
 		$cache_file = sprintf('%s%s%s.%s.%s.cache.php', _XE_PATH_, $this->cache_file, $query_id, __ZBXE_VERSION__, $this->db_type);
 
 		$cache_time = -1;
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$cache_time = filemtime($cache_file);
 		}
 
 		// if there is no cache file or is not new, find original xml query file and parse it
-		if($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_ . 'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php'))
+		if ($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_ . 'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php'))
 		{
 			$oParser = new XmlQueryParser();
 			$oParser->parse($query_id, $xml_file, $cache_file);
@@ -610,27 +610,27 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if (!in_array($type, array('master', 'slave'))) $type = 'slave';
 
-		if(!file_exists($cache_file))
+		if (!file_exists($cache_file))
 		{
 			return new Object(-1, 'msg_invalid_queryid');
 		}
 
-		if($source_args)
+		if ($source_args)
 		{
 			$args = clone $source_args;
 		}
 
 		$output = include($cache_file);
 
-		if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool())
+		if ((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool())
 		{
 			return $output;
 		}
 
 		// execute appropriate query
-		switch($output->getAction())
+		switch ($output->getAction())
 		{
 			case 'insert' :
 			case 'insert-select' :
@@ -653,11 +653,11 @@ 
 				break;
 		}
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			$output = $this->getError();
 		}
-		else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
+		else if (!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
 		{
 			$output = new Object();
 		}
@@ -803,7 +803,7 @@ 
 	 */
 	function dropTable($table_name)
 	{
-		if(!$table_name)
+		if (!$table_name)
 		{
 			return;
 		}
@@ -820,54 +820,54 @@ 
 	function getSelectSql($query, $with_values = TRUE)
 	{
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
 
 		$tableObjects = $query->getTables();
 		$index_hint_list = '';
-		foreach($tableObjects as $tableObject)
+		foreach ($tableObjects as $tableObject)
 		{
-			if(is_a($tableObject, 'CubridTableWithHint'))
+			if (is_a($tableObject, 'CubridTableWithHint'))
 			{
 				$index_hint_list .= $tableObject->getIndexHintString() . ', ';
 			}
 		}
 		$index_hint_list = substr($index_hint_list, 0, -2);
-		if($index_hint_list != '')
+		if ($index_hint_list != '')
 		{
 			$index_hint_list = 'USING INDEX ' . $index_hint_list;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
 			$groupBy = ' GROUP BY ' . $groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
 			$orderBy = ' ORDER BY ' . $orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
 			$limit = ' LIMIT ' . $limit;
 		}
@@ -890,7 +890,7 @@ 
 	{
 		$new_update_columns = array();
 		$click_count_columns = $queryObject->getClickCountColumns();
-		foreach($click_count_columns as $click_count_column)
+		foreach ($click_count_columns as $click_count_column)
 		{
 			$click_count_column_name = $click_count_column->column_name;
 
@@ -922,14 +922,14 @@ 
 		$sql .= $tables[0]->getAlias();
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$sql .= ' FROM ' . $from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$sql .= ' WHERE ' . $where;
 		}
@@ -947,19 +947,19 @@ 
 	function getUpdateSql($query, $with_values = TRUE, $with_priority = FALSE)
 	{
 		$columnsList = $query->getUpdateString($with_values);
-		if($columnsList == '')
+		if ($columnsList == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 
 		$tables = $query->getFromString($with_values);
-		if($tables == '')
+		if ($tables == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
@@ -1004,9 +1004,9 @@ 
 	 */
 	function _getConnection($type = 'master', $indx = NULL)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
-			if(!$this->master_db['is_connected'])
+			if (!$this->master_db['is_connected'])
 			{
 				$this->_connect($type);
 			}
@@ -1014,12 +1014,12 @@ 
 			return $this->master_db["resource"];
 		}
 
-		if($indx === NULL)
+		if ($indx === NULL)
 		{
 			$indx = $this->_getSlaveConnectionStringIndex($type);
 		}
 
-		if(!$this->slave_db[$indx]['is_connected'])
+		if (!$this->slave_db[$indx]['is_connected'])
 		{
 			$this->_connect($type, $indx);
 		}
@@ -1034,11 +1034,11 @@ 
 	 */
 	function _dbInfoExists()
 	{
-		if(!$this->master_db)
+		if (!$this->master_db)
 		{
 			return FALSE;
 		}
-		if(count($this->slave_db) === 0)
+		if (count($this->slave_db) === 0)
 		{
 			return FALSE;
 		}
@@ -1064,12 +1064,12 @@ 
 	 */
 	function close($type = 'master', $indx = 0)
 	{
-		if(!$this->isConnected($type, $indx))
+		if (!$this->isConnected($type, $indx))
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1100,12 +1100,12 @@ 
 	 */
 	function begin()
 	{
-		if(!$this->isConnected())
+		if (!$this->isConnected())
 		{
 			return;
 		}
 
-		if($this->_begin($this->transactionNestedLevel))
+		if ($this->_begin($this->transactionNestedLevel))
 		{
 			$this->transaction_started = TRUE;
 			$this->transactionNestedLevel++;
@@ -1128,15 +1128,15 @@ 
 	 */
 	function rollback()
 	{
-		if(!$this->isConnected() || !$this->transaction_started)
+		if (!$this->isConnected() || !$this->transaction_started)
 		{
 			return;
 		}
-		if($this->_rollback($this->transactionNestedLevel))
+		if ($this->_rollback($this->transactionNestedLevel))
 		{
 			$this->transactionNestedLevel--;
 
-			if(!$this->transactionNestedLevel)
+			if (!$this->transactionNestedLevel)
 			{
 				$this->transaction_started = FALSE;
 			}
@@ -1160,11 +1160,11 @@ 
 	 */
 	function commit($force = FALSE)
 	{
-		if(!$force && (!$this->isConnected() || !$this->transaction_started))
+		if (!$force && (!$this->isConnected() || !$this->transaction_started))
 		{
 			return;
 		}
-		if($this->transactionNestedLevel == 1 && $this->_commit())
+		if ($this->transactionNestedLevel == 1 && $this->_commit())
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
@@ -1196,7 +1196,7 @@ 
 	 */
 	function _query($query, $connection = NULL)
 	{
-		if($connection == NULL)
+		if ($connection == NULL)
 		{
 			$connection = $this->_getConnection('master');
 		}
@@ -1221,7 +1221,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$this->master_db = $db_info->master_db;
-		if($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
+		if ($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
 				&& $db_info->master_db["db_port"] == $db_info->slave_db[0]["db_port"]
 				&& $db_info->master_db["db_userid"] == $db_info->slave_db[0]["db_userid"]
 				&& $db_info->master_db["db_password"] == $db_info->slave_db[0]["db_password"]
@@ -1269,18 +1269,18 @@ 
 	 */
 	function _connect($type = 'master', $indx = 0)
 	{
-		if($this->isConnected($type, $indx))
+		if ($this->isConnected($type, $indx))
 		{
 			return;
 		}
 
 		// Ignore if no DB information exists
-		if(!$this->_dbInfoExists())
+		if (!$this->_dbInfoExists())
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1290,7 +1290,7 @@ 
 		}
 
 		$result = $this->__connect($connection);
-		if($result === NULL || $result === FALSE)
+		if ($result === NULL || $result === FALSE)
 		{
 			$connection["is_connected"] = FALSE;
 			return;
@@ -1326,7 +1326,7 @@ 
 	 */
 	function actDBClassFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -1349,7 +1349,7 @@ 
 	function &getParser($force = FALSE)
 	{
 		static $dbParser = NULL;
-		if(!$dbParser || $force)
+		if (!$dbParser || $force)
 		{
 			$oDB = DB::getInstance();
 			$dbParser = $oDB->getParser();

Doc Comments +3 added lines, -3 removed lines

@@ -671,7 +671,7 @@ 
 	 * Returns counter cache data
 	 * @param array|string $tables tables to get data
 	 * @param string $condition condition to get data
-	 * @return int count of cache data
+	 * @return boolean count of cache data
 	 */
 	function getCountCache($tables, $condition)
 	{
@@ -731,7 +731,7 @@ 
 	 * @param array|string $tables tables to save data
 	 * @param string $condition condition to save data
 	 * @param int $count count of cache data to save
-	 * @return void
+	 * @return boolean
 	 */
 	function putCountCache($tables, $condition, $count = 0)
 	{
@@ -1242,7 +1242,7 @@ 
 	 * DB Connect
 	 * this method is protected
 	 * @param array $connection
-	 * @return void
+	 * @return resource
 	 */
 	function __connect($connection)
 	{

classes/db/DBMysqli.class.php

Spacing +35 added lines, -35 removed lines

@@ -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;
@@ -87,11 +87,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);
@@ -108,23 +108,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];
@@ -132,7 +132,7 @@ 
 
 					// 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) . PHP_EOL . print_r($args, true));
 					}
@@ -141,7 +141,7 @@ 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
 					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
 				}
@@ -155,7 +155,7 @@ 
 		$result = mysqli_query($connection, $query);
 		// Error Check
 		$error = mysqli_error($connection);
-		if($error)
+		if ($error)
 		{
 			$this->setError(mysqli_errno($connection), $error);
 		}
@@ -174,23 +174,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';
@@ -202,9 +202,9 @@ 
 					$type = 's';
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
 					$params[] = $v;
 					$types .= $type;
@@ -226,12 +226,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;
 		}
@@ -247,9 +247,9 @@ 
 		 * 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;
 			}
@@ -258,14 +258,14 @@ 
 			$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);
 		}
@@ -273,17 +273,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);
 				}
@@ -295,9 +295,9 @@ 
 
 		mysqli_stmt_close($stmt);
 
-		if($arrayIndexEndValue)
+		if ($arrayIndexEndValue)
 		{
-			foreach($rows as $row)
+			foreach ($rows as $row)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -307,9 +307,9 @@ 
 			$output = $rows;
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -330,7 +330,7 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeInsertAct($queryObject);
 		}
@@ -348,7 +348,7 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeUpdateAct($queryObject);
 		}
@@ -366,7 +366,7 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeDeleteAct($queryObject);
 		}
@@ -387,7 +387,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);
 		}

Braces +7 added lines, -9 removed lines

@@ -51,8 +51,7 @@ 
 							, $connection["db_password"]
 							, $connection["db_database"]
 							, $connection["db_port"]);
-		}
-		else
+		} else
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -209,8 +208,7 @@ 
 					$params[] = $v;
 					$types .= $type;
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $value;
 				$types .= $type;
@@ -249,10 +247,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] = "";
@@ -301,8 +301,7 @@ 
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
-		}
-		else
+		} else
 		{
 			$output = $rows;
 		}
@@ -312,8 +311,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	/**
 	 * Search Result
 	 *
-	 * @return Object
+	 * @return Object|null
 	 */
 	function IS()
 	{

classes/db/queryparts/Subquery.class.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 

 	function isJoinTable()

 	{

-		if($this->join_type)

+		if ($this->join_type)

 		{

 			return true;

 		}

classes/db/queryparts/condition/ConditionGroup.class.php

Spacing +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@ 
 	function ConditionGroup($conditions, $pipe = "")

 	{

 		$this->conditions = array();

-		foreach($conditions as $condition)

+		foreach ($conditions as $condition)

 		{

-			if($condition->show())

+			if ($condition->show())

 			{

 				$this->conditions[] = $condition;

 			}

 		}

-		if(count($this->conditions) === 0)

+		if (count($this->conditions) === 0)

 		{

 			$this->_show = false;

 		}

@@ -58,7 +58,7 @@ 
 

 	function setPipe($pipe)

 	{

-		if($this->pipe !== $pipe)

+		if ($this->pipe !== $pipe)

 		{

 			$this->_group = null;

 		}

@@ -72,14 +72,14 @@ 
 	 */

 	function toString($with_value = true)

 	{

-		if(!isset($this->_group))

+		if (!isset($this->_group))

 		{

 			$cond_indx = 0;

 			$group = '';

 

-			foreach($this->conditions as $condition)

+			foreach ($this->conditions as $condition)

 			{

-				if($cond_indx === 0)

+				if ($cond_indx === 0)

 				{

 					$condition->setPipe("");

 				}

@@ -87,7 +87,7 @@ 
 				$cond_indx++;

 			}

 

-			if($this->pipe !== "" && trim($group) !== '')

+			if ($this->pipe !== "" && trim($group) !== '')

 			{

 				$group = $this->pipe . ' (' . $group . ')';

 			}

@@ -104,10 +104,10 @@ 
 	function getArguments()

 	{

 		$args = array();

-		foreach($this->conditions as $condition)

+		foreach ($this->conditions as $condition)

 		{

 			$arg = $condition->getArgument();

-			if($arg)

+			if ($arg)

 			{

 				$args[] = $arg;

 			}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}

classes/db/queryparts/condition/ConditionWithArgument.class.php

Spacing +10 added lines, -10 removed lines

@@ -19,7 +19,7 @@ 
 	 */

 	function ConditionWithArgument($column_name, $argument, $operation, $pipe = "")

 	{

-		if($argument === null)

+		if ($argument === null)

 		{

 			$this->_show = false;

 			return;

@@ -30,7 +30,7 @@ 
 

 	function getArgument()

 	{

-		if(!$this->show())

+		if (!$this->show())

 			return;

 		return $this->argument;

 	}

@@ -43,14 +43,14 @@ 
 	{

 		$value = $this->argument->getUnescapedValue();

 

-		if(is_array($value))

+		if (is_array($value))

 		{

 			$q = '';

-			foreach($value as $v)

+			foreach ($value as $v)

 			{

 				$q .= '?,';

 			}

-			if($q !== '')

+			if ($q !== '')

 			{

 				$q = substr($q, 0, -1);

 			}

@@ -59,7 +59,7 @@ 
 		else

 		{

 			// Prepared statements: column names should not be sent as query arguments, but instead concatenated to query string

-			if($this->argument->isColumnName())

+			if ($this->argument->isColumnName())

 			{

 				$q = $value;

 			}

@@ -76,17 +76,17 @@ 
 	 */

 	function show()

 	{

-		if(!isset($this->_show))

+		if (!isset($this->_show))

 		{

-			if(!$this->argument->isValid())

+			if (!$this->argument->isValid())

 			{

 				$this->_show = false;

 			}

-			if($this->_value === '\'\'')

+			if ($this->_value === '\'\'')

 			{

 				$this->_show = false;

 			}

-			if(!isset($this->_show))

+			if (!isset($this->_show))

 			{

 				return parent::show();

 			}

Braces +5 added lines, -6 removed lines

@@ -30,8 +30,9 @@ 
 

 	function getArgument()

 	{

-		if(!$this->show())

-			return;

+		if(!$this->show()) {
+					return;
+		}
 		return $this->argument;

 	}

 

@@ -55,15 +56,13 @@ 
 				$q = substr($q, 0, -1);

 			}

 			$q = '(' . $q . ')';

-		}

-		else

+		} else

 		{

 			// Prepared statements: column names should not be sent as query arguments, but instead concatenated to query string

 			if($this->argument->isColumnName())

 			{

 				$q = $value;

-			}

-			else

+			} else

 			{

 				$q = '?';

 			}

classes/db/queryparts/expression/ClickCountExpression.class.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	{

 		parent::SelectExpression($column_name, $alias);

 

-		if(!is_bool($click_count))

+		if (!is_bool($click_count))

 		{

 			// error_log("Click_count value for $column_name was not boolean", 0);

 			$this->click_count = false;

@@ -47,7 +47,7 @@ 
 	function getExpression()

 	{

 		$db_type = Context::getDBType();

-		if($db_type == 'cubrid')

+		if ($db_type == 'cubrid')

 		{

 			return "INCR($this->column_name)";

 		}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}

classes/db/queryparts/expression/DeleteExpression.class.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	function getValue()

 	{

 		// TODO Escape value according to column type instead of variable type

-		if(!is_numeric($this->value))

+		if (!is_numeric($this->value))

 		{

 			return "'" . $this->value . "'";

 		}

@@ -51,7 +51,7 @@ 
 

 	function show()

 	{

-		if(!$this->value)

+		if (!$this->value)

 		{

 			return false;

 		}

classes/db/queryparts/expression/InsertExpression.class.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 

 	function getValue($with_values = true)

 	{

-		if($with_values)

+		if ($with_values)

 		{

 			return $this->argument->getValue();

 		}

@@ -40,12 +40,12 @@ 
 

 	function show()

 	{

-		if(!$this->argument)

+		if (!$this->argument)

 		{

 			return false;

 		}

 		$value = $this->argument->getValue();

-		if(!isset($value))

+		if (!isset($value))

 		{

 			return false;

 		}

@@ -59,7 +59,7 @@ 
 

 	function getArguments()

 	{

-		if($this->argument)

+		if ($this->argument)

 		{

 			return array($this->argument);

 		}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}