X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=8880bef74aac03d79d985d0bb6be5132bab1334e;hb=1c4e78c5d68b97b82a3b930aa6db1e6df188f653;hp=4f4b8cd0989c67d6fbadf6c02a587db58927357b;hpb=22ba0c36c75ff989a6f48197c5a71524fb891b87;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 4f4b8cd098..8880bef74a 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -50,7 +50,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
// Link is up?
if (!SQL_IS_LINK_UP()) {
// We should not quietly ignore this!
- debug_report_bug(sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
$sqlString,
basename($F),
$L
@@ -60,7 +60,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
return false;
} elseif (empty($sqlString)) {
// Empty SQL string!
- debug_report_bug(sprintf("SQL string is empty. Please fix this. file=%s, line=%s",
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("SQL string is empty. Please fix this. file=%s, line=%s",
basename($F),
$L
));
@@ -72,30 +72,27 @@ function SQL_QUERY ($sqlString, $F, $L) {
// Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
$sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
- // Replace {PER}
- $sqlString = str_replace('{PER}', '%', $sqlString);
-
// Compile config entries out
- $sqlString = SQL_PREPARE_SQL_STRING($sqlString);
+ $GLOBALS['last_sql'] = SQL_PREPARE_SQL_STRING($sqlString);
// Starting time
$querytimeBefore = microtime(true);
// Run SQL command
- //* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($sqlString) . '
');
- $result = mysql_query($sqlString, SQL_GET_LINK())
- or debug_report_bug('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . $F . ' (' . $L . '):' . mysql_error() . "\n".
-'Query string:' . $sqlString);
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
+ //* DEBUG: */ debugOutput('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($GLOBALS['last_sql']));
+ $result = mysql_query($GLOBALS['last_sql'], SQL_GET_LINK())
+ or debug_report_bug($F, $L, 'file='. $F . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n".
+'Query string:' . $GLOBALS['last_sql']);
+ //* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . SQL_AFFECTEDROWS());
// Calculate query time
$queryTime = microtime(true) - $querytimeBefore;
// Add this query to array including timing
- addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
+ addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $F, $L);
// Save last successfull query
- setConfigEntry('db_last_query', $sqlString);
+ setConfigEntry('db_last_query', $GLOBALS['last_sql']);
// Count all query times
incrementConfigEntry('sql_time', $queryTime);
@@ -108,13 +105,13 @@ function SQL_QUERY ($sqlString, $F, $L) {
//
// 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 debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write mysql.log!');
if (!isset($GLOBALS['sql_first_entry'])) {
// Write first entry
fwrite($fp, 'Module=' . getModule() . "\n");
$GLOBALS['sql_first_entry'] = true;
} // END - if
- fwrite($fp, $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $sqlString)) . "\n");
+ fwrite($fp, $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])) . "\n");
fclose($fp);
} // END - if
@@ -132,7 +129,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
}
// SQL num rows
-function SQL_NUMROWS ($result) {
+function SQL_NUMROWS ($resource) {
// Valid link resource?
if (!SQL_IS_LINK_UP()) return false;
@@ -140,12 +137,12 @@ function SQL_NUMROWS ($result) {
$lines = false;
// Is the result a valid resource?
- if (is_resource($result)) {
+ if (is_resource($resource)) {
// Get the count of rows from database
- $lines = mysql_num_rows($result);
+ $lines = mysql_num_rows($resource);
} else {
// No resource given, please fix this
- trigger_error('No resource given! result[]=' . gettype($result));
+ debug_report_bug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' . $GLOBALS['last_sql']);
}
// Return lines
@@ -165,37 +162,24 @@ function SQL_AFFECTEDROWS() {
}
// SQL fetch row
-function SQL_FETCHROW ($result) {
+function SQL_FETCHROW ($resource) {
// Is a result resource set?
- if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) return false;
+ if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
// Fetch the data and return it
- return mysql_fetch_row($result);
+ return mysql_fetch_row($resource);
}
// SQL fetch array
-function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
+function SQL_FETCHARRAY ($res, $nr=0) {
// Is a result resource set?
if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
- // Initialize array
- $row = array();
-
// Load row from database
- $row = mysql_fetch_array($res);
+ $row = mysql_fetch_assoc($res);
// Return only arrays here
if (is_array($row)) {
- // Shall we remove numerical data here automatically?
- if ($remove_numerical) {
- // So let's remove all numerical elements to save memory!
- $max = count($row);
- for ($idx = '0'; $idx < ($max / 2); $idx++) {
- // Remove entry
- unset($row[$idx]);
- } // END - for
- } // END - if
-
// Return row
return $row;
} else {
@@ -205,12 +189,14 @@ function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
}
// SQL result
-function SQL_RESULT ($res, $row, $field = '0') {
- // Is $res valid?
- if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
+function SQL_RESULT ($resource, $row, $field = '0') {
+ // Is $resource valid?
+ if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+
+ // Run the result command
+ $result = mysql_result($resource, $row, $field);
- // Run the result command and return the result
- $result = mysql_result($res, $row, $field);
+ // ... and return the result
return $result;
}
@@ -257,23 +243,26 @@ function SQL_CLOSE ($F, $L) {
}
// SQL free result
-function SQL_FREERESULT ($result) {
- if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) {
+function SQL_FREERESULT ($resource) {
+ if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) {
// Abort here
return false;
} // END - if
- $res = mysql_free_result($result);
+ // Free result
+ $res = mysql_free_result($resource);
+
+ // And return that result of freeing it...
return $res;
}
// SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
+function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $secure = true) {
// Link is there?
if ((!SQL_IS_LINK_UP()) || (!is_array($data))) return false;
// Escape all data
- $dataSecured['__sql_string'] = $qstring;
+ $dataSecured['__sql_string'] = $sqlString;
foreach ($data as $key => $value) {
$dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
} // END - foreach
@@ -283,8 +272,8 @@ 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: */ $fp = fopen(getConfig('CACHE_PATH') . 'escape_debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write debug.log!');
+ //* DEBUG: */ fwrite($fp, $F . '(' . $L . '): ' . str_replace("\r", '', str_replace("\n", ' ', $eval)) . "\n");
//* DEBUG: */ fclose($fp);
if ($run === true) {
@@ -303,7 +292,7 @@ function SQL_INSERTID () {
}
// Escape a string for the database
-function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
+function SQL_ESCAPE ($str, $secureString = true, $strip = true) {
// Do we have cache?
if (!isset($GLOBALS['sql_escapes'][''.$str.''])) {
// Secure string first? (which is the default behaviour!)
@@ -340,7 +329,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
// Is columns an array?
if (!is_array($columns)) {
// No array
- debug_report_bug(sprintf("columns is not an array. %s != array, file=%s, line=%s",
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s",
gettype($columns),
basename($F),
$L
@@ -397,7 +386,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
// Get column information
$result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
- array($tableName, $columnName), __FILE__, __LINE__);
+ array($tableName, $columnName), __FUNCTION__, __LINE__);
// 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
@@ -422,7 +411,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
} elseif ($noIndex === false) {
// And column name as well
- //* DEBUG: */ print __LINE__.':tableArray=' . print_r($tableArray, true) . '
';
+ //* DEBUG: */ debugOutput(__LINE__.':tableArray=' . print_r($tableArray, true) . '
');
$keyName = str_replace('`', '', $tableArray[5]);
// Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
@@ -444,7 +433,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
} // END - if
// Show indexes
- $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
// Non-skipping is default for ADD
$skip = false;
@@ -459,7 +448,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
// Walk through all
while ($content = SQL_FETCHARRAY($result)) {
// Is it found?
- //* DEBUG: */ print(__LINE__.':columnName='.$keyName.',content=' . print_r($content, true) . '
');
+ //* DEBUG: */ debugOutput(__LINE__.':columnName='.$keyName.',content=' . print_r($content, true) . '
');
if (($content['Key_name'] == $keyName) && ($tableArray[3] == 'ADD')) {
// Skip this query!
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ADD: Skiped: %s", $sql));
@@ -515,7 +504,7 @@ function SQL_SET_LINK ($link) {
// Is this a resource or null?
if ((!is_resource($link)) && (!is_null($link))) {
// This should never happen!
- debug_report_bug(sprintf("link is not resource or null. Type: %s", gettype($link)));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("link is not resource or null. Type: %s", gettype($link)));
} // END - if
// Set it
@@ -553,12 +542,11 @@ function SQL_HASZERONUMS ($result) {
function SQL_PREPARE_SQL_STRING ($sqlString) {
// Is it already cached?
if (!isset($GLOBALS['sql_strings'][$sqlString])) {
- // No, then generate the eval() command
- $eval = '$sql = "' . FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG(escapeQuotes($sqlString))) . '";';
- eval($eval);
+ // Compile config+expression code
+ $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString));
- // ... and set it
- $GLOBALS['sql_strings'][$sqlString] = $sql;
+ // Do final compilation
+ $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false);
} // END - if
// Return it