Fix and rewritten to expression language

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

diff --git a/inc/autopurge/purge-tsks.php b/inc/autopurge/purge-tsks.php
index 04acbb5e0a9828344bcb2325419ea25c2164ca83..40de412f3f92b8206ecefebccc58f8704fedfe73 100644 (file)
--- a/inc/autopurge/purge-tsks.php
+++ b/inc/autopurge/purge-tsks.php
@@ -47,22 +47,23 @@ if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')
        return false;
 } // END - if
 
-// Check version (must be > 0.0)
-if ((getExtensionVersion('task') > '0.0') && (getConfig('autopurge_tasks') == 'Y')) {
+// Check version (must be >= 0.1.9)
+if ((isExtensionInstalledAndNewer('task', '0.1.9')) && (getConfig('autopurge_tasks') == 'Y')) {
        // Purge deleted tasks (no notification to admin)
        SQL_QUERY("DELETE LOW_PRIORITY
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
-       `status`='DELETED' AND `task_created` <= (UNIX_TIMESTAMP() - {?ap_tasks_time?})", __FILE__, __LINE__);
+       `status`='DELETED' AND
+       `task_created` <= (UNIX_TIMESTAMP() - {?ap_tasks_time?})", __FILE__, __LINE__);
 
        // Get deleted rows
-       $DELETED = SQL_AFFECTEDROWS();
+       $deletedTasks = SQL_AFFECTEDROWS();
 
        // Do we need to send a notification?
-       if (($DELETED > 0) && (getConfig('ap_tasks_notify') == 'Y')) {
+       if (($deletedTasks > 0) && (getConfig('ap_tasks_notify') == 'Y')) {
                // Send out email to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TASKS_SUBJECT'), "admin_autopurge_tsks", $DELETED, '');
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TASKS_SUBJECT'), 'admin_autopurge_tsks', $deletedTasks);
        } // END - if
 } // END - if