Whoops, forgot debug code. Thaks Jonathan.

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 090fc062ad04902be7fa8de8d43fcc5fecc989f6..83848d0b804f82bc48e2c4202e8ab4a9b51e9863 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -10,6 +10,7 @@
  * about any other message you can think of.
  *
  * $Id$
+ * @package squirrelmail
  */
 
 /**
@@ -18,7 +19,7 @@
  * called "src", "functions", or "plugins", but people who do that need
  * to be beaten with a steel pipe anyway.
  *
- * @return  the base uri of squirrelmail installation.
+ * @return string the base uri of squirrelmail installation.
  */
 function sqm_baseuri(){
     global $base_uri, $PHP_SELF;
@@ -34,34 +35,16 @@ function sqm_baseuri(){
     return $base_uri;
 }
 
-function error_username_password_incorrect() {
-    global $frame_top, $color;
-    /* XXX: Should really not start the HTML before this, or close off more
-       cleanly. */
-
-    if (!isset($frame_top)) {
-        $frame_top = '_top';
-    }
-    $string = '<TR><TD ALIGN="center">'.
-                 _("Unknown user or password incorrect.") .
-              '</TD></TR><TR><TD ALIGN="center">'.
-                '<A HREF="' . sqm_baseuri() . '"login.php" TARGET='.
-                    $frame_top.'>' . _("Click here to try again") .
-                    '</A>.'.
-              '</TD></TR>';
-   error_box($string,$color);
-echo  '</BODY></HTML>';
-}
-
 function error_message($message, $mailbox, $sort, $startMessage, $color) {
     $urlMailbox = urlencode($mailbox);
-
+    if (strtoupper($mailbox) == 'INBOX')
+                   $mailbox = _("INBOX");
     $string = '<tr><td ALIGN="center">' . $message . '</td></tr>'."\n".
                '<tr><td ALIGN="center">'.
                   '<A HREF="' . sqm_baseuri() 
                   . "src/right_main.php?sort=$sort&amp;startMessage=$startMessage"
                   . "&amp;mailbox=$urlMailbox\">" .
-           sprintf (_("Click here to return to %s"), $mailbox) .
+    sprintf (_("Click here to return to %s"), imap_utf7_decode_local($mailbox)) .
            '</A></td></tr>';
     error_box($string, $color);
 }
@@ -104,6 +87,8 @@ function logout_error( $errString, $errTitle = '' ) {
         $color[8]  = '#000000';  /* black         Normal text            */
     }
 
+    list($junk, $errString, $errTitle) = do_hook('logout_error', $errString, $errTitle);
+
     if ( $errTitle == '' ) {
         $errTitle = $errString;
     }
@@ -141,6 +126,8 @@ function error_box($string, $color) {
 
     $err = _("ERROR");
 
+    $string = concat_hook_function('error_box', $string);
+
     /* check if the page header has been sent; if not, send it! */
     if(!isset($pageheader_sent) && !$pageheader_sent) {
         /* include this just to be sure */
@@ -154,15 +141,15 @@ function error_box($string, $color) {
    echo '     <tr><td>';
    echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
    echo '        <tr><td ALIGN="center" bgcolor="'.$color[0].'">';
-   echo '           <font color="' . $color[2].'"><b>' . _("ERROR") . ':</b></font>';
+   echo '           <font color="' . $color[2].'"><b>' . $err . ':</b></font>';
    echo '        </td></tr>';
    echo '        <tr><td>';
    echo '            <table cellpadding="1" cellspacing="5" align="center" border="0">';
    echo '              <tr>' . html_tag( 'td', $string."\n", 'left')
                     . '</tr>';
    echo '            </table>';
+   echo '        </td></tr>';
    echo '       </table></td></tr>';
    echo '    </table>';
-   echo '  </td></tr>';
 }
 ?>