[Phpgroupware-cvs] CVS: phpgwapi/inc class.portalbox.inc.php,1.20,1.21 class.xmltool.inc.php,1.6,1.7 class.xslttemplates.inc.php,1.8,1.9

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv22925/inc

Modified Files:
        class.portalbox.inc.php class.xmltool.inc.php 
        class.xslttemplates.inc.php 
Log Message:
update xslt

Index: class.portalbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.portalbox.inc.php     25 Oct 2002 16:43:00 -0000      1.20
--- class.portalbox.inc.php     25 Oct 2002 20:34:36 -0000      1.21
***************
*** 99,104 ****
                function start_template($extra = '')
                {
-                       echo 'APPNAME: ' . $this->app_name;
- 
                        if ($extra && $this->app_name)
                        {
--- 99,102 ----

Index: class.xmltool.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xmltool.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.xmltool.inc.php       19 Oct 2002 00:37:23 -0000      1.6
--- class.xmltool.inc.php       25 Oct 2002 20:34:36 -0000      1.7
***************
*** 28,32 ****
                        if ($this->node_type == 'node')
                        {
!                               if($name != '')
                                {
                                        $this->name = $name;
--- 28,32 ----
                        if ($this->node_type == 'node')
                        {
!                               if($name !== '')
                                {
                                        $this->name = $name;
***************
*** 147,151 ****
                        return $this->attributes;
                }
!               
                function add_comment ($comment)
                {
--- 147,151 ----
                        return $this->attributes;
                }
! 
                function add_comment ($comment)
                {
***************
*** 191,195 ****
                                                }
                                        }
!                                       reset($value);  
                                        while (list ($key, $val) = each 
($value))
                                        {
--- 191,195 ----
                                                }
                                        }
!                                       reset($value);
                                        while (list ($key, $val) = each 
($value))
                                        {
***************
*** 212,216 ****
                                                                $subnode = new 
xmltool('node', $nextkey,$this->indentstring);
                                                                
$subnode->set_value($val);
!                                                               
$node->add_node($subnode);                                                      
                                                                break;
                                                        case 'boolean':
--- 212,216 ----
                                                                $subnode = new 
xmltool('node', $nextkey,$this->indentstring);
                                                                
$subnode->set_value($val);
!                                                               
$node->add_node($subnode);
                                                                break;
                                                        case 'boolean':
***************
*** 224,231 ****
                                                                        
$subnode->set_value('0');
                                                                }
!                                                               
$node->add_node($subnode);                                                      
                                                                break;
                                                        case 'array':
!                                                               if($new_index)
                                                                {
                                                                        while 
(list ($subkey, $subval) = each ($val))
--- 224,232 ----
                                                                        
$subnode->set_value('0');
                                                                }
!                                                               
$node->add_node($subnode);
                                                                break;
                                                        case 'array':
!                                                               
list($first_key) = each($val); reset($val);
!                                                               if($new_index 
&& is_int($first_key))
                                                                {
                                                                        while 
(list ($subkey, $subval) = each ($val))
***************
*** 237,241 ****
                                                                {
                                                                        
$subnode = $this->import_var($nextkey, $val);
!                                                                       
$node->add_node($subnode);                                                      
                                                                }
                                                                break;
--- 238,242 ----
                                                                {
                                                                        
$subnode = $this->import_var($nextkey, $val);
!                                                                       
$node->add_node($subnode);
                                                                }
                                                                break;
***************
*** 243,247 ****
                                                                $subnode = new 
xmltool('node', $nextkey,$this->indentstring);
                                                                
$subnode->set_value('PHP_SERIALIZED_OBJECT&:'.serialize($val));
!                                                               
$node->add_node($subnode);                                                      
                                                                break;
                                                        case 'resource':
--- 244,248 ----
                                                                $subnode = new 
xmltool('node', $nextkey,$this->indentstring);
                                                                
$subnode->set_value('PHP_SERIALIZED_OBJECT&:'.serialize($val));
!                                                               
$node->add_node($subnode);
                                                                break;
                                                        case 'resource':
***************
*** 252,255 ****
--- 253,257 ----
                                                                exit;
                                                }
+ 
                                        }
                                        break;
***************
*** 589,591 ****
--- 591,594 ----
                }
        }
+ 
  ?>

Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.xslttemplates.inc.php 25 Oct 2002 16:43:00 -0000      1.8
--- class.xslttemplates.inc.php 25 Oct 2002 20:34:36 -0000      1.9
***************
*** 143,147 ****
                                        }
                                }
!                               _debug_array($this->vars);
                        }
                        else
--- 143,147 ----
                                        }
                                }
!                               //_debug_array($this->vars);
                        }
                        else