X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=ad35460f7d5a70172a1447350107b6c5c91d655b;hb=a9805897ba12de9a63b9a435ccbb49a027d86e4a;hp=a517984af2b2871d07d38f0a705835d5177687f5;hpb=b94bfe13d33c8d6df9a98d5eba757ddbcbf9dd4a;p=squirrelmail.git diff --git a/functions/display_messages.php b/functions/display_messages.php index a517984a..ad35460f 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -3,153 +3,194 @@ /** * display_messages.php * - * 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 * about any other message you can think of. * - * $Id$ + * @copyright 1999-2014 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 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) { + $urlMailbox = urlencode($mailbox); + $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") : sm_encode_html_special_chars(imap_utf7_decode_local($mailbox))) + ); + error_box($message, $link); } -function error_username_password_incorrect() { - global $frame_top, $color; - /* XXX: Should really not start the HTML before this, or close off more - cleanly. */ - - if (!isset($frame_top)) { - $frame_top = '_top'; - } - $string = '