}
// SQL queries
-function SQL_QUERY($sql_string, $F, $L) {
+function SQL_QUERY ($sql_string, $F, $L) {
global $link, $CSS, $_CONFIG, $OK;
+ // Link is up?
+ if (!is_resource($link)) 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)));
// Run SQL command
//* DEBUG: */ echo $sql_string."<br />\n";
- $result = @mysql_query($sql_string, $link)
- or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
-".MYSQL_QUERY_STRING."<br />
+ $result = mysql_query($sql_string, $link)
+ or addFatalMessage($F." (".$L."):".mysql_error()."<br />
+Query string:<br />
".$sql_string);
- // Save last successfull query
- $_CONFIG['db_last_query'] = $sql_string;
-
// Ending time
$querytimeAfter = array_sum(explode(' ', microtime()));
// Calculate query time
$queryTime = $querytimeAfter - $querytimeBefore;
+ // Save last successfull query
+ $_CONFIG['db_last_query'] = $sql_string;
+
// Count this query
- if (!isset($_CONFIG['sql_count'])) $_CONFIG['sql_count'] = 0;
- $_CONFIG['sql_count']++;
+ incrementConfigEntry('sql_count');
// Debug output
- //* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<b>".SQL_AFFECTEDROWS()."</b>, numrows=<b>".SQL_NUMROWS($result)."</b><br />\n";
+ //* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<strong>".SQL_AFFECTEDROWS()."</strong>, numrows=<strong>".SQL_NUMROWS($result)."</strong><br />\n";
if (($CSS != "1") && ($CSS != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
//
} // END - if
// Count DB hits
- if (!isset($_CONFIG['db_hits_run'])) {
+ if (getConfig('db_hits_run') == null) {
// Count in dummy variable
$_CONFIG['db_hits_run'] = 1;
} else {
// Is the result a valid resource?
if (is_resource($result)) {
// Get the count of rows from database
- $lines = @mysql_num_rows($result);
+ $lines = mysql_num_rows($result);
// Is the result empty? Then we have an error!
if (empty($lines)) $lines = 0;
if (!is_resource($link)) return false;
// Get affected rows
- $lines = @mysql_affected_rows($link);
+ $lines = mysql_affected_rows($link);
// Return it
return $lines;
// Is a result resource set?
if (!is_resource($result)) return false;
- $DATA = @mysql_fetch_row($result);
+ $DATA = mysql_fetch_row($result);
return $DATA;
}
$row = array();
// Load row from database
- $row = @mysql_fetch_array($res);
+ $row = mysql_fetch_array($res);
// Return only arrays here
if (is_array($row)) {
// SQL result
function SQL_RESULT($res, $row, $field) {
- $result = @mysql_result($res, $row, $field);
+ $result = mysql_result($res, $row, $field);
return $result;
}
// SQL connect
function SQL_CONNECT($host, $login, $password, $F, $L) {
- $connect = @mysql_connect($host, $login, $password) or ADD_FATAL($F." (".$L."):".mysql_error());
+ $connect = mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());
return $connect;
}
// SQL select database
function SQL_SELECT_DB($dbName, $link, $F, $L) {
$select = false;
if (is_resource($link)) {
- $select = @mysql_select_db($dbName, $link) or ADD_FATAL($F." (".$L."):".mysql_error());
+ $select = mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());
}
return $select;
}
return false;
} // END - if
- // Add new hits
- $_CONFIG['db_hits'] += $_CONFIG['db_hits_run'];
- //* DEBUG: */ echo "DB=".$_CONFIG['db_hits'].",CACHE=".$_CONFIG['cache_hits']."<br />\n";
- if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance))) {
+ // 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) && (is_object($cacheInstance))) {
+ // Add new hits
+ $_CONFIG['db_hits'] += getConfig('db_hits_run');
+
// Update counter for db/cache
- UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])));
+ UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval(getConfig('db_hits')), bigintval(getConfig('cache_hits'))));
} // END - if
// Close database link and forget the link
- $close = @mysql_close($link) or ADD_FATAL($F." (".$L."):".mysql_error());
+ $close = mysql_close($link) or addFatalMessage($F." (".$L."):".mysql_error());
$link = null;
return $close;
}
+
// SQL free result
-function SQL_FREERESULT($result) {
- $res = @mysql_free_result($result);
+function SQL_FREERESULT ($result) {
+ if (!is_resource($result)) {
+ // Abort here
+ return false;
+ } // END - if
+
+ $res = mysql_free_result($result);
return $res;
}
+
// SQL string escaping
-function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
+function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
global $link;
- $query = "";
+
+ // Link is there?
+ if (!is_resource($link)) return false;
+
+ // Init variable
+ $query = "failed";
+
+ if ($strip) {
+ $strip = "true";
+ } else {
+ $strip = "false";
+ }
+
$eval = "\$query = sprintf(\"".$qstring."\"";
foreach ($data as $var) {
if ((!empty($var)) || ($var === 0)) {
- if ($strip) {
- $eval .= ", SQL_ESCAPE(\"".strip_tags($var)."\")";
- } else {
- $eval .= ", SQL_ESCAPE(\"".$var."\")";
- }
+ $eval .= ", SQL_ESCAPE(\"".$var."\",true,".$strip.")";
} else {
$eval .= ", ''";
}
//
// Debugging
//
- //$fp = fopen(PATH."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
- //fwrite($fp, $file."(".$line."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
- //fclose($fp);
- @eval($eval);
- if (empty($query)) {
+ //* DEBUG: */ $fp = fopen(PATH."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+ //* DEBUG: */ fwrite($fp, $file."(".$line."): ".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?
print "eval=".htmlentities($eval)."<pre>";
debug_print_backtrace();
die("</pre>");
- }
+ } // END - if
+
if ($run) {
// Run SQL query (default)
return SQL_QUERY($query, $file, $line);
return $query;
}
}
+
// Get ID from last INSERT command
-function SQL_INSERTID() {
- return @mysql_insert_id();
+function SQL_INSERTID () {
+ global $link;
+ if (!is_resource($link)) return false;
+ return mysql_insert_id();
}
+
// Escape a string for the database
-function SQL_ESCAPE($str, $secureString = true) {
+function SQL_ESCAPE ($str, $secureString=true,$strip=true) {
global $link;
// Secure string first? (which is the default behaviour!)
if ($secureString) {
// Then do it here
- $str = secureString($str);
+ $str = secureString($str, $strip);
} // END - if
if (!is_resource($link)) {
if (function_exists('mysql_real_escape_string')) {
// The new and improved version
- //* DEBUG: */ echo __FUNCTION__.":str={$str}<br />\n";
+ //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />\n";
return mysql_real_escape_string($str, $link);
} elseif (function_exists('mysql_escape_string')) {
- // The obsulete function
+ // The obsolete function
return mysql_escape_string($str, $link);
} else {
// If nothing else works
return SQL_QUERY_ESC($SQL, array(bigintval($id)), $F, $L);
}
// ALTER TABLE wrapper function
-function SQL_ALTER_TABLE($sql, $F, $L) {
- // Shall we add?
- if (eregi("ADD", $sql) > 0) {
+function SQL_ALTER_TABLE ($sql, $F, $L) {
+ // This is the default result...
+ $result = false;
+
+ // Determine index/fulltext/unique word
+ $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]);
$result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
array($tableName, $columnName), $F, $L);
- // Do we have no entry?
- if (SQL_NUMROWS($result) == 0) {
+ // Do we have no entry on ADD or an entry on DROP?
+ if (((SQL_NUMROWS($result) == 0) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
// Do the query
- return SQL_QUERY($sql, $F, $L, false);
+ $result = SQL_QUERY($sql, $F, $L, false);
} // END - if
} else {
// Send it to the SQL_QUERY() function
- return SQL_QUERY($sql, $F, $L, false);
+ $result = SQL_QUERY($sql, $F, $L, false);
}
+
+ // Return result
+ return $result;
}
//
?>