oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: Calendar: Weekly re-occurence function not working properly (#10228)

Browse source
This commit is contained in:
Martin Kamerbeek 2009-06-03 14:28:11 +00:00
parent 15b197976e
commit bb31750e7c
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -17,6 +17,8 @@
- fixed #10365: Head tags do not work "Use Packed Head Tags".
- fixed #9927: Survey - verbatim
- fixed #10352: Deleting a user does not clean up any address books
- fixed #10228: Calendar: Weekly re-occurence function not working properly
( Martin Kamerbeek / Oqapi )
7.7.8
- fixed: Basic Auth doesn't work if password contains colon (Arjan Widlak,

24
lib/WebGUI/Asset/Event.pm
View file

@ -755,13 +755,13 @@ sub getRecurrenceDates {
return undef unless $recur->{recurType};
my %dayNames = (
monday => "m",
tuesday => "t",
wednesday => "w",
thursday => "r",
friday => "f",
saturday => "s",
sunday => "u",
1 => "m",
2 => "t",
3 => "w",
4 => "r",
5 => "f",
6 => "s",
7 => "u",
);
my %weeks = (
@ -844,7 +844,7 @@ sub getRecurrenceDates {
last RECURRENCE
if ($recur->{endDate} && $dt_day > $dt_end);
my $today = $dayNames{lc $dt_day->day_name};
my $today = $dayNames{ $dt_day->day_of_week };
if (grep /$today/i, @{$recur->{dayNames}}) {
### Add date
@ -915,7 +915,7 @@ sub getRecurrenceDates {
# If today isn't in the month, stop looking
last if ($dt_day->month ne $dt->month);
my $today = $dayNames{lc $dt_day->day_name};
my $today = $dayNames{ $dt_day->day_of_week };
if (grep /$today/i, @{$recur->{dayNames}})
{
@ -946,7 +946,7 @@ sub getRecurrenceDates {
# If today is past the endDate, try the next one
next if ($recur->{endDate} && $dt_day > $dt_end);
my $today = $dayNames{lc $dt_day->day_name};
my $today = $dayNames{ $dt_day->day_of_week };
if (grep /$today/i, @{$recur->{dayNames}}) {
### Add date
@ -1036,7 +1036,7 @@ sub getRecurrenceDates {
# If today isn't in the month, stop looking
last if ($dt_day->month ne $dt_month->month);
my $today = $dayNames{lc $dt_day->day_name};
my $today = $dayNames{ lc $dt_day->day_of_week };
if (grep /$today/i, @{$recur->{dayNames}}) {
### Add date
@ -1064,7 +1064,7 @@ sub getRecurrenceDates {
next
if ($recur->{endDate} && $dt_day > $dt_end);
my $today = $dayNames{lc $dt_day->day_name};
my $today = $dayNames{ $dt_day->day_of_week };
if (grep /$today/i, @{$recur->{dayNames}}) {
### Add date