Better use {%template,DisplayUsername=%} instead of [nickname]

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 8c1ec94b52659a182adefc79dec6802a1e5f9b73..d409f4a3fdec964f233e46d19e26454bc0b10560 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -990,14 +990,13 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
 
 // Calculate sum (default) or count records of given criteria
 function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = FALSE, $add = '', $mode = '=') {
-       // Init count/sum
-       $data['res'] = '0';
-
+       // Debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',tableName=' . $tableName . ',lookFor=' . $lookFor . ',whereStatement=' . $whereStatement . ',add=' . $add);
        if ((empty($search)) && ($search != '0')) {
                // Count or sum whole table?
                if ($countRows === TRUE) {
                        // Count whole table
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
                        $result = SQL_QUERY_ESC('SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
                                array(
                                        $lookFor,
@@ -1005,6 +1004,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
                                ), __FUNCTION__, __LINE__);
                } else {
                        // Sum whole table
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
                        $result = SQL_QUERY_ESC('SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`' . $add . ' LIMIT 1',
                                array(
                                        $lookFor,
@@ -1619,7 +1619,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
        `html_msg`
 ) VALUES (
        '%s',
-       %s',
+       '%s',
        '%s',
        %s,
        %s,
@@ -1918,7 +1918,7 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId,
                foreach ($orderByColumns as $orderByColumn => $array) {
                        // Get keys (table/alias) and values (sorting itself)
                        $table   = trim(implode('', array_keys($array)));
-                       $sorting = trim(implode('', array_keys($array)));
+                       $sorting = trim(implode('', array_values($array)));
 
                        // table/alias can be omitted
                        if (!empty($table)) {
@@ -2022,7 +2022,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                } // END - if
 
                // Debug message
-               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])) . '<br />');
+               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])));
 
                // Copy entry securely to the final arrays
                $sqlColumns[$key] = SQL_ESCAPE($columnName);
@@ -2030,15 +2030,36 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
 
                // Send data through the filter function if found
                if ((isset($filterFunctions[$key])) && (isset($extraValues[$key . '_list']))) {
-                       // Filter function set!
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
+                       // Debug mode enabled?
+                       if (isDebugModeEnabled()) {
+                               // Then log it
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
+                       } // END - if
+
+                       // Filter function set, so run it
                        $sqlValues[$key] = call_user_func_array($filterFunctions[$key], merge_array(array($columnName), $extraValues[$key . '_list']));
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
-               } elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key])) && (!empty($sqlValues[$key]))) {
+
+                       // Debug mode enabled?
+                       if (isDebugModeEnabled()) {
+                               // Then log it
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
+                       } // END - if
+               } elseif (isset($filterFunctions[$key])) {
+                       // Debug mode enabled?
+                       if (isDebugModeEnabled()) {
+                               // Then log it
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
+                       } // END - if
+
                        // Run through an extra filter
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
                        $sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], NULL);
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
+
+                       // Debug mode enabled?
+                       if (isDebugModeEnabled()) {
+                               // Then log it
+                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
+                       } // END - if
+
                }
 
                // Is the value not a number?
@@ -2064,7 +2085,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                // Run the SQL query
                SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
-               // Add id
+               // Add id number
                setPostRequestElement('id', SQL_INSERTID());
 
                // Prepare filter data array
@@ -2131,11 +2152,22 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                                        // Filter function + extra value set
                                        $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
                                } elseif (isset($filterFunctions[$search])) {
-                                       // Filter function set
-                                       //* BUG: */ die($id.'/'.$key.'='.$entries[$id].'/'.$filterFunctions[$search]);
-                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - BEFORE!');
+                                       // Debug mode enabled?
+                                       if (isDebugModeEnabled()) {
+                                               // Then log it
+                                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - BEFORE!');
+                                       } // END - if
+
+                                       // Handle extra values
                                        $entries[$id] = handleExtraValues($filterFunctions[$search], $entries[$id], NULL);
-                                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - AFTER!');
+
+                                       // Debug mode enabled?
+                                       if (isDebugModeEnabled()) {
+                                               // Then log it
+                                               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',filterFunctions=' . $filterFunctions[$search] . ',key=' . $key . ',id=' . $id . ',entries[' . gettype($entries[$id]) . ']=' . $entries[$id] . ' - AFTER!');
+                                       } // END - if
+
+                                       // Make sure entries[id] is not bool, then something went wrong
                                        assert(!is_bool($entries[$id]));
                                }