X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_points.php;h=3ab13856dd0a09baf38601915fc6a3726434ce2b;hb=ea6cf3578750b2697b45cab74725396962b56ceb;hp=67821bb35bb05f61298d3db2d14e959bf6a5adff;hpb=8fba2c387c8d589a4dd63ae1f1fc3ca8de8c95ed;p=mailer.git diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index 67821bb35b..3ab13856dd 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -14,11 +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, 2010 by Mailer Developer Team * + * 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 * @@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); if (getRequestParameter('userid') == 'all') { // Add points to all accounts @@ -57,6 +55,9 @@ if (getRequestParameter('userid') == 'all') { // Process all entries 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... @@ -68,11 +69,12 @@ if (getRequestParameter('userid') == 'all') { // Prepare content $content = array( 'reason' => SQL_ESCAPE(postRequestParameter('reason')), - 'points' => bigintval(postRequestParameter('points')) + 'points' => bigintval(postRequestParameter('points')), + 'userid' => $row['userid'] ); // Load email template and send email away - $message = loadEmailTemplate('add-points', $content, bigintval($content['userid'])); + $message = loadEmailTemplate('member_add_points', $content, bigintval($content['userid'])); sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJECT--}', $message); } // END - while @@ -80,7 +82,7 @@ if (getRequestParameter('userid') == 'all') { SQL_FREERESULT($result_main); // Output message - loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_POINTS_ADDED--}'); + displayMessage('{--ADMIN_ALL_POINTS_ADDED--}'); } else { // Display form add points loadTemplate('admin_add_points_all'); @@ -102,10 +104,10 @@ if (getRequestParameter('userid') == 'all') { ); // Message laden - $message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid'))); + $message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestParameter('userid'))); sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJECT--}', $message); - loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}'); + displayMessage('{--ADMIN_POINTS_ADDED--}'); } else { // Prepare content $content['userid'] = bigintval(getRequestParameter('userid')); @@ -114,8 +116,8 @@ if (getRequestParameter('userid') == 'all') { loadTemplate('admin_add_points', false, $content); } } else { - // User not found! - loadTemplate('admin_settings_saved', false, '