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

Fix for bug #417366

Browse Source
This commit is contained in:
skeeter 2001-04-19 17:38:42 +00:00
parent e3d69cc480
commit ddecf65549
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1326,8 +1326,8 @@ class calendar extends calendar_
$p->set_var($var); $p->set_var($var);
$first_hour = (int)$phpgw_info['user']['preferences']['calendar']['workdaystarts'] + 1; $first_hour = (int)$phpgw_info['user']['preferences']['calendar']['workdaystarts'];
$last_hour = (int)$phpgw_info['user']['preferences']['calendar']['workdayends'] + 1; $last_hour = (int)$phpgw_info['user']['preferences']['calendar']['workdayends'];
$events = Array( $events = Array(
CreateObject('calendar.calendar_item') CreateObject('calendar.calendar_item')
@ -1634,18 +1634,19 @@ class calendar extends calendar_
} }
$str = ''; $str = '';
for($i=0;$i<count($event->participants);$i++) reset($event->participants);
while (list($key,$value) = each($event->participants))
{ {
if($i) if($str)
{ {
$str .= '<br>'; $str .= '<br>';
} }
$status = $this->get_long_status($event->status[$i]); $status = $this->get_long_status($event->status[$key]);
$str .= $phpgw->common->grab_owner_name($event->participants[$i]).' ('; $str .= $phpgw->common->grab_owner_name($event->participants[$key]).' (';
if($event->participants[$i] == $this->owner && $this->check_perms(PHPGW_ACL_EDIT) == True) if($event->participants[$key] == $this->owner && $this->check_perms(PHPGW_ACL_EDIT) == True)
{ {
$str .= '<a href="'.$phpgw->link('/calendar/edit_status.php','owner='.$this->owner.'&id='.$event->id).'">'.$status.'</a>'; $str .= '<a href="'.$phpgw->link('/calendar/edit_status.php','owner='.$this->owner.'&id='.$event->id).'">'.$status.'</a>';
} }
@ -1653,7 +1654,7 @@ class calendar extends calendar_
{ {
$str .= $status; $str .= $status;
} }
$str .= ')'; $str .= ')'."\n";
} }
$var = Array( $var = Array(
'field' => lang('Participants'), 'field' => lang('Participants'),

4
calendar/preferences.php
View File

@ -127,7 +127,7 @@
for ($i=0; $i<24; $i++) for ($i=0; $i<24; $i++)
{ {
$str .= '<option value="'.$i.'"'.$t_workdaystarts[$i].'>' $str .= '<option value="'.$i.'"'.$t_workdaystarts[$i].'>'
. $phpgw->common->formattime($i+1,'00') . '</option>'; . $phpgw->common->formattime($i,'00') . '</option>';
} }
$str .= '</select>'; $str .= '</select>';
display_item(lang('work day starts on'),$str); display_item(lang('work day starts on'),$str);
@ -137,7 +137,7 @@
for ($i=0; $i<24; $i++) for ($i=0; $i<24; $i++)
{ {
$str .= '<option value="'.$i.'"'.$t_workdayends[$i].'>' $str .= '<option value="'.$i.'"'.$t_workdayends[$i].'>'
. $phpgw->common->formattime($i+1,'00') . '</option>'; . $phpgw->common->formattime($i,'00') . '</option>';
} }
$str .= '</select>'; $str .= '</select>';
display_item(lang('work day ends on'),$str); display_item(lang('work day ends on'),$str);