X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=c6c27638b724cf956058d515ee9eff3dbf63457b;hb=3482b953460718915a60361a1073206654abde9e;hp=079efbc60aad554cce494c08a771fe18ac719a75;hpb=03486c08011d4c233e2455c8e5335ecc0818333f;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 079efbc60a..c6c27638b7 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?
@@ -333,14 +335,16 @@ function FILTER_UPDATE_LOGIN_DATA () {
 
 // Filter for initializing randomizer
 function FILTER_INIT_RANDOMIZER () {
+	// Take a prime number which is long (if you know a longer one please try it out!)
+	setConfigEntry('_PRIME', 591623);
+
 	// Only execute this filter if installed
 	if ((!isInstalled()) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) {
+		// Set missing entry
+		setConfigEntry('_ADD', 0);
 		return;
 	} // END - if
 
-	// Take a prime number which is long (if you know a longer one please try it out!)
-	setConfigEntry('_PRIME', 591623);
-
 	// Calculate "entropy" with the prime number (for code generation)
 	setConfigEntry('_ADD', (getPrime() * getPrime() / (pi() * getCodeLength() + 1)));
 
@@ -600,16 +604,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
@@ -783,7 +786,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
@@ -813,7 +816,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
@@ -1078,5 +1081,23 @@ function FILTER_SET_CURRENT_DATE () {
 	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;
+}
+
+// Filter for generating mails links for 'pool' mails
+function FILTER_GENERATE_POOL_MAIL_LINKS ($data) {
+	// Is type 'mid'?
+	if ($data['type'] == 'mid') {
+		// Load template
+		$data['__output'] .= loadTemplate('admin_links_' . strtolower($data['mail_status']) . '_pool_mail', true, $data);
+	} // END - if
+
+	// Return data
+	return $data;
+}
+
 // [EOF]
 ?>