needed page_header.php included for viewing text attachments. It now

includes it only in those special cases, otherwise session_start() will
not get called.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@756 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/download.php b/src/download.php
index d516cf1..91f90cc 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -13,8 +13,6 @@
       include("../config/config.php");
    if (!isset($strings_php))
       include("../functions/strings.php");
       include("../config/config.php");
    if (!isset($strings_php))
       include("../functions/strings.php");

-//   if (!isset($page_header_php))
-//      include("../functions/page_header.php");

    if (!isset($imap_php))
       include("../functions/imap.php");
    if (!isset($mime_php))
    if (!isset($imap_php))
       include("../functions/imap.php");
    if (!isset($mime_php))


@@ -27,6 +25,8 @@
    function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
       global $where, $what, $charset;
       global $startMessage;
    function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
       global $where, $what, $charset;
       global $startMessage;

+
+      

       displayPageHeader($color, "None");
 
       echo "<BR><TABLE WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
       displayPageHeader($color, "None");
 
       echo "<BR><TABLE WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";


@@ -127,10 +127,12 @@
       switch ($type0) {
          case "text":
             $body = decodeBody($body, $header->encoding);
       switch ($type0) {
          case "text":
             $body = decodeBody($body, $header->encoding);

+            include("../functions/page_header.php");

             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          case "message":
             $body = decodeBody($body, $header->encoding);
             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          case "message":
             $body = decodeBody($body, $header->encoding);

+            include("../functions/page_header.php");

             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          default:
             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          default: