typo

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 8a39eade60854dd7fab0662cb2da1d28ea5a23f7..580a62c70435ce82da76dd944f3a7961c0362306 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;
     }
-    $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
@@ -42,63 +63,44 @@ function error_username_password_incorrect() {
     if (!isset($frame_top)) {
         $frame_top = '_top';
     }
-
-    echo '<BR>'.
-                '<TABLE COLS=1 WIDTH="75%" BORDER="0" BGCOLOR="' . $color[4] . '" ALIGN=CENTER>'.
-                '<TR BGCOLOR="' . $color[0] . '">'.
-                    '<TH>' . _("ERROR") . '</TH>'.
-                '</TR>' .
-                '<TR><TD ALIGN="center">'.
-                    '<BR>' . _("Unknown user or password incorrect.") .
-                    '<BR><A HREF="' . sqm_baseuri() . '"login.php" TARGET='.
+    $string = '<TR><TD ALIGN="center">'.
+                 _("Unknown user or password incorrect.") .
+              '</TD></TR><TR><TD ALIGN="center">'.
+                '<A HREF="' . sqm_baseuri() . '"login.php" TARGET='.
                     $frame_top.'>' . _("Click here to try again") .
                     '</A>.'.
-                '</TD></TR>'.
-                '</TABLE>'.
-            '</BODY></HTML>';
+              '</TD></TR>';
+   error_box($string,$color);
+echo  '</BODY></HTML>';
 }
 
 function error_message($message, $mailbox, $sort, $startMessage, $color) {
     $urlMailbox = urlencode($mailbox);
 
-    echo '<BR>'.
-         "<TABLE WIDTH=\"70%\" 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">'.
-               "<BR>$message<BR>\n".
-               '<BR>'.
-                  "<A HREF=\"" . sqm_baseuri() 
+    $string = '<tr><td ALIGN="center">' . $message . '</td></tr>'."\n".
+               '<tr><td ALIGN="center">'.
+                  '<A HREF="' . sqm_baseuri() 
                   . "src/right_main.php?sort=$sort&amp;startMessage=$startMessage"
-                  . "&amp;mailbox=$urlMailbox\">";
-    printf (_("Click here to return to %s"), $mailbox);
-    echo '</A>.'.
-            '</TD></TR>'.
-         '</TABLE>';
+                  . "&amp;mailbox=$urlMailbox\">" .
+           sprintf (_("Click here to return to %s"), $mailbox) .
+           '</A></td></tr>';
+    error_box($string, $color);
 }
 
 function plain_error_message($message, $color) {
-    echo "<br><TABLE WIDTH=\"70%\" 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">'.
-               "<BR>$message".
-            '</TD></TR>'.
-         '</TABLE>';
+    error_box($message, $color);
 }
 
 function logout_error( $errString, $errTitle = '' ) {
-
-    GLOBAL $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height,
+    global $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height,
            $hide_sm_attributions, $version, $squirrelmail_language;
 
     $base_uri = sqm_baseuri();
-    include_once( '../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( '../config/config.php' );
+        include( "$topdir/config/config.php" );
     }
     /* Display width and height like good little people */
     $width_and_height = '';
@@ -135,8 +137,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) .
@@ -156,7 +159,23 @@ function logout_error( $errString, $errTitle = '' ) {
                   $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>';
 }
 
+function error_box($string, $color) {
+   echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
+   echo '     <tr><td>';
+   echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
+   echo '        <tr><td ALIGN="center" bgcolor="'.$color[0].'">';
+   echo '           <font color="' . $color[2].'"><b>' . _("ERROR") . ':</b></font>';
+   echo '        </td></tr>';
+   echo '        <tr><td>';
+   echo '            <table cellpadding="1" cellspacing="5" align="center" border="0">';
+   echo '              <tr>' . html_tag( 'td', $string."\n", 'left')
+                    . '</tr>';
+   echo '            </table>';
+   echo '       </table></td></tr>';
+   echo '    </table>';
+   echo '  </td></tr>';
+}
 ?>