X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=0cd50f820f5980a5be2f71cc57d91b1f899d66fa;hp=4e81eaa6c7373be7f35a013a878b4819e261f646;hb=83574a6475896fbdc231e685e2ebb0ee4f3e6eba;hpb=f03cb5d87e69bb2efc885b5c5f5f3026b24c06f6

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 4e81eaa6c7..0cd50f820f 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -17,7 +17,7 @@
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,92 +38,89 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-} elseif (!EXT_IS_ACTIVE("beg")) {
+	die();
+} elseif (!isExtensionActive('beg')) {
 	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 (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)";
-		$MODE = "en";
-	}
-	 else
-	{
-		// Do not notify!
-		$sql = "";
-	}
-	break;
-
-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";
-		$MODE = "di";
-	}
-	 else
-	{
-		// Do not notify!
-		$sql = "";
-	}
-	break;
-}
+$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`)';
+			$mode = 'en';
+		} else {
+			// Do not notify!
+			$sql = '';
+		}
+		break;
+
+	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`';
+			$mode = 'di';
+		} else {
+			// Do not notify!
+			$sql = '';
+		}
+		break;
+} // END - switch
 
 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')));
-	define('__BEG_MAX_POINTS' , TRANSLATE_COMMA(getConfig('beg_points_max')));
-	define('__BEG_MAX_WINNERS', round(getConfig('beg_ranks')));
-	if (getConfig('beg_ip_timeout') == 0)
-	{
-		// No IP locking setuped!
-		define('__BEG_IP_LOCKER', BEG_NO_LIMITATION);
-	}
-	 else
-	{
+	$content['min_points'] = translateComma(getConfig('beg_points'));
+	$content['max_points'] = translateComma(getConfig('beg_points_max'));
+	$content['max_winner'] = round(getConfig('beg_ranks'));
+
+	// No IP locking setuped by default
+	$content['ip_locker'] = getMessage('BEG_NO_LIMITATION');
+
+	if (getConfig('beg_ip_timeout') > 0) {
 		// Create timemark
-		define('__BEG_IP_LOCKER', CREATE_FANCY_TIME(getConfig('beg_ip_timeout')));
-	}
+		$content['ip_locker'] = createFancyTime(getConfig('beg_ip_timeout'));
+	} // END - if
 
 	// Check for accounts to be notified
 	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_main) > 0) {
 		// Normal notification mails or bonus mails?
-		$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
+		$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == "en") && (isExtensionActive('bonus')));
 
 		// Generate subject line
-		$subject = constant('BEG_RALLYE_'.strtoupper($MODE).'_NOTIFY');
+		$subject = getMessage('BEG_RALLYE_'.strtoupper($mode).'_NOTIFY');
 
 		// Load message body for bonus mails
-		$message = LOAD_EMAIL_TEMPLATE("beg_en_notify_body", "", "{PER}uid{PER}");
-		$RECEIVER = ""; $UIDs = array();
+		$message = loadEmailTemplate('beg_en_notify_body', '', '{PER}userid{PER}');
+		$RECEIVER = ''; $UIDs = array();
 
 		// Okay lets notify all users!
-		while ($content = SQL_FETCHARRAY($result_main)) {
+		while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
 			// Update account
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET beg_ral_notify='%s', beg_ral_%s_notify='%s'
-WHERE userid=%s
+			SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`beg_ral_notify`=UNIX_TIMESTAMP(),
+	`beg_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) {
@@ -131,21 +128,21 @@ LIMIT 1",
 				$UIDs[] = $content['userid'];
 			} else {
 				// Send normal notification mail to the members
-				$message = LOAD_EMAIL_TEMPLATE("beg_".$MODE."_notify", array(), $content['userid']);
-				SEND_EMAIL($content['email'], $subject, $message);
+				$message = loadEmailTemplate('beg_' . $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(';', $UIDs);
 
 			// 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, $message, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, "normal", SQL_NUMROWS($result_main));
+			addBonusMailToQueue($subject, $message, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if
 
@@ -153,5 +150,5 @@ LIMIT 1",
 	SQL_FREERESULT($result_main);
 } // END - if
 
-//
+// [EOF]
 ?>