Changeset 8232 for branches/2.5/expressoAdmin1_2/inc/class.db_functions.inc.php

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/expressoAdmin1_2/inc/class.db_functions.inc.php (modified) (1 diff)

branches/2.5/expressoAdmin1_2/inc/class.db_functions.inc.php

@@ -539 +539 @@
         {
                 // AGENDA
-                $this->db->query('SELECT cal_id FROM phpgw_cal WHERE owner ='.$user_info['uidnumber']);
+                $this->db->query('SELECT calendar_id FROM calendar_signature WHERE user_uidnumber ='.$user_info['uidnumber'] . ' AND is_owner = 1' );
                 while($this->db->next_record())
                 {
                         $ids[] = $this->db->row();
                 }
+
                 if (count($ids))
                 {
                         foreach($ids as $i => $id)
-                        {
-                                $this->db->query('DELETE FROM phpgw_cal WHERE cal_id='.$id['cal_id']);
-                                $this->db->query('DELETE FROM phpgw_cal_user WHERE cal_id='.$id['cal_id']);
-                                $this->db->query('DELETE FROM phpgw_cal_repeats WHERE cal_id='.$id['cal_id']);
-                                $this->db->query('DELETE FROM phpgw_cal_extra WHERE cal_id='.$id['cal_id']);
-                        }
+                $this->db->query('DELETE FROM calendar WHERE id = '.$id['calendar_id']);
                 }