Further fixes for installation phase and endless loop

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

diff --git a/inc/autopurge/purge-tsks.php b/inc/autopurge/purge-tsks.php
index 96124da6be91095b8d2ae3c10fa53c8818ec8459..da854441c1464212f6dbcf137129e7be32317d2f 100644 (file)
--- a/inc/autopurge/purge-tsks.php
+++ b/inc/autopurge/purge-tsks.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Auto-Loeschung von veralteten Mail-Links         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,31 +38,31 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
+       die();
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') == "N")) {
+if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
        // Abort here
        return false;
 } // END - if
 
 // Check version (must be > 0.0)
-if ((GET_EXT_VERSION("task") > "0.0") && (getConfig('ap_tasks') == "Y")) {
-       // Since when shall we purge?
-       $since = bigintval(getConfig('ap_tasks_time'));
-
+if ((getExtensionVersion('task') > '0.0') && (getConfig('autopurge_tasks') == 'Y')) {
        // Purge deleted tasks (no notification to admin)
-       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY
-FROM "._MYSQL_PREFIX."_task_system
-WHERE status='DELETED' AND task_created <= (UNIX_TIMESTAMP() - %s)",
-        array($since), __FILE__, __LINE__);
+       SQL_QUERY("DELETE LOW_PRIORITY
+FROM
+       `{?_MYSQL_PREFIX?}_task_system`
+WHERE
+       `status`='DELETED' AND `task_created` <= (UNIX_TIMESTAMP() - {?ap_tasks_time?})", __FILE__, __LINE__);
+
+       // Get deleted rows
        $DELETED = SQL_AFFECTEDROWS();
 
-       if (($DELETED > 0) && (getConfig('ap_tasks_notify') == "Y")) {
+       // Do we need to send a notification?
+       if (($DELETED > 0) && (getConfig('ap_tasks_notify') == 'Y')) {
                // Send out email to admin
-               SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_TASKS_SUBJECT, "admin_autopurge_tsks", $DELETED, "");
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TASKS_SUBJECT'), "admin_autopurge_tsks", $DELETED, '');
        } // END - if
 } // END - if