Module data now correctly set in 'cache_array'

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index f1a41e67ec3832f3ca075d7962fd13ffc361478a..29151e81e02a79e8b77ab201a0ad87daed99b9f7 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -458,6 +456,9 @@ function translateUserStatus ($status) {
 
 // "Translates" 'visible' and 'locked' to a CSS class
 function translateMenuVisibleLocked ($content, $prefix = '') {
+       // Default is 'menu_unknown'
+       $content['visible_css'] = $prefix . 'menu_unknown';
+
        // Translate 'visible' and keep an eye on the prefix
        switch ($content['visible']) {
                // Should be visible
@@ -712,10 +713,13 @@ function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
        $ret = preg_replace('/[^0123456789]/', '', $num);
 
        // Shall we cast?
-       if ($castValue === true) $ret = (double)$ret;
+       if ($castValue === true) {
+               // Cast to biggest numeric type
+               $ret = (double) $ret;
+       } // END - if
 
        // Has the whole value changed?
-       if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true)) {
+       if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true) && (!is_null($num))) {
                // Log the values
                debug_report_bug(__FUNCTION__, __LINE__, 'Problem with number found. ret=' . $ret . ', num='. $num);
        } // END - if
@@ -1447,7 +1451,7 @@ function getMessageFromErrorCode ($code) {
        switch ($code) {
                case '': break;
                case getCode('LOGOUT_DONE')        : $message = '{--LOGOUT_DONE--}'; break;
-               case getCode('LOGOUT_FAILED')      : $message = '<span class="guest_failed">{--LOGOUT_FAILED--}</span>'; break;
+               case getCode('LOGOUT_FAILED')      : $message = '<span class="notice">{--LOGOUT_FAILED--}</span>'; break;
                case getCode('DATA_INVALID')       : $message = '{--MAIL_DATA_INVALID--}'; break;
                case getCode('POSSIBLE_INVALID')   : $message = '{--MAIL_POSSIBLE_INVALID--}'; break;
                case getCode('USER_404')           : $message = '{--USER_404--}'; break;
@@ -1945,11 +1949,11 @@ function determineReferalId () {
                $GLOBALS['refid'] = getConfig('def_refid');
        } else {
                // No default id when sql_patches is not installed or none set
-               $GLOBALS['refid'] = '0';
+               $GLOBALS['refid'] = null;
        }
 
        // Set cookie when default refid > 0
-       if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) {
+       if (!isSessionVariableSet('refid') || (isValidUserId($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) {
                // Default is not found
                $found = false;
 
@@ -1969,7 +1973,7 @@ function determineReferalId () {
                } // END - if
 
                // Set cookie
-               setSession('refid', $GLOBALS['refid']);
+               setSession('refid', bigintval($GLOBALS['refid']));
        } // END - if
 
        // Return determined refid
@@ -2441,7 +2445,7 @@ if (!function_exists('http_build_query')) {
        // Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder
        function http_build_query($data, $prefix = '', $sep = '', $key = '') {
                $ret = array();
-               foreach ((array)$data as $k => $v) {
+               foreach ((array) $data as $k => $v) {
                        if (is_int($k) && $prefix != null) {
                                $k = urlencode($prefix . $k);
                        } // END - if