A lot calls saved, expression language rewritten:

[mailer.git] / inc / autopurge / purge-inact.php

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index aa74f85ad8b252df2bd18722ec166a4e95709234..74dd7469a14577fc6becaa474bcc9d51fd868393 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
+if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
        return false;
 } // END - if
@@ -84,15 +84,15 @@ WHERE
 ORDER BY
        d.userid ASC",
                array(
-                       getConfig('ap_inactive_since'),
-                       getConfig('ap_inactive_since'),
-                       getConfig('ap_inactive_since')
+                       getApInactiveSince(),
+                       getApInactiveSince(),
+                       getApInactiveSince()
                ), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_inactive) > 0) {
                // Prepare variables and constants...
                $useridsContent = '';
-               $content['since'] = (getConfig('ap_inactive_since') / 60 / 60);
+               $content['since'] = (getApInactiveSince() / 60 / 60);
                $content['time']  = (getConfig('ap_inactive_time')  / 60 / 60);
 
                // Mark found accounts as inactive and send an email