X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=a2d715f7ead7a94bba2b33e88c61b83f20ac4c8d;hp=67d20ee247e3a66a0a14bfd637a3d764b4b3eaf3;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=508228c85fba8448d00865b1639cb8cd7a69e457

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 67d20ee247..a2d715f7ea 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                                  *
@@ -10,14 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Versendet Erinnerungsmails                       *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $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 - 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,59 +39,58 @@
 
 // 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 ($GLOBALS['output_mode'] == 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 = "";
+$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";
-	} else {
-		// Do not notify!
-		$sql = "";
-	}
-	break;
-
-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";
-	} else {
-		// Do not notify!
-		$sql = "";
-	}
-	break;
+	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';
+		} else {
+			// Do not notify!
+			$sql = '';
+		}
+		break;
+
+	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';
+		} else {
+			// Do not notify!
+			$sql = '';
+		}
+		break;
 }
 
 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
-	$MSG = 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,33 +98,39 @@ 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
-				$MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $content['userid']);
-				SEND_EMAIL($content['email'], $SUBJECT, $MSG);
+				$message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
+				sendEmail($content['email'], $subject, $message);
 			}
 		} // END - while
 
 		// 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
-			ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $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