[Phpgroupware-cvs] projects/inc/class.soprojects.inc.php, 1.106

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.soprojects.inc.php

date: 2004/11/12 15:51:47;  author: ceb;  state: Exp;  lines: +10 -14

Log Message:
bugfix for delete project
=====================================================================
Index: projects/inc/class.soprojects.inc.php
diff -u projects/inc/class.soprojects.inc.php:1.105 
projects/inc/class.soprojects.inc.php:1.106
--- projects/inc/class.soprojects.inc.php:1.105 Mon Jul 19 15:53:50 2004
+++ projects/inc/class.soprojects.inc.php       Fri Nov 12 15:51:47 2004
@@ -909,7 +909,6 @@
 
                        if ($subs)
                        {
-                               $subdelete = ' OR main =' . $project_id;
                                $subpro = $this->read_projects(array('column' 
=> 'project_id,level','limit' => False,'action' => 'subs','parent' => 
$project_id));
 
                                if(is_array($subpro))
@@ -925,28 +924,25 @@
                                if(is_array($s))
                                {
                                        $sub_acl_delete = ' OR acl_location 
in(' . implode(',',$s) . ')';
+                                       $sub_pro_delete = ' OR project_id in(' 
. implode(',',$s) . ')';
                                }
                        }
 
                        $this->db->query("DELETE from phpgw_acl where 
acl_appname='projects' and acl_rights=7 and (acl_location=" . $project_id . 
$sub_acl_delete
                                                        . 
')',__LINE__,__FILE__);
 
-                       $this->db->query('DELETE from phpgw_p_projects where 
project_id=' . $project_id . $subdelete,__LINE__,__FILE__);
+                       $this->db->query('DELETE from phpgw_p_projects where 
project_id=' . $project_id . $sub_pro_delete,__LINE__,__FILE__);
 
-                       if ($subs)
-                       {
-                               $subdelete = ' or pro_parent=' . $project_id;
-                       }
+                       $this->db->query('DELETE from phpgw_p_hours where 
project_id=' . $project_id . $sub_pro_delete,__LINE__,__FILE__); 
 
-                       $this->db->query('DELETE from phpgw_p_hours where 
project_id=' . $project_id . $subdelete,__LINE__,__FILE__); 
 
-                       $this->db->query('select id from phpgw_p_delivery where 
project_id=' . $project_id,__LINE__,__FILE__);
+                       $this->db->query('SELECT id from phpgw_p_delivery where 
project_id=' . $project_id . $sub_pro_delete,__LINE__,__FILE__);
 
                        while ($this->db->next_record())
                        {
                                $del[] = array
                                (
-                                       'id'    => $this->db->f('id')
+                                       'id' => $this->db->f('id')
                                );
                        }
 
@@ -956,16 +952,16 @@
                                {
                                        $this->db->query('Delete from 
phpgw_p_deliverypos where delivery_id=' . 
intval($del[$i]['id']),__LINE__,__FILE__);
                                }
-                               $this->db->query('DELETE from phpgw_p_delivery 
where project_id=' . $project_id,__LINE__,__FILE__);
+                               $this->db->query('DELETE from phpgw_p_delivery 
where project_id=' . $project_id . $sub_pro_delete,__LINE__,__FILE__);
                        }
 
-                       $this->db->query('select id from phpgw_p_invoice where 
project_id=' . $project_id,__LINE__,__FILE__);
+                       $this->db->query('SELECT id from phpgw_p_invoice where 
project_id=' . $project_id . $sub_pro_delete,__LINE__,__FILE__);
 
                        while ($this->db->next_record())
                        {
                                $inv[] = array
                                (
-                                       'id'    => $this->db->f('id')
+                                       'id' => $this->db->f('id')
                                );
                        }
 
@@ -975,7 +971,7 @@
                                {
                                        $this->db->query('Delete from 
phpgw_p_invoicepos where invoice_id=' . 
intval($inv[$i]['id']),__LINE__,__FILE__);
                                }
-                               $this->db->query('DELETE from phpgw_p_invoice 
where project_id=' . $project_id,__LINE__,__FILE__);
+                               $this->db->query('DELETE from phpgw_p_invoice 
where project_id=' . $project_id . $sub_pro_delete,__LINE__,__FILE__);
                        }
                }