Javascript detection no longer requires SquirrelSpell.

[squirrelmail.git] / src / printer_friendly_bottom.php

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 88fdaf90fce5e0dc1255b75a6dfed1b3f2644db5..41c23ce250a1a33a906ec7c27e0c19538c6d3107 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -14,13 +14,17 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/strings.php');
-require_once('../config/config.php');
-require_once('../src/load_prefs.php');
-require_once('../functions/imap.php');
-require_once('../functions/page_header.php');
-require_once('../functions/html.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'include/load_prefs.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/page_header.php');
+require_once(SM_PATH . 'functions/html.php');
 
 $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
 $mailbox = urldecode($mailbox);
@@ -45,7 +49,11 @@ $subject = trim(decodeHeader($rfc822_header->subject));
 $cc = decodeHeader($rfc822_header->getAddr_s('cc'));
 $to = decodeHeader($rfc822_header->getAddr_s('to'));
 
-$ent_ar = $message->findDisplayEntity();
+if ($show_html_default == 1) {
+    $ent_ar = $message->findDisplayEntity(array());
+} else {
+    $ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+}
 $body = '';
 if ($ent_ar[0] != '') {
   for ($i = 0; $i < count($ent_ar); $i++) {