[Logicampus-cvs] logicampus/src/logicreate/lib xmlparser.php, 1.6, 1.7

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27125

Modified Files:
	xmlparser.php 
Log Message:
Fix for utf8 data in xml library.


Index: xmlparser.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/xmlparser.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xmlparser.php	26 Sep 2007 16:41:34 -0000	1.6
--- xmlparser.php	5 Oct 2007 19:26:53 -0000	1.7
***************
*** 119,125 ****
  		{	
  			if ($base64_check && @$nAttrs['BASE64']) {
! 				$this->value = utf8_decode(html_entity_decode(base64_decode($nValue))); // i'm not sure i need to do this.. (html_entity_decode())
  			} else {
! 				$this->value = utf8_decode(html_entity_decode($nValue));
  			}
  			
--- 119,125 ----
  		{	
  			if ($base64_check && @$nAttrs['BASE64']) {
! 				$this->value = base64_decode($nValue);
  			} else {
! 				$this->value = $nValue;
  			}
  			
***************
*** 135,139 ****
  		if (is_array($this->attrs))
  		foreach($this->attrs as $key => $val)
! 		{	$attrs[] = $key . '="'. utf8_encode(htmlspecialchars($val)). '"'; // encode this
  		}
  		
--- 135,139 ----
  		if (is_array($this->attrs))
  		foreach($this->attrs as $key => $val)
! 		{	$attrs[] = $key . '="'. htmlspecialchars($val, ENT_QUOTES, 'UTF-8'). '"'; // encode this
  		}