X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fdb%2Flib-mysql3.php;h=d2d13ba4530eb4dc92544699149b3ee06ead3ead;hb=168004e78b90321c9e8b0f1d9b591fb8159a9c96;hp=7f5a297c64642679265ab14be06f0452a9861131;hpb=fd4bf800943a932696a2d2c25f702a771c2c3cf9;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 7f5a297c64..d2d13ba453 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -14,8 +14,6 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
@@ -43,14 +41,14 @@ if (!defined('__SECURITY')) {
} // END - if
// SQL queries
-function SQL_QUERY ($sqlString, $F, $L) {
+function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
// Trim SQL string
$sqlString = trim($sqlString);
// 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 +58,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,32 +70,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
- $eval = "\$sqlString = \"".FILTER_COMPILE_CONFIG(escapeQuotes($sqlString))."\";";
- eval($eval);
+ $GLOBALS['last_sql'] = SQL_PREPARE_SQL_STRING($sqlString, $enableCodes);
// 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 addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '
-Query string:
-' . $sqlString);
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
+ //* DEBUG: */ debugOutput('F=' . basename($F) . ',L=' . $L . 'sql=' . encodeEntities($GLOBALS['last_sql']));
+ $result = mysql_query($GLOBALS['last_sql'], SQL_GET_LINK())
+ or debug_report_bug($F, $L, 'file='. basename($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);
@@ -106,17 +99,17 @@ Query string:
incrementConfigEntry('sql_count');
// Debug output
- if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
+ if ((!isCssOutputMode()) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
//
// Debugging stuff...
//
- $fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or app_die(__FILE__, __LINE__, 'Cannot write mysql.log!');
+ $fp = fopen(getCachePath() . '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
@@ -134,20 +127,26 @@ Query string:
}
// SQL num rows
-function SQL_NUMROWS ($result) {
+function SQL_NUMROWS ($resource) {
+ // Valid link resource?
+ if (!SQL_IS_LINK_UP()) return false;
+
// Link is not up, no rows by default
$lines = false;
// Is the result a valid resource?
- if (is_resource($result)) {
+ if (isset($GLOBALS['sql_numrows'][$resource])) {
+ // Use cache
+ $lines = $GLOBALS['sql_numrows'][intval($resource)];
+ } elseif (is_resource($resource)) {
// Get the count of rows from database
- $lines = mysql_num_rows($result);
+ $lines = mysql_num_rows($resource);
- // Is the result empty? Then we have an error!
- if (empty($lines)) $lines = '0';
- } elseif (SQL_IS_LINK_UP()) {
- // No resource given, no lines found!
- $lines = '0';
+ // Remember it in cache
+ $GLOBALS['sql_numrows'][intval($resource)] = $lines;
+ } else {
+ // No resource given, please fix this
+ debug_report_bug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' . $GLOBALS['last_sql']);
}
// Return lines
@@ -167,65 +166,54 @@ 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) {
// 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 {
- // Return a false here...
+ // Return a false, else some loops would go endless...
return false;
}
}
// 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;
}
// SQL connect
function SQL_CONNECT ($host, $login, $password, $F, $L) {
// Try to connect
- $connect = mysql_connect($host, $login, $password) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+ $linkResource = mysql_connect($host, $login, $password) or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error());
// Set the link resource
- SQL_SET_LINK($connect);
+ SQL_SET_LINK($linkResource);
// Destroy cache
- unset($GLOBALS['sql_link_res']);
+ unset($GLOBALS['is_sql_link_up']);
}
// SQL select database
@@ -234,7 +222,7 @@ function SQL_SELECT_DB ($dbName, $F, $L) {
if (!SQL_IS_LINK_UP()) return false;
// Return the result
- return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+ return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error());
}
// SQL close link
@@ -252,30 +240,33 @@ 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;
}
// 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
@@ -285,8 +276,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(getCachePath() . '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) {
@@ -305,7 +296,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!)
@@ -342,7 +333,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
@@ -366,7 +357,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
}
// ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L) {
+function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
// Abort if link is down
if (!SQL_IS_LINK_UP()) return false;
@@ -399,18 +390,18 @@ 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
- if (((SQL_NUMROWS($result) == '0') && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
+ if (((SQL_HASZERONUMS($result)) && (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_HASZERONUMS($result)) && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
// Abort here because it is alreay there
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql);
break;
@@ -424,7 +415,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 @@ -446,7 +437,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; @@ -461,7 +452,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)); @@ -482,7 +473,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) { if ($skip === false) { // Send it to the SQL_QUERY() function //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql); - $result = SQL_QUERY($sql, $F, $L, false); + $result = SQL_QUERY($sql, $F, $L, $enableCodes); } else { // Not executed //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql); @@ -490,7 +481,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) { } else { // Other ALTER TABLE query //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql); - $result = SQL_QUERY($sql, $F, $L, false); + $result = SQL_QUERY($sql, $F, $L, $enableCodes); } // Return result @@ -515,9 +506,12 @@ function SQL_GET_LINK () { // Setter for link function SQL_SET_LINK ($link) { // Is this a resource or null? - if ((!is_resource($link)) && (!is_null($link))) { + if ((ifFatalErrorsDetected()) && (isInstallationPhase())) { + // This may happen in installation phase + return; + } elseif ((!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 @@ -530,20 +524,42 @@ 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 return $linkUp; } +// Wrapper function to make code more readable +function SQL_HASZERONUMS ($result) { + // Just pass it through + return (SQL_NUMROWS($result) === 0); +} + +// Private function to prepare the SQL query string +function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = true) { + // Is it already cached? + if (!isset($GLOBALS['sql_strings'][$sqlString])) { + // Compile config+expression code + $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString)); + + // Do final compilation + $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false, $enableCodes); + //die($sqlString.'