X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fdisplay_messages.php;h=963f48f52ad02847cbacf94e25f21ca07ced48a2;hb=f88384baceaa5e493132805e8ae6d8ce778bc1e5;hp=f035a2014e7a0a8b174865bba30974766280285c;hpb=472e7acbb50c8496ec9ae730bb82d785add1ed96;p=squirrelmail.git
diff --git a/functions/display_messages.php b/functions/display_messages.php
index f035a201..963f48f5 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$
+ * @version $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;
@@ -36,14 +42,12 @@ function sqm_baseuri(){
function error_message($message, $mailbox, $sort, $startMessage, $color) {
$urlMailbox = urlencode($mailbox);
-
- $string = '
' . $message . ' |
'."\n".
- ''.
- '" .
- sprintf (_("Click here to return to %s"), $mailbox) .
- ' |
';
+ $string = '' . $message . ' |
'.
+ ''.
+ '".
+ sprintf (_("Click here to return to %s"),
+ strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox)).
+ ' |
';
error_box($string, $color);
}
@@ -65,10 +69,10 @@ function logout_error( $errString, $errTitle = '' ) {
/* Display width and height like good little people */
$width_and_height = '';
if (isset($org_logo_width) && is_numeric($org_logo_width) && $org_logo_width>0) {
- $width_and_height = " WIDTH=\"$org_logo_width\"";
+ $width_and_height = " width=\"$org_logo_width\"";
}
if (isset($org_logo_height) && is_numeric($org_logo_height) && $org_logo_height>0) {
- $width_and_height .= " HEIGHT=\"$org_logo_height\"";
+ $width_and_height .= " height=\"$org_logo_height\"";
}
if (!isset($frame_top) || $frame_top == '' ) {
@@ -77,51 +81,68 @@ function logout_error( $errString, $errTitle = '' ) {
if ( !isset( $color ) ) {
$color = array();
- $color[0] = '#DCDCDC'; /* light gray TitleBar */
+ $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[2] = '#cc0000'; /* light red Warning/Error Messages */
+ $color[4] = '#ffffff'; /* white Normal Background */
+ $color[7] = '#0000cc'; /* blue Links */
$color[8] = '#000000'; /* black Normal text */
}
+ list($junk, $errString, $errTitle) = do_hook('logout_error', $errString, $errTitle);
+
if ( $errTitle == '' ) {
- $errTitle = $errString;
+ $errTitle = $org_name . ' - ' . $errString;
}
set_up_language($squirrelmail_language, true);
displayHtmlHeader( $errTitle, '', false );
- echo "\n\n" .
- '';
+ echo '\n\n".
+ '';
if (isset($org_logo) && ($org_logo != '')) {
- echo "
\n";
+ echo '
\n";
}
echo ( $hide_sm_attributions ? '' :
- '' . sprintf (_("SquirrelMail version %s"), $version) . "
\n".
- ' ' . _("By the SquirrelMail Development Team") . "
\n" ) .
- "';
+ '' . sprintf (_("SquirrelMail version %s"), $version) . '
'.
+ _("By the SquirrelMail Development Team") . "
\n" ).
+ '