X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-inact.php;h=01a59c5f905075d639a4dcd32db23315b0f89278;hb=ff9e8f739bd4b6e184b2a6bf427334196e501da8;hp=3835c046d807ccc4251848d765770dc544891976;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php index 3835c046d8..01a59c5f90 100644 --- a/inc/autopurge/purge-inact.php +++ b/inc/autopurge/purge-inact.php @@ -1,7 +1,7 @@ 0) { - $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid'); - } // END - if - + // @TODO Rewrite these if() blocks to a filter + $EXCLUDE_LIST = ''; + if (isValidUserId(getConfig('def_refid'))) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}'; // 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 (isExtensionActive('beg')) $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}'; + if (isExtensionActive('bonus')) $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}'; + if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND d.`userid` != {?doubler_userid?}'; // Check for new holiday extension - if (GET_EXT_VERSION("holiday") >= "0.1.3") { + if (isExtensionInstalledAndNewer('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 - $result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online -FROM `{!_MYSQL_PREFIX!}_user_data` AS d -WHERE d.`status`='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s) -".$EXCLUDE_LIST." -ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__); - - if (SQL_NUMROWS($result_inactive) > 0) { + $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online +FROM + `{?_MYSQL_PREFIX?}_user_data` AS d +WHERE + d.status='CONFIRMED' AND + d.joined < (UNIX_TIMESTAMP() - %s) AND + d.last_online < (UNIX_TIMESTAMP() - %s) AND + d.ap_notified < (UNIX_TIMESTAMP() - %s) + ".$EXCLUDE_LIST." +ORDER BY + d.userid ASC", + array( + getApInactiveSince(), + getApInactiveSince(), + getApInactiveSince() + ), __FILE__, __LINE__); + + if (!SQL_HASZERONUMS($result_inactive)) { // Prepare variables and constants... - $UIDs = ""; - define('__INACTIVE_SINCE', (getConfig('ap_inactive_since') / 60 / 60)); - define('__INACTIVE_TIME' , (getConfig('ap_in_time') / 60 / 60)); + $useridsContent = ''; + $content['since'] = (getApInactiveSince() / 60 / 60); + $content['time'] = (getApInactiveTime() / 60 / 60); // Mark found accounts as inactive and send an email - while ($content = SQL_FETCHARRAY($result_inactive)) { + while ($row = SQL_FETCHARRAY($result_inactive)) { + // Merge both arrays + $content = merge_array($content, $row); + // Remember userids for the admin - $UIDs .= $content['userid'].", "; + $useridsContent .= $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); + $message = loadEmailTemplate('member_autopurge_inactive', $content, bigintval($content['userid'])); + sendEmail($content['email'], '{--AUTOPURGE_MEMBER_INACTIVE_SUBJECT--}', $message); // Update this account - ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1", + addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1", array(bigintval($content['userid'])), __FILE__, __LINE__, false)); } // END - while // Remove last comma - $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2)); + $useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2)); // Send mail notification to admin - SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), "admin_autopurge_inactive", $UIDs, ""); + sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $useridsContent); } // END - if // Free memory @@ -115,35 +124,41 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__); // Now let's have a look for inactive accounts we want to delete we newly use the same exclude list // here for e.g. excluding holiday users - $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) -".$EXCLUDE_LIST." -ORDER BY userid", - array($since, $since, $time), __FILE__, __LINE__); - if (SQL_NUMROWS($result_inactive) > 0) { + $result_inactive = SQL_QUERY('SELECT + d.userid, d.email, d.last_online +FROM + `{?_MYSQL_PREFIX?}_user_data` AS d +WHERE + `status`='CONFIRMED' AND + `joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND + `last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND + `ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_time?}) +' . $EXCLUDE_LIST . ' +ORDER BY + `userid` ASC', __FILE__, __LINE__); + + if (!SQL_HASZERONUMS($result_inactive)) { // Prepare variable... - $UIDs = ""; + $useridsContent = ''; // Delete inactive accounts while ($content = SQL_FETCHARRAY($result_inactive)) { // Remember userids for the admin - $UIDs .= $content['userid'].", "; + $useridsContent .= $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'], loadEmailTemplate('member_autopurge_delete', $content['last_online'], '')); } // END - while // Remove last comma - $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2)); + $useridsContent = str_replace(', ', "\n", substr($useridsContent, 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('{--ADMIN_AUTOPURGE_DELETE_SUBJECT--}', 'admin_autopurge_delete', $useridsContent); } // END - if } // END - if @@ -154,5 +169,5 @@ ORDER BY userid", runFilterChain('run_sqls'); } // END - if -// +// [EOF] ?>