extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge from 1.2

Browse Source
This commit is contained in:
Cornelius Weiß 2006-05-18 16:19:50 +00:00
parent 0decebd55b
commit f7c9c18bb8
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,6 +270,8 @@
'extension_data' => $GLOBALS['egw_info']['etemplate']['extension_data'], 'extension_data' => $GLOBALS['egw_info']['etemplate']['extension_data'],
'to_process' => $GLOBALS['egw_info']['etemplate']['to_process'], 'to_process' => $GLOBALS['egw_info']['etemplate']['to_process'],
'java_script' => $GLOBALS['egw_info']['etemplate']['java_script'], 'java_script' => $GLOBALS['egw_info']['etemplate']['java_script'],
'java_script_from_flags' => $GLOBALS['egw_info']['flags']['java_script'],
'java_script_body_tags' => $GLOBALS['egw']->js->body,
'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'], 'hook_app' => $hooked ? $GLOBALS['egw_info']['flags']['currentapp'] : $GLOBALS['egw_info']['etemplate']['hook_app'],
@ -388,6 +390,21 @@
{ {
$GLOBALS['egw_info']['flags']['app_header'] = $session_data['app_header']; $GLOBALS['egw_info']['flags']['app_header'] = $session_data['app_header'];
} }
$GLOBALS['egw_info']['flags']['java_script'] .= $session_data['java_script_from_flags'];
if (!empty($session_data['java_script_body_tags']))
{
if( !is_object($GLOBALS['phpgw']->js))
{
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
}
foreach ($session_data['java_script_body_tags'] as $tag => $code)
{
error_log($GLOBALS['egw']->js->body[$tag]);
$GLOBALS['egw']->js->body[$tag] .= $code;
}
}
//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);
return $this->exec($session_data['method'],$session_data['content'],$session_data['sel_options'], return $this->exec($session_data['method'],$session_data['content'],$session_data['sel_options'],
$session_data['readonlys'],$session_data['preserv'],$session_data['output_mode'], $session_data['readonlys'],$session_data['preserv'],$session_data['output_mode'],