[Phpgroupware-cvs] CVS: etemplate/inc class.uietemplate.inc.php,1.50,1.51

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.uietemplate.inc.php 
Log Message:
etemplates send its output now for HEAD through the xslt-framework


Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** class.uietemplate.inc.php   20 Oct 2002 15:02:20 -0000      1.50
--- class.uietemplate.inc.php   26 Oct 2002 18:45:37 -0000      1.51
***************
*** 111,119 ****
                                $changes = array();
                        }
!                       $hooked = 
$GLOBALS['phpgw']->template->get_var('phpgw_body');
!                       
!                       if (address@hidden'phpgw_info']['etemplate']['hooked'])
                        {
!                               $GLOBALS['phpgw']->common->phpgw_header();
                        }
                        if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 
'etemplate')
--- 111,126 ----
                                $changes = array();
                        }
!                       if ($this->stable)
!                       {
!                               $hooked = 
$GLOBALS['phpgw']->template->get_var('phpgw_body');
!                               if 
(address@hidden'phpgw_info']['etemplate']['hooked'])
!                               {
!                                       
$GLOBALS['phpgw']->common->phpgw_header();
!                               }
!                       }
!                       else
                        {
!                               $hooked = 
$GLOBALS['phpgw']->xslttpl->get_var('phpgw');
!                               $hooked = $hooked['body_data'];
                        }
                        if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 
'etemplate')
***************
*** 160,165 ****
                        else
                        {
!                               $html = str_replace('${','${',$html);      
// else {} eg.'${test}' -> '$' got removed by template-class
!                               
$GLOBALS['phpgw']->template->set_var('phpgw_body',$html,True);
                        }
                }
--- 167,171 ----
                        else
                        {
!                               
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $html));
                        }
                }
***************
*** 201,205 ****
                                if ($session_data['hooked'] != '')      // set 
previous phpgw_body if we are called as hook
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('phpgw_body',$session_data['hooked']);
                                }
                                //echo "<p>process_exec($this->name): <font 
color=red>loop is set</font>, content=</p>\n"; _debug_array($content);
--- 207,218 ----
                                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']);
!                                       }
!                                       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);