X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=470a5d359ab0733a8ef1d0c7707a247b538e4508;hb=10bf80c009d938fc0cf85a70d0a6b3834365b146;hp=8a39eade60854dd7fab0662cb2da1d28ea5a23f7;hpb=35185c8298fbbff2cf7b9501fe978c59597f4b06;p=squirrelmail.git
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 8a39eade..470a5d35 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,22 +3,31 @@
/**
* 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-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ */
+
+/** @ignore */
+if (! defined('SM_PATH')) define('SM_PATH','../');
+
+/**
+ * including plugin functions
*/
+include_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
+ * 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.
+ * @since 1.2.6
*/
function sqm_baseuri(){
global $base_uri, $PHP_SELF;
@@ -28,135 +37,186 @@ 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") . - '.'. - ' |