X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbonus_mails.php;h=5f0cee83710322b70382d8a5a593e2fdb0abfc4e;hb=6bc05b8460aa514a136a9b2d924545b6cfa84cad;hp=edd37ab9176c3770b4849c8955659a8bd4bd9e9d;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php index edd37ab917..5f0cee8371 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`)"; + $sql .= '= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_en_notify` < `bonus_ral_di_notify`)'; $mode = 'en'; } else { // Do not notify! @@ -68,7 +68,7 @@ switch (getConfig('bonus_active')) 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`"; + $sql .= ' > 0 AND `bonus_ral_di_notify` < `bonus_ral_en_notify`'; $mode = 'di'; } else { // Do not notify! @@ -89,7 +89,7 @@ if (!empty($sql)) { // Load message body for bonus mails $message = loadEmailTemplate('bonus_en_notify_body', '', '{PER}userid{PER}'); - $RECEIVER = ''; $UIDs = array(); + $receiver = ''; $userids = array(); // Check for accounts to be notified $result_main = SQL_QUERY($sql, __FILE__, __LINE__); @@ -98,18 +98,24 @@ if (!empty($sql)) { 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 +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 - $message = loadEmailTemplate('bonus_' . $mode . '_notify', array(), $content['userid']); + $message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']); sendEmail($content['email'], $subject, $message); } } // END - while @@ -117,13 +123,13 @@ LIMIT 1", // 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'; // Insert mail - addBonusMailToQueue($subject, $message, $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