X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=9f9d4774c81a40c5c88a9ecd7b3f27779b3047ee;hp=d5d4931e6be1fc3bf4307de89b33bc4e83860e1e;hb=e53c9681b4646b7ca1b0071434d360be56a80a6e;hpb=97be216806423d7008317ac7b4ca81ca8a4c8504 diff --git a/functions/display_messages.php b/functions/display_messages.php index d5d4931e..9f9d4774 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -1,113 +1,181 @@ -"; - echo ""; - echo " "; - echo " "; - echo "
"; - echo "
ERROR
"; - echo "
"; - echo "

Unknown user or password incorrect.
Click here to try again.
"; - echo "
"; - echo ""; +' . $message . ''. + ''. + '". + sprintf (_("Click here to return to %s"), + strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox)). + ''; + error_box($string, $color); +} + +function plain_error_message($message, $color) { + error_box($message, $color); +} + +function logout_error( $errString, $errTitle = '' ) { + global $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height, + $hide_sm_attributions, $version, $squirrelmail_language; + + $base_uri = sqm_baseuri(); + + include_once( SM_PATH . 'functions/page_header.php' ); + if ( !isset( $org_logo ) ) { + // Don't know yet why, but in some accesses $org_logo is not set. + include( SM_PATH . 'config/config.php' ); + } + /* 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\""; + } + if (isset($org_logo_height) && is_numeric($org_logo_height) && $org_logo_height>0) { + $width_and_height .= " height=\"$org_logo_height\""; + } + + if (!isset($frame_top) || $frame_top == '' ) { + $frame_top = '_top'; } - function general_info($motd, $org_logo, $version, $org_name, $color) { - echo "
"; - echo ""; - echo " "; - echo " "; - echo "
"; - echo "
Welcome to $org_name's WebMail system
"; - echo "
"; - echo "
"; - echo "
Running SquirrelMail version $version (c) 1999-2000.
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - if (strlen($org_logo) > 3) - echo " "; - else - echo " $org_name"; - echo "
"; - echo " $motd"; - echo "
"; - echo "
"; - } - - function messages_deleted_message($mailbox, $sort, $startMessage, $color) { - $urlMailbox = urlencode($mailbox); - echo "
"; - echo ""; - echo " "; - echo " "; - echo "
"; - echo "
Messages Deleted
"; - echo "
"; - echo "

The selected messages were deleted successfully.
\n"; - echo "
"; - echo " "; - echo " Click here to return to $mailbox."; - echo "
"; - echo "
"; + // Since $color never is set, this is always true + 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 */ } - function messages_moved_message($mailbox, $sort, $startMessage, $color) { - $urlMailbox = urlencode($mailbox); - echo "
"; - echo ""; - echo " "; - echo " "; - echo "
"; - echo "
Messages Moved
"; - echo "
"; - echo "

The selected messages were moved successfully.
\n"; - echo "
"; - echo " "; - echo " Click here to return to $mailbox."; - echo "
"; - echo "
"; + list($junk, $errString, $errTitle) = do_hook('logout_error', $errString, $errTitle); + + if ( $errTitle == '' ) { + $errTitle = $errString; } + set_up_language($squirrelmail_language, true); + + displayHtmlHeader( $org_name.' - '.$errTitle, '', false ); - function error_message($message, $mailbox, $sort, $startMessage, $color) { - $urlMailbox = urlencode($mailbox); - echo "
"; - echo ""; - echo " "; - echo " "; - echo "
"; - echo "
ERROR
"; - echo "
"; - echo "

$message
\n"; - echo "
"; - echo " "; - echo " Click here to return to $mailbox."; - echo "
"; - echo "
"; + echo '\n\n". + '
'; + + if (isset($org_logo) && ($org_logo != '')) { + echo ''.sprintf(_(
\n"; } + echo ( $hide_sm_attributions ? '' : + '' . sprintf (_("SquirrelMail version %s"), $version) . '
'. + _("By the SquirrelMail Development Team") . "
\n" ). + ''. + '
'. + ''. + ''. + ''. + ''. + '
'. + '' . _("ERROR") . ''. + '
' . $errString . '
'. + ''. + ''. + _("Go to the login page") . '
'; +} + +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 */ + $color[9] = '#ababab'; /* mid-gray Darker version of #0 */ + } + + $err = _("ERROR"); - function plain_error_message($message, $color) { - echo "
"; - echo ""; - echo " "; - echo " "; - echo "
"; - echo "
ERROR
"; - echo "
"; - echo "

$message"; - echo "
"; - echo "
"; + $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 "\n\n"; + } + + 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