X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbeg_mails.php;h=58fae33f77bf0cf589351da5ddc6685a92ac368b;hb=a524135c24dd0a8fa359c9a92399467d50fd69e0;hp=0cd50f820f5980a5be2f71cc57d91b1f899d66fa;hpb=83574a6475896fbdc231e685e2ebb0ee4f3e6eba;p=mailer.git diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php index 0cd50f820f..58fae33f77 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 (`d`.`beg_rallye_enable_notify` > 0 AND `d`.`beg_rallye_enable_notify` < `d`.`beg_rallye_disable_notify`)'; + $mode = 'enable'; } else { // Do not notify! $sql = ''; @@ -65,10 +60,10 @@ 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 `d`.`beg_rallye_disable_notify` < `d`.`beg_rallye_enable_notify`'; + $mode = 'disable'; } else { // Do not notify! $sql = ''; @@ -78,42 +73,37 @@ switch (getConfig('beg_rallye')) { 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 - $content['min_points'] = translateComma(getConfig('beg_points')); - $content['max_points'] = translateComma(getConfig('beg_points_max')); - $content['max_winner'] = round(getConfig('beg_ranks')); + $sql .= ')' . runFilterChain('user_exclusion_sql', " AND `d`.`status`='CONFIRMED'") . ' ORDER BY `d`.`last_online` ASC'; // No IP locking setuped by default - $content['ip_locker'] = getMessage('BEG_NO_LIMITATION'); + $content['ip_locker'] = '{--BEG_NO_LIMITATION--}'; - if (getConfig('beg_ip_timeout') > 0) { + if (getBegIpTimeout() > 0) { // Create timemark - $content['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) { - // Normal notification mails or bonus mails? - $sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == "en") && (isExtensionActive('bonus'))); + $result_main = sqlQuery($sql, __FILE__, __LINE__); - // Generate subject line - $subject = getMessage('BEG_RALLYE_'.strtoupper($mode).'_NOTIFY'); + if (!ifSqlHasZeroNumRows($result_main)) { + // Normal notification mails or bonus mails? + $sentBonusMails = ((getBegNotifyBonus() > 0) && ($mode == 'enable') && (isExtensionActive('bonus'))); // Load message body for bonus mails - $message = loadEmailTemplate('beg_en_notify_body', '', '{PER}userid{PER}'); - $RECEIVER = ''; $UIDs = array(); + $message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}'); + $receiver = ''; $userids = array(); // Okay lets notify all users! - while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) { + while ($row = sqlFetchArray($result_main)) { + // Merge arrays + $content = merge_array($content, $row); + // Update account - SQL_QUERY_ESC("UPDATE + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `beg_ral_notify`=UNIX_TIMESTAMP(), - `beg_ral_%s_notify`=UNIX_TIMESTAMP() + `beg_rallye_%s_notify`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1", @@ -123,31 +113,31 @@ LIMIT 1", ), __FILE__, __LINE__); // Load email template and send it to the user! - if ($sentBonusMails === true) { + if ($sentBonusMails === TRUE) { // Add userid to queue - $UIDs[] = $content['userid']; + array_push($userids, $content['userid']); } else { // Send normal notification mail to the members $message = loadEmailTemplate('beg_' . $mode . '_notify', $content, $content['userid']); - sendEmail($content['email'], $subject, $message); + sendEmail($content['userid'], '{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message); } } // END - while // Shall I send out bonus mails? - if ($sentBonusMails === true) { + 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', sqlNumRows($result_main)); } // END - if } // END - if // Free memory - SQL_FREERESULT($result_main); + sqlFreeResult($result_main); } // END - if // [EOF]