cleanup mysql_* to mysqli_*

Author: nabeelio

core/classes/ezdb/ezdb_mysqli.class.php

@@ -1,14 +1,14 @@
 <?php
 /**
  * Copyright (c) 2010 Nabeel Shahzad
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
 
@@ -25,7 +25,7 @@
  * @link http://github.com/nshahzad/ezdb
  * @license MIT License
  */
- 
+
 /**
   * MySQLi implementation for ezDB
   * By Nabeel Shahzad
@@ -48,26 +48,26 @@ class ezDB_mysqli extends ezDB_Base
 	public function __construct($dbuser='', $dbpassword='', $dbname='', $dbhost='localhost')
 	{
 		if($dbname == '') return false;
-		
+
 		parent::__construct();
-		
+
 		if($this->connect($dbuser, $dbpassword, $dbhost))
 		{
 			return $this->select($dbname);
 		}
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * Explicitly close the connection on destruct
 	 */
-	
+
 	public function __destruct()
 	{
 		$this->close();
 	}
-	
+
 	/**
 	 * Connects to database immediately, unless $dbname is blank
 	 *
@@ -81,8 +81,8 @@ public function __destruct()
 	public function quick_connect($dbuser='', $dbpassword='', $dbname='', $dbhost='localhost')
 	{
 		$this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
-	}	
-	
+	}
+
 	/**
 	 * Connect to MySQL, but not to a database
 	 *
@@ -95,12 +95,12 @@ public function quick_connect($dbuser='', $dbpassword='', $dbname='', $dbhost='l
 	public function connect($dbuser='', $dbpassword='', $dbhost='localhost')
 	{
 		$this->dbh =  new mysqli($dbhost, $dbuser, $dbpassword);
-		
+
 		if(mysqli_connect_errno() != 0)
 		{
 			if($this->throw_exceptions)
 				throw new ezDB_Error(mysqli_connect_error(), mysqli_connect_errno());
-				
+
 			$this->register_error(mysqli_connect_error(), mysqli_connect_errno());
 			return false;
 		}
@@ -109,10 +109,10 @@ public function connect($dbuser='', $dbpassword='', $dbhost='localhost')
 			$this->clear_errors();
 			return true;
 		}
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Select a MySQL Database
 	 *
@@ -128,22 +128,22 @@ public function select($dbname='')
 			throw new ezDB_Error('No database name', -1);
 			$this->register_error('No database name specified!');
 		}
-		
+
 		// Must have an active database connection
 		if(!$this->dbh)
 		{
 			if($this->throw_exceptions)
 				throw new ezDB_Error(mysqli_connect_error(), mysqli_connect_errno());
-				
+
 			$this->register_error('Can\'t select database, invalid or inactive connection', -1);
 			return false;
 		}
-		
+
 		if(!$this->dbh->select_db($dbname))
 		{
 			if($this->throw_exceptions)
 				throw new ezDB_Error($this->dbh->error, $this->dbh->errno);
-				
+
 			$this->register_error($this->dbh->error, $this->dbh->errno);
 			return false;
 		}
@@ -152,18 +152,18 @@ public function select($dbname='')
 			$this->clear_errors();
 			return true;
 		}
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Close the database connection
 	 */
 	public function close()
 	{
 		return @$this->dbh->close();
 	}
-	
+
 	/**
 	 * Format a mySQL string correctly for safe mySQL insert
 	 *  (no matter if magic quotes are on or not)
@@ -176,7 +176,7 @@ public function escape($str)
 	{
 		return $this->dbh->real_escape_string($str);
 	}
-	
+
 	/**
 	 * Returns the DB specific timestamp function (Oracle: SYSDATE, MySQL: NOW())
 	 *
@@ -187,7 +187,7 @@ public function sysdate()
 	{
 		return 'NOW()';
 	}
-	
+
 	/**
 	 * Run the SQL query, and get the result. Returns false on failure
 	 *  Check $this->error() and $this->errno() functions for any errors
@@ -196,71 +196,71 @@ public function sysdate()
 	 * @param string $query SQL Query
 	 * @return mixed Return values
 	 *
-	 */	
+	 */
 	public function query($query)
 	{
 		// Initialise return
 		$return_val = true;
-		
+
 		// Flush cached values..
 		$this->flush();
-		
+
 		// For reg expressions
 		$query = trim($query);
-		
+
 		// Log how the function was called
 		$this->func_call = "\$db->query(\"$query\")";
-		
+
 		// Keep track of the last query for debug..
 		$this->last_query = $query;
-		
+
 		// Count how many queries there have been
 		$this->num_queries++;
-		
+
 		// Use core file cache function
 		if($cache = $this->get_cache($query))
 		{
 			return $cache;
 		}
-		
+
 		// If there is no existing database connection then try to connect
 		if ( ! $this->dbh )
 		{
 			if($this->throw_exceptions)
 				throw new ezDB_Error($this->dbh->error, $this->dbh->errno);
-				
+
 			$this->register_error('There is no active database connection!');
 			return false;
 		}
-		
+
 		// Perform the query via std mysql_query function..
 		$result = $this->dbh->query($query);
 
 		if($result === false)
 		{
 			if($this->throw_exceptions)
 				throw new ezDB_Error($this->dbh->error, $this->dbh->errno);
-				
+
 			$this->register_error($this->dbh->error, $this->dbh->errno);
 		}
 		else
 		{
 			$this->clear_errors();
 		}
-	
+
 		// Query was an insert, delete, update, replace
 		$is_insert = false;
 		if (preg_match("/^(insert|delete|update|replace)\s+/i",$query))
 		{
 			$this->rows_affected = $this->dbh->affected_rows;
 			$this->num_rows = $this->rows_affected;
-		
+
 			if($this->dbh->insert_id > 0)
 			{
 				$this->insert_id = $this->dbh->insert_id;
 				$is_insert = true;
 			}
-			
+
 			// Return number of rows affected
 			$return_val = $this->rows_affected;
 		}
@@ -270,64 +270,33 @@ public function query($query)
 			// Take note of column info
 			$num_rows = 0;
 			if($result instanceof MySQLi_Result)
-			{	
+			{
 				$this->col_info = $result->fetch_fields();
-						
+
 				// Store Query Results
 				while($row = $result->fetch_object())
 				{
 					$this->last_result[$num_rows] = $row;
 					$num_rows++;
 				}
-				
+
 				$result->close();
 			}
-			
+
 			// Log number of rows the query returned
 			$this->rows_affected = $num_rows;
 			$this->num_rows = $num_rows;
-			
+
 			// Return number of rows selected
 			$return_val = $this->num_rows;
 		}
-		
+
 		// disk caching of queries
 		$this->store_cache($query,$is_insert);
-		
+
 		// If debug ALL queries
 		$this->trace || $this->debug_all ? $this->debug() : null ;
-		
+
 		return $return_val;
 	}
-	
-	
-	/* this is mysqli only
-	 * incomplete implementation
-	 *//*
-	function execute($query, $params)
-	{
-		if($this->mysql_version!=5 || $query == '' || $params == '')
-			return;
-
-		$stmt =  $this->dbh->stmt_init();
-		if(!$stmt->prepare($query))
-			return false;
-
-		//bind our parameters
-		while(list($key, $value) = each($params))
-		{
-			if(is_double($value))
-				$type = 'd';
-			elseif(is_integer($value) || is_numeric($value))
-				$type = 'i';
-			else
-				$type = 's';
-
-			$stmt->bind_param($type, $value);
-		}
-
-		$stmt->execute();
-
-		
-	}*/
 }

install/Installer.class.php

@@ -362,7 +362,7 @@ public static function RegisterInstall($version = '')
         $params->addChild('email', SettingsData::GetSettingValue('ADMIN_EMAIL'));
         $params->addChild('version', $version);
         $params->addChild('php', phpversion());
-        $params->addChild('mysql', @mysql_get_server_info());
+        $params->addChild('mysql', @mysqli_get_server_info());
         $params->addChild('ext', $ext);
 
         $url = 'http://api.phpvms.net/register';