New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index b5d1f914085a8ddb685d90c76e5adff82b0ad916..285a3abc784828f5d804bc4354af0a909b237ec0 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Auto-Loeschung von inaktiven Mitgliedern         *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -38,18 +38,18 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
        // Abort here
        return false;
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
-if (getConfig('autopurge_inactive') == "Y") {
+if (getConfig('autopurge_inactive') == 'Y') {
        // Init SQLs
        INIT_SQLS();
 
@@ -57,20 +57,20 @@ if (getConfig('autopurge_inactive') == "Y") {
        $since = getConfig(('ap_inactive_since'));
 
        // Init exclusion list
-       $EXCLUDE_LIST = "";
+       $EXCLUDE_LIST = '';
        if (getConfig('def_refid') > 0) {
                $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid');
        } // END - if
 
        // Check for more extensions
-       if (EXT_IS_ACTIVE("beg"))     $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_uid')."";
-       if (EXT_IS_ACTIVE("bonus"))   $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_uid')."";
-       if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_uid')."";
+       if (EXT_IS_ACTIVE('beg'))     $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_uid')."";
+       if (EXT_IS_ACTIVE('bonus'))   $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_uid')."";
+       if (EXT_IS_ACTIVE('doubler')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_uid')."";
 
        // Check for new holiday extension
-       if (GET_EXT_VERSION("holiday") >= "0.1.3") {
+       if (GET_EXT_VERSION('holiday') >= '0.1.3') {
                // Include only users with no active holiday
-               $EXCLUDE_LIST .= " AND d.holiday_active='N'";
+               $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
        } // END - if
 
        // Check for all accounts
@@ -82,7 +82,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_inactive) > 0) {
                // Prepare variables and constants...
-               $UIDs = "";
+               $UIDs = '';
                define('__INACTIVE_SINCE', (getConfig('ap_inactive_since') / 60 / 60));
                define('__INACTIVE_TIME' , (getConfig('ap_in_time')  / 60 / 60));
 
@@ -92,11 +92,11 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                        $UIDs .= $content['userid'].", ";
 
                        // Get date/time from timestamp
-                       $content['last_online'] = MAKE_DATETIME($content['last_online'], "0");
+                       $content['last_online'] = generateDateTime($content['last_online'], '0');
 
                        // Load mail template
                        $msg = LOAD_EMAIL_TEMPLATE("member_autopurge_inactive", $content['last_online'], bigintval($content['userid']));
-                       SEND_EMAIL($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $msg);
+                       sendEmail($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $msg);
 
                        // Update this account
                        ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
@@ -107,7 +107,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
                // Send mail notification to admin
-               SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), "admin_autopurge_inactive", $UIDs, "");
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), "admin_autopurge_inactive", $UIDs, '');
        } // END - if
 
        // Free memory
@@ -118,13 +118,13 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
        $time = getConfig(('ap_in_time'));
        $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
 FROM `{!_MYSQL_PREFIX!}_user_data` AS d
-WHERE `status`='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
+WHERE `status`='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND `last_online` < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
-ORDER BY userid",
+ORDER BY `userid` ASC",
                array($since, $since, $time), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_inactive) > 0) {
                // Prepare variable...
-               $UIDs = "";
+               $UIDs = '';
 
                // Delete inactive accounts
                while ($content = SQL_FETCHARRAY($result_inactive)) {
@@ -132,18 +132,18 @@ ORDER BY userid",
                        $UIDs .= $content['userid'].", ";
 
                        // Get date/time from timestamp
-                       $content['last_online'] = MAKE_DATETIME($content['last_online'], "0");
+                       $content['last_online'] = generateDateTime($content['last_online'], '0');
 
                        // Finnaly delete this inactive account
-                       DELETE_USER_ACCOUNT($content['userid'], LOAD_EMAIL_TEMPLATE("member_autopurge_delete", $content['last_online'], ""));
+                       deleteUserAccount($content['userid'], LOAD_EMAIL_TEMPLATE("member_autopurge_delete", $content['last_online'], ''));
                } // END - while
 
                // Remove last comma
                $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
                // Send mail notification to admin
-               if (getConfig('ap_in_notify') == "Y") {
-                       SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), "admin_autopurge_delete", $UIDs, "");
+               if (getConfig('ap_in_notify') == 'Y') {
+                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), "admin_autopurge_delete", $UIDs, '');
                } // END - if
        } // END - if