extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 20:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed disapearing addressbook view if changing something in the hooked in infolog. Caused by one etemplate app hooking an other one, was not working.

Browse Source
This commit is contained in:
Ralf Becker 2006-04-05 15:24:46 +00:00
parent 85a9bfb5d3
commit 435a8ee099
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etemplate/inc/class.uietemplate.inc.php
View File

@ -202,16 +202,20 @@
} }
elseif (!$this->xslt) elseif (!$this->xslt)
{ {
$hooked = $GLOBALS['egw']->template->get_var('phpgw_body'); $hooked = isset($GLOBALS['egw_info']['etemplate']['content']) ? $GLOBALS['egw_info']['etemplate']['content'] :
$GLOBALS['egw']->template->get_var('phpgw_body');
if (!@$GLOBALS['egw_info']['etemplate']['hooked'] && (int) $output_mode != 1 && (int) $output_mode != -1) // not just returning the html if (!@$GLOBALS['egw_info']['etemplate']['hooked'] && (int) $output_mode != 1 && (int) $output_mode != -1) // not just returning the html
{ {
$GLOBALS['egw_info']['flags']['java_script'] .= $this->include_java_script(2); $GLOBALS['egw_info']['flags']['java_script'] .= $this->include_java_script(2);
$GLOBALS['egw']->common->egw_header(); $GLOBALS['egw']->common->egw_header();
} }
else elseif (!isset($GLOBALS['egw_info']['etemplate']['content']))
{ {
$html = $this->include_java_script(2).$html; // better than nothing $html = $this->include_java_script(2).$html; // better than nothing
} }
// saving the etemplate content for other hooked etemplate apps (atm. infolog hooked into addressbook)
$GLOBALS['egw_info']['etemplate']['content'] =& $html;
} }
else else
{ {
@ -271,6 +275,7 @@
'java_script' => $GLOBALS['egw_info']['etemplate']['java_script'], 'java_script' => $GLOBALS['egw_info']['etemplate']['java_script'],
'dom_enabled' => $GLOBALS['egw_info']['etemplate']['dom_enabled'], 'dom_enabled' => $GLOBALS['egw_info']['etemplate']['dom_enabled'],
'hooked' => $hooked != '' ? $hooked : $GLOBALS['egw_info']['etemplate']['hook_content'], 'hooked' => $hooked != '' ? $hooked : $GLOBALS['egw_info']['etemplate']['hook_content'],
'hook_app' => $hooked ? $GLOBALS['egw_info']['flags']['currentapp'] : $GLOBALS['egw_info']['etemplate']['hook_app'],
'app_header' => $GLOBALS['egw_info']['flags']['app_header'], 'app_header' => $GLOBALS['egw_info']['flags']['app_header'],
'output_mode' => $output_mode != -1 ? $output_mode : 0, 'output_mode' => $output_mode != -1 ? $output_mode : 0,
'session_used' => 0, 'session_used' => 0,
@ -280,7 +285,7 @@
if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1) // return html if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1) // return html
{ {
return $html; return $html;
} }
} }
@ -374,8 +379,8 @@
{ {
if (!$this->xslt) if (!$this->xslt)
{ {
//echo "<p>process_exec: hook_content set</p>\n";
$GLOBALS['egw_info']['etemplate']['hook_content'] = $session_data['hooked']; $GLOBALS['egw_info']['etemplate']['hook_content'] = $session_data['hooked'];
$GLOBALS['egw_info']['flags']['currentapp'] = $GLOBALS['egw_info']['etemplate']['hook_app'] = $session_data['hook_app'];
} }
else else
{ {