Don't abuse isValidSqlLink() for checking results

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

diff --git a/inc/db/lib-mysqli.php b/inc/db/lib-mysqli.php
index b3559bf7e807a03548b5e511da1dd46517b9e87a..200c58b79c207905a0fd13c47f6052a675964a0f 100644 (file)
--- a/inc/db/lib-mysqli.php
+++ b/inc/db/lib-mysqli.php
@@ -91,7 +91,7 @@ function sqlQuery ($sqlString, $file, $line, $enableCodes = TRUE) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($file) . ',line=' . $line . ',sql=' . $GLOBALS['last_sql']);
        $result = mysqli_query(getSqlLink(), $GLOBALS['last_sql'])
                or logSqlError($file, $line, 'file='. basename($file) . ',line=' . $line . ':mysqli_error()=' . mysqli_error(getSqlLink()) . ',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;
@@ -118,7 +118,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
@@ -155,7 +155,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 mysqli_fetch_row($resource);
@@ -164,7 +164,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 = mysqli_fetch_assoc($resource);
@@ -182,7 +182,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 = mysqli_result($resource, $row, $field);
@@ -261,7 +261,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
@@ -347,7 +347,7 @@ function setSqlError ($file, $line, $message) {
 // Checks whether given link is a valid SQL link
 function isValidSqlLink ($linkInstance) {
        // Is it an object?
-       $isValid = (($linkInstance instanceof mysqli) || ($linkInstance instanceof mysqli_result));
+       $isValid = ($linkInstance instanceof mysqli);
 
        // Debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'linkInstance[]=' . gettype($linkInstance). ',isValid=' . intval($isValid));
@@ -357,7 +357,7 @@ function isValidSqlLink ($linkInstance) {
 }
 
 // Checks whether given result is really a result
-function isSqlResult ($resultInstance) {
+function isValidSqlResult ($resultInstance) {
        // Is it a resource?
        $isValid = ($resultInstance instanceof mysqli_result);