X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=90fbca7c76fe4652bdcf8914f819d0c93b48e7ce;hb=a429618b5b82bad57a4d2ff65848ff96c1d8dc03;hp=a517984af2b2871d07d38f0a705835d5177687f5;hpb=b94bfe13d33c8d6df9a98d5eba757ddbcbf9dd4a;p=squirrelmail.git

diff --git a/functions/display_messages.php b/functions/display_messages.php
index a517984a..90fbca7c 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,22 +3,28 @@
 /**
  * display_messages.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This contains all messages, including information, error, and just
  * about any other message you can think of.
  *
  * $Id$
+ * @package squirrelmail
  */
 
+/**
+ * including plugin functions
+ */
+require_once(SM_PATH . 'functions/plugin.php');
+
 /**
  * Find out where squirrelmail lives and try to be smart about it.
  * The only problem would be when squirrelmail lives in directories
  * 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 +40,14 @@ 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);
-
     $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"), strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox)) .
 	    '</A></td></tr>';
     error_box($string, $color);
 }
@@ -104,6 +90,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;
     }
@@ -137,19 +125,47 @@ function logout_error( $errString, $errTitle = '' ) {
 }
 
 function error_box($string, $color) {
+    global $pageheader_sent;
+
+    if ( !isset( $color ) ) {
+        $color = array();
+        $color[0]  = '#DCDCDC';  /* light gray    TitleBar               */
+        $color[1]  = '#800000';  /* red                                  */
+        $color[2]  = '#CC0000';  /* light red     Warning/Error Messages */
+        $color[4]  = '#FFFFFF';  /* white         Normal Background      */
+        $color[7]  = '#0000CC';  /* blue          Links                  */
+        $color[8]  = '#000000';  /* black         Normal text            */
+    }
+
+    $err = _("ERROR");
+
+    $ret = concat_hook_function('error_box', $string);
+    if($ret != '') {
+        $string = $ret;
+    }
+
+    /* check if the page header has been sent; if not, send it! */
+    if(!isset($pageheader_sent) && !$pageheader_sent) {
+        /* include this just to be sure */
+        include_once( SM_PATH . 'functions/page_header.php' );
+        displayHtmlHeader('SquirrelMail: '.$err);
+        $pageheader_sent = TRUE;
+        echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n\n";
+    }
+
    echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
    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>';
 }
 ?>