From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 7 Jan 2007 15:44:12 +0000 (+0000)
Subject: frameset pages must not use standard footer because it contains "</body>",
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c2b22517f2ec05844f94fca31effe6773da02b5b;p=squirrelmail.git

frameset pages must not use standard footer because it contains "</body>",
just need closing </html> tag


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

diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php
index 7444fdce..a5f3294b 100644
--- a/src/addrbook_popup.php
+++ b/src/addrbook_popup.php
@@ -21,5 +21,4 @@ displayHtmlHeader($org_title .': '. _("Addresses"), '', false, true);
 
 $oTemplate->display('addressbook_popup.tpl');
 
-$oTemplate->display('footer.tpl');
 
diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index a4d3bed5..ce356ba9 100644
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -40,5 +40,4 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) ||
 
     $oTemplate->display('printer_friendly_main.tpl');
 
-    $oTemplate->display('footer.tpl');
 }
diff --git a/src/webmail.php b/src/webmail.php
index a2bc1c2e..6cd6c482 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -119,4 +119,3 @@ displayHtmlHeader($org_title, '', false, true);
 
 $oTemplate->display('webmail.tpl');
 
-$oTemplate->display('footer.tpl');
diff --git a/templates/default/addressbook_popup.tpl b/templates/default/addressbook_popup.tpl
index 5ccad0d5..5cb2a2ac 100644
--- a/templates/default/addressbook_popup.tpl
+++ b/templates/default/addressbook_popup.tpl
@@ -30,4 +30,7 @@ extract($t);
            marginwidth="0"
            border="0"
            src="addrbook_search.php?show=blank" />
-</frameset>
\ No newline at end of file
+</frameset>
+
+</html>
+
diff --git a/templates/default/printer_friendly_main.tpl b/templates/default/printer_friendly_main.tpl
index 8f0cb02e..9d201050 100644
--- a/templates/default/printer_friendly_main.tpl
+++ b/templates/default/printer_friendly_main.tpl
@@ -25,4 +25,5 @@ extract($t);
 <frameset rows="60, *">
  <frame src="printer_friendly_top.php" name="top_frame" scrolling="no" noresize="noresize" frameborder="0" />
  <frame src="<?php echo $printer_friendly_url; ?>" name="bottom_frame" frameborder="0" />
-</frameset>
\ No newline at end of file
+</frameset>
+</html>
diff --git a/templates/default/webmail.tpl b/templates/default/webmail.tpl
index 845c5cc7..2fb304ab 100644
--- a/templates/default/webmail.tpl
+++ b/templates/default/webmail.tpl
@@ -39,4 +39,4 @@ if ($nav_on_left) {
     $output .= $right_frame . $left_frame;
 }
 
-echo $output ."\n</frameset>";
+echo $output ."\n</frameset>\n</html>";