X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=090fc062ad04902be7fa8de8d43fcc5fecc989f6;hb=d9ad25253585e8da40d8bc979bc369e68ecb07f7;hp=024a40f82b84e4fdb4fc58b606a87f8894493dd4;hpb=c94b297c49f891fb9ca9117b33796aacaca2b32d;p=squirrelmail.git diff --git a/functions/display_messages.php b/functions/display_messages.php index 024a40f8..090fc062 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -3,7 +3,7 @@ /** * display_messages.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 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 @@ -28,8 +28,8 @@ function sqm_baseuri(){ if (isset($base_uri)){ return $base_uri; } - $dirs = array("|src/.*|", "|plugins/.*|", "|functions/.*|"); - $repl = array("", "", ""); + $dirs = array('|src/.*|', '|plugins/.*|', '|functions/.*|'); + $repl = array('', '', ''); $base_uri = preg_replace($dirs, $repl, $PHP_SELF); return $base_uri; } @@ -42,103 +42,51 @@ function error_username_password_incorrect() { if (!isset($frame_top)) { $frame_top = '_top'; } - - echo '
'. - ''. - ''. - ''. - '' . - ''. - '
' . _("ERROR") . '
'. - '

' . _("Unknown user or password incorrect.") . - '
'. + _("Unknown user or password incorrect.") . + '
'. + '' . _("Click here to try again") . - '.'. - '
'. - ''; -} - -function general_info($motd, $org_logo, $version, $org_name, $color) { - - echo '
'. - "
". - ''. - '' . - "'. - '
" . - '
'; - printf (_("Welcome to %s's WebMail system"), $org_name); - echo '
'. - '
'. - ''. - ''. - '' . - ''. - ''. - '
'; - if ( strlen($org_logo) > 3 ) { - echo ""; - } else { - echo "$org_name"; - } - echo '
'; - printf (_("Running SquirrelMail version %s (c) 1999-2001."), $version); - echo '

'. - '
' . - $motd. - '
'. - '
'. - '
'; + '.'. + ''; + error_box($string,$color); +echo ''; } function error_message($message, $mailbox, $sort, $startMessage, $color) { $urlMailbox = urlencode($mailbox); - echo '
'. - "". - ''. - "'. - '
". - "
" . _("ERROR") . '
'. - '
'. - "

$message
\n". - '
'. - ""; - printf (_("Click here to return to %s"), $mailbox); - echo '.'. - '
'; + $string = '' . $message . ''."\n". + ''. + '" . + sprintf (_("Click here to return to %s"), $mailbox) . + ''; + error_box($string, $color); } function plain_error_message($message, $color) { - echo "
". - ''. - "'. - '
". - "
" . _("ERROR") . '
'. - '
'. - "

$message". - '
'. - '
'; + 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; - GLOBAL $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height, - $hide_sm_attributions, $version, $DOCUMENT_ROOT; $base_uri = sqm_baseuri(); - include_once($DOCUMENT_ROOT . $base_uri . 'functions/page_header.php' ); + + 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( $DOCUMENT_ROOT . $base_uri . 'config/config.php' ); + include( SM_PATH . 'config/config.php' ); } /* Display width and height like good little people */ $width_and_height = ''; - if (isset($org_logo_width) && is_int($org_logo_width) && $org_logo_width>0) { + 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_int($org_logo_height) && $org_logo_height>0) { + if (isset($org_logo_height) && is_numeric($org_logo_height) && $org_logo_height>0) { $width_and_height .= " HEIGHT=\"$org_logo_height\""; } @@ -151,45 +99,70 @@ function logout_error( $errString, $errTitle = '' ) { $color[0] = '#DCDCDC'; /* light gray TitleBar */ $color[1] = '#800000'; /* red */ $color[2] = '#CC0000'; /* light red Warning/Error Messages */ - $color[3] = '#A0B8C8'; /* green-blue Left Bar Background */ $color[4] = '#FFFFFF'; /* white Normal Background */ - $color[5] = '#FFFFCC'; /* light yellow Table Headers */ - $color[6] = '#000000'; /* black Text on left bar */ $color[7] = '#0000CC'; /* blue Links */ $color[8] = '#000000'; /* black Normal text */ - $color[9] = '#ABABAB'; /* mid-gray Darker version of #0 */ - $color[10] = '#666666'; /* dark gray Darker version of #9 */ - $color[11] = '#770000'; /* dark red Special Folders color */ - $color[12] = '#EDEDED'; - $color[15] = '#002266'; /* (dark blue) Unselectable folders */ } if ( $errTitle == '' ) { $errTitle = $errString; } set_up_language($squirrelmail_language, true); - displayHtmlHeader( $errTitle ); - + + displayHtmlHeader( $errTitle, '', false ); + echo "\n\n" . - '
'. - "\""
\n". - ( $hide_sm_attributions ? '' : + '
'; + + if (isset($org_logo) && ($org_logo != '')) { + echo "\""
\n"; + } + echo ( $hide_sm_attributions ? '' : '' . sprintf (_("SquirrelMail version %s"), $version) . "
\n". ' ' . _("By the SquirrelMail Development Team") . "
\n" ) . "
". - "". - "'. - ''. - "
". - "
" . _("ERROR") . - '
' . $errString . '
". - "
". + "". + "'. + ''. + "'. - '
". + "" . _("ERROR") . + '
' . $errString . '
". + "". '' . - _("Go to the login page") . "". + _("Go to the login page") . "". '
'; + '
'; } -?> \ No newline at end of file +function error_box($string, $color) { + global $pageheader_sent; + + $err = _("ERROR"); + + /* 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 ' '; + echo ' '; + echo '
'; + echo ' '; + echo ' '; + echo '
'; + echo ' ' . _("ERROR") . ':'; + echo '
'; + echo ' '; + echo ' ' . html_tag( 'td', $string."\n", 'left') + . ''; + echo '
'; + echo '
'; + echo ' '; +} +?>