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 bd804baf9be9f455810726a2c7f3f0d45af85797..0c6b4980219f94f7cae42e6c628141f3aa84b50d 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -277,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']);
@@ -301,9 +301,6 @@ function FILTER_RUN_SQLS ($filterData) {
        // Debug message
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
 
-       // Clear any SQL queries
-       //initSqls();
-
        // Return counter
        return $count;
 }
@@ -1380,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]
 ?>