X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=963f48f52ad02847cbacf94e25f21ca07ced48a2;hb=4165198dd11d9bae29e7784400bec7031b696403;hp=3e91a4d176c6e0294cb111e72d1bb57e82a54964;hpb=c9062c05d957b48de56d8323a2c8b841cc57ca8d;p=squirrelmail.git
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 3e91a4d1..963f48f5 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,22 +3,28 @@
/**
* display_messages.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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$
+ * @version $Id$
+ * @package squirrelmail
*/
+/**
+ * including plugin functions
+ */
+require_once(SM_PATH . 'functions/plugin.php');
+
/**
* 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.
+ * @return string the base uri of squirrelmail installation.
*/
function sqm_baseuri(){
global $base_uri, $PHP_SELF;
@@ -28,85 +34,45 @@ function sqm_baseuri(){
if (isset($base_uri)){
return $base_uri;
}
- $dirs = array("|src/.*|", "|plugins/.*|", "|functions/.*|");
- $repl = array("", "", "");
+ $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") . - '.'. - ' |