etemplates send its output now for HEAD through the xslt-framework

This commit is contained in:
Ralf Becker 2002-10-26 18:45:37 +00:00
parent 122bddb15f
commit b7dfc2ef9d

View File

@ -110,12 +110,19 @@
{ {
$changes = array(); $changes = array();
} }
if ($this->stable)
{
$hooked = $GLOBALS['phpgw']->template->get_var('phpgw_body'); $hooked = $GLOBALS['phpgw']->template->get_var('phpgw_body');
if (!@$GLOBALS['phpgw_info']['etemplate']['hooked']) if (!@$GLOBALS['phpgw_info']['etemplate']['hooked'])
{ {
$GLOBALS['phpgw']->common->phpgw_header(); $GLOBALS['phpgw']->common->phpgw_header();
} }
}
else
{
$hooked = $GLOBALS['phpgw']->xslttpl->get_var('phpgw');
$hooked = $hooked['body_data'];
}
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'etemplate') if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'etemplate')
{ {
$GLOBALS['phpgw']->translation->add_app('etemplate'); // some extensions have own texts $GLOBALS['phpgw']->translation->add_app('etemplate'); // some extensions have own texts
@ -159,8 +166,7 @@
} }
else else
{ {
$html = str_replace('${','${',$html); // else {} eg.'${test}' -> '$' got removed by template-class $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $html));
$GLOBALS['phpgw']->template->set_var('phpgw_body',$html,True);
} }
} }
@ -199,9 +205,16 @@
if ($GLOBALS['phpgw_info']['etemplate']['loop']) if ($GLOBALS['phpgw_info']['etemplate']['loop'])
{ {
if ($session_data['hooked'] != '') // set previous phpgw_body if we are called as hook if ($session_data['hooked'] != '') // set previous phpgw_body if we are called as hook
{
if ($this->stable)
{ {
$GLOBALS['phpgw']->template->set_var('phpgw_body',$session_data['hooked']); $GLOBALS['phpgw']->template->set_var('phpgw_body',$session_data['hooked']);
} }
else
{
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $session_data['hooked']));
}
}
//echo "<p>process_exec($this->name): <font color=red>loop is set</font>, content=</p>\n"; _debug_array($content); //echo "<p>process_exec($this->name): <font color=red>loop is set</font>, content=</p>\n"; _debug_array($content);
$this->exec($session_data['method'],$session_data['content'],$session_data['sel_options'], $this->exec($session_data['method'],$session_data['content'],$session_data['sel_options'],
$session_data['readonlys'],$session_data['preserv'],$content); $session_data['readonlys'],$session_data['preserv'],$content);