[Phpgroupware-cvs] CVS: etemplate/inc class.xul_io.inc.php,1.16,1.17

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv18559

Modified Files:
        class.xul_io.inc.php 
Log Message:
fixed 'cannot redifine var2xml', which ocurs if xslt already loaded xmltools
added name of base-tpl to contructor-call for embeded templates

Index: class.xul_io.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.xul_io.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.xul_io.inc.php        3 Oct 2002 19:53:47 -0000       1.16
--- class.xul_io.inc.php        3 Oct 2002 23:46:28 -0000       1.17
***************
*** 14,17 ****
--- 14,29 ----
  
  
+       if (!function_exists('var2xml'))
+       {
+               if (file_exists(PHPGW_API_INC.'class.xmltool.inc.php'))
+               {
+                       include_once(PHPGW_API_INC.'class.xmltool.inc.php');
+               }
+               else
+               {
+                       include_once('class.xmltool.inc.php');
+               }
+       }
+ 
        class xul_io
        {
***************
*** 22,27 ****
                function xul_io()
                {
-          $this->xmltool = CreateObject('etemplate.xmltool');
- 
           $this->attr2xul = array(     // how to translate attr, common to all 
widgets
                                'name' => 'id',
--- 34,37 ----
***************
*** 154,158 ****
                                        if ($type == 'template' && 
$cell['name'][0] != '@' && $embeded_too)
                                        {
!                                               $embeded = new 
etemplate($cell['name']);
                                                
$this->etempl2grid($embeded,&$root,$embeded_too);
                                                unset($embeded);
--- 164,168 ----
                                        if ($type == 'template' && 
$cell['name'][0] != '@' && $embeded_too)
                                        {
!                                               $embeded = new 
etemplate($cell['name'],$etempl->as_array());
                                                
$this->etempl2grid($embeded,&$root,$embeded_too);
                                                unset($embeded);
***************
*** 498,501 ****
--- 508,515 ----
                                                
$etempl->data[$etempl->rows][$etempl->num2chrs($col++)] = $attr;
  
+                                               if ($attr['type'] == 'template' 
&& !empty($attr['name']) && $attr['name'][0] != '@')
+                                               {
+                                                       
$etempl->data[$etempl->rows][$etempl->num2chrs($col++)]['obj'] = new 
etemplate($attr['name']);
+                                               }
                                                while (--$spanned > 0)
                                                {