Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / purge / purge-tasks.php

diff --git a/inc/purge/purge-tasks.php b/inc/purge/purge-tasks.php
index 5e6b8aa5617c4b23d4499190ddeff4869f67a217..d18fc5db72afad46be278cb71e8ede0c8d44d8ab 100644 (file)
--- a/inc/purge/purge-tasks.php
+++ b/inc/purge/purge-tasks.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -49,7 +49,7 @@ if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive()) || (getConfig(
 // Check version (must be >= 0.1.9)
 if ((isExtensionInstalledAndNewer('task', '0.1.9')) && (getConfig('autopurge_tasks') == 'Y')) {
        // Select all tasks that needs purging
-       $result = SQL_QUERY("SELECT
+       $result = sqlQuery("SELECT
        `id`,
        `assigned_admin`,
        `userid`,
@@ -64,10 +64,10 @@ WHERE
        (UNIX_TIMESTAMP() - `task_created`) >= {?ap_tasks_time?}", __FILE__, __LINE__);
 
        // Send out a notification?
-       if (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // Init output and load all rows
                $output = ''; $ids = array();
-               while ($row = SQL_FETCHARRAY($result)) {
+               while ($row = sqlFetchArray($result)) {
                        // "Translate" creation timestamp
                        $row['task_created'] = generateDateTime($row['task_created'], '1');
 
@@ -80,19 +80,19 @@ WHERE
 
                // Init content array
                $content = array(
-                       'count' => SQL_NUMROWS($result),
+                       'count' => sqlNumRows($result),
                        'rows'  => $output
                );
 
                // Delete all tasks
-               SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id` IN (' . implode(', ', $ids) . ')');
+               sqlQuery('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id` IN (' . implode(', ', $ids) . ')', __FILE__, __LINE__);
 
                // Send out email to admin
                sendAdminNotification('{--ADMIN_AUTOPURGE_TASKS_SUBJECT--}', 'admin_purge_task', $content);
        } // END - if
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 } // END - if
 
 //