From 2ca2bec39ac3e2b7971335507ee0063a367702f6 Mon Sep 17 00:00:00 2001 From: Alexis Lahouze Date: Sun, 5 Jun 2011 08:15:32 +0000 Subject: [PATCH] Merged changeset 3036 from branch stable 1.0 to trunk. --- bureau/admin/head.php | 2 +- bureau/admin/index.php | 5 ++++- bureau/admin/mem_logout.php | 5 ++++- bureau/class/lang_env.php | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bureau/admin/head.php b/bureau/admin/head.php index 1a1a137a..ee9a3b2f 100644 --- a/bureau/admin/head.php +++ b/bureau/admin/head.php @@ -27,7 +27,7 @@ Purpose of file: Main header of all html files ---------------------------------------------------------------------- */ -if (!$charset) $charset="iso-8859-1"; +if (!$charset) $charset="UTF-8"; @header("Content-Type: text/html; charset=$charset"); ?> diff --git a/bureau/admin/index.php b/bureau/admin/index.php index 43bf36eb..be20b331 100644 --- a/bureau/admin/index.php +++ b/bureau/admin/index.php @@ -41,6 +41,9 @@ $H=getenv("HTTP_HOST"); if (!isset($restrictip)) { $restrictip=1; } +if (!$charset) $charset="UTF-8"; +@header("Content-Type: text/html; charset=$charset"); + ?> @@ -48,7 +51,7 @@ if (!isset($restrictip)) { AlternC Desktop - + diff --git a/bureau/admin/mem_logout.php b/bureau/admin/mem_logout.php index afedcb86..d8884e60 100644 --- a/bureau/admin/mem_logout.php +++ b/bureau/admin/mem_logout.php @@ -31,13 +31,16 @@ require_once("../class/config.php"); $mem->del_session(); +if (!$charset) $charset="UTF-8"; +@header("Content-Type: text/html; charset=$charset"); + ?> <?php __("Disconnected"); ?> - +

diff --git a/bureau/class/lang_env.php b/bureau/class/lang_env.php index 17b33412..10b4c243 100644 --- a/bureau/class/lang_env.php +++ b/bureau/class/lang_env.php @@ -69,5 +69,7 @@ textdomain("alternc"); if (_("") && preg_match("#charset=([A-Za-z0-9\.-]*)#",_(""),$mat)) { $charset=$mat[1]; } +if (!$charset) $charset="UTF-8"; +bind_textdomain_codeset("alternc","$charset"); ?>