X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=07efba1cbe773e2d0e84bfc31f280b05ae29e450;hb=af2d6cf24097b1460bca6b06af16c10f666b24ca;hp=6a279599ed2ba2afa9a9c8284a1565fdf8944e92;hpb=42c2281a0d039f996428a9e179c8c19efea59365;p=squirrelmail.git
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 6a279599..07efba1c 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,88 +3,61 @@
/**
* display_messages.php
*
- * Copyright (c) 1999-2004 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
* about any other message you can think of.
*
- * $Id$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package squirrelmail
*/
+
/**
- * Find out where squirrelmail lives and try to be smart about it.
- * The only problem would be when squirrelmail lives in directories
- * called "src", "functions", or "plugins", but people who do that need
- * to be beaten with a steel pipe anyway.
+ * Displays error message and URL to message listing
*
- * @return string the base uri of squirrelmail installation.
+ * Fifth argument ($color array) is removed in 1.5.2.
+ * @param string $message error message
+ * @param string $mailbox mailbox name
+ * @param integer $sort sort order
+ * @param integer $startMessage first message
+ * @since 1.0
*/
-function sqm_baseuri(){
- global $base_uri, $PHP_SELF;
- /**
- * If it is in the session, just return it.
- */
- if (isset($base_uri)){
- return $base_uri;
- }
- $dirs = array('|src/.*|', '|plugins/.*|', '|functions/.*|');
- $repl = array('', '', '');
- $base_uri = preg_replace($dirs, $repl, $PHP_SELF);
- return $base_uri;
-}
-
-function error_message($message, $mailbox, $sort, $startMessage, $color) {
+function error_message($message, $mailbox, $sort, $startMessage) {
$urlMailbox = urlencode($mailbox);
- $string = '
' . $message . ' |
'."\n".
- ''.
- '" .
- 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") : htmlspecialchars(imap_utf7_decode_local($mailbox)))
+ );
+ error_box($message, $link);
}
-function plain_error_message($message, $color) {
- error_box($message, $color);
+/**
+ * Displays error message
+ *
+ * Second argument ($color array) is removed in 1.5.2.
+ * @param string $message error message
+ * @since 1.0
+ */
+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;
+ global $frame_top, $org_logo, $org_logo_width, $org_logo_height, $org_name,
+ $hide_sm_attributions, $squirrelmail_language, $oTemplate;
$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';
- }
-
- 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 == '' ) {
@@ -92,38 +65,72 @@ function logout_error( $errString, $errTitle = '' ) {
}
set_up_language($squirrelmail_language, true);
- displayHtmlHeader( $errTitle, '', false );
-
- echo "\n\n" .
- '';
-
- if (isset($org_logo) && ($org_logo != '')) {
- echo "![\""](\"$org_logo\")
\n";
+ displayHtmlHeader( $org_name.' - '.$errTitle, '', false );
+
+ /* 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 = '![]('.$org_logo.')
'."\n";
+ }
+
+ $sm_attribute_str = '';
+ if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
+ $sm_attribute_str = _("SquirrelMail Webmail Application")."
\n" .
+ _("By the SquirrelMail Project Team")."
\n";
}
- echo ( $hide_sm_attributions ? '' :
- '' . sprintf (_("SquirrelMail version %s"), $version) . "
\n".
- ' ' . _("By the SquirrelMail Development Team") . "
\n" ) .
- "