mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-27 08:19:45 +01:00
This moves the calendar to use the n-tier layering. Old files are still here for continuity for .12 RC versions.
This commit is contained in:
parent
636666d306
commit
83f61d1767
@ -234,8 +234,9 @@
|
|||||||
|
|
||||||
if (!$this->bo->printer_friendly)
|
if (!$this->bo->printer_friendly)
|
||||||
{
|
{
|
||||||
|
unset($phpgw_info['flags']['noheader']);
|
||||||
|
unset($phpgw_info['flags']['nonavbar']);
|
||||||
$phpgw->common->phpgw_header();
|
$phpgw->common->phpgw_header();
|
||||||
echo parse_navbar();
|
|
||||||
$printer = '';
|
$printer = '';
|
||||||
$param = '&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1';
|
$param = '&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1';
|
||||||
$print = '<a href="'.$this->page('month'.$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
|
$print = '<a href="'.$this->page('month'.$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
|
||||||
|
@ -27,14 +27,6 @@
|
|||||||
|
|
||||||
include('../header.inc.php');
|
include('../header.inc.php');
|
||||||
|
|
||||||
$newpage = $phpgw_info['user']['preferences']['calendar']['defaultcalendar'];
|
Header('Location: '.$phpgw->link('/index.php','menuaction=calendar.uicalendar.index'));
|
||||||
if ($newpage=='index.php' || ($newpage != 'day.php' && $newpage != 'week.php' && $newpage != 'month.php' && $newpage != 'year.php'))
|
|
||||||
{
|
|
||||||
$newpage = 'month.php';
|
|
||||||
$phpgw->preferences->add('calendar','defaultcalendar','month.php');
|
|
||||||
$phpgw->preferences->save_repository();
|
|
||||||
}
|
|
||||||
|
|
||||||
Header('Location: '.$newpage.'?'.$QUERY_STRING);
|
|
||||||
$phpgw->common->phpgw_exit();
|
$phpgw->common->phpgw_exit();
|
||||||
?>
|
?>
|
||||||
|
Loading…
Reference in New Issue
Block a user