X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=ad35460f7d5a70172a1447350107b6c5c91d655b;hb=a9805897ba12de9a63b9a435ccbb49a027d86e4a;hp=a75dac4c194b0becb370139454ec4ee2ab75931d;hpb=3e6b917e771605772c45369d345860531a3b88bd;p=squirrelmail.git

diff --git a/functions/display_messages.php b/functions/display_messages.php
index a75dac4c..ad35460f 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -6,7 +6,7 @@
  * This contains all messages, including information, error, and just
  * about any other message you can think of.
  *
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright 1999-2014 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -28,7 +28,7 @@ function error_message($message, $mailbox, $sort, $startMessage) {
     $link = array (
         'URL'   => sqm_baseuri()."src/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox",
         'TEXT'  => sprintf (_("Click here to return to %s"),
-                            strtoupper($mailbox) == 'INBOX' ? _("INBOX") : htmlspecialchars(imap_utf7_decode_local($mailbox))) 
+                            strtoupper($mailbox) == 'INBOX' ? _("INBOX") : sm_encode_html_special_chars(imap_utf7_decode_local($mailbox))) 
                    );
     error_box($message, $link);
 }
@@ -37,6 +37,7 @@ function error_message($message, $mailbox, $sort, $startMessage) {
  * Displays error message
  * 
  * Second argument ($color array) is changed to boolean $return_output as of 1.5.2.
+ *
  * @param string $message error message
  * @param boolean $return_output When TRUE, output is returned to caller
  *                               instead of being sent to browser (OPTIONAL;
@@ -57,9 +58,7 @@ function plain_error_message($message, $return_output=FALSE) {
  */
 function logout_error( $errString, $errTitle = '' ) {
     global $frame_top, $org_logo, $org_logo_width, $org_logo_height, $org_name,
-           $hide_sm_attributions, $squirrelmail_language, $oTemplate;
-
-    $base_uri = sqm_baseuri();
+           $hide_sm_attributions, $squirrelmail_language, $oTemplate, $base_uri;
 
     $login_link = array (
                             'URI'   => $base_uri . 'src/login.php',
@@ -68,7 +67,8 @@ function logout_error( $errString, $errTitle = '' ) {
                         
     /* As of 1.5.2, plugin parameters are combined into one array; 
        plugins on this hook must be updated */
-    do_hook('logout_error', $temp=array(&$errString, &$errTitle, &$login_link));
+    $temp = array(&$errString, &$errTitle, &$login_link);
+    do_hook('logout_error', $temp);
 
     if ( $errTitle == '' ) {
         $errTitle = $errString;