extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

its hard to get a cvs tag in the source, that should not be changed by CVS

Browse Source
This commit is contained in:
Ralf Becker 2002-10-03 19:53:47 +00:00
parent 07bec1fa34
commit 3d9887ad01
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/inc/class.soetemplate.inc.php
View File

@ -596,7 +596,7 @@
return 0;
}
fwrite($f,"<?php\n// eTemplates for Application '$app', generated by etemplate.dump() ".date('Y-m-d H:i')."\n\n".
'/* $Id$ */'."\n\n");
'/* $'.'Id$ */'."\n\n");
for ($n = 0; $this->db->next_record(); ++$n)
{

28
etemplate/inc/class.xul_io.inc.php
View File

@ -165,9 +165,11 @@
$type = isset($widgetattr2xul['.name']) ? $widgetattr2xul['.name'] : $type;
list($parent,$child,$child2) = explode(',',$type);
$widget = new xmlnode($parent);
$attr_widget = &$widget;
if ($child)
{
$child = new xmlnode($child);
$attr_widget = &$child;
}
if ($child2)
{
@ -185,10 +187,10 @@
switch ($parent)
{
case 'nextmatch':
$embeded = new etemplate($cell['size']);
$this->etempl2grid($embeded,&$root,$embeded_too);
unset($embeded);
break;
$embeded = new etemplate($cell['size']);
$this->etempl2grid($embeded,&$root,$embeded_too);
unset($embeded);
break;
case 'tabbox':
$labels = explode('|',$cell['label']); unset($cell['label']);
$helps = explode('|',$cell['help']); unset($cell['help']);
@ -209,20 +211,16 @@
}
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'] != '')
if ($cell['span'])
{
$child->set_attribute('options',$cell['size']); unset($cell['size']);
$widget->set_attribute('span',$cell['span']);
unset($cell['span']);
}
if ($cell['type'] != 'select') // one of the sub-types
{
$child->set_attribute('type',$cell['type']);
}
break;
// fall-trought
case 'listbox':
if ($cell['type'] != 'select') // one of the sub-types
{
$widget->set_attribute('type',$cell['type']);
$attr_widget->set_attribute('type',$cell['type']);
}
break;
}
@ -240,7 +238,7 @@
{
$attr = $this->attr2xul[$attr];
}
$this->set_attributes($widget,$attr,$val,&$spanned);
$this->set_attributes($attr_widget,$attr,$val,&$spanned);
}
if ($child)
{
@ -275,7 +273,7 @@
echo "<p>etempl->data = "; _debug_array($etempl->data);
}
$doc = new xmldoc();
$doc->add_comment('$Id$');
$doc->add_comment('$'.'Id$');
$xul_overlay = new xmlnode('overlay');