From 7a5c48e7f70b8bc938fcae3ffd2be0fdbeaab145 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 13 Dec 2006 02:17:24 -0500
Subject: [PATCH] Changed 'junk' label in French localization
---
program/include/rcube_shared.inc | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 7f3771b..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,12 +215,9 @@
// find and add page footer
$output_lc = strtolower($output);
- if(($fpos = strrpos($output_lc, '</body>')) ||
- ($fpos = strrpos($output_lc, '</html>')))
- {
- $fpos -= 8;
+ 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";
@@ -1218,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