fix to get hook_home working for .14 and HEAD

This commit is contained in:
Ralf Becker 2003-07-06 20:12:27 +00:00
parent aa22cef37d
commit 336c0d0cdf
2 changed files with 41 additions and 9 deletions

View File

@ -147,7 +147,7 @@
return $total; 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; $referer = is_array($values) ? $values['referer'] : $referer;
//echo "<p>uiinfolog::index(action='$action/$action_id',referer='$referer/$values[referer]')</p>\n"; //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['action_id'] = $values['nm']['action_id'] = $action_id;
$persist['referer'] = $referer; $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='') function delete($values=0,$referer='')

View File

@ -20,15 +20,47 @@
$app_id = $GLOBALS['phpgw']->applications->name2id('infolog'); $app_id = $GLOBALS['phpgw']->applications->name2id('infolog');
$GLOBALS['portal_order'][] = $app_id; $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'); $infolog = CreateObject('infolog.uiinfolog');
$html = $infolog->index(array('nm' => array('filter' => 'own-open-today')),'','',0,False,True);
$GLOBALS['phpgw']->portalbox->draw($infolog->index()); $title = lang('InfoLog').' - '.lang($infolog->filters['own-open-today']);
$stable = $infolog->tmpl->stable;
unset($infolog); 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; $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
} }
?> ?>