X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=1e686b198c75d40fee7efb68223d02d3cb8c6b8c;hb=e506b6e54f09ec71062b55bf3d72c9db57c89f05;hp=f0291ab26829d0aec3cb9267127ed5dd2149ece5;hpb=cf710efeb46ad22432121211c29789bf5f2101b4;p=squirrelmail.git
diff --git a/functions/display_messages.php b/functions/display_messages.php
index f0291ab2..1e686b19 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,161 +3,195 @@
/**
* 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-2009 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_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';
- }
-
- echo '
'.
- '
' . _("ERROR") . ' | '. - '
---|
'.
- ' ' . _("Unknown user or password incorrect.") . - ' ' . _("Click here to try again") . - '. |