X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=c7cc26c7fae8ee02da7c98dd0d3e0e6d7f889995;hp=1c96788f119476f58d7db9bbd08d69f46e1018dc;hb=95ebee659171d4ad5ffd9ac55c1dbd68a90016fe;hpb=aaf81b8f35512782d34f78c1a0dac8b42d745393

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 1c96788f11..c7cc26c7fa 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -1,7 +1,7 @@
 <?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                                   *
@@ -18,6 +18,7 @@
  * 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 *
@@ -71,25 +72,26 @@ 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)));
 
-	// Compile config out
-	$sqlString = FILTER_COMPILE_CONFIG($sqlString, true);
+	// 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('F=' . basename($F) . ',L=' . $L . 'sql=' . $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);
 	//* 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:<br />
 	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");
@@ -199,7 +201,7 @@ 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;
 	}
 }
@@ -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) {
@@ -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