extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove date from fancy date+time formatting for multi-day events, leave day-relative time

Browse Source
This commit is contained in:
Nathan Gray 2011-03-29 15:10:55 +00:00
parent 3e1f3f9df8
commit ccfe337f1e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/inc/class.calendar_merge.inc.php
View File

@ -232,10 +232,8 @@ class calendar_merge extends bo_merge
} else { } else {
$dow = date('l', strtotime($day)); $dow = date('l', strtotime($day));
// Fancy date+time formatting for multi-day events // Fancy date+time formatting for multi-day events
$start_time = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1)); $replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
$end_time = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0)); $replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
$replacements['$$calendar_starttime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' .$start_time;
$replacements['$$calendar_endtime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' . $end_time;
} }
$days[date('Ymd',$_date)][$dow][] = $replacements; $days[date('Ymd',$_date)][$dow][] = $replacements;
@ -306,6 +304,7 @@ class calendar_merge extends bo_merge
$replacements = array(); $replacements = array();
$days = array(); $days = array();
$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
foreach($events as $day => $list) foreach($events as $day => $list)
{ {
foreach($list as $key => $event) foreach($list as $key => $event)
@ -317,10 +316,8 @@ class calendar_merge extends bo_merge
$dow = date('l',$event['start']); $dow = date('l',$event['start']);
} else { } else {
// Fancy date+time formatting for multi-day events // Fancy date+time formatting for multi-day events
$start_time = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1)); $replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
$end_time = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0)); $replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
$replacements['$$calendar_starttime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' .$start_time;
$replacements['$$calendar_endtime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' . $end_time;
} }
$days[date('Ymd',$_date)][$plugin][] = $replacements; $days[date('Ymd',$_date)][$plugin][] = $replacements;
} }