X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=a517984af2b2871d07d38f0a705835d5177687f5;hp=2fe6bd4a6a14dd4d0358fea35cc08acc7a498cda;hb=b94bfe13d33c8d6df9a98d5eba757ddbcbf9dd4a;hpb=76b684a5e8035dd5781262fab912c18ef2998ec9
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 2fe6bd4a..a517984a 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,7 +3,7 @@
/**
* display_messages.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * 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
@@ -12,6 +12,28 @@
* $Id$
*/
+/**
+ * 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 the base uri of squirrelmail installation.
+ */
+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
@@ -20,84 +42,114 @@ function error_username_password_incorrect() {
if (!isset($frame_top)) {
$frame_top = '_top';
}
-
- echo '
'.
- '
' . _("ERROR") . ' | '. - '
---|
'.
- ' ' . _("Unknown user or password incorrect.") . - ' ' . - _("Click here to try again") . - '. |