<?php
/************************************************************************
- * MXChange v0.2.1 Start: 08/29/2004 *
- * =============== Last change: 08/29/2004 *
+ * Mailer v0.2.1-FINAL Start: 08/29/2004 *
+ * =================== Last change: 08/29/2004 *
* *
* -------------------------------------------------------------------- *
* File : lib-mysql3.php *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
// 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)));
- // Compile config out
- $sqlString = FILTER_COMPILE_CONFIG($sqlString);
+ // Replace {PER}
+ $sqlString = str_replace('{PER}', '%', $sqlString);
+
+ // Compile config entries out
+ $eval = "\$sqlString = \"".FILTER_COMPILE_CONFIG(escapeQuotes($sqlString))."\";";
+ eval($eval);
// Starting time
- $querytimeBefore = array_sum(explode(' ', microtime()));
+ $querytimeBefore = microtime(true);
// Run SQL command
- ///* DEBUG: */ print($sqlString . '<br />');
+ //* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($sqlString) . '<br />');
$result = mysql_query($sqlString, SQL_GET_LINK())
- or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '<br />
-Query string:<br />
-' . $sqlString);
+ 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());
- // 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);
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");
// SQL num rows
function SQL_NUMROWS ($result) {
+ // Valid link resource?
+ if (!SQL_IS_LINK_UP()) return false;
+
// Link is not up, no rows by default
$lines = false;
$lines = mysql_num_rows($result);
// 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;
+ if (empty($lines)) $lines = '0';
+ } else {
+ // No resource given, please fix this
+ trigger_error('No resource given! result[]=' . gettype($result));
}
// Return lines
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
// 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;
SQL_SET_LINK($connect);
// Destroy cache
- unset($GLOBALS['sql_link_res']);
+ unset($GLOBALS['is_sql_link_up']);
}
// SQL select database
SQL_SET_LINK(null);
// Destroy cache
- unset($GLOBALS['sql_link_res']);
+ unset($GLOBALS['is_sql_link_up']);
// Return the result
return $close;
// 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: */ fclose($fp);
+ //* 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: */ fclose($fp);
if ($run === true) {
// Run SQL query (default)
} // 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);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str='.$str);
$ret = mysql_real_escape_string($str, SQL_GET_LINK());
} elseif (function_exists('mysql_escape_string')) {
// 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
// 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;
$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);
+}
+
// [EOF]
?>
projects / mailer.git / blobdiff