Renamed more:

[mailer.git] / inc / sql-functions.php

diff --git a/inc/sql-functions.php b/inc/sql-functions.php
index 052c6cdb65fea7944ae9edeb3df2a1fa74f4b855..eab241370e0969f6023fc2cf4dff69ad38f2762c 100644 (file)
--- a/inc/sql-functions.php
+++ b/inc/sql-functions.php
@@ -222,10 +222,10 @@ function getInsertSqlFromArray ($array, $tableName) {
 }
 
 // Function to unset __is_sql_link_up
-function unsetSqlLinkUp ($F, $L) {
+function unsetSqlLinkUp ($file, $line) {
        // Unset it
-       //* DEBUG: */ logDebugMessage($F, $L, __FUNCTION__ . ': Called!');
-       setSqlLink($F, $L, NULL);
+       //* DEBUG: */ logDebugMessage($file, $line, __FUNCTION__ . ': Called!');
+       setSqlLink($file, $line, NULL);
 }
 
 // Initializes the SQL link by bringing it up if set
@@ -292,11 +292,11 @@ function importSqlDump ($path, $dumpName, $sqlPool) {
 }
 
 // SQL string escaping
-function sqlQueryEscaped ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $secure = TRUE) {
+function sqlQueryEscaped ($sqlString, $data, $file, $line, $run = TRUE, $strip = TRUE, $secure = TRUE) {
        // Link is there?
        if ((!isSqlLinkUp()) || (!is_array($data))) {
                // Link is down or data is not an array
-               //* DEBUG: */ logDebugMessage($F, $L, 'isSqlLinkUp()=' . intval(isSqlLinkUp()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!');
+               //* DEBUG: */ logDebugMessage($file, $line, 'isSqlLinkUp()=' . intval(isSqlLinkUp()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!');
                return FALSE;
        } // END - if
 
@@ -315,7 +315,7 @@ function sqlQueryEscaped ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE,
 
        if ($run === TRUE) {
                // Run SQL query (default)
-               return sqlQuery($query, $F, $L);
+               return sqlQuery($query, $file, $line);
        } else {
                // Return secured string
                return $query;
@@ -323,14 +323,14 @@ function sqlQueryEscaped ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE,
 }
 
 // SELECT query string from table, columns and so on... ;-)
-function getSqlResultFromArray ($table, $columns, $idRow, $id, $F, $L) {
+function getSqlResultFromArray ($table, $columns, $idRow, $id, $file, $line) {
        // Is columns an array?
        if (!is_array($columns)) {
                // No array
                reportBug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s",
                        gettype($columns),
-                       basename($F),
-                       $L
+                       basename($file),
+                       $line
                ));
 
                // Abort here with 'false'
@@ -358,12 +358,12 @@ function getSqlResultFromArray ($table, $columns, $idRow, $id, $F, $L) {
                        $table,
                        $idRow,
                        bigintval($id),
-               ), $F, $L
+               ), $file, $line
        );
 }
 
 // ALTER TABLE wrapper function
-function sqlQueryAlterTable ($sql, $F, $L, $enableCodes = TRUE) {
+function sqlQueryAlterTable ($sql, $file, $line, $enableCodes = TRUE) {
        // Abort if link is down
        if (!isSqlLinkUp()) return FALSE;
 
@@ -411,7 +411,7 @@ function sqlQueryAlterTable ($sql, $F, $L, $enableCodes = TRUE) {
                        if (((!ifSqlTableColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((ifSqlTableColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!ifSqlTableColumnExists($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) {
                                // Do the query
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
-                               $result = sqlQuery($sql, $F, $L, FALSE);
+                               $result = sqlQuery($sql, $file, $line, FALSE);
 
                                // Skip further attempt(s)
                                break;
@@ -430,7 +430,7 @@ function sqlQueryAlterTable ($sql, $F, $L, $enableCodes = TRUE) {
                } // END - foreach
        } elseif ((getTableType() == 'InnoDB') && (isInString('FULLTEXT', $sql))) {
                // Skip this query silently because InnoDB does not understand fulltext indexes
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlTableColumnExists($columnName)), $F, $L));
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlTableColumnExists($columnName)), $file, $line));
        } elseif ($isAlterIndex === TRUE) {
                // And column name as well without backticks
                $keyName = str_replace('`', '', $tableArray[5]);
@@ -461,11 +461,11 @@ function sqlQueryAlterTable ($sql, $F, $L, $enableCodes = TRUE) {
                if (($tableArray[3] == 'ADD') && (!ifSqlTableIndexExist($tableName, $keyName))) {
                        // Send it to the sqlQuery() function to add it
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!');
-                       $result = sqlQuery($sql, $F, $L, $enableCodes);
+                       $result = sqlQuery($sql, $file, $line, $enableCodes);
                } elseif (($tableArray[3] == 'DROP') && (ifSqlTableIndexExist($tableName, $keyName))) {
                        // Send it to the sqlQuery() function to drop it
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!');
-                       $result = sqlQuery($sql, $F, $L, $enableCodes);
+                       $result = sqlQuery($sql, $file, $line, $enableCodes);
                } else {
                        // Not executed
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
@@ -473,7 +473,7 @@ function sqlQueryAlterTable ($sql, $F, $L, $enableCodes = TRUE) {
        } else {
                // Other ALTER TABLE query
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
-               $result = sqlQuery($sql, $F, $L, $enableCodes);
+               $result = sqlQuery($sql, $file, $line, $enableCodes);
        }
 
        // Return result
@@ -498,16 +498,16 @@ function getSqlLink () {
 }
 
 // Setter for link
-function setSqlLink ($F, $L, $link) {
-       //* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, 'link[]=' . gettype($link) . ' - ENTERED!');
+function setSqlLink ($file, $line, $link) {
+       //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'link[]=' . gettype($link) . ' - ENTERED!');
        // Is this a resource or null?
        if ((ifFatalErrorsDetected()) && (isInstallationPhase())) {
                // This may happen in installation phase
-               //* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, 'Some fatal errors detected in installation phase.');
+               //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'Some fatal errors detected in installation phase.');
                return;
        } elseif ((!is_resource($link)) && (!is_null($link))) {
                // This should never happen!
-               reportBug($F . ':' . __FUNCTION__, $L . ':' . __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
+               reportBug($file . ':' . __FUNCTION__, $line . ':' . __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
        } // END - if
 
        // Set it
@@ -515,7 +515,7 @@ function setSqlLink ($F, $L, $link) {
 
        // Re-init cache
        $GLOBALS['__is_sql_link_up'] = is_resource($link);
-       //* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, '__is_sql_link_up=' . intval($GLOBALS['__is_sql_link_up']) . ' - EXIT!');
+       //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, '__is_sql_link_up=' . intval($GLOBALS['__is_sql_link_up']) . ' - EXIT!');
 }
 
 // Checks if the link is up