X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=495c2b52cba920d975214811d85f1217856e7118;hp=da5d22c5128459193a825a404d9aa822ae3437dc;hb=20741b93fd58620af677a7f1039ffd16ea6ec689;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850 diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php index da5d22c512..495c2b52cb 100644 --- a/inc/mails/bonus_mails.php +++ b/inc/mails/bonus_mails.php @@ -1,7 +1,7 @@ 0 AND bonus_ral_en_notify < bonus_ral_di_notify)"; - $mode = "en"; + $sql .= '= 0 OR (`bonus_rallye_enable_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)'; + $mode = 'enable'; } else { // Do not notify! $sql = ''; @@ -67,64 +64,67 @@ switch (getConfig('bonus_active')) break; case 'N': // Active rallye is deactivated - if (getConfig('bonus_di_notify') == 'Y') { + if (getConfig('bonus_disable_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_rallye_disable_notify` < `bonus_rallye_enable_notify`'; + $mode = 'disable'; } 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"; // Normal notification mails or bonus mails? - $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == "en") && (EXT_IS_ACTIVE('bonus'))); - - // Generate subject line - $subject = constant('BONUS_RALLYE_'.strtoupper($mode).'_NOTIFY'); + $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus'))); // Load message body for bonus mails - $message = LOAD_EMAIL_TEMPLATE('bonus_en_notify_body', '', '{PER}uid{PER}'); - $RECEIVER = ''; $UIDs = array(); + $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}'); + $receiver = ''; $userids = array(); // Check for accounts to be notified $result_main = SQL_QUERY($sql, __FILE__, __LINE__); - if (SQL_NUMROWS($result_main) > 0) { + if (!SQL_HASZERONUMS($result_main)) { // 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_rallye_%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']); - sendEmail($content['email'], $subject, $message); + $message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']); + sendEmail($content['userid'], '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_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&what=login'; + $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