Moved "fix" files (which only helps to fix stuff) in own inc/fixes/ folder.

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index ceaf0e0ac9c47e6332df05342cf8a914989f7848..7d09db69cc978552f05cb662c8e9057e195d2e8e 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Allgemeine Filter                                *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -247,7 +242,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 +706,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
@@ -826,22 +802,6 @@ function FILTER_TRIGGER_SENDING_POOL () {
        unset($GLOBALS['pool_cnt']);
 }
 
-// Filter for checking and updating SVN revision
-function FILTER_CHECK_REPOSITORY_REVISION () {
-       // Only execute this filter if installed and all config entries are there
-       if ((!isInstalled()) || (!isConfigEntrySet('patch_level'))) {
-               return;
-       } // END - if
-
-       // Check for patch level differences between database and current hard-coded
-       if ((getCurrentRepositoryRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURRENT_REPOSITORY_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
-               // Update database and CONFIG array
-               updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrentRepositoryRevision(), 'UNIX_TIMESTAMP()'));
-               setConfigEntry('patch_level', getCurrentRepositoryRevision());
-               setConfigEntry('patch_ctime', time());
-       } // END - if
-}
-
 // Filter for running hourly reset
 function FILTER_RUN_HOURLY_RESET () {
        // Only execute this filter if installed
@@ -920,12 +880,18 @@ function FILTER_RUN_YEARLY_RESET () {
 // Filter for loading more runtime includes (not for installation)
 function FILTER_LOAD_RUNTIME_INCLUDES () {
        // Load more includes
-       foreach (array('databases', 'session', 'versions') as $inc) {
+       foreach (array('databases') as $inc) {
                // Load the include
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 }
 
+// Filter for initializing language by loading the language file
+function FILTER_INIT_LANGUAGE () {
+       // Load language file(s)
+       loadLanguageFile();
+}
+
 // Filter for checking admin ACL
 function FILTER_CHECK_ADMIN_ACL () {
        // Extension not installed so it's always allowed to access everywhere!
@@ -1050,8 +1016,8 @@ function FILTER_HANDLE_FATAL_ERRORS () {
                'corr' => $CORR
        );
 
-       // Load footer
-       loadIncludeOnce('inc/header.php');
+       // Load header
+       loadPageHeader();
 
        // Load main template
        loadTemplate('fatal_errors', FALSE, $content);
@@ -1060,7 +1026,7 @@ function FILTER_HANDLE_FATAL_ERRORS () {
        initFatalMessages();
 
        // Load footer
-       loadIncludeOnce('inc/footer.php');
+       loadPageFooter();
 
        // Abort here
        doShutdown();
@@ -1257,7 +1223,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
        // Check total amount of users
        if (getTotalConfirmedUser() >= getActivateXchange()) {
                // Activate System
-               addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`mem_only`='Y' WHERE `module`='order' LIMIT 1");
+               addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`mem_only`='Y' WHERE `module`='order' LIMIT 1");
                addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2");
 
                // Run SQLs
@@ -1315,7 +1281,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 +1289,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 +1408,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
@@ -1465,7 +1431,7 @@ WHERE
                // Are some entries deleted?
                if (sqlAffectedRows() > 0) {
                        // Okay, then send an email to the admin
-                       sendAdminNotification('{--ADMIN_PURGE_USER_SERVER_NAME_LOG_SUBJECT--}', 'admin_purge_user_server_name_log', sqlAffectedRows());
+                       sendAdminNotification('{--ADMIN_PURGE_SERVER_NAME_LOG_SUBJECT--}', 'admin_purge_user_server_name_log', sqlAffectedRows());
                } // END - if
        } // END - if