Claus Jensen & Kent B. Hansen

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index c1131462ab0e6c7064e4d641cdc111a591431bad..e48bf2a0a8e26b65f99a3d9255f1a34a12567575 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,10 +11,10 @@
  * $Id$
  */
 
-require_once('../functions/strings.php');
-require_once('../functions/imap_utf7_decode_local.php');
-require_once('../functions/html.php');
-//require_once('../functions/imap_mailbox.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/imap_mailbox.php');
+
 /* Always set up the language before calling these functions */
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
 
@@ -89,7 +89,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                      '    var newwin = window.open(comp_uri' .
                      ', "_blank",'.
                      '"width='.$compose_width. ',height='.$compose_height.
-                     '",scrollbars="yes",resizable="yes");'."\n".
+                     ',scrollbars=yes,resizable=yes");'."\n".
                      "}\n\n";
 
 
@@ -172,11 +172,10 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                      '    var newwin = window.open(comp_uri' .
                      ', "_blank",'.
                      '"width='.$compose_width. ',height='.$compose_height.
-                     '",scrollbars="yes",resizable="yes");'."\n".
+                     ',scrollbars=yes,resizable=yes");'."\n".
                      "}\n\n";
 
             }
-       $js .= $xtra;    
         $js .= "// -->\n". "</script>\n";
        
 
@@ -236,7 +235,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
             '<a href="http://www.squirrelmail.org/" target="_blank">SquirrelMail</a>');
     echo "</td>\n".
         "   </tr>\n".
-        "</table>\n\n";
+        "</table><br>\n\n";
 }
 
 /* blatently copied/truncated/modified from the above function */