X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-unconfirmed.php;h=0ef7d7ef076f4be944d909190634f9704862de8f;hb=255696fe065d35b951f66168c35296b10fdde060;hp=1b566c7a77b1fc4d3514dd88935a674732c85925;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 1b566c7a77..0ef7d7ef07 100644
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 05/29/2004 *
- * ===============                              Last change: 11/26/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 05/29/2004 *
+ * ===================                          Last change: 11/26/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : autopurge.php                                    *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
+if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
 	// Abort here
 	return false;
 } // END - if
@@ -58,29 +59,32 @@ WHERE
 	`status`='UNCONFIRMED' AND `joined` < (UNIX_TIMESTAMP() - {?ap_unconfirmed_time?})
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_uncon) > 0) {
+	if (!SQL_HASZERONUMS($result_uncon)) {
 		// Prepare variable...
-		$UIDs = '';
-		$content['time'] = (getConfig('ap_unconfirmed_time')  / 60 / 60);
+		$userids = '';
+		$content['time'] = (getApUnconfirmedTime()  / 60 / 60);
 
 		// Delete inactive accounts
-		while ($content = SQL_FETCHARRAY($result_uncon)) {
+		while ($row = SQL_FETCHARRAY($result_uncon)) {
+			// Merge both arrays
+			$content = merge_array($content, $row);
+
 			// Remember userids for the admin
-			$UIDs .= $content['userid'] . ', ';
+			$userids .= $content['userid'] . ', ';
 
 			// Get date/time from timestamp
-			$content['joined'] = generateDateTime($content['joined'], '0');
+			$content['joined'] = generateDateTime($content['joined'], 0);
 
 			// Finnaly delete this inactive account
 			deleteUserAccount($content['userid'], loadEmailTemplate('member_autopurge_unconfirmed', $content, ''));
 		} // END - while
 
 		// Remove last comma
-		$UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
+		$userids = str_replace(', ', "\n", substr($userids, 0, -2));
 
 		// Send mail notification to admin
 		if (getConfig('ap_un_notify') == 'Y') {
-			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), 'admin_autopurge_unconfirmed', $UIDs, '');
+			sendAdminNotification('{--ADMIN_AUTOPURGE_UNCONFIRMED_SUBJECT--}', 'admin_autopurge_unconfirmed', $userids);
 		} // END - if
 	} // END - if