[Phpfreechat-svn] SF.net SVN: phpfreechat: [682] trunk/demo

[<ke...@us...>]

Revision: 682
Author:   kerphi
Date:     2006-08-18 15:09:53 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=682&view=rev

Log Message:
-----------
Bug fix: the nickname encoding was not correctly converted according to the output_encoding parameter (cf demo8).

Modified Paths:
--------------
    trunk/demo/demo8_with_a_iso-8859-1_encoded_page.php
    trunk/src/client/chat.js.tpl.php
Modified: trunk/demo/demo8_with_a_iso-8859-1_encoded_page.php
===================================================================
--- trunk/demo/demo8_with_a_iso-8859-1_encoded_page.php	2006-08-18 21:58:42 UTC (rev 681)
+++ trunk/demo/demo8_with_a_iso-8859-1_encoded_page.php	2006-08-18 22:09:53 UTC (rev 682)
@@ -1,5 +1,8 @@
 <?php
 
+// force the encoding because off some strange configured server
+header("Content-Type: text/html; charset=ISO-8859-1");
+
 require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
 
 $params["serverid"]        = md5(__FILE__); // calculate a unique id for this chat

Modified: trunk/src/client/chat.js.tpl.php
===================================================================
--- trunk/src/client/chat.js.tpl.php	2006-08-18 21:58:42 UTC (rev 681)
+++ trunk/src/client/chat.js.tpl.php	2006-08-18 22:09:53 UTC (rev 682)
@@ -1,5 +1,5 @@
 var pfc_version               = '<?php echo $version; ?>';
-var pfc_nickname              = '<?php echo addslashes($u->nick); ?>';
+var pfc_nickname              = '<?php echo ($GLOBALS["output_encoding"]=="UTF-8" ? addslashes($u->nick) : iconv("UTF-8", $GLOBALS["output_encoding"],addslashes($u->nick))); ?>';
 var pfc_clientid              = '<?php echo md5(uniqid(rand(), true)); ?>';
 var pfc_title                 = '<?php echo addslashes($title); ?>';
 var pfc_refresh_delay         = <?php echo $refresh_delay; ?>;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.