From 515547081d52328045a174ded166ef2c3cbf55f5 Mon Sep 17 00:00:00 2001
From: jervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 7 Feb 2008 11:29:57 +0000
Subject: [PATCH 1/1] Reinserting support for the "iframe_height" option. This
 might be done in a better way - if so, please do it.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12923 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mime.php                     | 1 +
 templates/default/css/default.css      | 1 -
 templates/default/read_html_iframe.tpl | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions/mime.php b/functions/mime.php
index ee66d81e..c151ecf6 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -421,6 +421,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
 
                 global $oTemplate;
                 $oTemplate->assign('iframe_url', $iframeurl);
+                $oTemplate->assign('iframe_height', $iframe_height);
                 $oTemplate->assign('html_body', $html_body);
 
                 $body = $oTemplate->fetch('read_html_iframe.tpl');
diff --git a/templates/default/css/default.css b/templates/default/css/default.css
index c01045b2..44fb5dc8 100644
--- a/templates/default/css/default.css
+++ b/templates/default/css/default.css
@@ -1068,7 +1068,6 @@ div.htmlIframe {
 }
 
 div.htmlIframe iframe {
-    height: 250px;
     width:100%;
 }
 
diff --git a/templates/default/read_html_iframe.tpl b/templates/default/read_html_iframe.tpl
index b673b446..addeea93 100644
--- a/templates/default/read_html_iframe.tpl
+++ b/templates/default/read_html_iframe.tpl
@@ -24,7 +24,7 @@ extract($t);
 ?>
 <div class="htmlIframe">
 <?php echo _("Viewing HTML formatted email"); ?>
-<iframe name="message_frame" src="<?php echo $iframe_url; ?>" frameborder="1" marginwidth="0" marginheight="0" scrolling="auto">
+<iframe name="message_frame" src="<?php echo $iframe_url; ?>" frameborder="1" marginwidth="0" marginheight="0" scrolling="auto" height="<?php echo $iframe_height; ?>">
 <?php echo $html_body; ?>
 </iframe>
 </div>
\ No newline at end of file
-- 
2.25.1