projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spanish Update
[squirrelmail.git]
/
functions
/
display_messages.php
diff --git
a/functions/display_messages.php
b/functions/display_messages.php
index 3e91a4d176c6e0294cb111e72d1bb57e82a54964..cce8e1109b95c1f0477630ca4e634e1e608899ff 100644
(file)
--- a/
functions/display_messages.php
+++ b/
functions/display_messages.php
@@
-28,12
+28,33
@@
function sqm_baseuri(){
if (isset($base_uri)){
return $base_uri;
}
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;
}
$base_uri = preg_replace($dirs, $repl, $PHP_SELF);
return $base_uri;
}
+/**
+ * Find out the top REAL path of the squirrelmail installation.
+ *
+ * @return the real installation directory of squirrelmail.
+ */
+
+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 error_username_password_incorrect() {
global $frame_top, $color;
/* XXX: Should really not start the HTML before this, or close off more
function error_username_password_incorrect() {
global $frame_top, $color;
/* XXX: Should really not start the HTML before this, or close off more
@@
-90,15
+111,15
@@
function plain_error_message($message, $color) {
}
function logout_error( $errString, $errTitle = '' ) {
}
function logout_error( $errString, $errTitle = '' ) {
+ global $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height,
+ $hide_sm_attributions, $version, $squirrelmail_language;
- GLOBAL $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height,
- $hide_sm_attributions, $version, $DOCUMENT_ROOT,
- $squirrelmail_language;
$base_uri = sqm_baseuri();
$base_uri = sqm_baseuri();
- include_once($DOCUMENT_ROOT . $base_uri . 'functions/page_header.php' );
+ $topdir = sqm_topdir();
+ include_once( "$topdir/functions/page_header.php" );
if ( !isset( $org_logo ) ) {
// Don't know yet why, but in some accesses $org_logo is not set.
if ( !isset( $org_logo ) ) {
// Don't know yet why, but in some accesses $org_logo is not set.
- include(
$DOCUMENT_ROOT . $base_uri . 'config/config.php'
);
+ include(
"$topdir/config/config.php"
);
}
/* Display width and height like good little people */
$width_and_height = '';
}
/* Display width and height like good little people */
$width_and_height = '';
@@
-135,8
+156,9
@@
function logout_error( $errString, $errTitle = '' ) {
$errTitle = $errString;
}
set_up_language($squirrelmail_language, true);
$errTitle = $errString;
}
set_up_language($squirrelmail_language, true);
- displayHtmlHeader( $errTitle );
-
+
+ displayHtmlHeader( $errTitle, '', false );
+
echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n\n" .
'<CENTER>'.
"<IMG SRC=\"$org_logo\" ALT=\"" . sprintf(_("%s Logo"), $org_name) .
echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n\n" .
'<CENTER>'.
"<IMG SRC=\"$org_logo\" ALT=\"" . sprintf(_("%s Logo"), $org_name) .
@@
-156,7
+178,7
@@
function logout_error( $errString, $errTitle = '' ) {
$frame_top . '">' .
_("Go to the login page") . "</a></B></FONT>".
'</TD></TR>'.
$frame_top . '">' .
_("Go to the login page") . "</a></B></FONT>".
'</TD></TR>'.
- '</TABLE></td></tr></table></center></body></html>';
+
'</TABLE></td></tr></table></center></body></html>';
}
?>
}
?>