Even more fixes for SQL problems :-(

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 5a5507bab8f13d8c8a12b519fba444de03eaf2f8..a8935e8c2c38ac5917d416a2e5034de479989290 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -877,8 +877,8 @@ function translateMenuVisibleLocked ($content, $prefix = '') {
        // Translate 'visible' and keep an eye on the prefix
        switch ($content[$prefix . 'visible']) {
                // Should be visible
-               case 'Y': $content[$prefix . 'visible_css'] = $prefix . 'menu_visible_css'  ; break;
-               case 'N': $content[$prefix . 'visible_css'] = $prefix . 'menu_invisible_css'; break;
+               case 'Y': $content[$prefix . 'visible_css'] = $prefix . 'menu_visible'  ; break;
+               case 'N': $content[$prefix . 'visible_css'] = $prefix . 'menu_invisible'; break;
                default:
                        // Please report this
                        debug_report_bug('Unsupported visible value detected. content=<pre>'.print_r($content, true).'</pre>');
@@ -888,8 +888,8 @@ function translateMenuVisibleLocked ($content, $prefix = '') {
        // Translate 'locked' and keep an eye on the prefix
        switch ($content[$prefix . 'locked']) {
                // Should be locked
-               case 'Y': $content[$prefix . 'locked_css'] = $prefix . 'menu_locked_css'  ; break;
-               case 'N': $content[$prefix . 'locked_css'] = $prefix . 'menu_unlocked_css'; break;
+               case 'Y': $content[$prefix . 'locked_css'] = $prefix . 'menu_locked'  ; break;
+               case 'N': $content[$prefix . 'locked_css'] = $prefix . 'menu_unlocked'; break;
                default:
                        // Please report this
                        debug_report_bug('Unsupported locked value detected. content=<pre>'.print_r($content, true).'</pre>');
@@ -2640,7 +2640,7 @@ function getMessageFromErrorCode ($code) {
                        if (isExtensionActive('mailid', true)) {
                                $message = getMessage('ERROR_CONFIRMING_MAIL');
                        } else {
-                               $message = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'mailid');
+                               $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
                        }
                        break;
 
@@ -3577,10 +3577,10 @@ function determinePageTitle () {
                $pageTitle = '[-- ' . getConfig('MAIN_TITLE') . ' - ' . getModuleTitle(getModule()) . ' --]';
        } elseif ((isInstalled()) && (!isAdminRegistered())) {
                // Installed but no admin registered
-               $pageTitle = getMessage('SETUP_OF_MXCHANGE');
+               $pageTitle = getMessage('SETUP_OF_MAILER');
        } elseif ((!isInstalled()) || (!isAdminRegistered())) {
                // Installation mode
-               $pageTitle = getMessage('INSTALLATION_OF_MXCHANGE');
+               $pageTitle = getMessage('INSTALLATION_OF_MAILER');
        } else {
                // Configuration not found!
                $pageTitle = getMessage('NO_CONFIG_FOUND_TITLE');