Extension ext-earning introduced (unfinished), renamings:

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

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 069632197f7e325df8b59939f2aec550be93d710..3afba091ea0198775c6989c04725f07edc6b47c9 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_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 *
@@ -42,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (getRequestElement('userid') == 'all') {
        // Add points to all accounts
@@ -55,7 +54,10 @@ if (getRequestElement('userid') == 'all') {
                        __FILE__, __LINE__);
 
                // Process all entries
-               while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
+               while ($row = SQL_FETCHARRAY($result_main)) {
+                       // Merge $row into $content
+                       $content = merge_array($content, $row);
+
                        // Remove depth to prevent booking errors. This is a bad coding
                        // practice, thats also why we need to write this project from
                        // scratch...
@@ -65,19 +67,22 @@ if (getRequestElement('userid') == 'all') {
                        addPointsDirectly('admin_all', $content['userid'], bigintval(postRequestElement('points')));
 
                        // Prepare content
-                       $content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-                       $content['points'] = bigintval(postRequestElement('points'));
+                       $content = array(
+                               'reason' => SQL_ESCAPE(postRequestElement('reason')),
+                               'points' => bigintval(postRequestElement('points')),
+                               'userid' => $row['userid']
+                       );
 
                        // Load email template and send email away
-                       $message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
-                       sendEmail(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $message);
+                       $message = loadEmailTemplate('member_add_points', $content, bigintval($content['userid']));
+                       sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJECT--}', $message);
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_ADDED'));
+               displayMessage('{--ADMIN_ALL_POINTS_ADDED--}');
        } else {
                // Display form add points
                loadTemplate('admin_add_points_all');
@@ -94,26 +99,25 @@ if (getRequestElement('userid') == 'all') {
 
                        // Prepare content
                        $content = array(
-                               'text'   => SQL_ESCAPE(postRequestElement('reason')),
+                               'reason' => SQL_ESCAPE(postRequestElement('reason')),
                                'points' => bigintval(postRequestElement('points'))
                        );
 
                        // Message laden
-                       $message = loadEmailTemplate('add-points', $content, bigintval(getRequestElement('userid')));
+                       $message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestElement('userid')));
 
-                       sendEmail(bigintval(getRequestElement('userid')), getMessage('ADMIN_ADD_SUBJ'), $message);
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+                       sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
+                       displayMessage('{--ADMIN_POINTS_ADDED--}');
                } else {
                        // Prepare content
-                       $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
                        $content['userid'] = bigintval(getRequestElement('userid'));
 
                        // Output template
                        loadTemplate('admin_add_points', false, $content);
                }
        } else {
-               // User not found!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
+               // User not found
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed