A lot has been rewritten, ext-teams added, ext-forced continued:

[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 d498b284bdc6bdd1f5a089ff840dc4fa7c450fcc..3ade43b94026ec41d572d2ba0f41c1dbca191919 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,37 +38,43 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('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)) {
-               $result_main = SQL_QUERY("SELECT userid, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
+               // 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))) {
-                       // Ok, add points to used points and send an email to him...
+               while ($row = SQL_FETCHARRAY($result_main)) {
+                       // Merge both arrays
+                       $content = merge_array($content, $row);
+
+                       // Ok, add points to used points, send an email to him and ignore return status
                        subtractPoints('admin_all', $content['userid'], postRequestParameter('points'));
 
-                       // Add more content
-                       $content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
-                       $content['points'] = bigintval(postRequestParameter('points'));
+                       // Prepare content
+                       $content = array(
+                               'reason' => SQL_ESCAPE(postRequestParameter('reason')),
+                               'points' => bigintval(postRequestParameter('points'))
+                       );
 
                        // Load message and send it away
-                       $message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+                       $message = loadEmailTemplate('member_sub_points', $content, bigintval($content['userid']));
+                       sendEmail($row['userid'], '{--ADMIN_SUB_SUBJECT--}', $message);
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_SUBTRACTED'));
+               displayMessage('{--ADMIN_ALL_POINTS_SUBTRACTED--}');
        } else {
                // Display form add points
                loadTemplate('admin_sub_points_all');
@@ -81,30 +86,31 @@ if (getRequestParameter('userid') == 'all') {
                $content = getUserDataArray();
 
                if ((isFormSent()) && (isPostRequestParameterSet('points'))) {
-                       // Ok, add to used points and send an email to him...
+                       // Ok, add to used points, send an email to him and ignore return status
                        subtractPoints('admin_single', bigintval(getRequestParameter('userid')), postRequestParameter('points'));
 
-                       // Add more content
-                       $content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
-                       $content['points'] = bigintval(postRequestParameter('points'));
+                       // Prepare content
+                       $content = array(
+                               'reason' => SQL_ESCAPE(postRequestParameter('reason')),
+                               'points' => bigintval(postRequestParameter('points'))
+                       );
 
                        // Load email and send it away
-                       $message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
-                       sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+                       $message = loadEmailTemplate('member_sub_points', $content, bigintval(getRequestParameter('userid')));
+                       sendEmail(getRequestParameter('userid'), '{--ADMIN_SUB_SUBJECT--}', $message);
 
                        // Output message
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_SUBTRACTED'));
+                       displayMessage('{--ADMIN_POINTS_SUBTRACTED--}');
                } else {
                        // Prepare content
-                       $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
                        $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', getRequestParameter('userid')) . '</div>');
+               // User not found
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed