[Phpgroupware-cvs] CVS: etemplate/inc class.soetemplate.inc.php,1.19,1.20 class.xul_io.inc.php,1.15,1.16

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.soetemplate.inc.php class.xul_io.inc.php 
Log Message:
its hard to get a cvs tag in the source, that should not be changed by CVS

Index: class.soetemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.soetemplate.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.soetemplate.inc.php   3 Oct 2002 16:46:18 -0000       1.19
--- class.soetemplate.inc.php   3 Oct 2002 19:53:47 -0000       1.20
***************
*** 597,601 ****
                        }
                        fwrite($f,"<?php\n// eTemplates for Application '$app', 
generated by etemplate.dump() ".date('Y-m-d H:i')."\n\n".
!                               '/* $Id$ */'."\n\n");
  
                        for ($n = 0; $this->db->next_record(); ++$n)
--- 597,601 ----
                        }
                        fwrite($f,"<?php\n// eTemplates for Application '$app', 
generated by etemplate.dump() ".date('Y-m-d H:i')."\n\n".
!                               '/* $'.'Id$ */'."\n\n");
  
                        for ($n = 0; $this->db->next_record(); ++$n)

Index: class.xul_io.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.xul_io.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.xul_io.inc.php        3 Oct 2002 16:48:17 -0000       1.15
--- class.xul_io.inc.php        3 Oct 2002 19:53:47 -0000       1.16
***************
*** 166,172 ****
--- 166,174 ----
                                        list($parent,$child,$child2) = 
explode(',',$type);
                                        $widget = new xmlnode($parent);
+                                       $attr_widget = &$widget;
                                        if ($child)
                                        {
                                                $child = new xmlnode($child);
+                                               $attr_widget = &$child;
                                        }
                                        if ($child2)
***************
*** 186,193 ****
                                        {
                                        case 'nextmatch':
!                                                       $embeded = new 
etemplate($cell['size']);
!                                                       
$this->etempl2grid($embeded,&$root,$embeded_too);
!                                                       unset($embeded);
!                                                       break;
                                        case 'tabbox':
                                                $labels = 
explode('|',$cell['label']);  unset($cell['label']);
--- 188,195 ----
                                        {
                                        case 'nextmatch':
!                                               $embeded = new 
etemplate($cell['size']);
!                                               
$this->etempl2grid($embeded,&$root,$embeded_too);
!                                               unset($embeded);
!                                               break;
                                        case 'tabbox':
                                                $labels = 
explode('|',$cell['label']);  unset($cell['label']);
***************
*** 210,227 ****
                                                break;
                                        case 'menulist':        // id,options 
belongs to the 'menupopup' child
!                                               
$child->set_attribute('id',$cell['name']); unset($cell['name']);
!                                               if (isset($cell['size']) && 
$cell['size'] != '')
                                                {
!                                                       
$child->set_attribute('options',$cell['size']); unset($cell['size']);
                                                }
!                                               if ($cell['type'] != 'select')  
// one of the sub-types
!                                               {
!                                                       
$child->set_attribute('type',$cell['type']);
!                                               }
!                                               break;
                                        case 'listbox':
                                                if ($cell['type'] != 'select')  
// one of the sub-types
                                                {
!                                                       
$widget->set_attribute('type',$cell['type']);
                                                }
                                                break;
--- 212,225 ----
                                                break;
                                        case 'menulist':        // id,options 
belongs to the 'menupopup' child
!                                               if ($cell['span'])
                                                {
!                                                       
$widget->set_attribute('span',$cell['span']);
!                                                       unset($cell['span']);
                                                }
!                                               // fall-trought
                                        case 'listbox':
                                                if ($cell['type'] != 'select')  
// one of the sub-types
                                                {
!                                                       
$attr_widget->set_attribute('type',$cell['type']);
                                                }
                                                break;
***************
*** 241,245 ****
                                                        $attr = 
$this->attr2xul[$attr];
                                                }
!                                               
$this->set_attributes($widget,$attr,$val,&$spanned);
                                        }
                                        if ($child)
--- 239,243 ----
                                                        $attr = 
$this->attr2xul[$attr];
                                                }
!                                               
$this->set_attributes($attr_widget,$attr,$val,&$spanned);
                                        }
                                        if ($child)
***************
*** 276,280 ****
                        }
                        $doc = new xmldoc();
!                       $doc->add_comment('$Id$');
  
                        $xul_overlay = new xmlnode('overlay');
--- 274,278 ----
                        }
                        $doc = new xmldoc();
!                       $doc->add_comment('$'.'Id$');
  
                        $xul_overlay = new xmlnode('overlay');