X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=495c2b52cba920d975214811d85f1217856e7118;hb=188495baa4eae4327a063f99989ea503598b2174;hp=2b9ff117c477fa7130f3fc476e62017a78633f18;hpb=67f53c107d5b68f6e735407b98803fc83e12d7b4;p=mailer.git diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php index 2b9ff117c4..495c2b52cb 100644 --- a/inc/mails/bonus_mails.php +++ b/inc/mails/bonus_mails.php @@ -14,12 +14,10 @@ * $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 * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -45,14 +43,14 @@ if (!defined('__SECURITY')) { } // Do not execute when script is in CSS mode -if (getScriptOutputMode() != 0) return; +if (!isHtmlOutputMode()) return; // Create timemark from saved month -$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear()); +$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear()); $sql = ''; $mode = ''; // Shall I sent activation or deactivation mail? -$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` "; +$sql = "SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` "; switch (getConfig('bonus_active')) { case 'Y': // Active rallye is activated if (getConfig('bonus_enable_notify') == 'Y') { @@ -84,9 +82,6 @@ if (!empty($sql)) { // Normal notification mails or bonus mails? $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus'))); - // Generate subject line - $subject = '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}'; - // Load message body for bonus mails $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}'); $receiver = ''; $userids = array(); @@ -116,7 +111,7 @@ LIMIT 1", } else { // Send normal notification mail to the members $message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']); - sendEmail($content['email'], $subject, $message); + sendEmail($content['userid'], '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message); } } // END - while @@ -129,7 +124,7 @@ LIMIT 1", $url = 'modules.php?module=index&what=login'; // Insert mail - addBonusMailToQueue($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main)); + addBonusMailToQueue('{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main)); } // END - if } // END - if