chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix mysqli_* function calls

Browse Source
1.9.x
jmontoyaa 9 years ago
parent 8fd1b6b02c
commit 065a7f77b0
1 changed files with 29 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 58
      main/inc/lib/database.mysqli.lib.php

58
main/inc/lib/database.mysqli.lib.php
Unescape View File

@ -25,7 +25,7 @@ require_once 'database.constants.inc.php';
* @package chamilo.library * @package chamilo.library
*/ */
class MySQLIDatabase { class MySQLIDatabase {
/* Variable use only in the installation process to log errors. See the Database::query function */ /* Variable use only in the installation process to log errors. See the Database::query function */
static $log_queries = false; static $log_queries = false;
@ -424,7 +424,7 @@ class MySQLIDatabase {
? new mysqli('p:'.$parameters['server'], $parameters['username'], $parameters['password']) ? new mysqli('p:'.$parameters['server'], $parameters['username'], $parameters['password'])
: new mysqli($parameters['server'], $parameters['username'], $parameters['password']); : new mysqli($parameters['server'], $parameters['username'], $parameters['password']);
if ($database_connection->connect_errno) { if ($database_connection->connect_errno) {
error_log($database_connection->connect_errno());
return false; return false;
} else { } else {
return true; return true;
@ -438,7 +438,7 @@ class MySQLIDatabase {
*/ */
public static function errno($connection = null) public static function errno($connection = null)
{ {
return self::use_default_connection($connection) ? mysqli::mysqli_errno() : mysqli::mysqli_errno($connection); return self::use_default_connection($connection) ? mysqli_connect_error() : mysqli_connect_error($connection);
} }
/** /**
@ -448,7 +448,7 @@ class MySQLIDatabase {
*/ */
public static function error($connection = null) public static function error($connection = null)
{ {
return self::use_default_connection($connection) ? mysqli::mysqli_error() : mysqli::mysqli_error($connection); return self::use_default_connection($connection) ? mysqli_connect_error() : mysqli_connect_error($connection);
} }
/** /**
@ -595,7 +595,7 @@ class MySQLIDatabase {
*/ */
public function get_host_info($connection = null) public function get_host_info($connection = null)
{ {
return self::use_default_connection($connection) ? mysqli::mysqli_get_host_info() : mysqli::mysqli_get_host_info($connection); return self::use_default_connection($connection) ? mysqli_get_host_info() : mysqli_get_host_info($connection);
} }
/** /**
@ -605,7 +605,7 @@ class MySQLIDatabase {
*/ */
public function get_proto_info($connection = null) public function get_proto_info($connection = null)
{ {
return self::use_default_connection($connection) ? mysqli::mysqli_get_proto_info() : mysqli::mysqli_get_proto_info($connection); return self::use_default_connection($connection) ? mysqli_get_proto_info() : mysqli_get_proto_info($connection);
} }
/** /**
@ -615,7 +615,7 @@ class MySQLIDatabase {
*/ */
public function get_server_info($connection = null) public function get_server_info($connection = null)
{ {
return self::use_default_connection($connection) ? mysqli::mysqli_get_server_info() : mysqli::mysqli_get_server_info($connection); return self::use_default_connection($connection) ? mysqli_get_server_info() : mysqli_get_server_info($connection);
} }
/** /**
@ -713,7 +713,7 @@ class MySQLIDatabase {
public static function query($query, $connection = null, $file = null, $line = null) public static function query($query, $connection = null, $file = null, $line = null)
{ {
global $database_connection; global $database_connection;
$result = @$database_connection->query($query); $result = @$database_connection->query($query);
if ($database_connection->errno) { if ($database_connection->errno) {
$backtrace = debug_backtrace(); // Retrieving information about the caller statement. $backtrace = debug_backtrace(); // Retrieving information about the caller statement.
@ -760,19 +760,19 @@ class MySQLIDatabase {
$info .= '</pre>'; $info .= '</pre>';
echo $info; echo $info;
} }
if (isset(self::$log_queries) && self::$log_queries) { if (isset(self::$log_queries) && self::$log_queries) {
error_log("---------------- SQL error ---------------- "); error_log("---------------- SQL error ---------------- ");
error_log($query); error_log($query);
error_log('error #'.self::errno($connection)); error_log('error #'.self::errno($connection));
error_log('error: '.self::error($connection)); error_log('error: '.self::error($connection));
$info = 'FILE: ' .(empty($file) ? ' unknown ' : $file); $info = 'FILE: ' .(empty($file) ? ' unknown ' : $file);
error_log($info); error_log($info);
$info = 'LINE: '.(empty($line) ? ' unknown ' : $line); $info = 'LINE: '.(empty($line) ? ' unknown ' : $line);
error_log($info); error_log($info);
if (empty($type)) { if (empty($type)) {
if (!empty($function)) { if (!empty($function)) {
$info = 'FUNCTION: ' . $function; $info = 'FUNCTION: ' . $function;
@ -788,7 +788,7 @@ class MySQLIDatabase {
} }
error_log("---------------- end ----------------"); error_log("---------------- end ----------------");
} }
} }
return $result; return $result;
} }
@ -1209,20 +1209,20 @@ class MySQLIDatabase {
$value_array = Database::escape_string($value_array); $value_array = Database::escape_string($value_array);
$clean_values = $value_array; $clean_values = $value_array;
} }
if (!empty($condition) && $clean_values != '') { if (!empty($condition) && $clean_values != '') {
$condition = str_replace('%',"'@percentage@'", $condition); //replace "%" $condition = str_replace('%',"'@percentage@'", $condition); //replace "%"
$condition = str_replace("'?'","%s", $condition); $condition = str_replace("'?'","%s", $condition);
$condition = str_replace("?","%s", $condition); $condition = str_replace("?","%s", $condition);
$condition = str_replace("@%s@","@-@", $condition); $condition = str_replace("@%s@","@-@", $condition);
$condition = str_replace("%s","'%s'", $condition); $condition = str_replace("%s","'%s'", $condition);
$condition = str_replace("@-@","@%s@", $condition); $condition = str_replace("@-@","@%s@", $condition);
//Treat conditons as string //Treat conditons as string
$condition = vsprintf($condition, $clean_values); $condition = vsprintf($condition, $clean_values);
$condition = str_replace('@percentage@','%', $condition); //replace "%" $condition = str_replace('@percentage@','%', $condition); //replace "%"
$where_return .= $condition; $where_return .= $condition;
} }
} }
if (!empty($where_return)) { if (!empty($where_return)) {
$return_value = " WHERE $where_return" ; $return_value = " WHERE $where_return" ;
@ -1230,11 +1230,11 @@ class MySQLIDatabase {
break; break;
case 'order': case 'order':
$order_array = $condition_data; $order_array = $condition_data;
if (!empty($order_array)) { if (!empty($order_array)) {
// 'order' => 'id desc, name desc' // 'order' => 'id desc, name desc'
$order_array = self::escape_string($order_array); $order_array = self::escape_string($order_array);
$new_order_array = explode(',', $order_array); $new_order_array = explode(',', $order_array);
$temp_value = array(); $temp_value = array();
foreach($new_order_array as $element) { foreach($new_order_array as $element) {
@ -1247,19 +1247,19 @@ class MySQLIDatabase {
$order = 'DESC'; $order = 'DESC';
if (in_array($element[1], array('desc', 'asc'))) { if (in_array($element[1], array('desc', 'asc'))) {
$order = $element[1]; $order = $element[1];
} }
$temp_value[]= $element[0].' '.$order.' '; $temp_value[]= $element[0].' '.$order.' ';
} else { } else {
//by default DESC //by default DESC
$temp_value[]= $element[0].' DESC '; $temp_value[]= $element[0].' DESC ';
} }
} }
if (!empty($temp_value)) { if (!empty($temp_value)) {
$return_value .= ' ORDER BY '.implode(', ', $temp_value); $return_value .= ' ORDER BY '.implode(', ', $temp_value);
} else { } else {
//$return_value .= ''; //$return_value .= '';
} }
} }
break; break;
case 'limit': case 'limit':
@ -1291,7 +1291,7 @@ class MySQLIDatabase {
{ {
$result = false; $result = false;
$where_return = self::parse_where_conditions($where_conditions); $where_return = self::parse_where_conditions($where_conditions);
$sql = "DELETE FROM $table_name $where_return "; $sql = "DELETE FROM $table_name $where_return ";
$result = self::query($sql); $result = self::query($sql);
$affected_rows = self::affected_rows(); $affected_rows = self::affected_rows();
//@todo should return affected_rows for //@todo should return affected_rows for

Write Preview
Loading…
Cancel
Save