Even more rewrites/fixes from EL branch (please report any broken part after you...

[mailer.git] / inc / mails / beg_mails.php

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 9bf3915639ae0d6a45a616696a322b437419766d..4dcba25b0d53479ea2b44449ae4da86b898230cb 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -80,11 +81,6 @@ 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'));
-
        // No IP locking setuped by default
        $content['ip_locker'] = getMessage('BEG_NO_LIMITATION');
 
@@ -107,7 +103,10 @@ if (!empty($sql)) {
                $receiver = ''; $userids = array();
 
                // Okay lets notify all users!
-               while ($content = merge_array($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`
@@ -139,10 +138,10 @@ LIMIT 1",
                        $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($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if