Changeset 6402

Timestamp:

06/04/12 10:22:30 (11 years ago)

Author:

acoutinho

Message:

Ticket #2831 - Implementação ao suporte a repetição de eventos

File:

• trunk/expressoCalendar/inc/class.ui_migration.inc.php (modified) (7 diffs)

trunk/expressoCalendar/inc/class.ui_migration.inc.php

@@ -143 +143 @@
                                 $sql_insert .= "'".$calendar_object."', ";  
                                 
-                                $sql_insert .= ($repeat['recur_enddate']) == 0 ? ("'', ") : ("'".$repeat['recur_enddate']."000',");
+                                $sql_insert .= ($repeat['recur_enddate']) == 0 ? ("'0', ") : ("'".$repeat['recur_enddate']."000',");
                                 $sql_insert .= "'".$weeklyDays."', ";
                                 $sql_insert .= "'".$byMonthDay."', ";
@@ -157 +157 @@
 
                                         foreach($ocurrences as $value){
-                                                $sql_insert_excepetions = 'insert into calendar_repeat_ocurrence (ocurrence, exception, repeat_id) values ( ';
+                                                $sql_insert_excepetions = 'insert into calendar_repeat_occurrence (occurrence, exception, repeat_id) values ( ';
                                                 $sql_insert_excepetions .= "'".$value."', ";
                                                 $sql_insert_excepetions .= "'1', ";
@@ -183 +183 @@
 
                                 $offset = ($date_ini - $evento['next']);
+                                
+                                if($offset < 0)
+                                    continue;
 
                                 $sql_insert = "insert into calendar_alarm (action_id, unit, alarm_offset, time, participant_id, object_id, sent) values ( ";
@@ -218 +221 @@
                                         $sql_insert = "insert into calendar_ex_participant (name, mail, owner) values ( ";
                                         if(array_key_exists('cn', $ex)) 
-                                                $sql_insert .= "'".$ex['cn']."', ";
+                                                $sql_insert .= "'".addslashes($ex['cn'])."', ";
                                         else
                                                 $sql_insert .= "'', ";
-                                        $sql_insert .= "'".$ex['mail']."', ";
+                                        $sql_insert .= "'".addslashes($ex['mail'])."', ";
                                         $sql_insert .= $owner.") RETURNING id";
                                         
@@ -303 +306 @@
                                         $sql_insert .= "'', ";
                                 else
-                                        $sql_insert .= "'".$evento['description']."', ";
+                                        $sql_insert .= "'".addslashes($evento['description'])."', ";
                                 //dtend
                                 $sql_insert .= $evento['edatetime']."000, ";
@@ -310 +313 @@
                                         $sql_insert .= "'', ";
                                 else
-                                        $sql_insert .= "'".$evento['location']."', ";
+                                        $sql_insert .= "'".addslashes($evento['location'])."', ";
                                 //class_id
                                 if($evento['is_public'] == 1){
@@ -331 +334 @@
                                         $sql_insert .= "'', ";
                                 else
-                                        $sql_insert .= "'".$evento['title']."', ";
+                                        $sql_insert .= "'".addslashes($evento['title'])."', ";
                                 //allday
                                 $sql_insert .= "0, ";