X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=37ab2613bceafc371d26872db77d3abc795aad55;hp=6a279599ed2ba2afa9a9c8284a1565fdf8944e92;hb=a9a7cda1e186f13501bd2d59a28c0763f16f2f96;hpb=42c2281a0d039f996428a9e179c8c19efea59365
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 6a279599..37ab2613 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,57 +3,65 @@
/**
* 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-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package squirrelmail
*/
+/** @ignore */
+if (! defined('SM_PATH')) define('SM_PATH','../');
+
/**
- * 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.
- *
- * @return string the base uri of squirrelmail installation.
+ * including plugin functions
*/
-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;
-}
+include_once(SM_PATH . 'functions/plugin.php');
+/**
+ * Displays error message and URL to message listing
+ * @param string $message error message
+ * @param string $mailbox mailbox name
+ * @param integer $sort sort order
+ * @param integer $startMessage first message
+ * @param array $color color theme
+ * @since 1.0
+ */
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);
}
+/**
+ * Displays error message
+ * @param string $message error message
+ * @param array $color color theme
+ * @since 1.0
+ */
function plain_error_message($message, $color) {
error_box($message, $color);
}
+/**
+ * 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;
+ $hide_sm_attributions, $version, $squirrelmail_language,
+ $color, $theme, $theme_default;
$base_uri = sqm_baseuri();
@@ -65,23 +73,27 @@ 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 == '' ) {
$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[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 */
}
@@ -92,36 +104,57 @@ function logout_error( $errString, $errTitle = '' ) {
}
set_up_language($squirrelmail_language, true);
- displayHtmlHeader( $errTitle, '', false );
+ displayHtmlHeader( $org_name.' - '.$errTitle, '', false );
- echo "\n\n" .
- '';
+ echo '\n\n".
+ '';
if (isset($org_logo) && ($org_logo != '')) {
- echo "![\""](\"$org_logo\")
\n";
+ echo '
\n";
}
echo ( $hide_sm_attributions ? '' :
- '' . sprintf (_("SquirrelMail version %s"), $version) . "
\n".
- ' ' . _("By the SquirrelMail Development Team") . "
\n" ) .
- "';
+ '' . _("SquirrelMail Webmail Application") . '
'.
+ _("By the SquirrelMail Project Team") . "
\n" ).
+ '