From df8e8ec9eee72743d0f14a8409aacf66c4a80d89 Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Mon, 11 Dec 2006 12:09:34 -0500
Subject: [PATCH] updated da, de_DE, pt_BR, bs_BA, fr, pl, et_EE translations

---
 program/include/rcube_shared.inc |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 11af482..2ac3f3c 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -169,6 +169,9 @@
 
     if (strlen($this->scripts['foot']))
       $__page_footer .= sprintf($this->script_tag, $this->scripts['foot']);
+      
+    if ($this->footer)
+      $__page_footer .= "\n" . $this->footer;
 
     $__page_header .= $this->css->show();
   
@@ -212,11 +215,9 @@
   
     // find and add page footer
     $output_lc = strtolower($output);
-    if(($fpos = strrpos($output_lc, '</body>')) ||
-       ($fpos = strrpos($output_lc, '</html>')))
-      {
-      $output = substr($output,0,$fpos) . "$__page_footer\n" . substr($output,$fpos,strlen($output));
-      }
+    if(($fpos = strrstr($output_lc, '</body>')) ||
+       ($fpos = strrstr($output_lc, '</html>')))
+      $output = substr($output,0,$fpos) . "$__page_footer\n" . substr($output,$fpos);
     else
       $output .= "\n$__page_footer";
   
@@ -1217,8 +1218,12 @@
 // send header with expire date 30 days in future
 function send_future_expire_header()
   {
-  if (!headers_sent())
-    header("Expires: ".gmdate("D, d M Y H:i:s", mktime()+2600000)." GMT");
+  if (headers_sent())
+    return;
+
+  header("Expires: ".gmdate("D, d M Y H:i:s", mktime()+2600000)." GMT");
+  header("Cache-Control: ");
+  header("Pragma: ");
   }
 
 

--
Gitblit v1.9.1