support XOOPS_DB_TYPE: mysqli

XoopsX · Feb 16, 2014 · 249d280 · 249d280
1 parent 3e1e1e4
commit 249d280
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/xoops_trust_path/modules/webphoto/class/bin/xoops_mysql_database.php b/xoops_trust_path/modules/webphoto/class/bin/xoops_mysql_database.php
@@ -37,14 +37,14 @@ function mysql_database()
 //---------------------------------------------------------
 function connect()
 {
-	$this->conn = mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+	$this->conn = mysqli_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
 
 	if (!$this->conn) {
 		$this->_print_error();
 		return false;
 	}
 
-	if (!mysql_select_db(XOOPS_DB_NAME)) {
+	if (!mysqli_select_db($this->conn, XOOPS_DB_NAME)) {
 		$this->_print_error();
 		return false;
 	}
@@ -67,52 +67,52 @@ function set_charset()
 
 function fetchRow($result)
 {
-	return @mysql_fetch_row($result);
+	return @mysqli_fetch_row($result);
 }
 
 function fetchArray($result)
 {
-	return @mysql_fetch_assoc( $result );
+	return @mysqli_fetch_assoc( $result );
 }
 
 function fetchBoth($result)
 {
-	return @mysql_fetch_array( $result, MYSQL_BOTH );
+	return @mysqli_fetch_array( $result, MYSQL_BOTH );
 }
 
 function getInsertId()
 {
-	return mysql_insert_id($this->conn);
+	return mysqli_insert_id($this->conn);
 }
 
 function getRowsNum($result)
 {
-	return @mysql_num_rows($result);
+	return @mysqli_num_rows($result);
 }
 
 function getAffectedRows()
 {
-	return mysql_affected_rows($this->conn);
+	return mysqli_affected_rows($this->conn);
 }
 
 function close()
 {
-	mysql_close($this->conn);
+	mysqli_close($this->conn);
 }
 
 function freeRecordSet($result)
 {
-	return mysql_free_result($result);
+	return mysqli_free_result($result);
 }
 
 function error()
 {
-	return @mysql_error();
+	return @mysqli_error($this->conn);
 }
 
 function errno()
 {
-	return @mysql_errno();
+	return @mysqli_errno($this->conn);
 }
 
 function quoteString($str)
@@ -130,7 +130,7 @@ function &queryF($sql, $limit=0, $start=0)
 		$sql = $sql. ' LIMIT '.(int)$start.', '.(int)$limit;
 	}
 
-	$result = mysql_query($sql, $this->conn);
+	$result = mysqli_query($this->conn, $sql);
 
 	if ( !$result ) {
 		$this->_print_error($sql);

diff --git a/xoops_trust_path/modules/webphoto/class/lib/server_info.php b/xoops_trust_path/modules/webphoto/class/lib/server_info.php
@@ -41,9 +41,11 @@ function &getInstance()
 //---------------------------------------------------------
 function build_server()
 {
+	$db = XoopsDatabaseFactory::getDatabaseConnection();
+	$get_server_info = (is_object($db->conn) && get_class($db->conn) === 'mysqli')? 'mysqli_get_server_info' : 'mysql_get_server_info';
 	$str  = "OS: ". php_uname() ."<br />\n"; 
 	$str .= "PHP: ". PHP_VERSION ."<br />\n"; 
-	$str .= "MySQL: ". mysql_get_server_info() ."<br />\n"; 
+	$str .= "MySQL: ". $get_server_info($db->conn) ."<br />\n"; 
 	$str .= "XOOPS: ". XOOPS_VERSION ."<br />\n"; 
 	return $str;
 }