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

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index e5120cb50ffef667bc390fc2dca5b04b004f1662..0c6b4980219f94f7cae42e6c628141f3aa84b50d 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -80,10 +80,16 @@ function FILTER_FLUSH_FILTERS () {
                        // Is this filter loaded?
                        //* DEBUG: */ debugOutput('FOUND:'.$filterName.'/'.$filterFunction.'='.$active);
                        if (((!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) && ($active != 'R')) || ($active == 'A')) {
-                               // Add this filter (all filters are active by default)
-                               //* DEBUG: */ debugOutput('ADD:'.$filterName.'/'.$filterFunction);
-                               $insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
-                               $inserted++;
+                               // Is this filter already in database?
+                               if (countSumTotalData($filterFunction, 'filters', 'filter_name', 'filter_function', TRUE, sprintf(" AND `filter_name`='%s'", SQL_ESCAPE($filterName))) == 0) {
+                                       // Add this filter (all filters are active by default)
+                                       //* DEBUG: */ debugOutput('ADD:'.$filterName.'/'.$filterFunction);
+                                       $insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
+                                       $inserted++;
+                               } elseif (isDebugModeEnabled()) {
+                                       // Log already registered filters
+                                       logDebugMessage(__FUNCTION__, __LINE__, 'Already registered: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',active=' . $active);
+                               }
                        } elseif ($active == 'R') {
                                // Remove this filter
                                //* DEBUG: */ debugOutput('REMOVE:'.$filterName.'/'.$filterFunction);
@@ -271,8 +277,8 @@ function FILTER_RUN_SQLS ($filterData) {
 
                                // Is there still a query left?
                                if (!empty($sql)) {
-                                       // Is there an "ALTER TABLE" command?
-                                       if (substr(strtolower($sql), 0, 11) == 'alter table') {
+                                       // Is there an "ALTER TABLE" command? Exclude installation phase here as it would cause this query to fail
+                                       if ((substr(strtolower($sql), 0, 11) == 'alter table') && (!isset($filterData['ext_installing']))) {
                                                // Analyse the alteration command
                                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Alterting table: ' . $sql . ',enable_codes=' . intval($filterData['enable_codes']));
                                                SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $filterData['enable_codes']);
@@ -295,9 +301,6 @@ function FILTER_RUN_SQLS ($filterData) {
        // Debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
 
-       // Clear any SQL queries
-       //initSqls();
-
        // Return counter
        return $count;
 }
@@ -1088,12 +1091,12 @@ function FILTER_LOAD_PAGE_HEADER () {
        $GLOBALS['__page_header'] = loadTemplate('page_header', TRUE);
 
        // Include meta data in 'guest' module
-       if ((isModuleSet()) && (getModule() == 'index')) {
+       if (isModuleSet()) {
                // Load meta data template
-               $GLOBALS['__page_header'] .= loadTemplate('metadata', TRUE);
+               $GLOBALS['__page_header'] .= loadTemplate(getMenuModeFromModule() . '_metadata', TRUE);
 
                // Add meta description to header
-               if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
+               if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP()) && (getModule() == 'index')) {
                        // Add meta description not in admin and login module and when the script is installed
                        generateMetaDescriptionCode();
                } // END - if
@@ -1374,5 +1377,18 @@ WHERE
        return $filterData;
 }
 
+// Filter for detecting menu mode
+function FILTER_DETERMINE_MENU_MODE_GENERIC ($filterData) {
+       // "Detect" it
+       switch (getModule()) {
+               case 'confirm': // Login script is 'member'
+                       $filterData = 'member';
+                       break;
+       } // END - switch
+
+       // Return filter data
+       return $filterData;
+}
+
 // [EOF]
 ?>