Don't abuse isValidSqlLink() for checking results

[mailer.git] / inc / db / lib-mysql.php

diff --git a/inc/db/lib-mysql.php b/inc/db/lib-mysql.php
index 56cfe52861e791f6fa7a9c6dbc9cf989a2980cd9..3d0a3b2ca59be47d3e959aaa2ed7a91948429b25 100644 (file)
--- a/inc/db/lib-mysql.php
+++ b/inc/db/lib-mysql.php
@@ -89,7 +89,7 @@ function sqlQuery ($sqlString, $file, $line, $enableCodes = TRUE) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($file) . ',line=' . $line . ',sql=' . $GLOBALS['last_sql']);
        $result = mysql_query($GLOBALS['last_sql'], getSqlLink())
                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)));
+       //* DEBUG: */ logDebugMessage($file, $line, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . sqlAffectedRows() . ',numRows='.(isValidSqlResult($result) ? sqlNumRows($result) : gettype($result)));
 
        // Calculate query time
        $queryTime = microtime(TRUE) - $querytimeBefore;
@@ -116,7 +116,7 @@ function sqlQuery ($sqlString, $file, $line, $enableCodes = TRUE) {
                } // END - if
 
                // 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']));
+               appendLineToFile(getCachePath() . 'mysql.log', basename($file) . '|LINE=' . $line . '|NUM=' . (isValidSqlResult($result) ? sqlNumRows($result) : 'false') . '|AFFECTED=' . sqlAffectedRows() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), PHP_EOL), array('', ' '), $GLOBALS['last_sql']));
        } // END - if
 
        // Increment stats entry
@@ -138,7 +138,7 @@ function sqlNumRows ($resource) {
        if (isset($GLOBALS['sql_numrows'][intval($resource)])) {
                // Use cache
                $lines = $GLOBALS['sql_numrows'][intval($resource)];
-       } elseif (isValidSqlLink($resource)) {
+       } elseif (isValidSqlResult($resource)) {
                // Get the count of rows from database
                $lines = mysql_num_rows($resource);
 
@@ -168,7 +168,7 @@ function sqlAffectedRows () {
 // SQL fetch row
 function sqlFetchRow ($resource) {
        // Is $resource valid?
-       if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
+       if ((!isValidSqlResult($resource)) || (!isSqlLinkUp())) return FALSE;
 
        // Fetch the data and return it
        return mysql_fetch_row($resource);
@@ -177,7 +177,7 @@ function sqlFetchRow ($resource) {
 // SQL fetch array
 function sqlFetchArray ($resource) {
        // Is $resource valid?
-       if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
+       if ((!isValidSqlResult($resource)) || (!isSqlLinkUp())) return FALSE;
 
        // Load row as array from database
        $row = mysql_fetch_assoc($resource);
@@ -195,7 +195,7 @@ function sqlFetchArray ($resource) {
 // SQL result
 function sqlResult ($resource, $row, $field = '0') {
        // Is $resource valid?
-       if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
+       if ((!isValidSqlResult($resource)) || (!isSqlLinkUp())) return FALSE;
 
        // Run the result command
        $result = mysql_result($resource, $row, $field);
@@ -268,7 +268,7 @@ function sqlCloseLink ($file, $line) {
 
 // SQL free result
 function sqlFreeResult ($resource) {
-       if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) {
+       if ((!isValidSqlResult($resource)) || (!isSqlLinkUp())) {
                // Abort here
                return FALSE;
        } // END - if
@@ -361,9 +361,9 @@ function isValidSqlLink ($linkResource) {
 }
 
 // Checks whether given result is a valid SQL result
-function isSqlResult ($result) {
+function isValidSqlResult ($resultResource) {
        // TODO: Can't this be made better?
-       return is_resource($result);
+       return is_resource($resultResource);
 }
 
 // [EOF]