[Fmsystem-commits] [8423] api: clean up config on removing apps

[Sigurd Nes]

Revision: 8423
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8423
Author:   sigurdne
Date:     2011-12-23 11:36:00 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
api: clean up config on removing apps

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.setup.inc.php

Modified: trunk/phpgwapi/inc/class.setup.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.setup.inc.php      2011-12-23 11:34:31 UTC (rev 
8422)
+++ trunk/phpgwapi/inc/class.setup.inc.php      2011-12-23 11:36:00 UTC (rev 
8423)
@@ -553,10 +553,21 @@
                                $this->db->query('DELETE FROM phpgw_cust_choice 
WHERE location_id IN ('. implode (',',$locations) . ')');
                                $this->db->query('DELETE FROM 
phpgw_cust_attribute WHERE location_id IN ('. implode (',',$locations). ')');
                                $this->db->query('DELETE FROM phpgw_acl  WHERE 
location_id IN ('. implode (',',$locations) . ')');
+
+                               $this->db->query('SELECT id FROM 
phpgw_config2_section WHERE location_id IN ('. implode (',',$locations) . ')');
+                               $sections = array();
+                               while ($this->db->next_record())
+                               {
+                                       $sections[] = $this->db->f('id');
+                               }
+                               $this->db->query('DELETE FROM 
phpgw_config2_value WHERE section_id IN ('. implode (',',$sections) . ')');
+                               $this->db->query('DELETE FROM 
phpgw_config2_choice WHERE section_id IN ('. implode (',',$sections) . ')');
+                               $this->db->query('DELETE FROM 
phpgw_config2_attrib WHERE section_id IN ('. implode (',',$sections) . ')');
+                               $this->db->query('DELETE FROM 
phpgw_config2_section WHERE location_id IN ('. implode (',',$locations) . ')');
                        }
 
                        $this->db->query("DELETE FROM phpgw_locations WHERE 
app_id = {$app_id}");
-
+                       $this->db->query("DELETE FROM phpgw_config WHERE 
config_app='{$appname}'",__LINE__,__FILE__);
                        //echo 'DELETING application: ' . $appname;
                        $this->db->query("DELETE FROM phpgw_applications WHERE 
app_name='{$appname}'",__LINE__,__FILE__);
                        $this->clear_session_cache();