From feec3557f5ac09d623406186891ffbaef15f5c37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 11 Aug 2011 13:41:21 +0000 Subject: [PATCH] Missing 'points subjects' and 'subject' added --- inc/language/de.php | 7 +++++++ inc/modules/admin/what-add_points.php | 16 +++++++++------- inc/modules/admin/what-sub_points.php | 14 ++++++++------ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/inc/language/de.php b/inc/language/de.php index 2d418110c0..86d5bbf417 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -1172,6 +1172,13 @@ addMessages(array( // Admin 'pool' mail actions 'ADMIN_EDIT_POOL_MAIL_LINK' => "Klick-Mail bearbeiten", 'ADMIN_DELETE_POOL_MAIL_LINK' => "Klick-Mail löschen", + + // Generic points subjects + 'POINTS_SUBJECT_UNKNOWN' => "??? (%s)", + 'POINTS_SUBJECT_ADMIN_ADD_ALL' => "Gutschrift für alle durch den Administrator", + 'POINTS_SUBJECT_ADMIN_ADD_SINGLE' => "Einzelgutschrift durch den Administrator", + 'POINTS_SUBJECT_ADMIN_SUB_ALL' => "Abzug aller Accounts durch den Administrator", + 'POINTS_SUBJECT_ADMIN_SUB_SINGLE' => "Einzelabzug durch den Administrator", )); // Description of all months diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index ef6c84659d..66d4d2aefc 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -64,13 +64,14 @@ if (getRequestElement('userid') == 'all') { $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 = array( - 'reason' => SQL_ESCAPE(postRequestElement('reason')), - 'points' => bigintval(postRequestElement('points')), - 'userid' => $row['userid'] + 'reason' => SQL_ESCAPE(postRequestElement('reason')), + 'points' => bigintval(postRequestElement('points')), + 'userid' => $row['userid'], + 'subject' => 'admin_add_all', ); // Load email template and send email away @@ -95,12 +96,13 @@ if (getRequestElement('userid') == 'all') { 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( - 'reason' => SQL_ESCAPE(postRequestElement('reason')), - 'points' => bigintval(postRequestElement('points')) + 'reason' => SQL_ESCAPE(postRequestElement('reason')), + 'points' => bigintval(postRequestElement('points')), + 'subject' => 'admin_add_single', ); // Message laden diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index 52da92ab38..439e4a1e98 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -57,12 +57,13 @@ if (getRequestElement('userid') == 'all') { $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'], postRequestElement('points')); + subtractPoints('admin_sub_all', $content['userid'], postRequestElement('points')); // Prepare content $content = array( - 'reason' => SQL_ESCAPE(postRequestElement('reason')), - 'points' => bigintval(postRequestElement('points')) + 'reason' => SQL_ESCAPE(postRequestElement('reason')), + 'points' => bigintval(postRequestElement('points')), + 'subject' => 'admin_sub_all', ); // Load message and send it away @@ -87,12 +88,13 @@ if (getRequestElement('userid') == 'all') { if ((isFormSent()) && (isPostRequestElementSet('points'))) { // Ok, add to used points, send an email to him and ignore return status - subtractPoints('admin_single', bigintval(getRequestElement('userid')), postRequestElement('points')); + subtractPoints('admin_sub_single', bigintval(getRequestElement('userid')), postRequestElement('points')); // Prepare content $content = array( - 'reason' => SQL_ESCAPE(postRequestElement('reason')), - 'points' => bigintval(postRequestElement('points')) + 'reason' => SQL_ESCAPE(postRequestElement('reason')), + 'points' => bigintval(postRequestElement('points')), + 'subject' => 'admin_sub_single', ); // Load email and send it away -- 2.39.5