The maximum file size needs to be increased a little. Still you may not need

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index ceaf0e0ac9c47e6332df05342cf8a914989f7848..15f5c00d4622b5ce1ee73de52d3dc7d393db777f 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -247,7 +247,7 @@ function FILTER_RUN_SQLS ($filterData) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!');
 
        // Is the array there?
-       if ((isSqlsValid()) && ((!isset($filterData['dry_run'])) || ($filterData['dry_run'] == FALSE))) {
+       if ((ifSqlsRegistered()) && ((!isset($filterData['dry_run'])) || ($filterData['dry_run'] == FALSE))) {
                // Run SQL commands
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.');
                foreach (getSqls() as $mode => $sqls) {
@@ -711,25 +711,6 @@ function FILTER_FLUSH_OUTPUT () {
        outputHtml();
 }
 
-// Prepares an SQL statement part for HTML mail and/or holiday dependency
-function FILTER_HTML_INCLUDE_USERS ($mode) {
-       // Exclude no users by default
-       $MORE = '';
-
-       // HTML mail?
-       if ($mode == 'html') {
-               $MORE = " AND `html`='Y'";
-       } // END - if
-
-       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-               // Add something for the holiday extension
-               $MORE .= " AND `holiday_active`='N'";
-       } // END - if
-
-       // Return result
-       return $MORE;
-}
-
 // Filter for determining what/action/module
 function FILTER_DETERMINE_WHAT_ACTION () {
        // In installation phase we don't have what/action
@@ -1315,7 +1296,7 @@ function FILTER_GENERATE_FILE_SECRET_HASH ($filterData) {
        setConfigEntry('secret_key', '');
 
        // File hash was generated so we can also file the secret file... hopefully.
-       $hashFile = sprintf('%s%s.%s.cache', getPath(), getCachePath(), getFileHash());
+       $hashFile = getGenericHashFileName();
 
        // Read key from secret file
        if ((getFileHash() == '') || (getMasterSalt() == '') || (getPassScramble() == '') || (!isFileReadable($hashFile))) {
@@ -1323,7 +1304,7 @@ function FILTER_GENERATE_FILE_SECRET_HASH ($filterData) {
                loadIncludeOnce('inc/gen_sql_patches.php');
 
                // Generate file name again
-               $hashFile = sprintf('%s%s.%s.cache', getPath(), getCachePath(), getFileHash());
+               $hashFile = getGenericHashFileName();
        } // END - if
 
        // Test again
@@ -1442,7 +1423,7 @@ function FILTER_REDIRECT_WRONG_SERVER_NAME ($filterData) {
 // Filter for adding hidden session id
 function FILTER_ADD_INPUT_HIDDEN_SESSION_ID ($filterData) {
        // Is a spider detected?
-       if ((!isSpider()) && (!isSessionValid()) && ($filterData['__form_method'] == 'get')) {
+       if ((!isSpider()) && (!isValidSession()) && ($filterData['__form_method'] == 'get')) {
                // No, then add the hidden field
                $filterData['__replacer'] .= '<input type="hidden" name="' . session_name() . '" value="' . session_id() . '" />';
        } // END - if