X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=c7cc26c7fae8ee02da7c98dd0d3e0e6d7f889995;hp=b4e386ce8ea20a1835d8a4bea4be04d445c05938;hb=95ebee659171d4ad5ffd9ac55c1dbd68a90016fe;hpb=82ba828dcdb063ea3292fad79008469d6423d223
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index b4e386ce8e..c7cc26c7fa 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -1,7 +1,7 @@
');
+ //* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($sqlString) . '
');
$result = mysql_query($sqlString, SQL_GET_LINK())
or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '
Query string:
' . $sqlString);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
- // Ending time
- $querytimeAfter = array_sum(explode(' ', microtime()));
-
// Calculate query time
- $queryTime = $querytimeAfter - $querytimeBefore;
+ $queryTime = microtime(true) - $querytimeBefore;
// Add this query to array including timing
addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
@@ -104,11 +106,11 @@ Query string:
incrementConfigEntry('sql_count');
// Debug output
- if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y')) {
+ if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
//
// Debugging stuff...
//
- $fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write mysql.log!");
+ $fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or app_die(__FILE__, __LINE__, 'Cannot write mysql.log!');
if (!isset($GLOBALS['sql_first_entry'])) {
// Write first entry
fwrite($fp, 'Module=' . getModule() . "\n");
@@ -142,10 +144,10 @@ function SQL_NUMROWS ($result) {
$lines = mysql_num_rows($result);
// Is the result empty? Then we have an error!
- if (empty($lines)) $lines = 0;
+ if (empty($lines)) $lines = '0';
} elseif (SQL_IS_LINK_UP()) {
// No resource given, no lines found!
- $lines = 0;
+ $lines = '0';
}
// Return lines
@@ -190,7 +192,7 @@ function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
if ($remove_numerical) {
// So let's remove all numerical elements to save memory!
$max = count($row);
- for ($idx = 0; $idx < ($max / 2); $idx++) {
+ for ($idx = '0'; $idx < ($max / 2); $idx++) {
// Remove entry
unset($row[$idx]);
} // END - for
@@ -199,13 +201,13 @@ function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
// Return row
return $row;
} else {
- // Return a false here...
+ // Return a false, else some loops would go endless...
return false;
}
}
// SQL result
-function SQL_RESULT ($res, $row, $field = 0) {
+function SQL_RESULT ($res, $row, $field = '0') {
// Is $res valid?
if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
@@ -223,7 +225,7 @@ function SQL_CONNECT ($host, $login, $password, $F, $L) {
SQL_SET_LINK($connect);
// Destroy cache
- unset($GLOBALS['sql_link_res']);
+ unset($GLOBALS['is_sql_link_up']);
}
// SQL select database
@@ -250,7 +252,7 @@ function SQL_CLOSE ($F, $L) {
SQL_SET_LINK(null);
// Destroy cache
- unset($GLOBALS['sql_link_res']);
+ unset($GLOBALS['is_sql_link_up']);
// Return the result
return $close;
@@ -284,7 +286,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
// Debugging
//
//* DEBUG: */ $fp = fopen(getConfig('CACHE_PATH') . 'escape_debug.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write debug.log!");
- //* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", " ", $eval))."\n");
+ //* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", ' ', $eval))."\n");
//* DEBUG: */ fclose($fp);
if ($run === true) {
@@ -313,8 +315,8 @@ function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
} // END - if
if (!SQL_IS_LINK_UP()) {
- // Fall-back to smartAddSlashes() when there is no link
- $ret = smartAddSlashes($str);
+ // Fall-back to escapeQuotes() when there is no link
+ $ret = escapeQuotes($str);
} elseif (function_exists('mysql_real_escape_string')) {
// The new and improved version
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str='.$str);
@@ -323,8 +325,8 @@ function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
// The obsolete function
$ret = mysql_escape_string($str, SQL_GET_LINK());
} else {
- // If nothing else works, fall back to smartAddSlashes() again
- $ret = smartAddSlashes($str);
+ // If nothing else works, fall back to escapeQuotes() again
+ $ret = escapeQuotes($str);
}
// Cache result
@@ -401,14 +403,14 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
// Do we have no entry on ADD or an entry on DROP?
// 123 4 4 3 3 4 4 32 23 4 4 3 3 4 4 321
- if (((SQL_NUMROWS($result) == 0) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
+ if (((SQL_NUMROWS($result) == '0') && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
// Do the query
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
$result = SQL_QUERY($sql, $F, $L, false);
// Skip further attempt(s)
break;
- } elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 0) && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
+ } elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == '0') && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
// Abort here because it is alreay there
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql);
break;
@@ -528,15 +530,15 @@ function SQL_IS_LINK_UP () {
$linkUp = false;
// Do we have cached this?
- if (isset($GLOBALS['sql_link_res'])) {
+ if (isset($GLOBALS['is_sql_link_up'])) {
// Then use this
- $linkUp = $GLOBALS['sql_link_res'];
+ $linkUp = $GLOBALS['is_sql_link_up'];
} else {
// Get it
$linkUp = is_resource(SQL_GET_LINK());
// And cache it
- $GLOBALS['sql_link_res'] = $linkUp;
+ $GLOBALS['is_sql_link_up'] = $linkUp;
}
// Return the result