Code cleanup, more usage of API functions

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index f1a41e67ec3832f3ca075d7962fd13ffc361478a..5f3727065a6c36b0c7a2163add3d555586000bd8 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
@@ -1447,7 +1448,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;
@@ -1949,7 +1950,7 @@ function determineReferalId () {
        }
 
        // 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;