X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=a74c21a33792ab8484e2874c356f114bc2ab5b90;hp=da5d22c5128459193a825a404d9aa822ae3437dc;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index da5d22c512..a74c21a337 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/22/2005 *
- * ===============                              Last change: 11/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 11/22/2005 *
+ * ===================                          Last change: 11/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : bonus_mails.php                                  *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,28 +39,27 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!EXT_IS_ACTIVE('bonus')) {
+	die();
+} elseif (!isExtensionActive('bonus')) {
 	return;
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() == 1) return;
+if (getOutputMode() != 0) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, getConfig('last_month'), date('d', time()), date('Y', time()));
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (bonus_ral_notify ";
+$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_ral_notify` ";
 switch (getConfig('bonus_active'))
 {
 	case 'Y': // Active rallye is activated
 		if (getConfig('bonus_en_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= "= 0 OR (bonus_ral_notify > 0 AND bonus_ral_en_notify < bonus_ral_di_notify)";
-			$mode = "en";
+			$sql .= '= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_en_notify` < `bonus_ral_di_notify`)';
+			$mode = 'en';
 		} else {
 			// Do not notify!
 			$sql = '';
@@ -69,8 +69,8 @@ switch (getConfig('bonus_active'))
 	case 'N': // Active rallye is deactivated
 		if (getConfig('bonus_di_notify') == 'Y') {
 			// Okay, let's check for member accounts
-			$sql .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
-			$mode = "di";
+			$sql .= ' > 0 AND `bonus_ral_di_notify` < `bonus_ral_en_notify`';
+			$mode = 'di';
 		} else {
 			// Do not notify!
 			$sql = '';
@@ -80,17 +80,17 @@ switch (getConfig('bonus_active'))
 
 if (!empty($sql)) {
 	// The SQL command needs to be finisched here (only confirmed accounts!)
-	$sql .= ") AND `status`='CONFIRMED' ORDER BY last_online ASC";
+	$sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
 	// Normal notification mails or bonus mails?
-	$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == "en") && (EXT_IS_ACTIVE('bonus')));
+	$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == "en") && (isExtensionActive('bonus')));
 
 	// Generate subject line
-	$subject = constant('BONUS_RALLYE_'.strtoupper($mode).'_NOTIFY');
+	$subject = getMessage('BONUS_RALLYE_' . strtoupper($mode).'_NOTIFY');
 
 	// Load message body for bonus mails
-	$message = LOAD_EMAIL_TEMPLATE('bonus_en_notify_body', '', '{PER}uid{PER}');
-	$RECEIVER = ''; $UIDs = array();
+	$message = loadEmailTemplate('bonus_en_notify_body', '', '{PER}userid{PER}');
+	$receiver = ''; $userids = array();
 
 	// Check for accounts to be notified
 	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -98,19 +98,26 @@ if (!empty($sql)) {
 		// Okay lets notify all users!
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Update account
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s'
-WHERE userid=%s
+			SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`bonus_ral_notify`=UNIX_TIMESTAMP(),
+	`bonus_ral_%s_notify`=UNIX_TIMESTAMP()
+WHERE
+	`userid`=%s
 LIMIT 1",
-			array(time(), $mode, time(), $content['userid']), __FILE__, __LINE__);
+				array(
+					$mode,
+					$content['userid']
+				), __FILE__, __LINE__);
 
 			// Load email template and send it to the user!
 			if ($sentBonusMails === true) {
 				// Add userid to queue
-				$UIDs[] = $content['userid'];
+				$userids[] = $content['userid'];
 			} else {
 				// Send normal notification mail to the members
-				$message = LOAD_EMAIL_TEMPLATE('bonus_' . $mode . '_notify', array(), $content['userid']);
+				$message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
 				sendEmail($content['email'], $subject, $message);
 			}
 		} // END - while
@@ -118,13 +125,13 @@ LIMIT 1",
 		// Shall I send out bonus mails?
 		if ($sentBonusMails === true) {
 			// Okay, make array to string
-			$RECEIVER = implode(';', $UIDs);
+			$receiver = implode(';', $userids);
 
 			// Prepare URL
-			$URL = 'modules.php?module=index&amp;what=login';
+			$url = 'modules.php?module=index&amp;what=login';
 
 			// Insert mail
-			addBonusMailToQueue($subject, $message, $RECEIVER, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+			addBonusMailToQueue($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if