X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=377beacfadbcf4164d37fa5a6edd498fa5c349cd;hp=aff1feb391eef1e8830b06e01c4cf0ce53db2303;hb=0d56053e93791b494820d5d35d0d200ac4451dda;hpb=b116fd78fe16a46736d204d8f81b558e2ea508f7

diff --git a/functions/page_header.php b/functions/page_header.php
index aff1feb3..377beacf 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -70,12 +70,14 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
     $aUserStyles = array();
 
     // 2. Option user-defined stylesheet from preferences.
-    if (!empty($used_theme)) {
+    if (!empty($used_theme) && $used_theme != 'none') {
         /**
-         * All styles just point to a directory, so we need to include all .css
-         * files in that directory. 
+         * All styles (except "none" - ugh) just point to a directory,
+         * so we need to include all .css files in that directory.
          */
-        $styles = list_files($used_theme, '.css');
+//FIXME: rid ourselves of "none" strings!  I didn't do it here because I think the problem is that the theme itself should never be "none" (? well, what else would it be?  if "none" theme is actually OK, then is there a constant to use below in stead of a hard-coded string?)
+        $styles = $used_theme == 'none' ? array()
+                : list_files($used_theme, '.css');
         foreach ($styles as $sheet) { 
             $aUserStyles[] = $used_theme .'/'.$sheet;
         }
@@ -94,6 +96,9 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
         $header_tags .= $oTemplate->fetch_right_to_left_stylesheet_link();
     }
 
+    // 5. Printer friendly stylesheet
+    $header_tags .= create_css_link($base_uri . 'css/print.css', 'printerfriendly', false, 'print');
+
     if ($squirrelmail_language == 'ja_JP') {
         /*
          * force correct detection of charset, when browser does not follow
@@ -103,7 +108,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
          * recommendations and switch to unicode.
          */
         $header_tags .= "<!-- \xfd\xfe -->\n";
-        $header_tags .= '<meta http-equiv="Content-type" content="text/html; charset=euc-jp" />' . "\n";
+        $header_tags .= '<meta http-equiv="Content-type" content="' . $oTemplate->get_content_type() . '; charset=euc-jp" />' . "\n";
     }
     if ($do_hook) {
         // NOTE! plugins here MUST assign output to template 
@@ -115,9 +120,9 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
         //       hooks for the current page request.  See 
         //       the Sent Confirmation v1.7 or Restrict Senders v1.2
         //       plugins for examples of this approach.
-        global $null;
         ob_start();
-        do_hook('generic_header', $null);
+        $temp = array(&$header_tags);
+        do_hook('generic_header', $temp);
         $output = ob_get_contents();
         ob_end_clean();
         // plugin authors can debug their errors with one of the following:
@@ -176,14 +181,6 @@ function makeInternalLink($path, $text, $target='') {
     return create_hyperlink($base_uri . $path, $text, $target);
 }
 
-/**
- * Same as makeInternalLink, but echoes it too
- */
-function displayInternalLink($path, $text, $target='') {
-// FIXME: should let the template echo all these kinds of things
-    echo makeInternalLink($path, $text, $target);
-}
-
 /**
  * Outputs a complete SquirrelMail page header, starting with <!doctype> and
  * including the default menu bar. Uses displayHtmlHeader and takes
@@ -200,7 +197,8 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '')
 
     global $reply_focus, $hide_sm_attributions, $frame_top,
         $provider_name, $provider_uri, $startMessage,
-        $action, $oTemplate, $org_title, $base_uri;
+        $action, $oTemplate, $org_title, $base_uri,
+        $data_dir, $username;
 
 //FIXME: $sBodyTag should be turned into $sOnload and should only contain the contents of the onload attribute (not the attribute name nor any quotes).... only question is if anyone was using $sBodyTag for anything but onload event handlers? (see function compose_Header() below for how to fix it once we confirm it can be changed)
     if (empty($sBodyTagJs)) {
@@ -216,7 +214,6 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '')
         $sBodyTagJs = 'onload="checkForm();"';
     }
 
-    $urlMailbox = urlencode($mailbox);
     $startMessage = (int)$startMessage;
 
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
@@ -243,14 +240,20 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '')
         displayHtmlHeader ($org_title);
         $sBodyTagJs = '';
     }
-    /*
-     * this explains the imap_mailbox.php dependency. We should instead store
-     * the selected mailbox in the session and fallback to the session var.
-     */
-    $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
-                readShortMailboxName($mailbox, $delimiter)));
-    if ( $shortBoxName == 'INBOX' ) {
-        $shortBoxName = _("INBOX");
+    if ($mailbox) {
+        /*
+        * this explains the imap_mailbox.php dependency. We should instead store
+        * the selected mailbox in the session and fallback to the session var.
+        */
+        $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
+                    readShortMailboxName($mailbox, $delimiter)));
+        if (getPref($data_dir, $username, 'translate_special_folders')) {
+            $shortBoxName = _($shortBoxName);
+        }
+        $urlMailbox = urlencode($mailbox);
+    } else {
+        $shortBoxName = '';
+        $urlMailbox = '';
     }
 
     $provider_link = '';