From: Roland Häder <roland@mxchange.org>
Date: Fri, 12 Aug 2011 14:05:01 +0000 (+0000)
Subject: Some minor cleanups
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c8baf7e02feebf07460dc85da2ffa1c58b1f9caf;p=mailer.git

Some minor cleanups
---

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 12402a4ced..1eee08b4c3 100644
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -50,8 +50,8 @@ function replaceExpressionCode ($data, $replacer) {
 // Private function to determine wether we have a special expression function avaible
 // (mostly located in wrapper-functions.php)
 function isExpressionFunctionAvaiable ($data) {
-	// Get the enty we need
-	$entry = $data['matches'][4][$data['key']];
+	// Get the enty we need and trim it
+	$entry = trim($data['matches'][4][$data['key']]);
 
 	// Do we have cache?
 	if (!isset($GLOBALS['expression_function_available'][$entry])) {
@@ -70,7 +70,7 @@ function isExpressionFunctionAvaiable ($data) {
 		// Is that function there?
 		if (function_exists($functionName)) {
 			// Cache it all
-			$GLOBALS['expression_function_name'][$entry] = $functionName;
+			$GLOBALS['expression_function_name'][$entry]      = $functionName;
 			$GLOBALS['expression_function_available'][$entry] = true;
 		} else {
 			// Not avaiable
diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 66d4d2aefc..7c96f3acc3 100644
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -58,11 +58,6 @@ if (getRequestElement('userid') == 'all') {
 			// 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_add_all', $content['userid'], bigintval(postRequestElement('points')));
 
@@ -105,10 +100,13 @@ if (getRequestElement('userid') == 'all') {
 				'subject' => 'admin_add_single',
 			);
 
-			// Message laden
+			// Load message
 			$message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestElement('userid')));
 
+			// Send the email out
 			sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
+
+			// .. and display a message
 			displayMessage('{--ADMIN_POINTS_ADDED--}');
 		} else {
 			// Prepare content