X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-add_points.php;h=66d4d2aefc2c1fca382cd8f9a59996756e883202;hb=3c311675e341584ad25c561a5a65198f3717125f;hp=a86d41efedd51e055656d6f4c302813c7511d9e7;hpb=e5fe5afb17a5c8106f4c890234dfa39419e70f5d;p=mailer.git diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index a86d41efed..66d4d2aefc 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -14,11 +14,10 @@ * $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 * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -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,29 +54,36 @@ 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... $GLOBALS['ref_level'] = -1; // Ok, add points and send an email to him... - addPointsDirectly('admin_all', $content['userid'], bigintval(postRequestElement('points'))); + addPointsDirectly('admin_add_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'], + 'subject' => 'admin_add_all', + ); // 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'); @@ -88,32 +94,32 @@ if (getRequestElement('userid') == 'all') { // Selected user does exist $content = getUserDataArray(); - if ((isFormSent()) && (isPostRequestElementSet(('points')))) { + if ((isFormSent()) && (isPostRequestElementSet('points'))) { // Add points and send an email to him... - addPointsDirectly('admin_single', bigintval(getRequestElement('userid')), bigintval(postRequestElement('points'))); + addPointsDirectly('admin_add_single', bigintval(getRequestElement('userid')), bigintval(postRequestElement('points'))); // Prepare content $content = array( - 'text' => SQL_ESCAPE(postRequestElement('reason')), - 'points' => bigintval(postRequestElement('points')) + 'reason' => SQL_ESCAPE(postRequestElement('reason')), + 'points' => bigintval(postRequestElement('points')), + 'subject' => 'admin_add_single', ); // 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'] = "".$content['surname']." ".$content['family'].""; $content['userid'] = bigintval(getRequestElement('userid')); // Output template loadTemplate('admin_add_points', false, $content); } } else { - // User not found! - loadTemplate('admin_settings_saved', false, "