mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:15 +01:00
fix to get hook_home working for .14 and HEAD
This commit is contained in:
parent
aa22cef37d
commit
336c0d0cdf
@ -147,7 +147,7 @@
|
||||
return $total;
|
||||
}
|
||||
|
||||
function index($values = 0,$action='',$action_id='',$referer=0,$extra_app_header=False)
|
||||
function index($values = 0,$action='',$action_id='',$referer=0,$extra_app_header=False,$return_html=False)
|
||||
{
|
||||
$referer = is_array($values) ? $values['referer'] : $referer;
|
||||
//echo "<p>uiinfolog::index(action='$action/$action_id',referer='$referer/$values[referer]')</p>\n";
|
||||
@ -236,7 +236,7 @@
|
||||
$persist['action_id'] = $values['nm']['action_id'] = $action_id;
|
||||
$persist['referer'] = $referer;
|
||||
|
||||
$this->tmpl->exec('infolog.uiinfolog.index',$values,'',$readonlys,$persist);
|
||||
return $this->tmpl->exec('infolog.uiinfolog.index',$values,'',$readonlys,$persist,'',$return_html);
|
||||
}
|
||||
|
||||
function delete($values=0,$referer='')
|
||||
|
@ -20,15 +20,47 @@
|
||||
$app_id = $GLOBALS['phpgw']->applications->name2id('infolog');
|
||||
$GLOBALS['portal_order'][] = $app_id;
|
||||
|
||||
$GLOBALS['phpgw']->portalbox->set_params(array('app_id' => $app_id,
|
||||
'title' => lang('infolog')));
|
||||
|
||||
$GLOBALS['HTTP_POST_VARS']['filter'] = $GLOBALS['filter'] = 'own-open-today';
|
||||
$infolog = CreateObject('infolog.uiinfolog');
|
||||
|
||||
$GLOBALS['phpgw']->portalbox->draw($infolog->index());
|
||||
|
||||
$html = $infolog->index(array('nm' => array('filter' => 'own-open-today')),'','',0,False,True);
|
||||
$title = lang('InfoLog').' - '.lang($infolog->filters['own-open-today']);
|
||||
$stable = $infolog->tmpl->stable;
|
||||
unset($infolog);
|
||||
|
||||
if ($stable) // .14/6
|
||||
{
|
||||
$portalbox = CreateObject('phpgwapi.listbox',array(
|
||||
'title' => $title,
|
||||
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||
'width' => '100%',
|
||||
'outerborderwidth' => '0',
|
||||
'header_background_image' => $GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler')
|
||||
));
|
||||
foreach(array(
|
||||
'up' => Array('url' => '/set_box.php', 'app' => $app_id),
|
||||
'down' => Array('url' => '/set_box.php', 'app' => $app_id),
|
||||
'close' => Array('url' => '/set_box.php', 'app' => $app_id),
|
||||
'question' => Array('url' => '/set_box.php', 'app' => $app_id),
|
||||
'edit' => Array('url' => '/set_box.php', 'app' => $app_id)
|
||||
) as $key => $value)
|
||||
{
|
||||
$portalbox->set_controls($key,$value);
|
||||
}
|
||||
$portalbox->data = $data;
|
||||
|
||||
echo "\n<!-- BEGIN InfoLog info -->\n".$portalbox->draw($html)."\n<!-- END InfoLog info -->\n";
|
||||
unset($portalbox);
|
||||
}
|
||||
else // HEAD / XSLT
|
||||
{
|
||||
$GLOBALS['phpgw']->portalbox->set_params(array(
|
||||
'app_id' => $app_id,
|
||||
'title' => $title
|
||||
));
|
||||
$GLOBALS['phpgw']->portalbox->draw($html);
|
||||
}
|
||||
unset($html);
|
||||
$GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
|
||||
}
|
||||
?>
|
||||
|
Loading…
Reference in New Issue
Block a user