* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
-}
+ die();
+} // END - if
// SQL queries
-function SQL_QUERY ($sql_string, $F, $L) {
+function SQL_QUERY ($sqlString, $F, $L) {
+ // Trim SQL string
+ $sqlString = trim($sqlString);
+
// Link is up?
- if (!SQL_IS_LINK_UP()) return false;
+ if (!SQL_IS_LINK_UP()) {
+ // We should not quietly ignore this!
+ debug_report_bug(sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
+ $sqlString,
+ basename($F),
+ $L
+ ));
+
+ // Return 'false' because it has failed
+ return false;
+ } elseif (empty($sqlString)) {
+ // Empty SQL string!
+ debug_report_bug(sprintf("SQL string is empty. Please fix this. file=%s, line=%s",
+ basename($F),
+ $L
+ ));
+
+ // This is invalid, of course
+ return false;
+ }
// Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
- $sql_string = str_replace("\t", " ", str_replace("\n", " ", str_replace("\r", " ", $sql_string)));
-
- // Replace {!_MYSQL_PREFIX!} with constant, closes #84. Thanks to profi-concept
- $sql_string = str_replace("{!_MYSQL_PREFIX!}", constant('_MYSQL_PREFIX'), $sql_string);
+ $sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
- // Replace {!_TABLE_TYPE!} with constant
- $sql_string = str_replace("{!_TABLE_TYPE!}", constant('_TABLE_TYPE'), $sql_string);
+ // Compile config out
+ $sqlString = FILTER_COMPILE_CONFIG($sqlString);
// Starting time
$querytimeBefore = array_sum(explode(' ', microtime()));
// Run SQL command
- //* DEBUG: */ echo $sql_string."<br />\n";
- $result = mysql_query($sql_string, SQL_GET_LINK())
- or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()."<br />
+ //* DEBUG: */ print($sqlString . '<br />');
+ $result = mysql_query($sqlString, SQL_GET_LINK())
+ or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '<br />
Query string:<br />
-".$sql_string);
+' . $sqlString);
+ //* DEBUG: */ print(__LINE__ . ': numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS() . "<br />");
// Ending time
$querytimeAfter = array_sum(explode(' ', microtime()));
// Calculate query time
$queryTime = $querytimeAfter - $querytimeBefore;
+ // Add this query to array including timing
+ addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
+
// Save last successfull query
- setConfigEntry('db_last_query', $sql_string);
+ setConfigEntry('db_last_query', $sqlString);
+
+ // Count all query times
+ incrementConfigEntry('sql_time', $queryTime);
// Count this query
incrementConfigEntry('sql_count');
// Debug output
- //* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<strong>".SQL_AFFECTEDROWS()."</strong>, numrows=<strong>".SQL_NUMROWS($result)."</strong><br />\n";
- if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isDebugModeEnabled()) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
+ if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y')) {
//
// Debugging stuff...
//
- $fp = fopen(constant('PATH')."inc/cache/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=".$GLOBALS['module']."\n");
+ fwrite($fp, 'Module=' . getModule() . "\n");
$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");
+ fwrite($fp, $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $sqlString)) . "\n");
fclose($fp);
} // END - if
// Count DB hits
- if (!isConfigEntrySet('db_hits_run')) {
+ if (!isStatsEntrySet('db_hits')) {
// Count in dummy variable
- setConfigEntry('db_hits_run', 1);
+ setStatsEntry('db_hits', 1);
} else {
// Count to config array
- incrementConfigEntry('db_hits_run');
+ incrementStatsEntry('db_hits');
}
// Return the result
// SQL num rows
function SQL_NUMROWS ($result) {
+ // Link is not up, no rows by default
+ $lines = false;
+
// Is the result a valid resource?
if (is_resource($result)) {
// Get the count of rows from database
// Is the result empty? Then we have an error!
if (empty($lines)) $lines = 0;
- } else {
+ } elseif (SQL_IS_LINK_UP()) {
// No resource given, no lines found!
$lines = 0;
}
+
+ // Return lines
return $lines;
}
// SQL fetch row
function SQL_FETCHROW ($result) {
// Is a result resource set?
- if (!is_resource($result)) return false;
+ if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) return false;
// Fetch the data and return it
return mysql_fetch_row($result);
}
// SQL fetch array
-function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
+function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
// Is a result resource set?
- if (!is_resource($res)) return false;
+ if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
// Initialize array
$row = array();
if (is_array($row)) {
// Shall we remove numerical data here automatically?
if ($remove_numerical) {
- // So let's remove all numerical elements to save memory!
+ // So let's remove all numerical elements to save memory!
$max = count($row);
for ($idx = 0; $idx < ($max / 2); $idx++) {
// Remove entry
// SQL result
function SQL_RESULT ($res, $row, $field = 0) {
// Is $res valid?
- if (!is_resource($res)) return false;
+ if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
// Run the result command and return the result
$result = mysql_result($res, $row, $field);
// Set the link resource
SQL_SET_LINK($connect);
+
+ // Destroy cache
+ unset($GLOBALS['sql_link_res']);
}
// SQL select database
return false;
} // END - if
- // Do we need to update cache/db counter?
- //* DEBUG: */ echo "DB=".getConfig('db_hits').",CACHE=".getConfig('cache_hits')."<br />\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
- updateConfiguration(array('db_hits', 'cache_hits'), array(getConfig(('db_hits')), getConfig(('cache_hits'))));
- } // 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(SQL_GET_LINK())
+ or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
// Close link
SQL_SET_LINK(null);
+ // Destroy cache
+ unset($GLOBALS['sql_link_res']);
+
// Return the result
return $close;
}
// SQL free result
function SQL_FREERESULT ($result) {
- if (!is_resource($result)) {
+ if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) {
// Abort here
return false;
} // END - if
// SQL string escaping
function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
// Link is there?
- if (!SQL_IS_LINK_UP()) return false;
+ if ((!SQL_IS_LINK_UP()) || (!is_array($data))) return false;
+
+ /* Other way */
+ // Escape all data
+ $dataSecured['__sql_string'] = $qstring;
+ foreach ($data as $key => $value) {
+ $dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
+ } // END - foreach
+ // Generate query
+ $query = call_user_func_array('sprintf', $dataSecured);
+ /*
+ /* Old eval() way... *
// Init variable
- $query = "failed";
+ $query = 'failed';
if ($strip === true) {
- $strip = "true";
+ $strip = 'true';
} else {
- $strip = "false";
+ $strip = 'false';
}
if ($secure === true) {
- $secure = "true";
+ $secure = 'true';
} else {
- $secure = "false";
+ $secure = 'false';
}
- $eval = "\$query = sprintf(\"".$qstring."\"";
+ $eval = "\$query = sprintf(\"" . $qstring . "\"";
foreach ($data as $var) {
if ((!empty($var)) || ($var === 0)) {
- $eval .= ", SQL_ESCAPE(\"".$var."\", ".$secure.", ".$strip.")";
+ $eval .= ", SQL_ESCAPE('" . $var . "', " . $secure . ', ' . $strip . ')';
} else {
$eval .= ", ''";
}
} // END - foreach
- $eval .= ");";
- //
+ $eval .= ');';
+ **/
+
// Debugging
//
- //* DEBUG: */ $fp = fopen(constant('PATH')."inc/cache/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: */ $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);
// Run the code
+ /**
eval($eval);
// Was the eval() command fine?
- if ($query == "failed") {
+ if ($query == 'failed') {
// Something went wrong?
- debug_report_bug("eval={$eval}");
+ debug_report_bug('eval=' . $eval);
} // END - if
+ **/
if ($run === true) {
// Run SQL query (default)
// 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);
+ // Do we have cache?
+ if (!isset($GLOBALS['sql_escapes'][''.$str.''])) {
+ // Secure string first? (which is the default behaviour!)
+ if ($secureString === true) {
+ // Then do it here
+ $str = secureString($str, $strip);
+ } // END - if
+
+ if (!SQL_IS_LINK_UP()) {
+ // Fall-back to smartAddSlashes() when there is no link
+ $ret = smartAddSlashes($str);
+ } elseif (function_exists('mysql_real_escape_string')) {
+ // The new and improved version
+ //* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />");
+ $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);
+ }
+
+ // Cache result
+ $GLOBALS['sql_escapes'][''.$str.''] = $ret;
} // 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__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />\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);
- }
+ // Return it
+ return $GLOBALS['sql_escapes'][''.$str.''];
}
// SELECT query string from table, columns and so on... ;-)
// Is columns an array?
if (!is_array($columns)) {
// No array
- trigger_error(sprintf("columns is not array. %s!=array", gettype($columns)));
+ debug_report_bug(sprintf("columns is not an array. %s != array, file=%s, line=%s",
+ gettype($columns),
+ basename($F),
+ $L
+ ));
+
+ // Abort here with 'false'
+ return false;
} // END - if
// Prepare the SQL statement
- $sql = "SELECT `".implode("`,`", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
+ $sql = "SELECT `".implode("`,`", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
// Return the result
return SQL_QUERY_ESC($sql,
array(
- bigintval($id),
$table,
- $idRow
- ), $F, $L);
+ $idRow,
+ bigintval($id),
+ ), $F, $L
+ );
}
// ALTER TABLE wrapper function
function SQL_ALTER_TABLE ($sql, $F, $L) {
+ // Abort if link is down
+ if (!SQL_IS_LINK_UP()) return false;
+
// 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 = ((ereg("INDEX", $sql) == false) && (ereg("FULLTEXT", $sql) == false) && (ereg("UNIQUE", $sql) == false));
+ $noIndex = (
+ (
+ strpos($sql, 'INDEX') === false
+ ) && (
+ strpos($sql, 'FULLTEXT') === false
+ ) && (
+ strpos($sql, 'UNIQUE') === false
+ )
+ );
// Extract table name
$tableArray = explode(" ", $sql);
- $tableName = str_replace("`", '', $tableArray[2]);
+ $tableName = str_replace('`', '', $tableArray[2]);
// Shall we add/drop?
- if (((ereg("ADD", $sql)) || (ereg("DROP", $sql))) && ($noIndex)) {
+ if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) {
// And column name as well
- $columnName = str_replace("`", '', $tableArray[4]);
+ $columnName = str_replace('`', '', $tableArray[4]);
// Get column information
- $result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
+ $result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
array($tableName, $columnName), __FILE__, __LINE__);
// Do we have no entry on ADD or an entry on DROP?
- // 123 4 4 3 3 4 432 23 4 4 3 3 4 4321
- if (((SQL_NUMROWS($result) == 0) && (ereg("ADD", $sql))) || ((SQL_NUMROWS($result) == 1) && (ereg("DROP", $sql)))) {
+ // 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))) {
// Do the query
- //* DEBUG: */ print __LINE__.':'.$sql."<br />\n";
+ //* DEBUG: */ print(__LINE__.':'.$sql."<br />");
$result = SQL_QUERY($sql, $F, $L, false);
} // END - if
- } elseif ((constant('_TABLE_TYPE') == "InnoDB") && (ereg("FULLTEXT", $sql))) {
+ } elseif ((getConfig('_TABLE_TYPE') == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
// Skip this query silently
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
- } elseif (!$noIndex) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
+ } elseif ($noIndex === false) {
// And column name as well
- $columnName = str_replace("`", '', $tableArray[4]);
+ $columnName = str_replace('`', '', $tableArray[4]);
// Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
- if (in_array(strtoupper($columnName), array("INDEX", "UNIQUE", "KEY", "FULLTEXT"))) {
+ if (in_array(strtoupper($columnName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
// Init loop
- $begin = 1; $columnName = ",";
- while (strpos($columnName, ",") !== false) {
+ $begin = 1; $columnName = ',';
+ while (strpos($columnName, ',') !== false) {
// Use last
- $columnName = str_replace("`", '', $tableArray[count($tableArray) - $begin]);
- //* DEBUG: */ print __LINE__.':'.$columnName."----------------".$begin."<br />\n";
+ $columnName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
+ //* DEBUG: */ print(__LINE__.':'.$columnName."----------------".$begin."<br />");
// Remove brackes
- $columnName = str_replace("(", '', str_replace(")", '', $columnName));
- //* DEBUG: */ print __LINE__.':'.$columnName."----------------".$begin."<br />\n";
+ $columnName = str_replace('(', '', str_replace(')', '', $columnName));
+ //* DEBUG: */ print(__LINE__.':'.$columnName."----------------".$begin."<br />");
// Continue
$begin++;
} // END - if
// Show indexes
- $result = SQL_QUERY_ESC("SHOW INDEX FROM %s",
+ $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`",
array($tableName), __FILE__, __LINE__);
// Walk through all
$skip = false;
while ($content = SQL_FETCHARRAY($result)) {
// Is it found?
- //* DEBUG: */ print "<pre>".print_r($content, true)."</pre>";
+ //* DEBUG: */ print("<pre>".print_r($content, true)."</pre>");
if (($content['Column_name'] == $columnName) || ($content['Key_name'] == $columnName)) {
// Skip this query!
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Skiped: %s", $sql));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skiped: %s", $sql));
$skip = true;
break;
} // END - if
SQL_FREERESULT($result);
// Shall we run it?
- if (!$skip) {
+ if ($skip === false) {
// Send it to the SQL_QUERY() function
- //* DEBUG: */ print __LINE__.':'.$sql."<br />\n";
+ //* DEBUG: */ print(__LINE__.':'.$sql."<br />");
$result = SQL_QUERY($sql, $F, $L, false);
} // END - if
} else {
// Other ALTER TABLE query
- //* DEBUG: */ print __LINE__.':'.$sql."<br />\n";
+ //* DEBUG: */ print(__LINE__.':'.$sql."<br />");
$result = SQL_QUERY($sql, $F, $L, false);
}
// 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)));
+ debug_report_bug(sprintf("link is not resource or null. Type: %s", gettype($link)));
} // END - if
// Set it
// Checks if the link is up
function SQL_IS_LINK_UP () {
- // Get the link
- $link = SQL_GET_LINK();
+ // Default is not up
+ $linkUp = false;
+
+ // Do we have cached this?
+ if (isset($GLOBALS['sql_link_res'])) {
+ // Then use this
+ $linkUp = $GLOBALS['sql_link_res'];
+ } else {
+ // Get it
+ $linkUp = is_resource(SQL_GET_LINK());
+
+ // And cache it
+ $GLOBALS['sql_link_res'] = $linkUp;
+ }
// Return the result
- return (is_resource($link));
+ return $linkUp;
}
-//
+// [EOF]
?>
projects / mailer.git / blobdiff