[Phpgroupware-cvs] CVS: etemplate/inc class.uietemplate.inc.php,1.61,1.62

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.uietemplate.inc.php 
Log Message:
added parameter to exec to return the html, used for hook_home

Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** class.uietemplate.inc.php   6 Jul 2003 11:01:40 -0000       1.61
--- class.uietemplate.inc.php   6 Jul 2003 20:07:19 -0000       1.62
***************
*** 87,94 ****
                @param $readonlys Array with field-names as keys for fields 
with should be readonly
                @param            (eg. to implement ACL grants on field-level 
or to remove buttons not applicable)
!               @param $preserv Array with vars which should be transported to 
the $method-call (eg. an id) array('id' => $id) sets $HTTP_POST_VARS['id'] for 
the $method-call
                @result nothing
                */
!               function 
exec($method,$content,$sel_options='',$readonlys='',$preserv='',$changes='')
                {
                        //echo "<br>globals[java_script] = 
'".$GLOBALS['phpgw_info']['etemplate']['java_script']."', this->java_script() = 
'".$this->java_script()."'\n";
--- 87,96 ----
                @param $readonlys Array with field-names as keys for fields 
with should be readonly
                @param            (eg. to implement ACL grants on field-level 
or to remove buttons not applicable)
!               @param $preserv Array with vars which should be transported to 
the $method-call (eg. an id) array('id' => $id) 
!                       sets $HTTP_POST_VARS['id'] for the $method-call
!               @param $return_html if true, dont show the page, just return 
the html
                @result nothing
                */
!               function 
exec($method,$content,$sel_options='',$readonlys='',$preserv='',$changes='',$return_html=False)
                {
                        //echo "<br>globals[java_script] = 
'".$GLOBALS['phpgw_info']['etemplate']['java_script']."', this->java_script() = 
'".$this->java_script()."'\n";
***************
*** 117,121 ****
                        {
                                $hooked = 
$GLOBALS['phpgw']->template->get_var('phpgw_body');
!                               if 
(address@hidden'phpgw_info']['etemplate']['hooked'])
                                {
                                        
$GLOBALS['phpgw_info']['flags']['java_script'] = $this->include_java_script(2);
--- 119,123 ----
                        {
                                $hooked = 
$GLOBALS['phpgw']->template->get_var('phpgw_body');
!                               if 
(address@hidden'phpgw_info']['etemplate']['hooked'] && !$return_html)
                                {
                                        
$GLOBALS['phpgw_info']['flags']['java_script'] = $this->include_java_script(2);
***************
*** 167,170 ****
--- 169,176 ----
                        ),$id);
  
+                       if ($return_html)
+                       {
+                               return $html;
+                       }
                        if ($this->stable)
                        {