X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=61aaa980cd7a7498ee0e30e7c1f8abb78fca6a4a;hb=7770a9545292d628afd2be4f58f86da5c9139619;hp=67c37e02ef7d37985664e3d2258d2eed35316b03;hpb=2e9e34b22b8354dba7c0bd699e5486e99a64bc58;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 67c37e02ef..fd86300e36 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -1,19 +1,23 @@
\n";
- $result = mysql_query($sql_string, SQL_GET_LINK())
- or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()."
-Query string:
-".$sql_string);
-
- // Ending time
- $querytimeAfter = array_sum(explode(' ', microtime()));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($file) . ',line=' . $line . ',sql=' . $GLOBALS['last_sql']);
+ $result = mysql_query($GLOBALS['last_sql'], getSqlLink())
+ or sqlError($file, $line, 'file='. basename($file) . ',line=' . $line . ':mysql_error()=' . mysql_error() . ',last_query=' . $GLOBALS['last_sql']);
+ //* DEBUG: */ logDebugMessage($file, $line, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . sqlAffectedRows() . ',numRows='.(isValidSqlLink($result) ? sqlNumRows($result) : gettype($result)));
// Calculate query time
- $queryTime = $querytimeAfter - $querytimeBefore;
+ $queryTime = microtime(TRUE) - $querytimeBefore;
+
+ // Add this query to array including timing
+ addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $file, $line);
// Save last successfull query
- setConfigEntry('db_last_query', $sql_string);
+ setConfigEntry('db_last_query', $GLOBALS['last_sql']);
+
+ // Count all query times
+ incrementConfigEntry('sql_time', $queryTime);
// Count this query
incrementConfigEntry('sql_count');
// Debug output
- //* DEBUG: */ print "Query=".$sql_string."
, affected=".SQL_AFFECTEDROWS().", numrows=".SQL_NUMROWS($result)."
\n";
- if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isDebugModeEnabled()) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
- //
- // Debugging stuff...
- //
- $fp = fopen(constant('PATH')."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
+ if (isSqlDebugEnabled()) {
+ // Is this the first call?
if (!isset($GLOBALS['sql_first_entry'])) {
// Write first entry
- fwrite($fp, "Module=".$GLOBALS['module']."\n");
- $GLOBALS['sql_first_entry'] = true;
+ appendLineToFile(getCachePath() . 'mysql.log', 'Module=' . getModule());
+ $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', " ", $sql_string))."\n");
- fclose($fp);
+
+ // Append debug line
+ appendLineToFile(getCachePath() . 'mysql.log', basename($file) . '|LINE=' . $line . '|NUM=' . (isValidSqlLink($result) ? sqlNumRows($result) : 'false') . '|AFFECTED=' . sqlAffectedRows() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), PHP_EOL), array('', ' '), $GLOBALS['last_sql']));
} // END - if
- // Count DB hits
- if (!isConfigEntrySet('db_hits_run')) {
- // Count in dummy variable
- setConfigEntry('db_hits_run', 1);
- } else {
- // Count to config array
- incrementConfigEntry('db_hits_run');
- }
+ // Increment stats entry
+ incrementStatsEntry('db_hits');
// Return the result
return $result;
}
// SQL num rows
-function SQL_NUMROWS ($result) {
+function sqlNumRows ($resource) {
+ // Valid link resource?
+ if (!isSqlLinkUp()) 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'][intval($resource)])) {
+ // Use cache
+ $lines = $GLOBALS['sql_numrows'][intval($resource)];
+ } elseif (isValidSqlLink($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;
+ // Remember it in cache
+ $GLOBALS['sql_numrows'][intval($resource)] = $lines;
} else {
- // No resource given, no lines found!
- $lines = 0;
+ // No resource given, please fix this
+ reportBug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' . $GLOBALS['last_sql']);
}
+
+ // Return lines
return $lines;
}
// SQL affected rows
-function SQL_AFFECTEDROWS() {
+function sqlAffectedRows () {
// Valid link resource?
- if (!SQL_IS_LINK_UP()) return false;
+ if (!isSqlLinkUp()) return FALSE;
// Get affected rows
- $lines = mysql_affected_rows(SQL_GET_LINK());
+ $lines = mysql_affected_rows(getSqlLink());
// Return it
return $lines;
}
// SQL fetch row
-function SQL_FETCHROW($result) {
- // Init data
- $DATA = array();
+function sqlFetchRow ($resource) {
+ // Is $resource valid?
+ if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
- // Is a result resource set?
- if (!is_resource($result)) return false;
-
- $DATA = mysql_fetch_row($result);
- return $DATA;
+ // Fetch the data and return it
+ return mysql_fetch_row($resource);
}
// SQL fetch array
-function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
- // Is a result resource set?
- if (!is_resource($res)) return false;
-
- // Initialize array
- $row = array();
+function sqlFetchArray ($resource) {
+ // Is $resource valid?
+ if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
- // Load row from database
- $row = mysql_fetch_array($res);
+ // Load row as array from database
+ $row = mysql_fetch_assoc($resource);
// 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 false;
+ // Return a false, else some loops would go endless...
+ return FALSE;
}
}
// SQL result
-function SQL_RESULT ($res, $row, $field) {
- $result = mysql_result($res, $row, $field);
+function sqlResult ($resource, $row, $field = '0') {
+ // Is $resource valid?
+ if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
+
+ // Run the result command
+ $result = mysql_result($resource, $row, $field);
+
+ // ... and return the result
return $result;
}
// SQL connect
-function SQL_CONNECT ($host, $login, $password, $F, $L) {
+function sqlConnectToDatabase ($host, $login, $password, $file, $line) {
// Try to connect
- $connect = mysql_connect($host, $login, $password) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+ $linkResource = mysql_connect($host, $login, $password) or sqlError($file, $line, mysql_error());
// Set the link resource
- SQL_SET_LINK($connect);
+ if (isValidSqlLink($linkResource)) {
+ /*
+ * A non-resource (boolean) may happen on installation phase which
+ * shall not be set here. Only valid link resources shall be set so
+ * isSqlLinkUp() will only return 'true' if there is really a
+ * working database link.
+ */
+ setSqlLink($file . ':' . __FUNCTION__, $line . ':' . __LINE__, $linkResource);
+
+ // Init charsets (UTF-8 is default now)
+ sqlQuery("SET
+ `character_set_results`='utf8',
+ `character_set_client`='utf8',
+ `character_set_connection`='utf8',
+ `character_set_database`='utf8',
+ `character_set_server`='utf8'", $file . ':' . __FUNCTION__, $line . ':' . __LINE__);
+
+ // Disallow subtraction for unsigned columns
+ sqlQuery("SET `sql_mode`='NO_UNSIGNED_SUBTRACTION'", $file . ':' . __FUNCTION__, $line . ':' . __LINE__);
+ } // END - if
+
+ // Return the resource
+ //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'linkResource[]=' . gettype($linkResource));
+ return $linkResource;
}
// SQL select database
-function SQL_SELECT_DB ($dbName, $F, $L) {
+function sqlSelectDatabase ($dbName, $file, $line) {
// Is there still a valid link? If not, skip it.
- if (!SQL_IS_LINK_UP()) return false;
+ if (!isSqlLinkUp()) return FALSE;
// Return the result
- return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+ //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'Selecting database ' . $dbName);
+ return mysql_select_db($dbName, getSqlLink()) or sqlError($file, $line, mysql_error());
}
// SQL close link
-function SQL_CLOSE ($F, $L) {
- if (!SQL_IS_LINK_UP()) {
+function sqlCloseLink ($file, $line) {
+ // Is the link up?
+ if (!isSqlLinkUp()) {
// Skip double close
- return false;
- } // END - if
-
- // Do we need to update cache/db counter?
- //* DEBUG: */ echo "DB=".getConfig('db_hits').",CACHE=".getConfig('cache_hits')."
\n";
- if ((GET_EXT_VERSION("cache") >= "0.0.7") && (getConfig('db_hits') > 0) && (getConfig('cache_hits') > 0) && (isCacheInstanceValid())) {
- // Add new hits
- incrementConfigEntry('db_hits', getConfig('db_hits_run'));
-
- // Update counter for db/cache
- UPDATE_CONFIG(array("db_hits", "cache_hits"), array(getConfig(('db_hits')), getConfig(('cache_hits'))));
+ //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'Called but no link is open.');
+ return FALSE;
} // END - if
// Close database link and forget the link
- $close = mysql_close(SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+ $close = mysql_close(getSqlLink()) or sqlError($file . ':' . __FUNCTION__, $line . ':' . __LINE__, mysql_error());
- // Close link
- SQL_SET_LINK(null);
+ // Close link in this layer
+ unsetSqlLinkUp(__FUNCTION__, __LINE__);
// Return the result
+ //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'close[' . gettype($close) . ']=' . intval($close));
return $close;
}
// SQL free result
-function SQL_FREERESULT ($result) {
- if (!is_resource($result)) {
+function sqlFreeResult ($resource) {
+ if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) {
// Abort here
- return false;
+ 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) {
- // Link is there?
- if (!SQL_IS_LINK_UP()) return false;
+// Get id from last INSERT command and secure id
+function getSqlInsertId () {
+ if (!isSqlLinkUp()) return FALSE;
+ return bigintval(mysql_insert_id());
+}
- // Init variable
- $query = "failed";
+// Escape a string for the database
+function sqlEscapeString ($str, $secureString = TRUE, $strip = TRUE) {
+ // Is there cache?
+ if (!isset($GLOBALS['sql_escapes']['' . $str . ''])) {
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ' - BEFORE!');
- if ($strip) {
- $strip = "true";
- } else {
- $strip = "false";
- }
+ // Prepare the string here
+ $str = sqlPrepareQueryString($str);
- $eval = "\$query = sprintf(\"".$qstring."\"";
- foreach ($data as $var) {
- if ((!empty($var)) || ($var === 0)) {
- $eval .= ", SQL_ESCAPE(\"".$var."\",true,".$strip.")";
- } else {
- $eval .= ", ''";
- }
- } // END - foreach
- $eval .= ");";
- //
- // Debugging
- //
- //* DEBUG: */ $fp = fopen(constant('PATH')."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
- //* DEBUG: */ fwrite($fp, $F."(".$L."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
- //* DEBUG: */ fclose($fp);
-
- // Run the code
- eval($eval);
-
- // Was the eval() command fine?
- if ($query == "failed") {
- // Something went wrong?
- debug_report_bug("eval={$eval}");
- } // END - if
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ' - AFTER!');
- if ($run === true) {
- // Run SQL query (default)
- return SQL_QUERY($query, $F, $L);
- } else {
- // Return secured string
- return $query;
- }
-}
+ // Secure string first? (which is the default behaviour!)
+ if ($secureString === TRUE) {
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',strip=' . intval($strip) . ' - BEFORE!');
-// Get ID from last INSERT command
-function SQL_INSERTID () {
- if (!SQL_IS_LINK_UP()) return false;
- return mysql_insert_id();
-}
+ // Then do it here
+ $str = secureString($str, $strip);
-// Escape a string for the database
-function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
- // Secure string first? (which is the default behaviour!)
- if ($secureString) {
- // Then do it here
- $str = secureString($str, $strip);
- } // END - if
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',strip=' . intval($strip) . ' - AFTER!');
+ } // END - if
- if (!SQL_IS_LINK_UP()) {
- // Fall-back to smartAddSlashes() when there is no link
- return smartAddSlashes($str);
- } elseif (function_exists('mysql_real_escape_string')) {
- // The new and improved version
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):str={$str}
\n";
- return mysql_real_escape_string($str, SQL_GET_LINK());
- } elseif (function_exists('mysql_escape_string')) {
- // The obsolete function
- return mysql_escape_string($str, SQL_GET_LINK());
- } else {
- // If nothing else works, fall back to smartAddSlashes()
- return smartAddSlashes($str);
- }
-}
+ // Init (invalid) value
+ $ret = '!INVALID!';
-// SELECT query string from table, columns and so on... ;-)
-function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
- // Is columns an array?
- if (!is_array($columns)) {
- // No array
- trigger_error(sprintf("columns is not array. %s!=array", gettype($columns)));
- } // END - if
+ if (!isSqlLinkUp()) {
+ // Fall-back to escapeQuotes() when there is no link
+ $ret = escapeQuotes($str);
+ } elseif (function_exists('mysql_real_escape_string')) {
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str);
- // Prepare the SQL statement
- $sql = "SELECT `".implode("`, `", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
+ // The new and improved version
+ $ret = mysql_real_escape_string($str, getSqlLink());
- // Return the result
- return SQL_QUERY_ESC($sql,
- array(
- bigintval($id),
- $table,
- $idRow
- ), $F, $L);
-}
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',ret=' . $ret);
+ } elseif (function_exists('mysql_escape_string')) {
+ // The obsolete function
+ $ret = mysql_escape_string($str, getSqlLink());
+ } else {
+ // If nothing else works, fall back to escapeQuotes() again
+ $ret = escapeQuotes($str);
+ }
-// ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L) {
- // This is the default result...
- $result = false;
-
- // Determine index/fulltext/unique word
- // 12 3 3 2 2 3 3 2 2 3 3 21
- $noIndex = ((eregi("INDEX", $sql) == false) && (eregi("FULLTEXT", $sql) == false) && (eregi("UNIQUE", $sql) == false));
-
- // Shall we add/drop?
- if (((eregi("ADD", $sql) > 0) || (eregi("DROP", $sql) > 0)) && ($noIndex)) {
- // Extract table name
- $tableArray = explode(" ", $sql);
- $tableName = str_replace("`", "", $tableArray[2]);
-
- // And column name as well
- $columnName = str_replace("`", "", $tableArray[4]);
-
- // Get column information
- $result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
- array($tableName, $columnName), $F, $L);
-
- // 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) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
- // Do the query
- $result = SQL_QUERY($sql, $F, $L, false);
- } // END - if
- } else {
- // Send it to the SQL_QUERY() function
- $result = SQL_QUERY($sql, $F, $L, false);
- }
+ // Log message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',ret=' . $ret);
- // Return result
- return $result;
+ // Cache result
+ $GLOBALS['sql_escapes']['' . $str . ''] = $ret;
+ } // END - if
+
+ // Log message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',sql_escapes=' . $GLOBALS['sql_escapes']['' . $str . '']);
+
+ // Return it
+ return $GLOBALS['sql_escapes']['' . $str . ''];
}
-// Getter for SQL link
-function SQL_GET_LINK () {
- // Init link
- $link = null;
+// Log SQL errors to debug.log in installation phase or call reportBug()
+function sqlError ($file, $line, $message) {
+ // Remember plain error in last_sql_error
+ $GLOBALS['last_sql_error'] = mysql_error();
- // Is it in the globals?
- if (isset($GLOBALS['sql_link'])) {
- // Then take it
- $link = $GLOBALS['sql_link'];
+ // Is login set?
+ if (!empty($GLOBALS['mysql']['login'])) {
+ // Secure login name in message
+ $message = str_replace($GLOBALS['mysql']['login'], '***', $message);
} // END - if
- // Return it
- return $link;
-}
+ // Is database password set?
+ if (!empty($GLOBALS['mysql']['password'])) {
+ // Secure password in message
+ $message = str_replace($GLOBALS['mysql']['password'], '***', $message);
+ } // END - if
-// Setter for link
-function SQL_SET_LINK ($link) {
- // Is this a resource or null?
- if ((!is_resource($link)) && (!is_null($link))) {
- // This should never happen!
- trigger_error(sprintf("link is not resource or null. Type: %s", gettype($link)));
+ // Is database name set?
+ if (!empty($GLOBALS['mysql']['dbase'])) {
+ // Secure database name in message
+ $message = str_replace($GLOBALS['mysql']['dbase'], '***', $message);
} // END - if
- // Set it
- $GLOBALS['sql_link'] = $link;
+ // Is there installation phase?
+ if (isInstaller()) {
+ /*
+ * In installation phase, we don't want SQL errors abort e.g. connection
+ * tests, so just log it away.
+ */
+ logDebugMessage($file, $line, $message);
+ } else {
+ // Regular mode, then call reportBug()
+ reportBug($file, $line, $message);
+ }
}
-// Checks if the link is up
-function SQL_IS_LINK_UP () {
- // Get the link
- $link = SQL_GET_LINK();
-
- // Return the result
- return (is_resource($link));
+// Checks whether given link is a valid SQL link
+function isValidSqlLink ($linkResource) {
+ // Is it a resource?
+ return is_resource($linkResource);
}
-//
+// [EOF]
?>