X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=d40b73ec795ec8620cebc63f83a22a6d2112a364;hp=b3580e82c036c4f571672c8fd5b1dee06743ca0c;hb=fb7120ffa230b62b54895bcf95952e1cf30f8594;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index b3580e82c0..d40b73ec79 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Versendet Erinnerungsmails                       *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -40,28 +45,27 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-global $CSS;
-if ($CSS == 1) return;
+if ($GLOBALS['output_mode'] == 1) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, getConfig('last_month'), date("d", time()), date('Y', time()));
-$SQL = ""; $MODE = "";
+$sql = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?
-$SQL = "SELECT userid, email FROM `"._MYSQL_PREFIX."_user_data` WHERE (beg_ral_notify ";
+$sql = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (beg_ral_notify ";
 switch (getConfig('beg_rallye'))
 {
 case "Y": // Begging rallye is activated
 	if (getConfig('beg_ral_en_notify') == "Y")
 	{
 		// Okay, let's check for member accounts
-		$SQL .= "= 0 OR (beg_ral_notify > 0 AND beg_ral_en_notify < beg_ral_di_notify)";
+		$sql .= "= 0 OR (beg_ral_notify > 0 AND beg_ral_en_notify < beg_ral_di_notify)";
 		$MODE = "en";
 	}
 	 else
 	{
 		// Do not notify!
-		$SQL = "";
+		$sql = "";
 	}
 	break;
 
@@ -69,20 +73,20 @@ case "N": // Begging rallye is deactivated
 	if (getConfig('beg_ral_di_notify') == "Y")
 	{
 		// Okay, let's check for member accounts
-		$SQL .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
+		$sql .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
 		$MODE = "di";
 	}
 	 else
 	{
 		// Do not notify!
-		$SQL = "";
+		$sql = "";
 	}
 	break;
 }
 
-if (!empty($SQL)) {
+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";
 
 	// Prepare data for the template
 	define('__BEG_MIN_POINTS' , TRANSLATE_COMMA(getConfig('beg_points')));
@@ -100,10 +104,10 @@ if (!empty($SQL)) {
 	}
 
 	// Check for accounts to be notified
-	$result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
+	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_main) > 0) {
 		// Normal notification mails or bonus mails?
-		$MAIL_MODE = ((getConfig('beg_notify_bonus') > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
+		$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
 		// Generate subject line
 		$SUBJECT = constant('BEG_RALLYE_'.strtoupper($MODE).'_NOTIFY');
@@ -113,35 +117,35 @@ if (!empty($SQL)) {
 		$RECEIVER = ""; $UIDs = array();
 
 		// Okay lets notify all users!
-		while(list($uid, $email) = SQL_FETCHROW($result_main)) {
+		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Update account
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET beg_ral_notify='%s', beg_ral_%s_notify='%s'
 WHERE userid=%s
 LIMIT 1",
-				array(time(), $MODE, time(), $uid), __FILE__, __LINE__);
+				array(time(), $MODE, time(), $content['userid']), __FILE__, __LINE__);
 
 			// Load email template and send it to the user!
-			if ($MAIL_MODE) {
+			if ($sentBonusMails === true) {
 				// Add userid to queue
-				$UIDs[] = $uid;
+				$UIDs[] = $content['userid'];
 			} else {
 				// Send normal notification mail to the members
-				$MSG = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", array(), $uid);
-				SEND_EMAIL($uid, $SUBJECT, $MSG);
+				$MSG = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", array(), $content['userid']);
+				SEND_EMAIL($content['email'], $SUBJECT, $MSG);
 			}
 		} // END - while
 
 		// Shall I send out bonus mails?
-		if ($MAIL_MODE) {
+		if ($sentBonusMails === true) {
 			// Okay, make array to string
 			$RECEIVER = implode(";", $UIDs);
 
 			// Prepare URL
-			$url = URL."/modules.php?module=index&what=login";
+			$URL = "modules.php?module=index&amp;what=login";
 
 			// Insert mail
-			ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $url, 0, "normal", SQL_NUMROWS($result_main));
+			ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, "normal", SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if