X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=0cd2a06191ca317ca8b1ce69434ff214c6bc5cfb;hb=150ed402878985508f10f4e06d25831e0fb3a1f8;hp=7fba80252b32a099718e499c36eca6812509cdd0;hpb=175b3f506e193d8d791ec6523db42276e296dd0b;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 7fba80252b..0cd2a06191 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * 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                   *
  * For more information visit: http://mxchange.org                      *
@@ -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();
@@ -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