X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=9f9d4774c81a40c5c88a9ecd7b3f27779b3047ee;hp=13bed86966b7b771aad178a3ce6703b6caef6d4d;hb=c4ea392c26d334e154510fb1d635252d5310e367;hpb=82d304a0501324b276cabab1870755d5352bd21c;ds=sidebyside
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 13bed869..9f9d4774 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -9,10 +9,15 @@
* 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
@@ -37,15 +42,12 @@ function sqm_baseuri(){
function error_message($message, $mailbox, $sort, $startMessage, $color) {
$urlMailbox = urlencode($mailbox);
- if (strtoupper($mailbox) == 'INBOX')
- $mailbox = _("INBOX");
- $string = '| ' . $message . ' |
'."\n".
- '| '.
- '" .
- sprintf (_("Click here to return to %s"), imap_utf7_decode_local($mailbox)) .
- ' |
';
+ $string = '| ' . $message . ' |
'.
+ '| '.
+ '".
+ sprintf (_("Click here to return to %s"),
+ strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox)).
+ ' |
';
error_box($string, $color);
}
@@ -67,23 +69,24 @@ 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 == '' ) {
$frame_top = '_top';
}
+ // Since $color never is set, this is always true
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 */
}
@@ -94,39 +97,52 @@ function logout_error( $errString, $errTitle = '' ) {
}
set_up_language($squirrelmail_language, true);
- displayHtmlHeader( $errTitle, '', false );
+ displayHtmlHeader( $org_name.' - '.$errTitle, '', false );
- echo "\n\n" .
- '';
+ echo '\n\n".
+ '';
if (isset($org_logo) && ($org_logo != '')) {
- echo "![\""](\"$org_logo\")
\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" ).
+ '