Earning subscriptions introduced (unfinished):

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index a826c3d69b85716689946314fb9f18eb01ac04d9..6266dbed5b6112d9bbbeb0693bfa90f051812ba2 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -127,15 +127,13 @@ function clearOutputBuffer () {
 }
 
 // Encode strings
-// @TODO Implement $compress
-function encodeString ($str, $compress = true) {
+function encodeString ($str) {
        $str = urlencode(base64_encode(compileUriCode($str)));
        return $str;
 }
 
 // Decode strings encoded with encodeString()
-// @TODO Implement $decompress
-function decodeString ($str, $decompress = true) {
+function decodeString ($str) {
        $str = compileUriCode(base64_decode(urldecode(compileUriCode($str))));
        return $str;
 }
@@ -172,7 +170,7 @@ function isFileReadable ($FQFN) {
        // Do we have cache?
        if (!isset($GLOBALS['file_readable'][$FQFN])) {
                // Check all...
-               $GLOBALS['file_readable'][$FQFN] = ((file_exists($FQFN)) && (is_file($FQFN)) && (is_readable($FQFN)));
+               $GLOBALS['file_readable'][$FQFN] = ((is_file($FQFN)) && (file_exists($FQFN)) && (is_readable($FQFN)));
        } // END - if
 
        // Return result
@@ -561,7 +559,7 @@ function isNicknameUsed ($userid) {
        // Is the cache there
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it
-               $GLOBALS[__FUNCTION__][$userid] = ((!empty($userid)) && (('' . round($userid) . '') != $userid));
+               $GLOBALS[__FUNCTION__][$userid] = ((!empty($userid)) && (('' . round($userid) . '') != $userid) && ($userid != 'NULL'));
        } // END - if
 
        // Return the result
@@ -571,7 +569,7 @@ function isNicknameUsed ($userid) {
 // Getter for 'what' value
 function getWhat () {
        // Default is null
-       $what = null;
+       $what = NULL;
 
        // Is the value set?
        if (isWhatSet(true)) {
@@ -615,7 +613,7 @@ function isWhatSet ($strict =  false) {
 // Getter for 'action' value
 function getAction ($strict = true) {
        // Default is null
-       $action = null;
+       $action = NULL;
 
        // Is the value set?
        if (isActionSet(($strict) && (isHtmlOutputMode()))) {
@@ -650,7 +648,7 @@ function isActionSet ($strict =  false) {
 // Getter for 'module' value
 function getModule ($strict = true) {
        // Default is null
-       $module = null;
+       $module = NULL;
 
        // Is the value set?
        if (isModuleSet($strict)) {
@@ -688,7 +686,7 @@ function getScriptOutputMode () {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Default is null
-               $output_mode = null;
+               $output_mode = NULL;
 
                // Is the value set?
                if (isOutputModeSet(true)) {
@@ -949,6 +947,7 @@ function initUserData () {
        } // END - if
 
        // Init the user
+       unset($GLOBALS['is_userdata_valid'][getCurrentUserId()]);
        $GLOBALS['user_data'][getCurrentUserId()] = array();
 }
 
@@ -961,7 +960,7 @@ function getUserData ($column) {
        } // END - if
 
        // Default is empty
-       $data = null;
+       $data = NULL;
 
        if (isset($GLOBALS['user_data'][getCurrentUserId()][$column])) {
                // Return the value
@@ -1009,7 +1008,9 @@ function getUserDataArray () {
 // in, but you should use isMember() if you want to find that out.
 function isUserDataValid () {
        // User id should not be zero so abort here
-       if (!isCurrentUserIdSet()) return false;
+       if (!isCurrentUserIdSet()) {
+               return false;
+       } // END - if
 
        // Is it cached?
        if (!isset($GLOBALS['is_userdata_valid'][getCurrentUserId()])) {
@@ -1064,8 +1065,8 @@ function getFetchedUserData ($keyColumn, $userid, $valueColumn) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyColumn=' . $keyColumn . ',userid=' . $userid . ',valueColumn=' . $valueColumn . ' - ENTERED!');
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$userid][$keyColumn][$valueColumn])) {
-               // Default is 'guest'
-               $data = '{--USERNAME_GUEST--}';
+               // Default is NULL
+               $data = NULL;
 
                // Can we fetch the user data?
                if ((isValidUserId($userid)) && (fetchUserData($userid, $keyColumn))) {
@@ -1143,7 +1144,7 @@ function sendRawRedirect ($url) {
 
        // check if running on IIS < 6 with CGI-PHP
        if ((isset($_SERVER['SERVER_SOFTWARE'])) && (isset($_SERVER['GATEWAY_INTERFACE'])) &&
-               (strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') !== false) &&
+               (isInString('CGI', $_SERVER['GATEWAY_INTERFACE'])) &&
                (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($_SERVER['SERVER_SOFTWARE']), $matches)) &&
                ($matches[1] < 6)) {
                // Send the IIS header
@@ -1270,11 +1271,23 @@ function encodeEntities ($str) {
 }
 
 // "Getter" for date from patch_ctime
-function getDateFromPatchTime () {
+function getDateFromRepository () {
+       // Is it cached?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Then set it
+               $GLOBALS[__FUNCTION__] = generateDateTime(getConfig('CURRENT_REPOSITORY_DATE'), '5');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for date/time from patch_ctime
+function getDateTimeFromRepository () {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then set it
-               $GLOBALS[__FUNCTION__] = generateDateTime(getConfig('patch_ctime'), '5');
+               $GLOBALS[__FUNCTION__] = generateDateTime(getConfig('CURRENT_REPOSITORY_DATE'), '2');
        } // END - if
 
        // Return cache
@@ -1282,7 +1295,7 @@ function getDateFromPatchTime () {
 }
 
 // Getter for current year (default)
-function getYear ($timestamp = null) {
+function getYear ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -1299,7 +1312,7 @@ function getYear ($timestamp = null) {
 }
 
 // Getter for current month (default)
-function getMonth ($timestamp = null) {
+function getMonth ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // If null is set, use time()
@@ -1317,7 +1330,7 @@ function getMonth ($timestamp = null) {
 }
 
 // Getter for current hour (default)
-function getHour ($timestamp = null) {
+function getHour ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -1334,7 +1347,7 @@ function getHour ($timestamp = null) {
 }
 
 // Getter for current day (default)
-function getDay ($timestamp = null) {
+function getDay ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -1351,7 +1364,7 @@ function getDay ($timestamp = null) {
 }
 
 // Getter for current week (default)
-function getWeek ($timestamp = null) {
+function getWeek ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -1366,7 +1379,7 @@ function getWeek ($timestamp = null) {
 }
 
 // Getter for current short_hour (default)
-function getShortHour ($timestamp = null) {
+function getShortHour ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -1381,7 +1394,7 @@ function getShortHour ($timestamp = null) {
 }
 
 // Getter for current long_hour (default)
-function getLongHour ($timestamp = null) {
+function getLongHour ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -1396,7 +1409,7 @@ function getLongHour ($timestamp = null) {
 }
 
 // Getter for current second (default)
-function getSecond ($timestamp = null) {
+function getSecond ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -1411,7 +1424,7 @@ function getSecond ($timestamp = null) {
 }
 
 // Getter for current minute (default)
-function getMinute ($timestamp = null) {
+function getMinute ($timestamp = NULL) {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
                // null is time()
@@ -2361,6 +2374,90 @@ function getUrlTlock () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for title_left
+function getTitleLeft () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('title_left');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for title_right
+function getTitleRight () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('title_right');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for title_middle
+function getTitleMiddle () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('title_middle');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// 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 'Y'
+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__];
+}
+
+// Getter for 'display_home_in_index'
+function getDisplayHomeInIndex () {
+       // Is the cache entry set?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // No, so determine it
+               $GLOBALS[__FUNCTION__] = getConfig('display_home_in_index');
+       } // END - if
+
+       // Return cached entry
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'display_home_in_index' is 'Y'
+function isDisplayHomeInIndexEnabled () {
+       // Is the cache entry set?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // No, so determine it
+               $GLOBALS[__FUNCTION__] = (getDisplayHomeInIndex() == 'Y');
+       } // END - if
+
+       // Return cached entry
+       return $GLOBALS[__FUNCTION__];
+}
+
 // Checks wether proxy configuration is used
 function isProxyUsed () {
        // Do we have cache?
@@ -2501,18 +2598,18 @@ function appendLineToFile ($file, $line) {
 }
 
 // Wrapper for changeDataInFile() but with full path added
-function changeDataInInclude ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
+function changeDataInInclude ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0) {
        // Add full path
        $FQFN = getPath() . $FQFN;
 
        // Call inner function
-       return changeDataInFile($FQFN, $comment, $prefix, $suffix, $DATA, $seek);
+       return changeDataInFile($FQFN, $comment, $prefix, $suffix, $inserted, $seek);
 }
 
 // Wrapper for changing entries in config-local.php
-function changeDataInLocalConfigurationFile ($comment, $prefix, $suffix, $DATA, $seek = 0) {
+function changeDataInLocalConfigurationFile ($comment, $prefix, $suffix, $inserted, $seek = 0) {
        // Call the inner function
-       return changeDataInInclude(getCachePath() . 'config-local.php', $comment, $prefix, $suffix, $DATA, $seek);
+       return changeDataInInclude(getCachePath() . 'config-local.php', $comment, $prefix, $suffix, $inserted, $seek);
 }
 
 // Shortens ucfirst(strtolower()) calls
@@ -2567,9 +2664,9 @@ function parseFloat ($floatString){
 }
 
 // Generates a YES/NO option list from given default
-function generateYesNoOptionList ($default = '') {
+function generateYesNoOptionList ($configValue = '') {
        // Generate it
-       return generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $default);
+       return generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $configValue);
 }
 
 // "Getter" for total available receivers
@@ -2593,33 +2690,5 @@ function getTotalUnconfirmedMails ($userid) {
        return $GLOBALS[__FUNCTION__][$userid];
 }
 
-//-----------------------------------------------------------------------------
-//                        Configuration wrapper
-//-----------------------------------------------------------------------------
-
-// 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 'Y'
-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]
 ?>