X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdisplay_messages.php;h=cce8e1109b95c1f0477630ca4e634e1e608899ff;hb=fe2a5f768f2c3458c6d0545a9d64c7e2f16593be;hp=024a40f82b84e4fdb4fc58b606a87f8894493dd4;hpb=c94b297c49f891fb9ca9117b33796aacaca2b32d;p=squirrelmail.git

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 024a40f8..cce8e110 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -28,12 +28,33 @@ 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;
 }
 
+/**
+ * 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
@@ -48,62 +69,29 @@ function error_username_password_incorrect() {
                 '<TR BGCOLOR="' . $color[0] . '">'.
                     '<TH>' . _("ERROR") . '</TH>'.
                 '</TR>' .
-                '<TR><TD>'.
-                    '<CENTER><BR>' . _("Unknown user or password incorrect.") .
+                '<TR><TD ALIGN="center">'.
+                    '<BR>' . _("Unknown user or password incorrect.") .
                     '<BR><A HREF="' . sqm_baseuri() . '"login.php" TARGET='.
                     $frame_top.'>' . _("Click here to try again") .
-                    '</A>.</CENTER>'.
+                    '</A>.'.
                 '</TD></TR>'.
                 '</TABLE>'.
             '</BODY></HTML>';
 }
 
-function general_info($motd, $org_logo, $version, $org_name, $color) {
-
-    echo '<BR>'.
-         "<TABLE COLS=1 WIDTH=\"80%\" CELLSPACING=0 CELLPADDING=2 BORDER=\"0\" ALIGN=CENTER><TR><TD BGCOLOR=\"$color[9]\">".
-         '<TABLE COLS=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=3 BORDER="0" BGCOLOR="' .  $color[4] . '" ALIGN=CENTER>'.
-            '<TR>' .
-               "<TD BGCOLOR=\"$color[0]\">" .
-                  '<B><CENTER>';
-    printf (_("Welcome to %s's WebMail system"), $org_name);
-    echo          '</CENTER></B>'.
-            '<TR><TD BGCOLOR="' . $color[4] .  '">'.
-               '<TABLE COLS=2 WIDTH="90%" CELLSPACING=0 CELLPADDING=3 BORDER="0" align="center">'.
-                  '<TR>'.
-                     '<TD BGCOLOR="' . $color[4] .  '"><CENTER>';
-    if ( strlen($org_logo) > 3 ) {
-        echo                "<IMG SRC=\"$org_logo\">";
-    } else {
-        echo                "<B>$org_name</B>";
-    }
-    echo          '<BR><CENTER>';
-    printf (_("Running SquirrelMail version %s (c) 1999-2001."), $version);
-    echo             '</CENTER><BR>'.
-                     '</CENTER></TD></TR><TR>' .
-                     '<TD BGCOLOR="' . $color[4] .  '">' .
-                         $motd.
-                     '</TD>'.
-                  '</TR>'.
-               '</TABLE>'.
-            '</TD></TR>'.
-         '</TABLE>'.
-         '</TD></TR></TABLE>';
-}
-
 function error_message($message, $mailbox, $sort, $startMessage, $color) {
     $urlMailbox = urlencode($mailbox);
 
     echo '<BR>'.
-         "<TABLE COLS=1 WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
+         "<TABLE WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
             '<TR>'.
-               "<TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>'.
-            '</TD></TR><TR><TD>'.
-               "<CENTER><BR>$message<BR>\n".
+               "<TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>" . _("ERROR") . '</B></FONT>'.
+            '</TD></TR><TR><TD ALIGN="center">'.
+               "<BR>$message<BR>\n".
                '<BR>'.
                   "<A HREF=\"" . sqm_baseuri() 
-                  . "right_main.php?sort=$sort&amp;startMessage=$startMessage"
+                  . "src/right_main.php?sort=$sort&amp;startMessage=$startMessage"
                   . "&amp;mailbox=$urlMailbox\">";
     printf (_("Click here to return to %s"), $mailbox);
     echo '</A>.'.
@@ -112,26 +100,26 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) {
 }
 
 function plain_error_message($message, $color) {
-    echo "<br><TABLE COLS=1 WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
+    echo "<br><TABLE WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
             '<TR>'.
-               "<TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>'.
-            '</TD></TR><TR><TD>'.
-               "<CENTER><BR>$message".
-               '</CENTER>'.
+               "<TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>" . _("ERROR") . '</B></FONT>'.
+            '</TD></TR><TR><TD ALIGN="center">'.
+               "<BR>$message".
             '</TD></TR>'.
          '</TABLE>';
 }
 
 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;
     $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.
-        include( $DOCUMENT_ROOT . $base_uri . 'config/config.php' );
+        include( "$topdir/config/config.php" );
     }
     /* Display width and height like good little people */
     $width_and_height = '';
@@ -168,8 +156,9 @@ function logout_error( $errString, $errTitle = '' ) {
         $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) .
@@ -178,18 +167,18 @@ function logout_error( $errString, $errTitle = '' ) {
            '<SMALL>' . sprintf (_("SquirrelMail version %s"), $version) . "<BR>\n".
            '  ' . _("By the SquirrelMail Development Team") . "<BR></SMALL>\n" ) .
          "<table cellspacing=1 cellpadding=0 bgcolor=\"$color[1]\" width=\"70%\"><tr><td>".
-         "<TABLE COLS=1 WIDTH=\"100%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
-            "<TR><TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") .
-                  '</CENTER></B></FONT></TD></TR>'.
-            '<TR><TD><CENTER>' . $errString . '</CENTER></TD></TR>'.
-            "<TR><TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>".
+         "<TABLE WIDTH=\"100%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>" . _("ERROR") .
+                  '</B></FONT></TD></TR>'.
+            '<TR><TD ALIGN="center">' . $errString . '</TD></TR>'.
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>".
                   '<a href="' . $base_uri . 'src/login.php" target="' .
                   $frame_top . '">' .
-                  _("Go to the login page") . "</a></CENTER></B></FONT>".
+                  _("Go to the login page") . "</a></B></FONT>".
             '</TD></TR>'.
-         '</TABLE></td></tr></table></body></html>';
+            '</TABLE></td></tr></table></center></body></html>';
 }
 
-?>
\ No newline at end of file
+?>