X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=c3d9a66643b51ef15f26752b1e7f0119eb7b2859;hb=70c5cd5304754bde55f6341d090a9b321f20c92e;hp=f6ab137fc41a9fb016b5b305c0b6f079f6522592;hpb=692155b7fd835420fda759bff62c0f34f6b1d583;p=squirrelmail.git

diff --git a/functions/page_header.php b/functions/page_header.php
index f6ab137f..c3d9a666 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -1,19 +1,35 @@
 <?php
-   /**
-    **  page_header.php
-    **
-    **  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', $xtra = '', $do_hook = TRUE ) {
+/**
+ * page_header.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Prints the page header (duh)
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the first line of the function definition below.     ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+// Always set up the language before calling these functions
+function displayHtmlHeader
+    ($title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
 
         global $theme_css;
 
@@ -37,7 +53,7 @@
 
       if ($target != '')
          $target = " target=\"$target\"";
-      
+
       echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
    }
 
@@ -49,18 +65,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";
-      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 "<A NAME=pagetop></A>\n"
+         . "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n"
+         . "   <TR BGCOLOR=\"$color[9]\" >\n"
+         . "      <TD ALIGN=left>\n"
+         . '         ' . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B>\n"
+         . "      </TD>\n"
+         . "      <TD ALIGN=right><b>\n";
+      displayInternalLink ('src/signout.php', _("Sign Out"), '_top');
+      echo "      </b></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";
@@ -80,9 +96,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>";
   }
+
 ?>