holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to get output mode 1 (return html) working again

Browse Source
This commit is contained in:
Ralf Becker 2019-03-07 10:06:20 +01:00
parent ab2d5e4c66
commit 756ebb77f3
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Etemplate.php
View File

@ -259,6 +259,8 @@ class Etemplate extends Etemplate\Widget\Template
{ {
$GLOBALS['egw_info']['flags']['nonavbar'] = $output_mode == 2 ? 'popup' : false; $GLOBALS['egw_info']['flags']['nonavbar'] = $output_mode == 2 ? 'popup' : false;
} }
if ($output_mode != 1)
{
echo $GLOBALS['egw']->framework->header(); echo $GLOBALS['egw']->framework->header();
if ($output_mode != 2 && !$GLOBALS['egw_info']['flags']['nonavbar']) if ($output_mode != 2 && !$GLOBALS['egw_info']['flags']['nonavbar'])
{ {
@ -268,6 +270,7 @@ class Etemplate extends Etemplate\Widget\Template
{ {
echo '<div id="popupMainDiv" class="popupMainDiv">'."\n"; echo '<div id="popupMainDiv" class="popupMainDiv">'."\n";
} }
}
// Send any accumulated json responses - after flush to avoid sending the buffer as a response // Send any accumulated json responses - after flush to avoid sending the buffer as a response
if(Json\Response::isJSONResponse()) if(Json\Response::isJSONResponse())
{ {
@ -277,6 +280,14 @@ class Etemplate extends Etemplate\Widget\Template
$form = '<form target="egw_iframe_autocomplete_helper" action="'.$form_action.'" id="'.$dom_id.'" class="et2_container" data-etemplate="'. $form = '<form target="egw_iframe_autocomplete_helper" action="'.$form_action.'" id="'.$dom_id.'" class="et2_container" data-etemplate="'.
htmlspecialchars(Json\Response::json_encode($load_array), ENT_COMPAT, Translation::charset(), true).'"></form>'."\n". htmlspecialchars(Json\Response::json_encode($load_array), ENT_COMPAT, Translation::charset(), true).'"></form>'."\n".
'<iframe name="egw_iframe_autocomplete_helper" style="width:0;height:0;position: absolute;visibility:hidden;"></iframe>'; '<iframe name="egw_iframe_autocomplete_helper" style="width:0;height:0;position: absolute;visibility:hidden;"></iframe>';
// output mode 1 - return html
if ($output_mode == 1)
{
ob_end_clean();
self::$request = null;
return $form;
}
echo $form; echo $form;
if ($output_mode == 2) if ($output_mode == 2)
@ -285,7 +296,6 @@ class Etemplate extends Etemplate\Widget\Template
echo $GLOBALS['egw']->framework->footer(); echo $GLOBALS['egw']->framework->footer();
} }
ob_flush(); ob_flush();
if ($output_mode == 1) return $form;
} }
self::$request = null; self::$request = null;
} }