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

Removed a parameter.

Browse Source
This commit is contained in:
skeeter 2001-03-20 04:15:04 +00:00
parent 8b682ee5b7
commit 7a9a260941
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/day.php
View File

@ -53,7 +53,7 @@
{
$printer = '';
$param = 'year='.$thisyear.'&month='.$thismonth.'&day='.$thisday.'&friendly=1&filter='.$filter.'&owner='.$owner;
$print = '<a href="'.$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/day.php',$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
$print = '<a href="'.$phpgw->link('/calendar/day.php',$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
}
else
{
@ -68,7 +68,7 @@
$var = Array(
'printer_friendly' => $printer,
'bg_text' => $phpgw_info['themem']['bg_text'],
'daily_events' => $phpgw->calendar->print_day_at_a_glance($now,$owner),
'daily_events' => $phpgw->calendar->print_day_at_a_glance($now),
'small_calendar' => $phpgw->calendar->mini_calendar($thisday,$thismonth,$thisyear,'day.php'),
'date' => lang(date('F',$m)).' '.$thisday.', '.$thisyear,
'username' => $phpgw->common->grab_owner_name($owner),

7
calendar/inc/class.calendar.inc.php
View File

@ -825,7 +825,7 @@ class calendar extends calendar_
$new_event_link .= '<img src="'.$this->image_dir.'/new.gif" width="10" height="10" alt="'.lang('New Entry').'" border="0" align="right">';
$new_event_link .= '</a>';
}
$day_number = '<a href="'.$phpgw->link('/calendar/day.php','month='.$date['month'].'&day='.$date['day'].'&year='.$date['year'].'&owner='.$this->owner).'">'.$date['day'].'</a>';
$day_number = '<a href="'.$phpgw->link('/calendar/day.php','month='.$date['month'].'&day='.$date['day'].'&year='.$date['year'].'&owner='.$owner).'">'.$date['day'].'</a>';
}
else
{
@ -1006,6 +1006,7 @@ class calendar extends calendar_
for($i=0;$i<$counter;$i++)
{
$this->repeated_events = Null;
$this->repeating_events = Null;
$owner = $owners_array[$i];
$this->read_repeated_events($owner);
$p->set_var('month_filler_text',$this->display_week($start,True,$cellcolor,$display_name,$owner));
@ -1139,10 +1140,12 @@ class calendar extends calendar_
$time[$ind] .= '<br>';
}
function print_day_at_a_glance($date,$owner=0)
function print_day_at_a_glance($date)
{
global $phpgw, $phpgw_info;
$this->read_repeated_events($this->owner);
$p = CreateObject('phpgwapi.Template',$this->template_dir);
$p->set_unknowns('remove');