X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=2520ae536409d806f7c3d6a61fa23c544e3979fc;hb=ec9f020e34a9f2029a2ea0969564dda015beca8a;hp=424d1ccba4a49e25c25cf2f8d2cf84986b3dea9f;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850;p=mailer.git diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php index 424d1ccba4..2520ae5364 100644 --- a/inc/mails/beg_mails.php +++ b/inc/mails/beg_mails.php @@ -1,7 +1,7 @@ 0 AND beg_ral_en_notify < beg_ral_di_notify)"; - $mode = "en"; + $sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)'; + $mode = 'enable'; } else { // Do not notify! $sql = ''; @@ -66,76 +64,78 @@ switch (getConfig('beg_rallye')) { break; case 'N': // Begging rallye is deactivated - if (getConfig('beg_ral_di_notify') == 'Y') { + if (isBegRallyeDisableNotifyEnabled()) { // Okay, let's check for member accounts - $sql .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify"; - $mode = "di"; + $sql .= ' > 0 AND `beg_rallye_disable_notify` < `beg_rallye_enable_notify`'; + $mode = 'disable'; } else { - // Do not notify! - $sql = ''; + // 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"; - - // Prepare data for the template - define('__BEG_MIN_POINTS' , translateComma(getConfig('beg_points'))); - define('__BEG_MAX_POINTS' , translateComma(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', getMessage('BEG_NO_LIMITATION')); - } else { + $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC"; + + // No IP locking setuped by default + $content['ip_locker'] = '{--BEG_NO_LIMITATION--}'; + + if (getBegIpTimeout() > 0) { // Create timemark - define('__BEG_IP_LOCKER', createFancyTime(getConfig('beg_ip_timeout'))); - } + $content['ip_locker'] = '{%config,createFancyTime=beg_ip_timeout%}'; + } // END - if // Check for accounts to be notified $result_main = SQL_QUERY($sql, __FILE__, __LINE__); - if (SQL_NUMROWS($result_main) > 0) { + if (!SQL_HASZERONUMS($result_main)) { // Normal notification mails or bonus mails? - $sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == "en") && (EXT_IS_ACTIVE('bonus'))); - - // Generate subject line - $subject = constant('BEG_RALLYE_'.strtoupper($mode).'_NOTIFY'); + $sentBonusMails = ((getBegNotifyBonus() > 0) && ($mode == 'enable') && (isExtensionActive('bonus'))); // Load message body for bonus mails - $message = LOAD_EMAIL_TEMPLATE("beg_en_notify_body", '', "{PER}uid{PER}"); - $RECEIVER = ''; $UIDs = array(); + $message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}'); + $receiver = ''; $userids = array(); // Okay lets notify all users! - while ($content = SQL_FETCHARRAY($result_main)) { + while ($row = SQL_FETCHARRAY($result_main)) { + // Merge arrays + $content = merge_array($content, $row); + // 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_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('beg_' . $mode . '_notify', array(), $content['userid']); - sendEmail($content['email'], $subject, $message); + $message = loadEmailTemplate('beg_' . $mode . '_notify', $content, $content['userid']); + sendEmail($content['email'], '{--BEG_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('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main)); + addBonusMailToQueue('{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getBegNotifyBonus(), getBegNotifyWait(), $url, 0, 'normal', SQL_NUMROWS($result_main)); } // END - if } // END - if @@ -143,5 +143,5 @@ LIMIT 1", SQL_FREERESULT($result_main); } // END - if -// +// [EOF] ?>