* Dummy extension "yoomedia" added for Yoo! Media's API (Interface 2.0 supported)

[mailer.git] / inc / extensions / ext-autopurge.php

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 2412b2acab6de1fc4e4615d90b6325c4aae15ee6..136d94b2f9377b000dba2d1bb4098359c25a9cff 100644 (file)
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -258,22 +258,7 @@ case "update": // Update an extension
 
 default: // Do stuff when extension is loaded
        $dummy = LOAD_CONFIG();
-       // 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...
+       $_CONFIG = array_merge($_CONFIG, $dummy);
        unset($dummy);
 
        // Do we have a daily-reset-run?