Opps ... :(

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 11ef1ef287f346d112133131bcb33ed652ee1963..ce97e2fc257d6817891f654563e482dd76c5e08d 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -740,7 +740,7 @@ function addPointsDirectly ($subject, $userid, $points) {
        unset($GLOBALS['ref_level']);
 
        // Call more complicated method (due to more parameters)
-       return addPointsThroughReferalSystem($subject, $userid, $points, false, 0, 'direct');
+       return addPointsThroughReferalSystem($subject, $userid, $points, false, 0, 'DIRECT');
 }
 
 // Wrapper for redirectToUrl but URL comes from a configuration entry
@@ -752,7 +752,7 @@ function redirectToConfiguredUrl ($configEntry) {
 // Wrapper function to redirect from member-only modules to index
 function redirectToIndexMemberOnlyModule () {
        // Do the redirect here
-       redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
+       redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
 }
 
 // Wrapper function to redirect to current URL
@@ -761,9 +761,9 @@ function redirectToRequestUri () {
 }
 
 // Wrapper function to redirect to de-refered URL
-function redirectToDereferedUrl ($URL) {
+function redirectToDereferedUrl ($url) {
        // Redirect to to
-       redirectToUrl(generateDerefererUrl($URL));
+       redirectToUrl(generateDerefererUrl($url));
 }
 
 // Wrapper function for checking if extension is installed and newer or same version
@@ -1220,7 +1220,9 @@ function getYear ($timestamp = null) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
-               if (is_null($timestamp)) $timestamp = time();
+               if (is_null($timestamp)) {
+                       $timestamp = time();
+               } // END - if
 
                // Then create it
                $GLOBALS[__FUNCTION__][$timestamp] = date('Y', $timestamp);
@@ -2334,7 +2336,7 @@ function getTotalPoints ($userid) {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it
-               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_points', 'order_points') - countSumTotalData($userid, 'user_data', 'used_points');
        } // END - if
 
        // Return cache
@@ -2431,7 +2433,7 @@ function changeDataInInclude ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0)
 }
 
 // Wrapper for changing entries in config-local.php
-function changeDataInInclude ($comment, $prefix, $suffix, $DATA, $seek = 0) {
+function changeDataInLocalConfigurationFile ($comment, $prefix, $suffix, $DATA, $seek = 0) {
        // Call the inner function
        return changeDataInInclude(getCachePath() . 'config-local.php', $comment, $prefix, $suffix, $DATA, $seek);
 }
@@ -2441,5 +2443,59 @@ function firstCharUpperCase ($str) {
        return ucfirst(strtolower($str));
 }
 
+// Shortens calls with configuration entry as first argument (the second will become obsolete in the future)
+function createConfigurationTimeSelections ($configEntry, $stamps, $align = 'center') {
+       // Get the configuration entry
+       $configValue = getConfig($configEntry);
+
+       // Call inner method
+       return createTimeSelections($configValue, $configEntry, $stamps, $align);
+}
+
+// Shortens converting of German comma to Computer's version in POST data
+function convertCommaToDotInPostData ($postEntry) {
+       // Read and convert given entry
+       $postValue = convertCommaToDot(postRequestParameter($postEntry));
+
+       // ... and set it again
+       setPostRequestParameter($postEntry, $postValue);
+}
+
+// Converts German commas to Computer's version in all entries
+function convertCommaToDotInPostDataArray (array $postEntries) {
+       // Replace german decimal comma with computer decimal dot
+       foreach ($postEntries as $entry) {
+               // Is the entry there?
+               if (isPostRequestParameterSet($entry)) {
+                       // Then convert it
+                       convertCommaToDotInPostData($entry);
+               } // END - if
+       } // END - foreach
+}
+
+// Getter for 'check_double_email'
+function getCheckDoubleEmail () {
+       // Is the cache entry set?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // No, so determine it
+               $GLOBALS[__FUNCTION__] = getConfig('check_double_email');
+       } // END - if
+
+       // Return cached entry
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'check_double_email' is "YES"
+function isCheckDoubleEmailEnabled () {
+       // Is the cache entry set?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // No, so determine it
+               $GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
+       } // END - if
+
+       // Return cached entry
+       return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>