Added doTemplateGuestFooterExtras() call-back and guest_footer_extras filter chain

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 5dfaf1366ea16d11910be5c7a9bc4de5cacd1cc8..679d415d40235a35dd061089cef05002e0006c7f 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1066,7 +1066,7 @@ function sendAdminEmails ($subject, $message, $isBugReport = FALSE) {
        // Is it a bug report?
        if ($isBugReport === TRUE) {
                // Then add a reply-to line back to the author (me)
-               $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+               $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL;
        } // END - if
 
        // Load all admin email addresses
@@ -1850,7 +1850,7 @@ LIMIT 1",
 }
 
 // List all given rows (callback function from XML)
-function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array()) {
+function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = array()) {
        // Verify that tableName and columns are not empty
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
@@ -1938,11 +1938,11 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId,
        } // END - if
 
        // Now handle all over to the inner function which will execute the listing
-       doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters);
+       doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content);
 }
 
 // Do the listing of entries
-function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) {
+function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array(), $content = array()) {
        // Run the SQL query
        $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
@@ -1950,11 +1950,11 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
        if (!SQL_HASZERONUMS($result)) {
                // List all URLs
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($row = SQL_FETCHARRAY($result)) {
                        // "Translate" content
                        foreach ($callbackColumns as $columnName => $callbackName) {
                                // Fill the callback arguments
-                               $args = array($content[$columnName]);
+                               $args = array($row[$columnName]);
 
                                // Is there more to add?
                                if (isset($extraParameters[$columnName])) {
@@ -1965,15 +1965,24 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
                                // Call the callback-function
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, TRUE).'</pre>');
                                // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-                               $content[$columnName] = call_user_func_array($callbackName, $args);
+                               $row[$columnName] = call_user_func_array($callbackName, $args);
                        } // END - foreach
 
                        // Load row template
-                       $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $content);
+                       $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $row);
                } // END - while
 
+               // Is at least one entry set in content?
+               if ((is_array($content)) && (count($content) > 0)) {
+                       // Then add generic 'rows' element
+                       $content['rows'] = $OUT;
+               } else {
+                       // Direct output is content
+                       $content = $OUT;
+               }
+
                // Load main template
-               loadTemplate(trim($tableTemplate[0]), FALSE, $OUT);
+               loadTemplate(trim($tableTemplate[0]), FALSE, $content);
        } else {
                // No URLs in surfbar
                displayMessage('{--' .$noEntryMessageId[0] . '--}');
@@ -2017,7 +2026,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                // Is columnIndex set?
                if (!is_null($columnIndex)) {
                        // Check conditions
-                       //* DEBUG: */ die('columnIndex=<pre>'.print_r($columnIndex,TRUE).'</pre>'.debug_get_printable_backtrace());
+                       //* DEBUG: */ die('columnName=<pre>'.print_r($columnName,TRUE).'</pre>columnIndex=<pre>'.print_r($columnIndex,TRUE).'</pre>'.debug_get_printable_backtrace());
                        assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex])));
 
                        // Then use that index "blindly"
@@ -2031,11 +2040,22 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                $sqlColumns[$key] = SQL_ESCAPE($columnName);
                $sqlValues[$key]  = SQL_ESCAPE(postRequestElement($columnName));
 
+               // Search for it
+               $search = key(search_array($columns, 'column', $columnName));
+
                // Try to handle call-back functions and/or extra values on the list
-               $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key . '_list', $sqlValues[$key], $userIdColumn, key(search_array($columns, 'column', $key)));
+               //* DEBUG: */ outputHtml($key . '/' . $columnName . '=<pre>'.print_r($columns,true).'</pre>search_array()=<pre>'.print_r(search_array($columns, 'column', $columnName), true).'</pre>');
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
+               if (is_string($key)) {
+                       // Key is a string
+                       $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key . '_list', $sqlValues[$key], array(''), $search);
+               } else {
+                       // Is a number
+                       $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key, $sqlValues[$key], array(''), $search);
+               }
 
                // Is the value not a number?
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key]);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
                if (($sqlValues[$key] != 'NULL') && (is_string($sqlValues[$key]))) {
                        // Add quotes around it
                        $sqlValues[$key] = chr(39) . $sqlValues[$key] . chr(39);
@@ -2107,14 +2127,14 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                // "Walk" through all entries
                foreach (postRequestArray() as $key => $entries) {
                        // Skip raw userid which is always invalid
-                       if (($key == $rawUserId[0]) || ($key == 'do_edit')) {
+                       if (($key == $rawUserId[0]) || ($key == ($rawUserId[0] . '_raw')) || ($key == 'do_edit')) {
                                // Continue with next field
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',rawUserId=' . $rawUserId[0]);
                                continue;
                        } // END - if
 
                        // Debug message
-                       /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,TRUE).'</pre>');
+                       //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,TRUE).'</pre>');
 
                        // Is entries an array?
                        if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
@@ -2138,7 +2158,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                                //* BUG: */ die($key.'/<pre>'.print_r($search, TRUE).'</pre>=<pre>'.print_r($columns, TRUE).'</pre>');
 
                                // Debug message
-                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!');
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!');
 
                                // Add normal entries as well
                                $content[$key] = $entries;
@@ -2147,7 +2167,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                                $entries = doHandleExtraValues($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search);
 
                                // Debug message
-                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!');
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!');
 
                                // Add key/value pair to SQL string
                                $sql .= addKeyValueSql($key, $entries);
@@ -2155,8 +2175,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                } // END - foreach
 
                // Finish SQL command
-               $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id);
-               if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
+               $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . $id;
+               if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) {
                        // Add user id as well
                        $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));
                } // END - if
@@ -2230,7 +2250,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 
        // Is a user id provided?
        //* BUG: */ die('<pre>'.print_r($rawUserId,TRUE).'</pre><pre>'.print_r($userIdColumn,TRUE).'</pre>');
-       if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
+       if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) {
                // Add user id as well
                $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0]));
        } // END - if
@@ -2288,7 +2308,8 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 }
 
 // Build a special template list
-function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
        // $tableName and $idColumn must bove be arrays!
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // $tableName is no array
@@ -2316,12 +2337,21 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                // Is there one entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Load all data
-                       $content = SQL_FETCHARRAY($result);
+                       $row = SQL_FETCHARRAY($result);
 
                        // Filter all data
-                       foreach ($content as $key => $value) {
+                       foreach ($row as $key => $value) {
                                // Search index
-                               $idx = searchXmlArray($key, $columns, 'column');
+                               $idx  = searchXmlArray($key, $columns, 'column');
+
+                               // Default name is NULL
+                               $name = NULL;
+
+                               // Is the name there?
+                               if (isset($columns[$idx]['name'])) {
+                                       // Then use it
+                                       $name = $columns[$idx]['name'];
+                               } // END - if
 
                                // Skip any missing entries
                                if ($idx === FALSE) {
@@ -2335,8 +2365,8 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                if ($key == $userIdColumn[0]) {
                                        // Add it again as raw id
                                        //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
-                                       $content[$userIdColumn[0]] = convertZeroToNull($value);
-                                       $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
+                                       $row[$userIdColumn[0]] = convertZeroToNull($value);
+                                       $row[$userIdColumn[0] . '_raw'] = $row[$userIdColumn[0]];
                                } // END - if
 
                                // If the key matches the idColumn variable, we need to temporary remember it
@@ -2351,7 +2381,9 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                } // END - if
 
                                // Try to handle call-back functions and/or extra values
-                               $content[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $content[$key], $userIdColumn, $idx);
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',row[' . $key . ']=' . $row[$key]);
+                               //if ($key == 'forced_campaign_created') die($idx.'=<pre>'.print_r($columns,true).'</pre><pre>'.print_r($extraValues,true).'</pre>');
+                               $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, ((!is_null($name)) ? $name : $key), $id);
                        } // END - foreach
 
                        // Then list it
@@ -2359,7 +2391,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                $prefix,
                                $listType,
                                $tableName[0]
-                               ), TRUE, $content
+                               ), TRUE, $row
                        );
                } // END - if
 
@@ -2367,12 +2399,21 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                SQL_FREERESULT($result);
        } // END - foreach
 
+       // Is there an entry in $content?
+       if ((is_array($content)) && (count($content) > 0)) {
+               // Use generic 'rows'
+               $content['rows'] = $OUT;
+       } else {
+               // Use direct output
+               $content = $OUT;
+       }
+
        // Load master template
        loadTemplate(sprintf("%s_%s_%s",
                $prefix,
                $listType,
                $tableName[0]
-               ), FALSE, $OUT
+               ), FALSE, $content
        );
 }