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

[mailer.git] / inc / modules / admin / what-sub_points.php

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 661dd3ff4dd601f941974601881df09c2e7efb14..4b72569767e18fde12ad0aea6819e9559d2029b5 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -46,14 +46,18 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 if (getRequestParameter('userid') == 'all') {
-       // Add points to all accounts
-       $content['points'] = bigintval(postRequestParameter('points'));
-
        // Is the form sent?
        if ((isFormSent()) && (postRequestParameter('points') > 0)) {
+               // Add points to all accounts
+               $content['points'] = bigintval(postRequestParameter('points'));
+
+               // Load userid
                $result_main = SQL_QUERY("SELECT userid, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
                        __FILE__, __LINE__);
-               while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
+               while ($row = SQL_FETCHARRAY($result_main)) {
+                       // Merge both arrays
+                       $content = merge_array($content, $row);
+
                        // Ok, add points to used points and send an email to him...
                        subtractPoints('admin_all', $content['userid'], postRequestParameter('points'));
 
@@ -105,7 +109,7 @@ if (getRequestParameter('userid') == 'all') {
                }
        } else {
                // User not found!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
        }
 } else {
        // Output selection form with all confirmed user accounts listed