[Phpgroupware-cvs] phpgwapi/inc class.xmltool.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/02/20 13:59:14

Modified files:
        inc            : class.xmltool.inc.php 

Log message:
        fix links in xslt templates, while being w3c compliant

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.xmltool.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.xmltool.inc.php
diff -u phpgwapi/inc/class.xmltool.inc.php:1.12 
phpgwapi/inc/class.xmltool.inc.php:1.13
--- phpgwapi/inc/class.xmltool.inc.php:1.12     Fri Nov 11 23:23:23 2005
+++ phpgwapi/inc/class.xmltool.inc.php  Mon Feb 20 13:59:14 2006
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage xml
-       * @version $Id: class.xmltool.inc.php,v 1.12 2005/11/11 23:23:23 ceb 
Exp $
+       * @version $Id: class.xmltool.inc.php,v 1.13 2006/02/20 13:59:14 
skwashd Exp $
        */
 
        /**
@@ -502,10 +502,9 @@
                                }
 
                                $result = $indentstring.'<'.$this->name;
-                               if(count($this->attributes) > 0 )
+                               if( is_array($this->attributes) && 
count($this->attributes) > 0 )
                                {
-                                       reset($this->attributes);
-                                       while(list($key,$val) = each 
($this->attributes))
+                                       foreach ( $this->attributes as $key => 
$val )
                                        {
                                                $result .= ' 
'.$key.'="'.htmlspecialchars($val).'"';
                                        }
@@ -541,6 +540,8 @@
                                                        }
                                                        else
                                                        {
+                                                               //TODO Work out 
how to solve this properly - this is done this way to stop W3C compliant links 
breaking
+                                                               $this->data = 
html_entity_decode($this->data);
                                                                $result .= 
htmlspecialchars($this->data);
                                                                $endtag_indent 
= '';
                                                        }