extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 22:21:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed dateformat d-M-Y and event2array to show recure-dates only for weekly (daily uses the current date !)

Browse Source
This commit is contained in:
Ralf Becker 2003-11-03 11:06:56 +00:00
parent cccbba347d
commit 49d89a9776
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.bocalendar.inc.php
View File

@ -1525,7 +1525,8 @@
} }
$datefmt = $this->prefs['common']['dateformat']; $datefmt = $this->prefs['common']['dateformat'];
$month_before_day = $datefmt[0] == 'm' || $datefmt[2] == 'm' && $datefmt[4] == 'd'; $month_before_day = strtolower($datefmt[0]) == 'm' ||
strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
for ($i = 0; $i < 5; $i += 2) for ($i = 0; $i < 5; $i += 2)
{ {
@ -1566,10 +1567,11 @@
$range .= ' ' . $last['day'] . ($datefmt[1] == '.' ? '.' : ''); $range .= ' ' . $last['day'] . ($datefmt[1] == '.' ? '.' : '');
break; break;
case 'm': case 'm':
case 'M':
$range .= ' '.lang(strftime('%B',$month_before_day ? $first['raw'] : $last['raw'])) . ' '; $range .= ' '.lang(strftime('%B',$month_before_day ? $first['raw'] : $last['raw'])) . ' ';
break; break;
case 'Y': case 'Y':
$range .= ($datefmt[0] == 'm' ? ', ' : ' ') . ($datefmt[0] == 'Y' ? $first['year'].', ' : $last['year'].' '); $range .= ($datefmt[0] == 'm' ? ', ' : ' ') . ($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
break; break;
} }
} }
@ -3025,7 +3027,8 @@
$str_extra .= lang('ends').': '.lang($GLOBALS['phpgw']->common->show_date($recur_end,'l')).', '.$this->long_date($recur_end).' '; $str_extra .= lang('ends').': '.lang($GLOBALS['phpgw']->common->show_date($recur_end,'l')).', '.$this->long_date($recur_end).' ';
} }
} }
if($event['recur_type'] == MCAL_RECUR_WEEKLY || $event['recur_type'] == MCAL_RECUR_DAILY) // only weekly uses the recur-data (days) !!!
if($event['recur_type'] == MCAL_RECUR_WEEKLY)
{ {
$repeat_days = array(); $repeat_days = array();
foreach ($this->rpt_day as $mcal_mask => $dayname) foreach ($this->rpt_day as $mcal_mask => $dayname)