Changeset 4024

Timestamp:

04/14/11 10:53:29 (13 years ago)

Author:

brunocosta

Message:

Ticket #1743 - Mudanças no tipo de eventos recorrentes.

Location:

branches/2.2.0.1/calendar/inc

Files:

• class.socalendar.inc.php (modified) (1 diff)
• class.socalendar_sql.inc.php (modified) (2 diffs)

branches/2.2.0.1/calendar/inc/class.socalendar.inc.php

@@ -122 +122 @@
                         $starttime = mktime(0,0,0,$smonth,$sday,$syear) - $GLOBALS['phpgw']->datetime->tz_offset;
                         $endtime = mktime(23,59,59,$emonth,$eday,$eyear) - $GLOBALS['phpgw']->datetime->tz_offset;
-                        $sql = "AND phpgw_cal.cal_type='M' AND phpgw_cal_user.cal_login IN (".
+                        $sql = "AND phpgw_cal_user.cal_login IN (".
                                 (is_array($owner_id) ? implode(',',$owner_id) : $owner_id).')';
 

branches/2.2.0.1/calendar/inc/class.socalendar_sql.inc.php

@@ -953 +953 @@
                         $enddate = $this->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
                         $today = time() - $GLOBALS['phpgw']->datetime->tz_offset;
-
-                        if($event['recur_type'] != MCAL_RECUR_NONE)
-                        {
-                                $type = 'M';
-                        }
-                        else
-                        {
+//
+//                      if($event['recur_type'] != MCAL_RECUR_NONE)
+//                      {
+//                              $type = 'M';
+//                      }
+//                      else
+//                      {
                                 if ($event['type'] == 'hourAppointment')
                                         $type = 'H';
@@ -966 +966 @@
                                 }else
                                         $type = 'E';
-                        }
-
-                        is_array($event['attachment'])?$sattach=serialize($event['attachment']):$sattach='';
+//                      }
+                        is_array($event['attachment'])?$sattach=serialize($event['attachment']):$sattach='';
 
                         $sql = 'UPDATE phpgw_cal SET '