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 813cf06a9252ad8bbd0b139ad2cf1b0c0a18b906..4b72569767e18fde12ad0aea6819e9559d2029b5 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.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 *
@@ -44,21 +45,25 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (getRequestElement('userid') == 'all') {
-       // Add points to all accounts
-       $content['points'] = bigintval(postRequestElement('points'));
-
+if (getRequestParameter('userid') == 'all') {
        // Is the form sent?
-       if ((isFormSent()) && (postRequestElement('points') > 0)) {
+       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'], postRequestElement('points'));
+                       subtractPoints('admin_all', $content['userid'], postRequestParameter('points'));
 
                        // Add more content
-                       $content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-                       $content['points'] = bigintval(postRequestElement('points'));
+                       $content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
+                       $content['points'] = bigintval(postRequestParameter('points'));
 
                        // Load message and send it away
                        $message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
@@ -74,22 +79,22 @@ if (getRequestElement('userid') == 'all') {
                // Display form add points
                loadTemplate('admin_sub_points_all');
        }
-} elseif (isGetRequestElementSet('userid')) {
+} elseif (isGetRequestParameterSet('userid')) {
        // User id found in URL so we use this give him some credits
-       if (fetchUserData(getRequestElement('userid'))) {
+       if (fetchUserData(getRequestParameter('userid'))) {
                // Selected user does exist
                $content = getUserDataArray();
 
-               if ((isFormSent()) && (isPostRequestElementSet('points'))) {
+               if ((isFormSent()) && (isPostRequestParameterSet('points'))) {
                        // Ok, add to used points and send an email to him...
-                       subtractPoints('admin_single', bigintval(getRequestElement('userid')), postRequestElement('points'));
+                       subtractPoints('admin_single', bigintval(getRequestParameter('userid')), postRequestParameter('points'));
 
                        // Add more content
-                       $content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-                       $content['points'] = bigintval(postRequestElement('points'));
+                       $content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
+                       $content['points'] = bigintval(postRequestParameter('points'));
 
                        // Load email and send it away
-                       $message = loadEmailTemplate('sub-points', $content, bigintval(getRequestElement('userid')));
+                       $message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
                        sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
 
                        // Output message
@@ -97,14 +102,14 @@ if (getRequestElement('userid') == 'all') {
                } else {
                        // Prepare content
                        $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
-                       $content['userid'] = bigintval(getRequestElement('userid'));
+                       $content['userid'] = bigintval(getRequestParameter('userid'));
 
                        // Load form
                        loadTemplate('admin_sub_points', false, $content);
                }
        } else {
                // User not found!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('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