X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=f0c79f254c31a4fa4a8561f14910f7ebef8edb2e;hp=f01808f59b8e11fc45a121472aa246b8277163fc;hb=284a0d8a7f0396b04cb9ba956a6117cad862a5c5;hpb=883d07f18ea3360c12fbda6c317b5ef49c0554cf
diff --git a/functions/display_messages.php b/functions/display_messages.php
index f01808f5..f0c79f25 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -22,15 +22,13 @@
* @param array $color color theme
* @since 1.0
*/
-function error_message($message, $mailbox, $sort, $startMessage, $color) {
+function error_message($message, $mailbox, $sort, $startMessage) {
$urlMailbox = urlencode($mailbox);
- $string = '
' . $message . ' |
'.
- ''.
- '".
- sprintf (_("Click here to return to %s"),
- strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox)).
- ' |
';
- error_box($string, $color);
+ $link = array (
+ 'URL' => sqm_baseuri()."src/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox",
+ 'TEXT' => sprintf (_("Click here to return to %s"), strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox))
+ );
+ error_box($message, $link);
}
/**
@@ -39,52 +37,24 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) {
* @param array $color color theme
* @since 1.0
*/
-function plain_error_message($message, $color) {
- error_box($message, $color);
+function plain_error_message($message) {
+ error_box($message);
}
/**
* Displays error when user is logged out
- *
+ *
* Error strings can be overriden by logout_error hook
* @param string $errString error message
* @param string $errTitle title of page with error message
* @since 1.2.6
*/
function logout_error( $errString, $errTitle = '' ) {
- global $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height,
- $hide_sm_attributions, $version, $squirrelmail_language,
- $color, $theme, $theme_default;
+ global $frame_top, $org_logo, $org_logo_width, $org_logo_height, $org_name,
+ $hide_sm_attributions, $squirrelmail_language, $oTemplate;
$base_uri = sqm_baseuri();
- /* 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';
- }
-
- // load default theme if possible
- if (!isset($color) && @file_exists($theme[$theme_default]['PATH']))
- @include ($theme[$theme_default]['PATH']);
-
- 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 */
- }
-
list($junk, $errString, $errTitle) = do_hook('logout_error', $errString, $errTitle);
if ( $errTitle == '' ) {
@@ -94,42 +64,59 @@ function logout_error( $errString, $errTitle = '' ) {
displayHtmlHeader( $org_name.' - '.$errTitle, '', false );
- echo '\n\n".
- '';
-
- if (isset($org_logo) && ($org_logo != '')) {
- echo '
\n";
+ /* If they don't have a logo, don't bother.. */
+ $logo_str = '';
+ if (isset($org_logo) && $org_logo) {
+ /* 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\"";
+ }
+
+ $logo_str = '
'."\n";
}
- echo ( $hide_sm_attributions ? '' :
- '
' . _("SquirrelMail Webmail Application") . '
'.
- _("By the SquirrelMail Project Team") . "
\n" ).
- '