X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-autopurge.php;h=02af08f1717abf8ddb93faa8675d6a4b8b315c4a;hb=0a7e0faba4feaf17432cbdcaf17eb7d2f3812a1e;hp=9ed1a8c7f223b6cc88f2b05c8f4700d0650add73;hpb=e1653405d28923c78b2e292125306ccf61138f24;p=mailer.git

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 9ed1a8c7f2..02af08f171 100644
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -138,7 +138,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_time bigint(20) not null default '".(60*60*24*7)."'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<BR><BR><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
+		$UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
@@ -147,7 +147,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_notify enum('Y', 'N') not null default 'Y'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<BR><BR><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
+		$UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
 		break;
 
 	case "0.2.1": // SQL queries for v0.2.1
@@ -257,24 +257,9 @@ case "update": // Update an extension
 	break;
 
 default: // Do stuff when extension is loaded
-	$DUMMY = LOAD_CONFIG("0");
-	// Transfer all to the $CONFIG array...
-	$CONFIG['ap_inactive']    = $DUMMY['autopurge_inactive'];    // Autopurge inactive accounts (yes/no)
-	$CONFIG['ap_unconfirmed'] = $DUMMY['autopurge_unconfirmed']; // Autopurge unconfirmed accounts (yes/no)
-	$CONFIG['ap_tasks']       = $DUMMY['autopurge_tasks'];       // Autopurge out-dated tasks (yes/no)
-	$CONFIG['ap_in_mail']     = $DUMMY['ap_in_notify'];          // Send email to admin when purging inactive accounts (yes/no)
-	$CONFIG['ap_un_mail']     = $DUMMY['ap_un_notify'];          // Send email to admin when purging unconfirmed accounts (yes/no)
-	$CONFIG['ap_tasks_mail']  = $DUMMY['ap_tasks_notify'];       // Send email to admin when purging out-dated tasks (yes/no)
-	$CONFIG['ap_in_since']    = $DUMMY['ap_inactive_since'];     // Timeout for confirmed accounts when they become inactive (seconds)
-	$CONFIG['ap_in_time']     = $DUMMY['ap_inactive_time'];      // Timeout for inactive accounts when they are automatically deleted (seconds)
-	$CONFIG['ap_un_time']     = $DUMMY['ap_unconfirmed_time'];   // Timeout for unconfirmed accounts when they are automatically deleted (seconds)
-	$CONFIG['ap_tasks_time']  = $DUMMY['ap_tasks_time'];         // Timeout for out-dated tasks
-	$CONFIG['ap_del_mails']   = $DUMMY['ap_del_mails'];          // Autopurge mails from deleted users?
-	$CONFIG['ap_dm_notify']   = $DUMMY['ap_dm_notify'];          // Send email to admin when purging mails from deleted users (yes/no)
-	$CONFIG['ap_dm_timeout']  = $DUMMY['ap_dm_timeout'];         // Timeout for mails from deleted users
-
-	// Save some RAM...
-	unset($DUMMY);
+	$dummy = LOAD_CONFIG();
+	$_CONFIG = array_merge($_CONFIG, $dummy);
+	unset($dummy);
 
 	// Do we have a daily-reset-run?
 	if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
@@ -288,7 +273,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "autopurge";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'Y';
+$EXT_ALWAYS_ACTIVE = "Y";
 
 //
 ?>