X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=1e686b198c75d40fee7efb68223d02d3cb8c6b8c;hb=e506b6e54f09ec71062b55bf3d72c9db57c89f05;hp=22abf4fcf93567831a7dfd859e25adc87756a34e;hpb=0e61edf7d33890b3b3493153962453ce2ffe2216;p=squirrelmail.git
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 22abf4fc..1e686b19 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -6,48 +6,45 @@
* This contains all messages, including information, error, and just
* about any other message you can think of.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2009 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','../');
-
-/**
- * including plugin functions
- */
-include_once(SM_PATH . 'functions/plugin.php');
/**
* Displays error message and URL to message listing
+ *
+ * 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
- * @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") : htmlspecialchars(imap_utf7_decode_local($mailbox)))
+ );
+ error_box($message, $link);
}
/**
* Displays error message
+ *
+ * Second argument ($color array) is changed to boolean $return_output as of 1.5.2.
* @param string $message error message
- * @param array $color color theme
+ * @param boolean $return_output When TRUE, output is returned to caller
+ * instead of being sent to browser (OPTIONAL;
+ * default = FALSE)
* @since 1.0
*/
-function plain_error_message($message, $color) {
- error_box($message, $color);
+function plain_error_message($message, $return_output=FALSE) {
+ return error_box($message, NULL, $return_output);
}
/**
@@ -59,45 +56,20 @@ function plain_error_message($message, $color) {
* @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();
- 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';
- }
-
- // 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);
+ $login_link = array (
+ 'URI' => $base_uri . 'src/login.php',
+ 'FRAME' => $frame_top
+ );
+
+ /* As of 1.5.2, plugin parameters are combined into one array;
+ plugins on this hook must be updated */
+ $temp = array(&$errString, &$errTitle, &$login_link);
+ do_hook('logout_error', $temp);
if ( $errTitle == '' ) {
$errTitle = $errString;
@@ -106,80 +78,108 @@ function logout_error( $errString, $errTitle = '' ) {
displayHtmlHeader( $org_name.' - '.$errTitle, '', false );
- echo '\n\n".
- '';
+ /* If they don't have a logo, don't bother.. */
+ $logo_str = '';
+ if (isset($org_logo) && $org_logo) {
+
+ if (isset($org_logo_width) && is_numeric($org_logo_width) &&
+ $org_logo_width>0) {
+ $width = $org_logo_width;
+ } else {
+ $width = '';
+ }
+ if (isset($org_logo_height) && is_numeric($org_logo_height) &&
+ $org_logo_height>0) {
+ $height = $org_logo_height;
+ } else {
+ $height = '';
+ }
+
+ $logo_str = create_image($org_logo, sprintf(_("%s Logo"), $org_name),
+ $width, $height, '', 'sqm_loginImage');
- if (isset($org_logo) && ($org_logo != '')) {
- echo '
\n";
}
- echo ( $hide_sm_attributions ? '' :
- '
' . _("SquirrelMail Webmail Application") . '
'.
- _("By the SquirrelMail Project Team") . "
\n" ).
- '