X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=963f48f52ad02847cbacf94e25f21ca07ced48a2;hb=4165198dd11d9bae29e7784400bec7031b696403;hp=6149751b8ecb9e5cddea9f895a884aa8a4a22753;hpb=6c92ca883c24f092f2d7d8d141ed5e03098702a5;p=squirrelmail.git diff --git a/functions/display_messages.php b/functions/display_messages.php index 6149751b..963f48f5 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -42,13 +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"), strtoupper($mailbox) == 'INBOX' ? _("INBOX") : 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); } @@ -70,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 == '' ) { @@ -82,46 +81,45 @@ 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 ''.sprintf(_(
\n"; } echo ( $hide_sm_attributions ? '' : - '' . sprintf (_("SquirrelMail version %s"), $version) . "
\n". - ' ' . _("By the SquirrelMail Development Team") . "
\n" ) . - "
". - "". - "'. - ''. - "'. - '
". - "" . _("ERROR") . - '
' . $errString . '
". - "". - '' . - _("Go to the login page") . "". - '
'; + '' . sprintf (_("SquirrelMail version %s"), $version) . '
'. + _("By the SquirrelMail Development Team") . "
\n" ). + ''. + '
'. + ''. + ''. + ''. + ''. + '
'. + '' . _("ERROR") . ''. + '
' . $errString . '
'. + ''. + ''. + _("Go to the login page") . '
'; } function error_box($string, $color) { @@ -129,13 +127,13 @@ function error_box($string, $color) { 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 */ - $color[9] = '#ABABAB'; /* mid-gray Darker version of #0 */ + $color[9] = '#ababab'; /* mid-gray Darker version of #0 */ } $err = _("ERROR"); @@ -154,21 +152,29 @@ function error_box($string, $color) { echo "\n\n"; } - echo ' '; - echo ' '; - echo '
'; - echo ' '; - echo ' '; - echo ' '; - echo '
'; - echo ' ' . $err . ':'; - echo '
'; - echo ' '; - echo ' ' . html_tag( 'td', $string."\n", 'left') - . ''; - echo '
'; - echo '
'; + echo ''. + '
'. + ''. + '
'. + '' . $err . ':'. + '
'. + ''. + '' . html_tag( 'td', $string."\n", 'left') . '
'. + '
'; } +/** + * Adds message that informs about non fatal error that can happen while saving preferences + * @param string $message error message + * @since 1.5.1 + */ +function error_option_save($message) { + global $optpage_save_error; + + if (! is_array($optpage_save_error) ) + $optpage_save_error=array(); + + $optpage_save_error=array_merge($optpage_save_error,array($message)); +} // vim: et ts=4 -?> +?> \ No newline at end of file