From a6b67b0a7874141223a7c5f635a48040e53bcc3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Fri, 23 Sep 2011 01:03:06 +0200 Subject: [PATCH] masterserver: Expect utf-8 from the clients (#621) Theoretically, we could use the charset information that's exchanged to do the right conversions, but everything simply uses utf-8 so that would be pointless. --- masterserver/web/index.php | 11 +++++------ masterserver/web/server/include/C4Network.php | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/masterserver/web/index.php b/masterserver/web/index.php index 658a5f1c3..178dbbda6 100644 --- a/masterserver/web/index.php +++ b/masterserver/web/index.php @@ -14,14 +14,13 @@ header('Content-Type: text/html; charset=utf-8'); //utf-8 require_once('frontend.php'); ?> - + OpenClonk Masterserver - - - - + + + @@ -44,4 +43,4 @@ require_once('frontend.php'); - \ No newline at end of file + diff --git a/masterserver/web/server/include/C4Network.php b/masterserver/web/server/include/C4Network.php index 009290824..077673904 100644 --- a/masterserver/web/server/include/C4Network.php +++ b/masterserver/web/server/include/C4Network.php @@ -73,7 +73,7 @@ abstract class C4Network { public static function decodeEntitiyString($string) { $num = ereg_replace("[^0-9]", "", $string); $num = octdec($num); - return iconv('Windows-1252', 'UTF-8', chr($num)); + return chr($num); } } -?> \ No newline at end of file +?>