Missing variable fixed, opps

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index ff063d75f75c854f946c209e55acaaada197f321..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;
@@ -1475,12 +1476,13 @@ function getMessageFromErrorCode ($code) {
                case getCode('NO_MAIL_TYPE')       : $message = '{--MEMBER_NO_MAIL_TYPE_SELECTED--}'; break;
                case getCode('UNKNOWN_ERROR')      : $message = '{--LOGIN_UNKNOWN_ERROR--}'; break;
                case getCode('UNKNOWN_STATUS')     : $message = '{--LOGIN_UNKNOWN_STATUS--}'; break;
+               case getCode('PROFILE_UPDATED')    : $message = '{--MEMBER_PROFILE_UPDATED--}'; break;
 
                case getCode('ERROR_MAILID'):
                        if (isExtensionActive('mailid', true)) {
                                $message = '{--ERROR_CONFIRMING_MAIL--}';
                        } else {
-                               $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
+                               $message = generateExtensionInactiveNotInstalledMessage('mailid');
                        }
                        break;
 
@@ -1492,34 +1494,31 @@ function getMessageFromErrorCode ($code) {
                        }
                        break;
 
-               case getCode('URL_TLOCK'):
+               case getCode('URL_TIME_LOCK'):
                        // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
                        $result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
                                array(bigintval(getRequestParameter('id'))), __FUNCTION__, __LINE__);
 
                        // Load timestamp from last order
-                       list($timestamp) = SQL_FETCHROW($result);
+                       $content = SQL_FETCHARRAY($result);
 
                        // Free memory
                        SQL_FREERESULT($result);
 
                        // Translate it for templates
-                       $timestamp = generateDateTime($timestamp, 1);
+                       $content['timestamp'] = generateDateTime($content['timestamp'], 1);
 
                        // Calculate hours...
-                       $STD = round(getConfig('url_tlock') / 60 / 60);
+                       $content['hours'] = round(getConfig('url_tlock') / 60 / 60);
 
                        // Minutes...
-                       $MIN = round((getConfig('url_tlock') - $STD * 60 * 60) / 60);
+                       $content['minutes'] = round((getConfig('url_tlock') - $content['hours'] * 60 * 60) / 60);
 
                        // And seconds
-                       $SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60;
+                       $content['seconds'] = round(getConfig('url_tlock') - $content['hours'] * 60 * 60 - $content['minutes'] * 60);
 
                        // Finally contruct the message
-                       // @TODO Rewrite this old lost code to a template
-                       $message = '{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ' . $STD . '
-                       {--_HOURS--}, ' . $MIN . ' {--_MINUTES--} {--_AND--} ' . $SEC . ' {--_SECONDS--}<br />
-                       {--MEMBER_LAST_TLOCK--}: ' . $timestamp;
+                       $message = loadTemplate('tlock_message', true, $content);
                        break;
 
                default:
@@ -1951,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;