X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fautopurge%2Fpurge-unconfirmed.php;h=c4eed02a77ac7fc0c926ad38d295ff08bde9d71d;hb=2e394cb5b8a6225a39a6942b1fcc17c37a17a175;hp=c8f587e3e42d4f2ed63d67688b70f360320faef7;hpb=29385a0483bbcbbe940a32a49d488b1d5add15c5;p=mailer.git

diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index c8f587e3e4..c4eed02a77 100644
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,7 +41,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
@@ -56,13 +54,14 @@ if (getConfig('autopurge_unconfirmed') == 'Y') {
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`status`='UNCONFIRMED' AND `joined` < (UNIX_TIMESTAMP() - {?ap_unconfirmed_time?})
+	`status`='UNCONFIRMED' AND
+	(UNIX_TIMESTAMP() - `joined`) >= {?ap_unconfirmed_time?}
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_uncon) > 0) {
+	if (!SQL_HASZERONUMS($result_uncon)) {
 		// Prepare variable...
 		$userids = '';
-		$content['time'] = (getConfig('ap_unconfirmed_time')  / 60 / 60);
+		$content['time'] = (getApUnconfirmedTime()  / 60 / 60);
 
 		// Delete inactive accounts
 		while ($row = SQL_FETCHARRAY($result_uncon)) {