From d0b973cf6aed4a7cb705f706624d25b31d19ed52 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 18 Sep 2008 07:54:14 -0400
Subject: [PATCH] Bind cookie gotten over HTTPS to HTTPS only (#1485336).
---
program/lib/utf8.class.php | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php
index adcf31b..e2d1059 100644
--- a/program/lib/utf8.class.php
+++ b/program/lib/utf8.class.php
@@ -50,7 +50,15 @@
"ISO-8859-1" => UTF8_MAP_DIR . "/ISO-8859-1.map",
"ISO-8859-2" => UTF8_MAP_DIR . "/ISO-8859-2.map",
"ISO-8859-3" => UTF8_MAP_DIR . "/ISO-8859-3.map",
- "ISO-8859-4" => UTF8_MAP_DIR . "/ISO-8859-4.map");
+ "ISO-8859-4" => UTF8_MAP_DIR . "/ISO-8859-4.map",
+ "ISO-8859-5" => UTF8_MAP_DIR . "/ISO-8859-5.map",
+ "ISO-8859-6" => UTF8_MAP_DIR . "/ISO-8859-6.map",
+ "ISO-8859-7" => UTF8_MAP_DIR . "/ISO-8859-7.map",
+ "ISO-8859-8" => UTF8_MAP_DIR . "/ISO-8859-8.map",
+ "ISO-8859-9" => UTF8_MAP_DIR . "/ISO-8859-9.map",
+ "KOI8-R" => UTF8_MAP_DIR . "/KOI8R.map",
+ "KOI8R" => UTF8_MAP_DIR . "/KOI8R.map"
+ );
//Error constants
define("ERR_OPEN_MAP_FILE","ERR_OPEN_MAP_FILE");
@@ -58,24 +66,18 @@
//Class definition
Class utf8{
- var $charset = CP1250;
+ var $charset = "ISO-8859-1";
var $ascMap = array();
var $utfMap = array();
-
- // made PHP5 capable by RoundCube
+
function __construct($charset="ISO-8859-1"){
$this->loadCharset($charset);
}
- //Constructor
- function utf8($charset="ISO-8859-1"){
- $this->__construct($charset);
- }
-
//Load charset
function loadCharset($charset){
global $utf8_maps;
-
+
if (!is_file($utf8_maps[$charset]))
{
$this->onError(ERR_OPEN_MAP_FILE, "Failed to open map file for $charset");
@@ -170,4 +172,5 @@
}
}
-?>
+
+?>
\ No newline at end of file
--
Gitblit v1.9.1