update xslt

This commit is contained in:
ceb 2002-10-25 20:34:36 +00:00
parent 6d2a19632f
commit 24aa900898
4 changed files with 13 additions and 11 deletions

View File

@ -98,8 +98,6 @@
function start_template($extra = '') function start_template($extra = '')
{ {
echo 'APPNAME: ' . $this->app_name;
if ($extra && $this->app_name) if ($extra && $this->app_name)
{ {
$GLOBALS['phpgw']->xslttpl->add_file(array('portal',$GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default') . SEP . 'extrabox')); $GLOBALS['phpgw']->xslttpl->add_file(array('portal',$GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default') . SEP . 'extrabox'));

View File

@ -27,7 +27,7 @@
$this->indentstring = $indentstring; $this->indentstring = $indentstring;
if ($this->node_type == 'node') if ($this->node_type == 'node')
{ {
if($name != '') if($name !== '')
{ {
$this->name = $name; $this->name = $name;
} }
@ -226,7 +226,8 @@
$node->add_node($subnode); $node->add_node($subnode);
break; break;
case 'array': case 'array':
if($new_index) list($first_key) = each($val); reset($val);
if($new_index && is_int($first_key))
{ {
while (list ($subkey, $subval) = each ($val)) while (list ($subkey, $subval) = each ($val))
{ {
@ -251,6 +252,7 @@
echo 'Halt: Invalid or unknown data type<br>'; echo 'Halt: Invalid or unknown data type<br>';
exit; exit;
} }
} }
break; break;
case 'object': case 'object':
@ -588,4 +590,5 @@
return $this->add_node($root_node); return $this->add_node($root_node);
} }
} }
?> ?>

View File

@ -142,7 +142,7 @@
$this->vars[$name][$key] = $val; $this->vars[$name][$key] = $val;
} }
} }
_debug_array($this->vars); //_debug_array($this->vars);
} }
else else
{ {

View File

@ -102,6 +102,7 @@
<td width="33%" class="info"><xsl:value-of select="user_info_name"/></td> <td width="33%" class="info"><xsl:value-of select="user_info_name"/></td>
<xsl:choose> <xsl:choose>
<xsl:when test="current_users"> <xsl:when test="current_users">
<xsl:variable name="url_current_users"><xsl:value-of select="url_current_users"/></xsl:variable>
<td width="33%" class="info"><a href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td> <td width="33%" class="info"><a href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>