Rewrote handling of 'menu adverts' to a filter. This allows e.g. ext-clickbanner...

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ace74be26f4831d058a6e2687d219abe20fc0e0c..69b023ff4c58576c78812acc8180bf803588c20f 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -354,28 +354,38 @@ ORDER BY
                                // Add separator
                                $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);
 
-                               // Should we display adverts in this menu?
-                               if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y') && ($action != 'admin')) {
-                                       // Display advert template
-                                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_' . $action, TRUE);
+                               // Prepare filter data array
+                               $filterData = array(
+                                       'output'    => '',
+                                       'exclusive' => FALSE,
+                                       'action'    => $action,
+                                       'mode'      => $mode,
+                               );
 
-                                       // Add separator again
-                                       $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);
-                               } // END - if
+                               // Run filter chain
+                               $filterData = runFilterChain($mode . '_menu_advert', $filterData);
+
+                               // Add content output
+                               $GLOBALS['rows'] .= $filterData['output'];
                        } // END - if
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
-               // Should we display adverts in this menu?
-               if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) {
-                       // Add separator again
-                       $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);
+               // Prepare filter data array
+               $filterData = array(
+                       'output'    => '',
+                       'exclusive' => FALSE,
+                       'action'    => $action,
+                       'mode'      => $mode,
+               );
 
-                       // Display advert template
-                       $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', TRUE);
-               } // END - if
+               // Run filter chain
+               $filterData = runFilterChain($mode . '_menu_advert_end', $filterData);
+
+               // Add content output
+               $GLOBALS['rows'] .= $filterData['output'];
 
                // Prepare data
                $content = array(
@@ -2026,7 +2036,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"
@@ -2040,11 +2050,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);