Added the hability to introduce external strings.

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index 637ba7f4924bedbacbd165404b3b3ed96d827da1..6e64f6792fc97ecb92f3e7cb1a6480d376852b12 100644 (file)
--- 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 ) {
@@ -49,11 +49,14 @@ function displayInternalLink($path, $text, $target='') {
 
 function displayPageHeader($color, $mailbox) {
 
-    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF;
+    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top;
 
     displayHtmlHeader ();
 
     $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
+    if (!isset($frame_top)) {
+        $frame_top = '_top';
+    }
 
     /*
         Locate the first displayable form element
@@ -64,33 +67,29 @@ function displayPageHeader($color, $mailbox) {
         $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
         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;
-            }
-            j++;
-        }
-        i++;
-    }
-    if( pos >= 0 ) {
-        document.forms[i-1].elements[pos].focus();
-    }
-    
-}
--->
-</script>
-        ';
+        echo '<script language="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".
+            "// -->\n".
+            "</script>\n";
         $onload = "onLoad=\"checkForm();\"";
         break;   
 
@@ -100,14 +99,21 @@ function checkForm() {
 
     /** 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"