X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=643aeb6df50b0323300501f67acdc86e390e78e8;hp=d320a3652af2d26100ec10c7bfd2f21de9c29a03;hb=f6b68e062c88ea1db25f76f60dc6a8bf07d47b45;hpb=e16cb07bf838b55f19ef602dd9bf62a7b1f25ccd diff --git a/functions/display_messages.php b/functions/display_messages.php index d320a365..643aeb6d 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -3,179 +3,194 @@ /** * display_messages.php * - * Copyright (c) 1999-2002 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-2007 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") : htmlspecialchars(imap_utf7_decode_local($mailbox))) + ); + error_box($message, $link); } /** - * Find out the top REAL path of the squirrelmail installation. - * - * @return the real installation directory of squirrelmail. + * Displays error message + * + * Second argument ($color array) is changed to boolean $return_output as of 1.5.2. + * @param string $message error message + * @param boolean $return_output When TRUE, output is returned to caller + * instead of being sent to browser (OPTIONAL; + * default = FALSE) + * @since 1.0 */ - -function sqm_topdir(){ - $topdir = ''; - /** - * $levels is just to avoid a potential infinite loop in case - * things are REALLY broken. Shouldn't really ever happen. - */ - $levels = 0; - while (!(is_dir("$topdir/functions") && is_dir("$topdir/src")) - && $levels < 10){ - $topdir .= '../'; - $levels++; - } - return $topdir; +function plain_error_message($message, $return_output=FALSE) { + return error_box($message, NULL, $return_output); } -function error_username_password_incorrect() { - global $frame_top, $color; - /* XXX: Should really not start the HTML before this, or close off more - cleanly. */ +/** + * 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_logo_width, $org_logo_height, $org_name, + $hide_sm_attributions, $squirrelmail_language, $oTemplate; + + $base_uri = sqm_baseuri(); + + $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 */ + do_hook('logout_error', $temp=array(&$errString, &$errTitle, &$login_link)); - if (!isset($frame_top)) { - $frame_top = '_top'; + if ( $errTitle == '' ) { + $errTitle = $errString; } - $string = '