From cead5c727147faac362e742aa7bcecf07f68cd99 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 May 2006 17:24:42 -0400
Subject: [PATCH] Updated CHANGELOG
---
program/include/rcube_shared.inc | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index b622203..fe1a560 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -85,16 +85,20 @@
function set_charset($charset)
{
+ global $MBSTRING;
+
$this->charset = $charset;
+
+ if ($MBSTRING && function_exists("mb_internal_encoding"))
+ {
+ if(!@mb_internal_encoding($charset))
+ $MBSTRING = FALSE;
+ }
}
-
- function encode_string($str)
+ function get_charset()
{
- if ($this->charset=='UTF-8' && function_exists('utf8_encode'))
- return utf8_encode($str);
- else
- return $str;
+ return $this->charset;
}
@@ -104,7 +108,7 @@
// set default page title
if (!strlen($this->title))
- $this->title = 'RoundCube|Mail';
+ $this->title = 'RoundCube Mail';
// replace specialchars in content
$__page_title = rep_specialchars_output($this->title, 'html', 'show', FALSE);
@@ -113,7 +117,10 @@
// include meta tag with charset
if (!empty($this->charset))
- $__page_header = '<meta http-equiv="content-type" content="text/html; charset='.$this->charset.'" />'."\n";;
+ {
+ header('Content-Type: text/html; charset='.$this->charset);
+ $__page_header = '<meta http-equiv="content-type" content="text/html; charset='.$this->charset.'" />'."\n";
+ }
// definition of the code to be placed in the document header and footer
@@ -186,8 +193,9 @@
// correct absolute pathes in images and other tags
$output = preg_replace('/(src|href|background)=(["\']?)(\/[a-z0-9_\-]+)/Ui', "\\1=\\2$base_path\\3", $output);
+ $output = str_replace('$__skin_path', $base_path, $output);
- print $output;
+ print rcube_charset_convert($output, 'UTF-8', $this->charset);
}
@@ -1357,4 +1365,37 @@
}
-?>
\ No newline at end of file
+// create a unix timestamp with a specified offset from now
+function get_offset_time($offset_str, $factor=1)
+ {
+ if (preg_match('/^([0-9]+)\s*([smhdw])/i', $offset_str, $regs))
+ {
+ $amount = (int)$regs[1];
+ $unit = strtolower($regs[2]);
+ }
+ else
+ {
+ $amount = (int)$offset_str;
+ $unit = 's';
+ }
+
+ $ts = mktime();
+ switch ($unit)
+ {
+ case 'w':
+ $amount *= 7;
+ case 'd':
+ $amount *= 24;
+ case 'h':
+ $amount *= 60;
+ case 'h':
+ $amount *= 60;
+ case 's':
+ $ts += $amount * $factor;
+ }
+
+ return $ts;
+ }
+
+
+?>
--
Gitblit v1.9.1