Convert Object class to BaseObject in core classes

classes/db/DB.class.php

@@ -143,7 +143,7 @@ class DB
 		}
 		if(!$db_type && Context::isInstalled())
 		{
-			return new Object(-1, 'msg_db_not_setted');
+			return new BaseObject(-1, 'msg_db_not_setted');
 		}
 
 		if(!isset($GLOBALS['__DB__']))
@@ -156,7 +156,7 @@ class DB
 			$class_file = RX_BASEDIR . "classes/db/$class_name.class.php";
 			if(!file_exists($class_file))
 			{
-				return new Object(-1, 'msg_db_not_setted');
+				return new BaseObject(-1, 'msg_db_not_setted');
 			}
 
 			// get a singletone instance of the database driver class
@@ -449,7 +449,7 @@ class DB
 	public function getError()
 	{
 		$this->errstr = Context::convertEncodingStr($this->errstr);
-		return new Object($this->errno, $this->errstr);
+		return new BaseObject($this->errno, $this->errstr);
 	}
 
 	/**
@@ -466,7 +466,7 @@ class DB
 
 		if(!$query_id)
 		{
-			return new Object(-1, 'msg_invalid_queryid');
+			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
 		if(!$this->db_type)
 		{
@@ -501,14 +501,14 @@ class DB
 			if(!$target || !$module || !$id)
 			{
 				$this->actDBClassFinish();
-				return new Object(-1, 'msg_invalid_queryid');
+				return new BaseObject(-1, 'msg_invalid_queryid');
 			}
 
 			$xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
 			if(!file_exists($xml_file))
 			{
 				$this->actDBClassFinish();
-				return new Object(-1, 'msg_invalid_queryid');
+				return new BaseObject(-1, 'msg_invalid_queryid');
 			}
 
 			// look for cache file
@@ -564,7 +564,7 @@ class DB
 
 		if(!file_exists($cache_file))
 		{
-			return new Object(-1, 'msg_invalid_queryid');
+			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
 
 		if (is_object($source_args))
@@ -582,13 +582,13 @@ class DB
 
 		$output = include($cache_file);
 
-		if($output instanceof Object && !$output->toBool())
+		if($output instanceof BaseObject && !$output->toBool())
 		{
 			return $output;
 		}
 		if(!is_object($output) || !method_exists($output, 'getAction'))
 		{
-			return new Object(-1, sprintf(lang('msg_failed_to_load_query'), $query_id));
+			return new BaseObject(-1, sprintf(lang('msg_failed_to_load_query'), $query_id));
 		}
 
 		// execute appropriate query
@@ -619,9 +619,9 @@ class DB
 		{
 			$output = $this->getError();
 		}
-		elseif(!($output instanceof Object))
+		elseif(!($output instanceof BaseObject))
 		{
-			$output = new Object();
+			$output = new BaseObject();
 		}
 		$output->add('_query', $this->query);
 		$output->add('_elapsed_time', sprintf("%0.5f", $this->elapsed_time));
@@ -688,14 +688,14 @@ class DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
@@ -790,7 +790,7 @@ class DB
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$sql .= ' FROM ' . $from;
 
@@ -815,13 +815,13 @@ class DB
 		$columnsList = $query->getUpdateString($with_values);
 		if($columnsList == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$tables = $query->getFromString($with_values);
 		if($tables == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$where = $query->getWhereString($with_values);

classes/db/DBCubrid.class.php

@@ -624,7 +624,7 @@ class DBCubrid extends DB
 	 * Get information about a column
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return object
+	 * @return BaseObject
 	 */
 	function getColumnInfo($table_name, $column_name)
 	{
@@ -982,7 +982,7 @@ class DBCubrid extends DB
 
 	/**
 	 * Handles insertAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -994,7 +994,7 @@ class DBCubrid extends DB
 			$with_values = FALSE;
 		}
 		$query = $this->getInsertSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			unset($this->param);
 			return;
@@ -1011,7 +1011,7 @@ class DBCubrid extends DB
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -1023,7 +1023,7 @@ class DBCubrid extends DB
 			$with_values = FALSE;
 		}
 		$query = $this->getUpdateSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			unset($this->param);
 			return;
@@ -1041,7 +1041,7 @@ class DBCubrid extends DB
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -1053,7 +1053,7 @@ class DBCubrid extends DB
 			$with_values = FALSE;
 		}
 		$query = $this->getDeleteSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			unset($this->param);
 			return;
@@ -1074,10 +1074,10 @@ class DBCubrid extends DB
 	 * Handle selectAct
 	 * To get a specific page list easily in select statement,
 	 * a method, navigation, is used
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = NULL, $with_values = TRUE)
 	{
@@ -1094,7 +1094,7 @@ class DBCubrid extends DB
 		else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
-			if(is_a($query, 'Object'))
+			if($query instanceof BaseObject)
 			{
 				unset($this->param);
 				return;
@@ -1109,7 +1109,7 @@ class DBCubrid extends DB
 			}
 
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->data = $data;
 
 			unset($this->param);
@@ -1119,15 +1119,15 @@ class DBCubrid extends DB
 
 	/**
 	 * If have a error, return error object
-	 * @param Object $queryObject
-	 * @return Object
+	 * @param BaseObject $queryObject
+	 * @return BaseObject
 	 */
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
 		if($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -1140,10 +1140,10 @@ class DBCubrid extends DB
 
 	/**
 	 * If select query execute, return page info
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object Object with page info containing
+	 * @return BaseObject Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $connection, $with_values)
 	{
@@ -1204,7 +1204,7 @@ class DBCubrid extends DB
 		{
 			// If requested page is bigger than total number of pages, return empty list
 
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -1226,7 +1226,7 @@ class DBCubrid extends DB
 		$virtual_no = $total_count - ($page - 1) * $list_count;
 		$data = $this->_fetch($result, $virtual_no);
 
-		$buff = new Object ();
+		$buff = new BaseObject;
 		$buff->total_count = $total_count;
 		$buff->total_page = $total_page;
 		$buff->page = $page;
@@ -1260,14 +1260,14 @@ class DBCubrid extends DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 

classes/db/DBMssql.class.php

@@ -494,7 +494,7 @@ class DBMssql extends DB
 	 * Get information about a column
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return object
+	 * @return BaseObject
 	 */
 	function getColumnInfo($table_name, $column_name)
 	{
@@ -774,7 +774,7 @@ class DBMssql extends DB
 	/**
 	 * Handles insertAct
 	 * @todo Lookup _filterNumber against sql injection - see if it is still needed and how to integrate
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @return resource
 	 */
 	function _executeInsertAct($queryObject)
@@ -786,7 +786,7 @@ class DBMssql extends DB
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @return resource
 	 */
 	function _executeUpdateAct($queryObject)
@@ -808,13 +808,13 @@ class DBMssql extends DB
 		$columnsList = $query->getUpdateString($with_values);
 		if($columnsList == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$tables = $query->getTables();
@@ -838,7 +838,7 @@ class DBMssql extends DB
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @return resource
 	 */
 	function _executeDeleteAct($queryObject)
@@ -876,7 +876,7 @@ class DBMssql extends DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		if($limit != '')
 		{
@@ -890,7 +890,7 @@ class DBMssql extends DB
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
@@ -961,9 +961,9 @@ class DBMssql extends DB
 	 * Handle selectAct
 	 * In order to get a list of pages easily when selecting \n
 	 * it supports a method as navigation
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = null)
 	{
@@ -1000,15 +1000,15 @@ class DBMssql extends DB
 
 	/**
 	 * If have a error, return error object
-	 * @param Object $queryObject
-	 * @return Object
+	 * @param BaseObject $queryObject
+	 * @return BaseObject
 	 */
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
 		if($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -1024,10 +1024,10 @@ class DBMssql extends DB
 
 	/**
 	 * If select query execute, return page info
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $result
 	 * @param resource $connection
-	 * @return Object Object with page info containing
+	 * @return BaseObject Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $result, $connection)
 	{
@@ -1090,7 +1090,7 @@ class DBMssql extends DB
 			{
 				// If requested page is bigger than total number of pages, return empty list
 
-				$buff = new Object ();
+				$buff = new BaseObject;
 				$buff->total_count = $total_count;
 				$buff->total_page = $total_page;
 				$buff->page = $page;
@@ -1110,7 +1110,7 @@ class DBMssql extends DB
 			$virtual_no = $total_count - $start_count;
 			$data = $this->_fetch($result, $virtual_no);
 
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -1120,7 +1120,7 @@ class DBMssql extends DB
 		else
 		{
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->data = $data;
 		}
 		return $buff;

classes/db/DBMysql.class.php

@@ -397,7 +397,7 @@ class DBMysql extends DB
 	 * Get information about a column
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return object
+	 * @return BaseObject
 	 */
 	function getColumnInfo($table_name, $column_name)
 	{
@@ -708,14 +708,14 @@ class DBMysql extends DB
 
 	/**
 	 * Handles insertAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
 	function _executeInsertAct($queryObject, $with_values = true)
 	{
 		$query = $this->getInsertSql($queryObject, $with_values, true);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			return;
 		}
@@ -724,14 +724,14 @@ class DBMysql extends DB
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
 	function _executeUpdateAct($queryObject, $with_values = true)
 	{
 		$query = $this->getUpdateSql($queryObject, $with_values, true);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			if(!$query->toBool()) return $query;
 			else return;
@@ -741,14 +741,14 @@ class DBMysql extends DB
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
 	function _executeDeleteAct($queryObject, $with_values = true)
 	{
 		$query = $this->getDeleteSql($queryObject, $with_values, true);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			return;
 		}
@@ -759,10 +759,10 @@ class DBMysql extends DB
 	 * Handle selectAct
 	 * In order to get a list of pages easily when selecting \n
 	 * it supports a method as navigation
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = true)
 	{
@@ -775,7 +775,7 @@ class DBMysql extends DB
 		else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
-			if(is_a($query, 'Object'))
+			if($query instanceof BaseObject)
 			{
 				return;
 			}
@@ -787,7 +787,7 @@ class DBMysql extends DB
 			}
 
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->data = $data;
 
 			if($queryObject->usesClickCount())
@@ -815,7 +815,7 @@ class DBMysql extends DB
 	/**
 	 * Fetch a result row as an object
 	 * @param resource $result
-	 * @return object
+	 * @return BaseObject
 	 */
 	function db_fetch_object(&$result)
 	{
@@ -845,15 +845,15 @@ class DBMysql extends DB
 
 	/**
 	 * If have a error, return error object
-	 * @param Object $queryObject
-	 * @return Object
+	 * @param BaseObject $queryObject
+	 * @return BaseObject
 	 */
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
 		if($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -869,11 +869,11 @@ class DBMysql extends DB
 
 	/**
 	 * If select query execute, return page info
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $result
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object Object with page info containing
+	 * @return BaseObject Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $result, $connection, $with_values = true)
 	{
@@ -933,7 +933,7 @@ class DBMysql extends DB
 		if($page > $total_page)
 		{
 			// If requested page is bigger than total number of pages, return empty list
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -954,7 +954,7 @@ class DBMysql extends DB
 		$virtual_no = $total_count - ($page - 1) * $list_count;
 		$data = $this->_fetch($result, $virtual_no);
 
-		$buff = new Object ();
+		$buff = new BaseObject;
 		$buff->total_count = $total_count;
 		$buff->total_page = $total_page;
 		$buff->page = $page;
@@ -976,14 +976,14 @@ class DBMysql extends DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 

classes/db/DBMysqli.class.php

@@ -299,7 +299,7 @@ class DBMysqli extends DBMysql
 
 	/**
 	 * Handles insertAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -317,7 +317,7 @@ class DBMysqli extends DBMysql
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -335,7 +335,7 @@ class DBMysqli extends DBMysql
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -355,10 +355,10 @@ class DBMysqli extends DBMysql
 	 * Handle selectAct
 	 * In order to get a list of pages easily when selecting \n
 	 * it supports a method as navigation
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
@@ -387,7 +387,7 @@ class DBMysqli extends DBMysql
 	/**
 	 * Fetch a result row as an object
 	 * @param resource $result
-	 * @return object
+	 * @return BaseObject
 	 */
 	function db_fetch_object(&$result)
 	{

classes/db/queryparts/Query.class.php

@@ -6,7 +6,7 @@
  * @package /classes/db/queryparts
  * @version 0.1
  */
-class Query extends Object
+class Query extends BaseObject
 {
 
 	/**