X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=1673fac147b0d37a9949eb915e0eaf4e94d6cc39;hb=4cb1746c0df09e049ec1a79dcf76b181eb82595c;hp=637ba7f4924bedbacbd165404b3b3ed96d827da1;hpb=43fdb2a474b990b8b7db21bfb05b30a70ac768a0;p=squirrelmail.git

diff --git a/functions/page_header.php b/functions/page_header.php
index 637ba7f4..1673fac1 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,7 +11,7 @@
  * $Id$
  */
 
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
 // Always set up the language before calling these functions
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
@@ -30,10 +30,6 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
              $base_uri . "themes/css/$custom_css\">\n";
     }
     
-    if( $do_hook ) {
-        do_hook ("generic_header");
-    }
-    
     echo "<title>$title</title>$xtra</head>\n\n";
 }
 
@@ -47,13 +43,14 @@ function displayInternalLink($path, $text, $target='') {
     echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
 }
 
-function displayPageHeader($color, $mailbox) {
-
-    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF;
+function displayPageHeader($color, $mailbox, $xtra='') {
 
-    displayHtmlHeader ();
+    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win, $username, $datadir;
 
     $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
+    if (!isset($frame_top)) {
+        $frame_top = '_top';
+    }
 
     /*
         Locate the first displayable form element
@@ -62,58 +59,85 @@ function displayPageHeader($color, $mailbox) {
     case 'src/search.php':
         $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
         $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+        displayHtmlHeader ();
         break;
     default:
-        echo '
-<script language="JavaScript">
-<!--
-function checkForm() {
-
-    var f = document.forms.length;
-    var i = 0;
-    var pos = -1;
-    while( pos == -1 && i < f ) {
-        var e = document.forms[i].elements.length;
-        var j = 0;
-        while( pos == -1 && j < e ) {
-            if ( document.forms[i].elements[j].type == \'text\' ) {
-                pos = j;
+        $js = '<script language="JavaScript" type="text/javascript">' .
+             "\n<!--\n" .
+             "function checkForm() {\n".
+                "var f = document.forms.length;\n".
+                "var i = 0;\n".
+                "var pos = -1;\n".
+                "while( pos == -1 && i < f ) {\n".
+                    "var e = document.forms[i].elements.length;\n".
+                    "var j = 0;\n".
+                    "while( pos == -1 && j < e ) {\n".
+                        "if ( document.forms[i].elements[j].type == 'text' ) {\n".
+                            "pos = j;\n".
+                        "}\n".
+                        "j++;\n".
+                    "}\n".
+                "i++;\n".
+                "}\n".
+                "if( pos >= 0 ) {\n".
+                    "document.forms[i-1].elements[pos].focus();\n".
+                "}\n".
+		"$xtra\n".
+            "}\n";
+            if ($compose_new_win == '1') {
+                $width= getPref($username, $datadir, 'editor_size', 76);
+                if ($width < 65) {
+                    $pix_width = 560;
+                }
+                else {
+                    $width = (.9*$width);
+                    $pix_width = intval($width).'0';
+                }
+                $js .= "function comp_in_new() {\n".
+                     "    var newwin = window.open(\"".$base_uri."src/compose.php\"".
+                     ", \"compose_window\", \"width=".$pix_width.",height=650".
+                     ",scrollbars=yes,resizable=yes\");\n".
+                     "}\n";
             }
-            j++;
-        }
-        i++;
-    }
-    if( pos >= 0 ) {
-        document.forms[i-1].elements[pos].focus();
-    }
-    
-}
--->
-</script>
-        ';
+        $js .= "// -->\n".
+        	 "</script>\n";
         $onload = "onLoad=\"checkForm();\"";
+        displayHtmlHeader ('Squirrelmail', $js);
         break;   
 
     }
 
-    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" $onload>\n\n";
 
+    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" $onload>\n\n";
     /** Here is the header and wrapping table **/
     $shortBoxName = readShortMailboxName($mailbox, $delimiter);
+    if ( $shortBoxName == 'INBOX' ) {
+        $shortBoxName = _("INBOX");
+    }
     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=left>\n";
+    if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) {
+        echo '         ' . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B>\n";
+    } else {
+        echo '&nbsp;';
+    }
+    echo  "      </TD>\n"
         . "      <TD ALIGN=right><b>\n";
-    displayInternalLink ('src/signout.php', _("Sign Out"), '_top');
+    displayInternalLink ('src/signout.php', _("Sign Out"), $frame_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');
+    if ($compose_new_win == '1') {
+        echo "<a href=$base_uri". "src/compose.php?mailbox=$urlMailbox target=".
+             '"compose_window" onClick="comp_in_new()">'. _("Compose"). '</a>';
+    }
+    else {
+        displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
+    } 
     echo "&nbsp;&nbsp;\n";
     displayInternalLink ("src/addressbook.php", _("Addresses"), 'right');
     echo "&nbsp;&nbsp;\n";
@@ -136,4 +160,56 @@ function checkForm() {
         "</TABLE>\n\n";
 }
 
+/* blatently copied/truncated/modified from the above function */
+function compose_Header($color, $mailbox) {
+
+    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win;
+
+
+    $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
+    if (!isset($frame_top)) {
+        $frame_top = '_top';
+    }
+
+    /*
+        Locate the first displayable form element
+    */
+    switch ( $module ) {
+    case 'src/search.php':
+        $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
+        $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+        displayHtmlHeader (_("Compose"));
+        break;
+    default:
+        $js = '<script language="JavaScript" type="text/javascript">' .
+             "\n<!--\n" .
+             "function checkForm() {\n".
+                "var f = document.forms.length;\n".
+                "var i = 0;\n".
+                "var pos = -1;\n".
+                "while( pos == -1 && i < f ) {\n".
+                    "var e = document.forms[i].elements.length;\n".
+                    "var j = 0;\n".
+                    "while( pos == -1 && j < e ) {\n".
+                        "if ( document.forms[i].elements[j].type == 'text' ) {\n".
+                            "pos = j;\n".
+                        "}\n".
+                        "j++;\n".
+                    "}\n".
+                "i++;\n".
+                "}\n".
+                "if( pos >= 0 ) {\n".
+                    "document.forms[i-1].elements[pos].focus();\n".
+                "}\n".
+            "}\n";
+        $js .= "// -->\n".
+        	 "</script>\n";
+        $onload = "onLoad=\"checkForm();\"";
+        displayHtmlHeader (_("Compose"), $js);
+        break;   
+
+    }
+
+    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" $onload>\n\n";
+}
 ?>