X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=020521858b84c815a9825f604c764518fc69343a;hb=9f30db83eedcaf1d265d973e4bffcd3fa7df9bde;hp=9a2ca2d52640e2126baed7e5036553f24a8a45c4;hpb=5261b522112c11417fc87bb0b14ca078bfa398e3;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 9a2ca2d526..020521858b 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -61,6 +61,7 @@ function FILTER_FLUSH_FILTERS () {
 	// Is the extension sql_patches updated?
 	if ((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9'))) {
 		// Abort silently here
+		logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, sql_patches might be missing. isExtensionInstalled()=' . isExtensionInstalled('sql_patches') . ',isExtensionInstalledAndOlder()=' . isExtensionInstalledAndOlder('sql_patches', '0.5.9'));
 		return false;
 	} // END - if
 
@@ -242,6 +243,7 @@ function FILTER_LOAD_INCLUDES ($pool) {
 // Filter for running SQL commands
 function FILTER_RUN_SQLS ($data) {
 	// Debug message
+	//* DEBUG: */ die('getSqls()=<pre>'.print_r(getSqls(), true).'</pre>ext_update_depends=<pre>'.print_r($GLOBALS['ext_update_depends'], true).'</pre>');
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!');
 
 	// Is the array there?
@@ -304,7 +306,9 @@ function FILTER_UPDATE_LOGIN_DATA () {
 		$content = getUserDataArray();
 
 		// Maybe first login time?
-		if (empty($content['last_module'])) $content['last_module'] = 'login';
+		if (empty($content['last_module'])) {
+			$content['last_module'] = 'login';
+		} // END - if
 
 		// This will be displayed on welcome page! :-)
 		if (empty($GLOBALS['last_online']['module'])) {
@@ -316,7 +320,9 @@ function FILTER_UPDATE_LOGIN_DATA () {
 		if (!isWhatSet()) {
 			// Fix it to default
 			setWhat('welcome');
-			if (getIndexHome() != '') setWhatFromConfig('index_home');
+			if (getIndexHome() != '') {
+				setWhatFromConfig('index_home');
+			} // END - if
 		} // END - if
 
 		// Update last module / online time
@@ -596,16 +602,15 @@ function FILTER_RUN_RESET_INCLUDES () {
 
 	// Is the config entry set?
 	if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) {
-		// Create current week mark
-		$currWeek = getWeek();
-
 		// Has it changed?
-		if ((getConfig('last_week') != $currWeek) || (isWeeklyResetDebugEnabled())) {
+		if (((isConfigEntrySet('last_week')) && (getConfig('last_week') != getWeek())) || (isWeeklyResetDebugEnabled())) {
 			// Include weekly reset scripts
 			mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
 			// Update config if not in debug mode
-			if (!isWeeklyResetDebugEnabled()) updateConfiguration('last_week', $currWeek);
+			if (!isWeeklyResetDebugEnabled()) {
+				updateConfiguration('last_week', getWeek());
+			} // END - if
 		} // END - if
 
 		// Create current month mark
@@ -779,7 +784,7 @@ function FILTER_RUN_HOURLY_RESET () {
 	} // END - if
 
 	// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-	if (((getConfig('last_hour') != getHour()) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) {
+	if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) {
 		// Tell every module we are in reset-mode!
 		doHourly();
 	} // END - if
@@ -809,7 +814,7 @@ function FILTER_CHECK_ADMIN_ACL () {
 		} // END - if
 
 		// Check for access control line of current menu entry
-		$ret = adminsCheckAdminAcl($action, getWhat());
+		$ret = isAdminsAllowedByAcl($action, getWhat());
 	} // END - if
 
 	// Set it here
@@ -1069,10 +1074,16 @@ function FILTER_SET_CURRENT_DATE () {
 	// Set current date
 	setConfigEntry('CURRENT_DATE', generateDateTime(time(), '3'));
 
-	// Timestamp for yesterday, today ... all at 00:00 am
+	// Epoche time for yesterday, today ... all at 00:00 am
 	setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getOneDay()));
 	setConfigEntry('START_TDAY', makeTime(0, 0, 0, time()));
 }
 
+// Filter for marking extension as installed
+function FILTER_EXTENSION_MARK_INSTALLED ($data) {
+	// Mark it as installed
+	$GLOBALS['ext_is_installed'][$data['ext_name']] = true;
+}
+
 // [EOF]
 ?>