Changeset 166 for trunk/calendar/inc/class.bocalendar.inc.php

Timestamp:

02/26/08 16:59:47 (16 years ago)

Author:

niltonneto

Message:

Correção de bug, conforme ticket 144 do SVN.
Correção na atualização pelo setup.

File:

• trunk/calendar/inc/class.bocalendar.inc.php (modified) (4 diffs)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -1888 +1888 @@
                                                                 echo '<!-- check_repeating_events - MCAL_RECUR_DAILY - '.$id.' -->'."\n";
                                                         }
+                                                        
                                                         if ($freq == 1 && $rep_events['recur_enddate']['month'] != 0 && $rep_events['recur_enddate']['mday'] != 0 && $rep_events['recur_enddate']['year'] != 0 && $search_date_full <= $end_recur_date)
                                                         {
                                                                 $this->sort_event($rep_events,$search_date_full);
                                                         }
-                                                        elseif (floor(($search_beg_day - $event_beg_day)/86400) % $freq)
+                                                        elseif (floor(($search_beg_day - $event_beg_day)/86400) % ($freq ? $freq : 1))
                                                         {
                                                                 continue;
@@ -1902 +1903 @@
                                                         break;
                                                 case MCAL_RECUR_WEEKLY:
-                                                        if (floor(($search_beg_day - $event_beg_day)/604800) % $freq)
+                                                        if (floor(($search_beg_day - $event_beg_day)/604800)  % ($freq ? $freq : 1))
                                                         {
                                                                 continue;
@@ -1949 +1950 @@
                                                         break;
                                                 case MCAL_RECUR_MONTHLY_MDAY:
-                                                        if ((($search_date_year - $rep_events['start']['year']) * 12 + $search_date_month - $rep_events['start']['month']) % $freq)
+                                                        if ((($search_date_year - $rep_events['start']['year']) * 12 + $search_date_month - $rep_events['start']['month'])  % ($freq ? $freq : 1))
                                                         {
                                                                 continue;
@@ -1959 +1960 @@
                                                         break;
                                                 case MCAL_RECUR_YEARLY:
-                                                        if (($search_date_year - $rep_events['start']['year']) % $freq)
+                                                        if (($search_date_year - $rep_events['start']['year']) % ($freq ? $freq : 1))
                                                         {
                                                                 continue;