New functions introduced, several rewrites:

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 64ac4a9660af8fd81e9d710b354aabeb447ae24e..1e36678f6f863f53110d5a1863b03301c988b8fa 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/04/2009 *
- * ===============                              Last change: 04/04/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 04/04/2009 *
+ * ===================                          Last change: 04/04/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : wrapper-functions.php                            *
@@ -138,9 +138,9 @@ function decodeString ($str, $decompress = true) {
 }
 
 // Decode entities in a nicer way
-function decodeEntities ($str) {
+function decodeEntities ($str, $quote = ENT_NOQUOTES) {
        // Decode the entities to UTF-8 now
-       $decodedString = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
+       $decodedString = html_entity_decode($str, $quote, 'UTF-8');
 
        // Return decoded string
        return $decodedString;
@@ -222,12 +222,12 @@ function detectRemoteHostname () {
 }
 
 // "Getter" for user agent
-function detectUserAgent () {
+function detectUserAgent ($alwaysReal = false) {
        // Get remote ip from environment
        $userAgent = getenv('HTTP_USER_AGENT');
 
        // Is removeip installed?
-       if (isExtensionActive('removeip')) {
+       if ((isExtensionActive('removeip')) && ($alwaysReal === false)) {
                // Then anonymize it
                $userAgent = getAnonymousUserAgent($userAgent);
        } // END - if
@@ -251,6 +251,17 @@ function detectReferer () {
        return $referer;
 }
 
+// "Getter" for request URI
+function detectRequestUri () {
+       // Return it
+       return (getenv('REQUEST_URI'));
+}
+
+// "Getter" for query string
+function detectQueryString () {
+       return str_replace('&', '&amp;', (getenv('QUERY_STRING')));
+}
+
 // Check wether we are installing
 function isInstalling () {
        // Determine wether we are installing
@@ -373,14 +384,22 @@ function copyFileVerified ($source, $dest, $chmod = '') {
 // Wrapper function for header()
 // Send a header but checks before if we can do so
 function sendHeader ($header) {
+       // Send the header
+       $GLOBALS['header'][] = trim($header);
+}
+
+// Flushes all headers
+function flushHeaders () {
        // Is the header already sent?
        if (headers_sent()) {
                // Then abort here
                debug_report_bug('Headers already sent!');
        } // END - if
 
-       // Send the header
-       header(trim($header));
+       // Flush all headers
+       foreach ($GLOBALS['header'] as $header) {
+               header($header);
+       } // END - foreach
 }
 
 // Wrapper function for chmod()
@@ -440,7 +459,7 @@ function isNicknameUsed ($userid) {
                $isUsed = $GLOBALS['is_nickname_used'][$userid];
        } else {
                // Determine it
-               $isUsed = ((isExtensionActive('nickname')) && (('' . round($userid) . '') != $userid));
+               $isUsed = (('' . round($userid) . '') != $userid);
 
                // And write it to the cache
                $GLOBALS['is_nickname_used'][$userid] = $isUsed;
@@ -558,14 +577,11 @@ function isModuleSet ($strict =  false) {
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               print 'Module not set!<pre>';
-               debug_print_backtrace();
-               die('</pre');
                debug_report_bug('module is empty.');
        } // END - if
 
        // Return it
-       return $isset;
+       return (($isset === true) && ($GLOBALS['module'] != 'unknown')) ;
 }
 
 // Getter for 'output_mode' value
@@ -739,6 +755,7 @@ function isUserDataValid () {
 
 // Setter for current userid
 function setCurrentUserId ($userid) {
+       logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid);
        $GLOBALS['current_userid'] = bigintval($userid);
 }
 
@@ -759,5 +776,25 @@ function isCurrentUserIdSet () {
        return isset($GLOBALS['current_userid']);
 }
 
+// Checks wether we are debugging template cache
+function isDebuggingTemplateCache () {
+       return (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y');
+}
+
+// Wrapper for fetchUserData() and getUserData() calls
+function getFetchedUserData ($keyColumn, $userId, $valueColumn) {
+       // Default is 'guest'
+       $data = getMessage('USERNAME_GUEST');
+
+       // Can we fetch the user data?
+       if (($userId > 0) && (fetchUserData($userId, $keyColumn))) {
+               // Now get the data back
+               $data = getUserData($valueColumn);
+       } // END - if
+
+       // Return it
+       return $data;
+}
+
 // [EOF]
 ?>