Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2012-12-11 14:36:20
|
Revision: 10359
http://sourceforge.net/p/xoops/svn/10359
Author: beckmi
Date: 2012-12-11 14:36:16 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
conversion to mysqli (see the readme_myqsli_conversion_warnings.txt)
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/protector/class/protector.php
XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/system/class/thumbs/phpThumb.php
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/functions.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -42,9 +42,9 @@
return $mysql_version;
}
if (!is_null($conn)) {
- $mysql_version = mysql_get_server_info($conn);
+ $mysql_version = ((is_null($___mysqli_res = mysqli_get_server_info($conn))) ? false : $___mysqli_res);
} else {
- $mysql_version = mysql_get_server_info();
+ $mysql_version = ((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
}
return $mysql_version;
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/Frameworks/art/object.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -84,9 +84,9 @@
function mysql_server_version($conn = null)
{
if (!is_null($conn)) {
- return mysql_get_server_info($conn);
+ return ((is_null($___mysqli_res = mysqli_get_server_info($conn))) ? false : $___mysqli_res);
} else {
- return mysql_get_server_info();
+ return ((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/database/mysqldatabase.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -45,17 +45,17 @@
{
static $db_charset_set;
- if (!extension_loaded('mysql')) {
- trigger_error('notrace:mysql extension not loaded', E_USER_ERROR);
+ if (!extension_loaded('mysqli')) {
+ trigger_error('notrace:mysqli extension not loaded', E_USER_ERROR);
return false;
}
$this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
if (XOOPS_DB_PCONNECT == 1) {
- $this->conn = @mysql_pconnect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ $this->conn = @($GLOBALS["___mysqli_ston"] = mysqli_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS));
} else {
- $this->conn = @mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ $this->conn = @($GLOBALS["___mysqli_ston"] = mysqli_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS));
}
if (!$this->conn) {
@@ -64,7 +64,7 @@
return false;
}
if ($selectdb != false) {
- if (!mysql_select_db(XOOPS_DB_NAME)) {
+ if (!((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . constant('XOOPS_DB_NAME')))) {
$xoopsPreload = XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.database.nodb');
return false;
@@ -100,7 +100,7 @@
*/
public function fetchRow($result)
{
- return @mysql_fetch_row($result);
+ return @mysqli_fetch_row($result);
}
/**
@@ -111,7 +111,7 @@
*/
public function fetchArray($result)
{
- return @mysql_fetch_assoc($result);
+ return @mysqli_fetch_assoc($result);
}
/**
@@ -122,7 +122,7 @@
*/
public function fetchBoth($result)
{
- return @mysql_fetch_array($result, MYSQL_BOTH);
+ return @mysqli_fetch_array($result, MYSQLI_BOTH);
}
/**
@@ -133,7 +133,7 @@
*/
public function fetchObject($result)
{
- return @mysql_fetch_object($result);
+ return @mysqli_fetch_object($result);
}
/**
@@ -143,7 +143,7 @@
*/
public function getInsertId()
{
- return mysql_insert_id($this->conn);
+ return ((is_null($___mysqli_res = mysqli_insert_id($this->conn))) ? false : $___mysqli_res);
}
/**
@@ -154,7 +154,7 @@
*/
public function getRowsNum($result)
{
- return @mysql_num_rows($result);
+ return @mysqli_num_rows($result);
}
/**
@@ -164,7 +164,7 @@
*/
public function getAffectedRows()
{
- return mysql_affected_rows($this->conn);
+ return mysqli_affected_rows($this->conn);
}
/**
@@ -174,7 +174,7 @@
*/
public function close()
{
- mysql_close($this->conn);
+ ((is_null($___mysqli_res = mysqli_close($this->conn))) ? false : $___mysqli_res);
}
/**
@@ -185,7 +185,7 @@
*/
public function freeRecordSet($result)
{
- return mysql_free_result($result);
+ return ((mysqli_free_result($result) || (is_object($result) && (get_class($result) == "mysqli_result"))) ? true : false);
}
/**
@@ -195,7 +195,7 @@
*/
public function error()
{
- return @mysql_error();
+ return @((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false));
}
/**
@@ -205,7 +205,7 @@
*/
public function errno()
{
- return @mysql_errno();
+ return @((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_errno($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_errno()) ? $___mysqli_res : false));
}
/**
@@ -227,7 +227,7 @@
*/
public function quote($string)
{
- return "'" . str_replace("\\\"", '"', str_replace("\\"", '"', mysql_real_escape_string($string, $this->conn))) . "'";
+ return "'" . str_replace("\\\"", '"', str_replace("\\"", '"', mysqli_real_escape_string( $this->conn, $string))) . "'";
}
/**
@@ -249,7 +249,7 @@
}
$xoopsPreload = XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.database.query.start');
- $result = mysql_query($sql, $this->conn);
+ $result = mysqli_query( $this->conn, $sql);
$xoopsPreload->triggerEvent('core.database.query.end');
if ($result) {
@@ -309,7 +309,7 @@
*/
public function getFieldName($result, $offset)
{
- return mysql_field_name($result, $offset);
+ return ((($___mysqli_tmp = mysqli_fetch_field_direct($result, 0)->name) && (!is_null($___mysqli_tmp))) ? $___mysqli_tmp : false);
}
/**
@@ -321,7 +321,7 @@
*/
public function getFieldType($result, $offset)
{
- return mysql_field_type($result, $offset);
+ return ((is_object($___mysqli_tmp = mysqli_fetch_field_direct($result, 0)) && !is_null($___mysqli_tmp = $___mysqli_tmp->type)) ? ((($___mysqli_tmp = (string)(substr(( (($___mysqli_tmp == MYSQLI_TYPE_STRING) || ($___mysqli_tmp == MYSQLI_TYPE_VAR_STRING) ) ? "string " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_TINY, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_LONG, MYSQLI_TYPE_LONGLONG, MYSQLI_TYPE_INT24))) ? "int " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_FLOAT, MYSQLI_TYPE_DOUBLE, MYSQLI_TYPE_DECIMAL, ((defined("MYSQLI_TYPE_NEWDECIMAL")) ? constant("MYSQLI_TYPE_NEWDECIMAL") : -1)))) ? "real " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_TIMESTAMP) ? "timestamp " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_YEAR) ? "year " : "" ) . ( (($___mysqli_tmp == MYSQLI_TYPE_DATE) || ($___mysqli_tmp == MYSQLI_TYPE_NEWDATE) ) ? "date " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_TIME) ? "time " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_SET) ? "set " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_ENUM) ? "enum " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_GEOMETRY) ? "geometry " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_DATETIME) ? "datetime " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_TINY_BLOB, MYSQLI_TYPE_BLOB, MYSQLI_TYPE_MEDIUM_BLOB, MYSQLI_TYPE_LONG_BLOB))) ? "blob " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_NULL) ? "null " : "" ), 0, -1))) == "") ? "unknown" : $___mysqli_tmp) : false);
}
/**
@@ -332,7 +332,7 @@
*/
public function getFieldsNum($result)
{
- return mysql_num_fields($result);
+ return (($___mysqli_tmp = mysqli_num_fields($result)) ? $___mysqli_tmp : false);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/model/sync.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -68,7 +68,7 @@
/**
* for MySQL 4.1+
*/
- if (version_compare(mysql_get_server_info(), "4.1.0", "ge")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res), "4.1.0", "ge")) {
$sql = "DELETE FROM `{$this->handler->table}`"
. " WHERE (`{$this->handler->field_object}` NOT IN ( SELECT DISTINCT `{$this->handler->field_link}` FROM `{$this->handler->table_link}`) )";
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/class/moduleadmin.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -372,7 +372,7 @@
if ($dbarray[XOOPS_DB_TYPE]) {
switch (XOOPS_DB_TYPE) {
case "mysql":
- $dbCurrentVersion = mysql_get_server_info();
+ $dbCurrentVersion = ((is_null($___mysqli_res = mysqli_get_server_info($GLOBALS["___mysqli_ston"]))) ? false : $___mysqli_res);
break;
case "mysqli":
$dbCurrentVersion = mysqli_get_server_info();
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/include/functions.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -255,8 +255,8 @@
$charsets["utf8"] = "UTF-8 Unicode";
$ut8_available = false;
- if ($result = mysql_query("SHOW CHARSET", $link)) {
- while ($row = mysql_fetch_assoc($result)) {
+ if ($result = mysqli_query( $link, "SHOW CHARSET")) {
+ while ($row = mysqli_fetch_assoc($result)) {
$charsets[$row["Charset"]] = $row["Description"];
if ($row["Charset"] == "utf8") {
$ut8_available = true;
@@ -282,8 +282,8 @@
return $collations[$charset];
}
- if ($result = mysql_query("SHOW COLLATION WHERE CHARSET = '" . mysql_real_escape_string($charset) . "'", $link)) {
- while ($row = mysql_fetch_assoc($result)) {
+ if ($result = mysqli_query( $link, "SHOW COLLATION WHERE CHARSET = '" . ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $charset) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : "")) . "'")) {
+ while ($row = mysqli_fetch_assoc($result)) {
$collations[$charset][$row["Collation"]] = $row["Default"] ? 1 : 0;
}
}
@@ -304,7 +304,7 @@
if (empty($charset)) {
$collation = "";
}
- if (version_compare(mysql_get_server_info($link), "4.1.0", "lt")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($link))) ? false : $___mysqli_res), "4.1.0", "lt")) {
$charset = $collation = "";
}
if (empty($charset) && empty($collation)) {
@@ -337,7 +337,7 @@
*/
function xoFormFieldCollation($name, $value, $label, $help, $link, $charset)
{
- if (version_compare(mysql_get_server_info($link), "4.1.0", "lt")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($link))) ? false : $___mysqli_res), "4.1.0", "lt")) {
return "";
}
if (empty($charset) || !$collations = getDbCollations($link, $charset)) {
@@ -402,7 +402,7 @@
*/
function xoFormFieldCharset($name, $value, $label, $help = '', $link)
{
- if (version_compare(mysql_get_server_info($link), "4.1.0", "lt")) {
+ if (version_compare(((is_null($___mysqli_res = mysqli_get_server_info($link))) ? false : $___mysqli_res), "4.1.0", "lt")) {
return "";
}
if (!$chars = getDbCharsets($link)) {
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_dbsettings.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -57,18 +57,18 @@
$error = validateDbCharset($link, $vars['DB_CHARSET'], $vars['DB_COLLATION']);
$db_exist = true;
if (empty($error)) {
- if (!@mysql_select_db($vars['DB_NAME'], $link)) {
+ if (!@((bool)mysqli_query( $link, "USE $vars['DB_NAME']"))) {
// Database not here: try to create it
- $result = mysql_query("CREATE DATABASE `" . $vars['DB_NAME'] . '`');
+ $result = mysqli_query($GLOBALS["___mysqli_ston"], "CREATE DATABASE `" . $vars['DB_NAME'] . '`');
if (!$result) {
$error = ERR_NO_DATABASE;
$db_exist = false;
}
}
if ($db_exist && $vars['DB_CHARSET']) {
- $sql = "ALTER DATABASE `" . $vars['DB_NAME'] . "` DEFAULT CHARACTER SET " . mysql_real_escape_string($vars['DB_CHARSET']) . ($vars['DB_COLLATION']
- ? " COLLATE " . mysql_real_escape_string($vars['DB_COLLATION']) : "");
- if (!mysql_query($sql)) {
+ $sql = "ALTER DATABASE `" . $vars['DB_NAME'] . "` DEFAULT CHARACTER SET " . ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $vars['DB_CHARSET']) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : "")) . ($vars['DB_COLLATION']
+ ? " COLLATE " . ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $vars['DB_COLLATION']) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : "")) : "");
+ if (!mysqli_query($GLOBALS["___mysqli_ston"], $sql)) {
$error = ERR_CHARSET_NOT_SET . $sql;
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/install/page_modcheck.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -59,7 +59,7 @@
<tr>
<th><?php printf(PHP_EXTENSION,'MySQL'); ?></th>
- <td><?php echo xoDiag(function_exists('mysql_connect') ? 1 : -1, @mysql_get_client_info()); ?></td>
+ <td><?php echo xoDiag(function_exists('mysqli_connect') ? 1 : -1, @mysqli_get_client_info()); ?></td>
</tr>
<tr>
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/kernel/notification.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -282,9 +282,9 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
- $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
+ $criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_uid', intval($user_id)));
$objects = $this->getObjectsArray($criteria);
if (count($objects) == 1) {
@@ -310,9 +310,9 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
- $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
+ $criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_uid', intval($user_id)));
return $this->getCount($criteria);
}
@@ -410,7 +410,7 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
if ($item_id) {
$criteria->add(new Criteria('not_itemid', intval($item_id)));
}
@@ -522,9 +522,9 @@
}
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
- $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
+ $criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$mode_criteria = new CriteriaCompo();
$mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDALWAYS), 'OR');
$mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE), 'OR');
@@ -640,7 +640,7 @@
}
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
$criteria->add(new Criteria('not_uid', intval($user_id)));
if (!is_array($events)) {
@@ -648,7 +648,7 @@
}
$event_criteria = new CriteriaCompo();
foreach ($events as $event) {
- $event_criteria->add(new Criteria('not_event', mysql_real_escape_string($event)), 'OR');
+ $event_criteria->add(new Criteria('not_event', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $event) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))), 'OR');
}
$criteria->add($event_criteria);
return $this->deleteAll($criteria);
@@ -682,7 +682,7 @@
{
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('not_modid', intval($module_id)));
- $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
+ $criteria->add(new Criteria('not_category', ((isset($GLOBALS["___mysqli_ston"]) && is_object($GLOBALS["___mysqli_ston"])) ? mysqli_real_escape_string($GLOBALS["___mysqli_ston"], $category) : ((trigger_error("[MySQLConverterToo] Fix the mysql_escape_string() call! This code does not work.", E_USER_ERROR)) ? "" : ""))));
$criteria->add(new Criteria('not_itemid', intval($item_id)));
return $this->deleteAll($criteria);
}
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/logger/plugins/pqp/logger.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -306,11 +306,11 @@
$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
try {
$sql = 'EXPLAIN ' . $query['sql'];
- $rs = mysql_query($sql, $this->db->conn);
+ $rs = mysqli_query( $this->db->conn, $sql);
} catch (Exception $e) {
}
if ($rs) {
- $row = mysql_fetch_array($rs, MYSQL_ASSOC);
+ $row = mysqli_fetch_array($rs, MYSQLI_ASSOC);
$query['explain'] = $row;
}
return $query;
Modified: XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php 2012-12-11 14:27:48 UTC (rev 10358)
+++ XoopsCore/branches/2.6.x/2.6.0_mysqli/htdocs/modules/maintenance/class/maintenance.php 2012-12-11 14:36:16 UTC (rev 10359)
@@ -112,7 +112,7 @@
$field_type = array();
$i = 0;
while ($i < $num_fields) {
- $meta = mysql_fetch_field($result, $i);
+ $meta = (((($___mysqli_tmp = mysqli_fetch_field_direct($result, 0)) && is_object($___mysqli_tmp)) ? ( (!is_null($___mysqli_tmp->primary_key = ($___mysqli_tmp->flags & MYSQLI_PRI_KEY_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->multiple_key = ($___mysqli_tmp->flags & MYSQLI_MULTIPLE_KEY_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->unique_key = ($___mysqli_tmp->flags & MYSQLI_UNIQUE_KEY_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->numeric = (int)(($___mysqli_tmp->type <= MYSQLI_TYPE_INT24) || ($___mysqli_tmp->type == MYSQLI_TYPE_YEAR) || ((defined("MYSQLI_TYPE_NEWDECIMAL")) ? ($___mysqli_tmp->type == MYSQLI_TYPE_NEWDECIMAL) : 0)))) && (!is_null($___mysqli_tmp->blob = (int)in_array($___mysqli_tmp->type, array(MYSQLI_TYPE_TINY_BLOB, MYSQLI_TYPE_BLOB, MYSQLI_TYPE_MEDIUM_BLOB, MYSQLI_TYPE_LONG_BLOB)))) && (!is_null($___mysqli_tmp->unsigned = ($___mysqli_tmp->flags & MYSQLI_UNSIGNED_FLAG) ? 1 : 0)) && (!is_null($___mysqli_tmp->zerofill = ($___mysqli_tmp->flags & MYSQLI_ZEROFILL_FLAG) ? 1 : 0)) && (!is_null($___mysqli_type = $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = (($___mysqli_type == MYSQLI_TYPE_STRING) || ($___mysqli_type == MYSQLI_TYPE_VAR_STRING)) ? "type" : "")) &&(!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && in_array($___mysqli_type, array(MYSQLI_TYPE_TINY, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_LONG, MYSQLI_TYPE_LONGLONG, MYSQLI_TYPE_INT24))) ? "int" : $___mysqli_tmp->type)) &&(!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && in_array($___mysqli_type, array(MYSQLI_TYPE_FLOAT, MYSQLI_TYPE_DOUBLE, MYSQLI_TYPE_DECIMAL, ((defined("MYSQLI_TYPE_NEWDECIMAL")) ? constant("MYSQLI_TYPE_NEWDECIMAL") : -1)))) ? "real" : $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && $___mysqli_type == MYSQLI_TYPE_TIMESTAMP) ? "timestamp" : $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = ("" == $___mysqli_tmp->type && $___mysqli_type == MYSQLI_TYPE_YEAR) ? "year" : $___mysqli_tmp->type)) && (!is_null($___mysqli_tmp->type = ("" |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X