X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_profile.php;h=5507e0aa42b391a4287186e17d43949035ff195c;hb=73d1c2fe034660e81b453653491d1b0160172398;hp=84ff6f6722c0bd506b44c04cb54fd77a2a3c9c2f;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index 84ff6f6722..5507e0aa42 100644
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/24/2009 *
- * ===================                          Last change: 10/24/2009 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_profile.php                                *
@@ -15,8 +15,6 @@
  * $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                    *
@@ -41,33 +39,40 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no daily reset
+	return;
 } elseif (!isExtensionActive('profile')) {
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() != 0) || (!isResetModeEnabled())) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
 
-if ((getConfig('send_prof_update') == 'Y') && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
+if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) {
 	// Load personal data
-	$result = SQL_QUERY_ESC("SELECT `userid`, `email`, `last_update`, `joined`
+	$result = SQL_QUERY("SELECT
+	`userid`, `email`, `last_update`, `joined`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	(`last_update` < (UNIX_TIMESTAMP() - %s) AND `last_update` != 0 AND `last_profile_sent` < (UNIX_TIMESTAMP() - %s))
-OR
-	(`last_update` = '0' AND `last_profile_sent` = '0' AND `joined` < (UNIX_TIMESTAMP() - %s))
+	`status`='CONFIRMED' AND (
+		(
+			`last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND
+			`last_update` > 0 AND
+			`last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?})
+		) OR (
+			`last_update` = 0 AND
+			`last_profile_sent` = 0 AND
+			`joined` < (UNIX_TIMESTAMP() - {?profile_update?})
+		)
+	)
 ORDER BY
-	`userid` ASC",
-		array(
-			getConfig('profile_update'),
-			getConfig('resend_profile_update'),
-			getConfig('profile_update')
-		), __FILE__, __LINE__);
+	`userid` ASC", __FILE__, __LINE__);
 
 	// Do we have some notifications to sent?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// We need to send-out notifications...
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Translate timestamp
@@ -75,15 +80,15 @@ ORDER BY
 
 			if (round($content['last_update']) == '0') {
 				// Has never changed his accont
-				$content['last_update'] = getMessage('PROFILE_NEVER_CHANGED');
+				$content['last_update'] = '{--MEMBER_PROFILE_NEVER_CHANGED--}';
 			} else {
 				// Has changed his account
 				$content['last_update'] = generateDateTime($content['last_update'], 0);
 			}
 
 			// Load email template and send mail away
-			$message = loadEmailTemplate('profile-updte', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('PROFILE_OUTDATED'), $message);
+			$message = loadEmailTemplate('member_profile', $content, bigintval($content['userid']));
+			sendEmail($content['email'], '{--MEMBER_PROFILE_OUTDATED_SUBJECT--}', $message);
 
 			// Update profile data
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_profile_sent`=UNIX_TIMESTAMP(), `notified`='Y' WHERE `userid`=%s LIMIT 1",
@@ -93,7 +98,10 @@ ORDER BY
 
 	// Free result
 	SQL_FREERESULT($result);
-}
+} // END - if
+
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
 
 // [EOF]
 ?>