Renamed all SQL-related functions to camel-case notation

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

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index b865300a323b6d272aaf8e26fd9543f0cd1830c3..45b4da7dc6c0313ba025be36fcbcf06268553f22 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -66,7 +66,7 @@ if (isAutopurgeInactiveEnabled()) {
        } // END - if
 
        // Check for all accounts
        } // END - if
 
        // Check for all accounts

-       $result_inactive = SQL_QUERY("SELECT
+       $result_inactive = sqlQuery("SELECT

        `userid`,
        `email`,
        `last_online`
        `userid`,
        `email`,
        `last_online`


@@ -81,14 +81,14 @@ WHERE
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 

-       if (!SQL_HASZERONUMS($result_inactive)) {
+       if (!ifSqlHasZeroNums($result_inactive)) {

                // Prepare variables and constants...
                $userids = array();
                $content['since'] = (getApInactiveSince() / 60 / 60);
                $content['time']  = (getApInactiveTime()  / 60 / 60);
 
                // Mark found accounts as inactive and send an email
                // Prepare variables and constants...
                $userids = array();
                $content['since'] = (getApInactiveSince() / 60 / 60);
                $content['time']  = (getApInactiveTime()  / 60 / 60);
 
                // Mark found accounts as inactive and send an email

-               while ($row = SQL_FETCHARRAY($result_inactive)) {
+               while ($row = sqlFetchArray($result_inactive)) {

                        // Merge both arrays
                        $content = merge_array($content, $row);
 
                        // Merge both arrays
                        $content = merge_array($content, $row);
 


@@ -103,7 +103,7 @@ ORDER BY
                        sendEmail($content['userid'], '{--MEMBER_AUTOPURGE_INACTIVE_SUBJECT--}', $message);
 
                        // Update this account
                        sendEmail($content['userid'], '{--MEMBER_AUTOPURGE_INACTIVE_SUBJECT--}', $message);
 
                        // Update this account

-                       addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
+                       addSql(sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",

                                array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));
                } // END - while
 
                                array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));
                } // END - while
 


@@ -115,14 +115,14 @@ ORDER BY
        } // END - if
 
        // Free memory
        } // END - if
 
        // Free memory

-       SQL_FREERESULT($result_inactive);
+       sqlFreeResult($result_inactive);

 
        /*
         * Now let's have a look for inactive accounts for deletion. Use the newly
         * added exclude list here for e.g. excluding holiday users, test users et
         * cetera.
         */
 
        /*
         * Now let's have a look for inactive accounts for deletion. Use the newly
         * added exclude list here for e.g. excluding holiday users, test users et
         * cetera.
         */

-       $result_inactive = SQL_QUERY("SELECT
+       $result_inactive = sqlQuery("SELECT

        `userid`,
        `email`,
        `last_online`
        `userid`,
        `email`,
        `last_online`


@@ -138,12 +138,12 @@ WHERE
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 

-       if (!SQL_HASZERONUMS($result_inactive)) {
+       if (!ifSqlHasZeroNums($result_inactive)) {

                // Prepare userid array for admin...
                $userids = array();
 
                // Delete inactive accounts
                // Prepare userid array for admin...
                $userids = array();
 
                // Delete inactive accounts

-               while ($content = SQL_FETCHARRAY($result_inactive)) {
+               while ($content = sqlFetchArray($result_inactive)) {

                        // Remember userids for the admin
                        array_push($userids, $content['userid']);
 
                        // Remember userids for the admin
                        array_push($userids, $content['userid']);
 


@@ -164,7 +164,7 @@ ORDER BY
        } // END - if
 
        // Free memory
        } // END - if
 
        // Free memory

-       SQL_FREERESULT($result_inactive);
+       sqlFreeResult($result_inactive);

 
        // Run all SQLs
        runFilterChain('run_sqls');
 
        // Run all SQLs
        runFilterChain('run_sqls');