X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fdb%2Flib-mysql3.php;h=d2d13ba4530eb4dc92544699149b3ee06ead3ead;hb=168004e78b90321c9e8b0f1d9b591fb8159a9c96;hp=13dc80bb446c8136b70a7ebcdb4bfec02e2a4fb0;hpb=5dc48c7ca2416a0893a34a2e049827a4b4ce68b9;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 13dc80bb44..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,7 +41,7 @@ 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);
@@ -73,7 +71,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
$sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
// Compile config entries out
- $GLOBALS['last_sql'] = SQL_PREPARE_SQL_STRING($sqlString);
+ $GLOBALS['last_sql'] = SQL_PREPARE_SQL_STRING($sqlString, $enableCodes);
// Starting time
$querytimeBefore = microtime(true);
@@ -81,7 +79,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
// Run SQL command
//* 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='. $F . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n".
+ 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());
@@ -101,7 +99,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
incrementConfigEntry('sql_count');
// Debug output
- if ((getScriptOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
+ if ((!isCssOutputMode()) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
//
// Debugging stuff...
//
@@ -137,9 +135,15 @@ function SQL_NUMROWS ($resource) {
$lines = false;
// Is the result a valid resource?
- if (is_resource($resource)) {
+ 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($resource);
+
+ // 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']);
@@ -171,7 +175,7 @@ function SQL_FETCHROW ($resource) {
}
// SQL fetch array
-function SQL_FETCHARRAY ($res, $nr=0) {
+function SQL_FETCHARRAY ($res) {
// Is a result resource set?
if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
@@ -203,10 +207,10 @@ function SQL_RESULT ($resource, $row, $field = '0') {
// 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['is_sql_link_up']);
@@ -218,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
@@ -353,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;
@@ -469,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);
@@ -477,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
@@ -502,7 +506,10 @@ 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(__FUNCTION__, __LINE__, sprintf("link is not resource or null. Type: %s", gettype($link)));
} // END - if
@@ -539,14 +546,15 @@ function SQL_HASZERONUMS ($result) {
}
// Private function to prepare the SQL query string
-function SQL_PREPARE_SQL_STRING ($sqlString) {
+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);
+ $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false, $enableCodes);
+ //die($sqlString.'
'.$sqlString2.'
'.$GLOBALS['sql_strings'][$sqlString]);
} // END - if
// Return it