X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=21f2e59e86943b96a502b2073c7c0f2759e19233;hb=25b4a580b4c7e0d429eb8e436785d3c2ef304f8e;hp=627a4007b89bc12e39c14db67edfe2de6421aae4;hpb=8deeddb48c055d0c2483509b7cd6a95ed6d3a87a;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 627a4007b8..21f2e59e86 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -450,7 +451,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
 	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
 	//* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
 
-	// Default is from OUTPUT_HTML
+	// Default is from outputHtml()
 	$outputMode = getOutputMode();
 
 	// Some entries found?
@@ -534,24 +535,24 @@ function FILTER_RUN_RESET_INCLUDES () {
 		$currWeek = date('W', time());
 
 		// Has it changed?
-		if ((getConfig('last_week') != $currWeek) || (getConfig('DEBUG_WEEKLY') == 'Y')) {
+		if ((getConfig('last_week') != $currWeek) || ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') == 'Y'))) {
 			// Include weekly reset scripts
 			mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
 			// Update config
-			if ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek);
+			if ((!isConfigEntrySet('DEBUG_WEEKLY')) || (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek);
 		} // END - if
 
 		// Create current month mark
 		$currMonth = date('m', time());
 
 		// Has it changed?
-		if ((getConfig('last_month') != $currMonth) || (getConfig('DEBUG_MONTHLY') == 'Y')) {
+		if ((getConfig('last_month') != $currMonth) || ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') == 'Y'))) {
 			// Include monthly reset scripts
 			mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
 			// Update config
-			if ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth);
+			if ((!isConfigEntrySet('DEBUG_MONTHLY')) || (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth);
 		} // END - if
 	} // END - if
 
@@ -932,5 +933,35 @@ function FILTER_DO_LOGIN_ADMIN ($data) {
 	return $data;
 }
 
+// Filter for loading page header, this should be ran first!
+function FILTER_LOAD_PAGE_HEADER () {
+	// Determine the page title
+	$content['header_title'] = determinePageTitle();
+
+	// Output page header code
+	$GLOBALS['page_header'] = loadTemplate('page_header', true, $content);
+
+	// Include meta data in 'guest' module
+	if (getModule() == 'index') {
+		// Load meta data template
+		$GLOBALS['page_header'] .= loadTemplate('metadata', true);
+
+		// Add meta description to header
+		if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
+			// Add meta description not in admin and login module and when the script is installed
+			generateMetaDescriptionCode();
+		} // END - if
+	} // END - if
+}
+
+// Filter for adding style sheet, closing page header
+function FILTER_FINISH_PAGE_HEADER () {
+	// Include stylesheet
+	loadIncludeOnce('inc/stylesheet.php');
+
+	// Closing HEAD tag
+	$GLOBALS['page_header'] .= '</head>';
+}
+
 // [EOF]
 ?>