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 7444fdce4472b950bdb080aa4eeba5c42eea5745..a5f3294bab0ace4d4f8dab02055a5a7a81be86d1 100644 (file)
--- 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 a4d3bed5b98e083ff5d36fea2a7669bc01732b32..ce356ba98af980076a6055a6ebe74d70d86795e0 100644 (file)
--- 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 a2bc1c2e670d2454e360ec9c7ab06614331ad0ba..6cd6c482250c1a1b09072cc8add58e1cc5259caf 100644 (file)
--- 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 5ccad0d55019243e4bf565fcafef66bde55e1978..5cb2a2ac98b8a6de629adf98d08cb9e0220d0334 100644 (file)
--- 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 8f0cb02eb46d8cd33c948116a782dcc9a2c355ef..9d201050320bcdab72a71d806098b6a0aec08f8d 100644 (file)
--- 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 845c5cc7690ec41fa6c583113eae80dd7af85675..2fb304ab7d3c2763155b1b9ece1a4a932ba0ec7c 100644 (file)
--- 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>";