Fixed line breaks that didn't allow xgetpo to work

[squirrelmail.git] / functions / page_header.php
diff --git a/functions/page_header.php b/functions/page_header.php

index ff964481c186dfa03ef8461aa219c31adaaac23d..3afdeef122aae02e436b5ca8af13256d383878d8 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -2,30 +2,33 @@
     /**
      **  page_header.php
      **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
      **  Prints the page header (duh)
      **
      **  $Id$
      **/
  
-   if (defined('page_header_php'))
-       return;
-   define('page_header_php', true);
-
     // Always set up the language before calling these functions
  
-   function displayHtmlHeader ($title="SquirrelMail") {
-     global $theme_css;
+   function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
  
-      echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">' .
-           "\n\n<HTML>\n<HEAD>\n";
-      if ($theme_css != '') {
-        echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">\n"; 
-      }
-      
-      do_hook ("generic_header");
+        global $theme_css;
+
+        echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">' .
+             "\n\n<HTML>\n<HEAD>\n";
+
+        if ($theme_css != '') {
+            echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">\n";
+        }
+
+        if( $do_hook ) {
+            do_hook ("generic_header");
+        }
+
+        echo "<title>$title</title>$xtra</head>\n\n";
  
-      echo "<TITLE>$title</TITLE>\n";
-      echo "</HEAD>\n\n";
     }
  
     function displayInternalLink ($path, $text, $target='') {
@@ -45,18 +48,18 @@
  
        /** Here is the header and wrapping table **/
        $shortBoxName = readShortMailboxName($mailbox, $delimiter);
-      echo "<A NAME=pagetop></A>\n";
-      // echo "<table cellpadding=1 cellspacing=1 BGCOLOR=\"$color[4]\" width=100%><tr><td>";
-      echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
-      echo "   <TR BGCOLOR=\"$color[9]\" >\n";
-      echo "      <TD ALIGN=left><b>\n";
+      echo "<A NAME=pagetop></A>\n".
+      // "<table cellpadding=1 cellspacing=1 BGCOLOR=\"$color[4]\" width=100%><tr><td>".
+           "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n".
+           "   <TR BGCOLOR=\"$color[9]\" >\n".
+           "      <TD ALIGN=left><b>\n";
        displayInternalLink ("src/signout.php", _("Sign Out"), "_top");
-      echo "      </b></TD><TD ALIGN=right>\n";
-      echo '         ' . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B>\n";
-      echo "      </TD>\n";
-      echo "   </TR>\n";
-      echo "   <TR BGCOLOR=\"$color[4]\">\n";
-      echo "      <TD ALIGN=left>\n";
+      echo "      </b></TD><TD ALIGN=right>\n".
+           '         ' . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B>\n".
+           "      </TD>\n".
+           "   </TR>\n".
+           "   <TR BGCOLOR=\"$color[4]\">\n".
+           "      <TD ALIGN=left>\n";
        $urlMailbox = urlencode($mailbox);
        displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right");
        echo "&nbsp;&nbsp;\n";
@@ -76,9 +79,10 @@
        echo "      </TD><TD ALIGN=right>\n";
        echo ($hide_sm_attributions ? '&nbsp;' :
              "<A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_blank\">SquirrelMail</A>\n");
-      echo "      </TD>\n";
-      echo "   </TR>\n";
-      echo "</TABLE>\n\n";
+      echo "      </TD>\n".
+           "   </TR>\n".
+           "</TABLE>\n\n";
        // echo "</td></tr></table>";
    }
-?>
+
+?>
+\ No newline at end of file