Merge branch 'contrib' into 0.2.1-FINAL

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

diff --git a/inc/purge/purge-unconfirmed.php b/inc/purge/purge-unconfirmed.php
index 61a90068e276bc62e4297396b67228efa9fe9c8c..b23ee75989fb85210a0596ce770079c106403fa1 100644 (file)
--- a/inc/purge/purge-unconfirmed.php
+++ b/inc/purge/purge-unconfirmed.php
@@ -49,7 +49,7 @@ if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
 // Shall I auto-purge unconfirmed accounts?
 if (getConfig('autopurge_unconfirmed') == 'Y') {
        // Init variables and find unconfirmed accounts which I shall auto-purge;
-       $result_uncon = SQL_QUERY("SELECT
+       $result_uncon = sqlQuery("SELECT
        `userid`,
        `email`,
        `joined`
@@ -60,13 +60,13 @@ WHERE
        (UNIX_TIMESTAMP() - `joined`) >= {?ap_unconfirmed_time?}
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
-       if (!SQL_HASZERONUMS($result_uncon)) {
+       if (!ifSqlHasZeroNums($result_uncon)) {
                // Prepare variable...
                $userids = '';
                $content['time'] = (getApUnconfirmedTime()  / 60 / 60);
 
                // Delete inactive accounts
-               while ($row = SQL_FETCHARRAY($result_uncon)) {
+               while ($row = sqlFetchArray($result_uncon)) {
                        // Merge both arrays
                        $content = merge_array($content, $row);
 
@@ -90,7 +90,7 @@ ORDER BY
        } // END - if
 
        // Free memory
-       SQL_FREERESULT($result_uncon);
+       sqlFreeResult($result_uncon);
 } // END - if
 
 // [EOF]