* =================== Last change: 08/29/2004 *
* *
* -------------------------------------------------------------------- *
- * File : lib-mysql3.php *
+ * File : lib-mysql.php *
* -------------------------------------------------------------------- *
- * Short description : Database layer for MySQL 3/4/5 server *
+ * Short description : Database layer for PHP 5.4 and older *
* -------------------------------------------------------------------- *
- * Kurzbeschreibung : Datenbankschicht fuer MySQL 3/4/5 Server *
- * -------------------------------------------------------------------- *
- * $Revision:: $ *
- * $Date:: $ *
- * $Tag:: 0.2.1-FINAL $ *
- * $Author:: $ *
+ * Kurzbeschreibung : Datenbankschicht fuer PHP 5.4 und aelter *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2013 by Mailer Developer Team *
// Run SQL command
//* 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']);
+ or logSqlError($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
// SQL connect
function sqlConnectToDatabase ($host, $login, $password, $file, $line) {
// Try to connect
- $linkResource = mysql_connect($host, $login, $password) or sqlError($file, $line, mysql_error());
+ $linkResource = mysql_connect($host, $login, $password) or logSqlError($file, $line, mysql_error());
// Set the link resource
if (isValidSqlLink($linkResource)) {
// Return the result
//* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'Selecting database ' . $dbName);
- return mysql_select_db($dbName, getSqlLink()) or sqlError($file, $line, mysql_error());
+ return mysql_select_db($dbName, getSqlLink()) or logSqlError($file, $line, mysql_error());
}
// SQL close link
} // END - if
// Close database link and forget the link
- $close = mysql_close(getSqlLink()) or sqlError($file . ':' . __FUNCTION__, $line . ':' . __LINE__, mysql_error());
+ $close = mysql_close(getSqlLink()) or logSqlError($file . ':' . __FUNCTION__, $line . ':' . __LINE__, mysql_error());
// Close link in this layer
unsetSqlLinkUp(__FUNCTION__, __LINE__);
return $GLOBALS['sql_escapes']['' . $str . ''];
}
-// Log SQL errors to debug.log in installation phase or call reportBug()
-function sqlError ($file, $line, $message) {
+// Set SQL error in global array
+function setSqlError ($file, $line, $message) {
// Remember plain error in last_sql_error
$GLOBALS['last_sql_error'] = mysql_error();
-
- // Is login set?
- if (!empty($GLOBALS['mysql']['login'])) {
- // Secure login name in message
- $message = str_replace($GLOBALS['mysql']['login'], '***', $message);
- } // END - if
-
- // Is database password set?
- if (!empty($GLOBALS['mysql']['password'])) {
- // Secure password in message
- $message = str_replace($GLOBALS['mysql']['password'], '***', $message);
- } // END - if
-
- // Is database name set?
- if (!empty($GLOBALS['mysql']['dbase'])) {
- // Secure database name in message
- $message = str_replace($GLOBALS['mysql']['dbase'], '***', $message);
- } // END - if
-
- // 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 whether given link is a valid SQL link