Some minor cleanups

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 12402a4ced7b2c9a46cfcac455e61a8305de65d0..1eee08b4c3f4c45598f498397ffde7c6cd00b4a6 100644 (file)
--- 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) {
 // 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])) {
 
        // 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
                // 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
                        $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 66d4d2aefc2c1fca382cd8f9a59996756e883202..7c96f3acc35c85ffa11d666eff68f94c255e37b4 100644 (file)
--- 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);
 
                        // 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')));
 
                        // 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',
                        );
 
                                'subject' => 'admin_add_single',
                        );
 

-                       // Message laden
+                       // Load message

                        $message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestElement('userid')));
 
                        $message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestElement('userid')));
 

+                       // Send the email out

                        sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
                        sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);

+
+                       // .. and display a message

                        displayMessage('{--ADMIN_POINTS_ADDED--}');
                } else {
                        // Prepare content
                        displayMessage('{--ADMIN_POINTS_ADDED--}');
                } else {
                        // Prepare content