[Phpgroupware-cvs] phpgwapi/inc class.setup.inc.php

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     07/02/10 13:18:36

Modified files:
        inc            : class.setup.inc.php 

Log message:
        streamline code

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup.inc.php?cvsroot=phpgwapi&r1=1.33&r2=1.34

Patches:
Index: class.setup.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.setup.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.setup.inc.php 6 Oct 2006 01:53:30 -0000       1.33
+++ class.setup.inc.php 10 Feb 2007 13:18:36 -0000      1.34
@@ -9,7 +9,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.setup.inc.php,v 1.33 2006/10/06 01:53:30 skwashd 
Exp $
+       * @version $Id: class.setup.inc.php,v 1.34 2007/02/10 13:18:36 skwashd 
Exp $
        */
 
        /**
@@ -501,27 +501,19 @@
                /**
                 * de-Register an application
                *
-                * @param       $appname        Application 'name' with a 
matching $setup_info[$appname] array slice
+                * @param string $appname Application 'name' with a matching 
$setup_info[$appname] array slice
                 */
                function deregister_app($appname)
                {
                        if(!$appname)
                        {
-                               return False;
-                       }
-                       $setup_info = $GLOBALS['setup_info'];
-
-                       
if($this->alessthanb($setup_info['phpgwapi']['currentver'],'0.9.10pre8') && 
($setup_info['phpgwapi']['currentver'] != ''))
-                       {
-                               $appstbl = 'applications';
-                       }
-                       else
-                       {
-                               $appstbl = 'phpgw_applications';
+                               return false;
                        }
+                       $appname = $this->db->db_addslashes($appname);
+                       $setup_info =& $GLOBALS['setup_info'];
 
                        //echo 'DELETING application: ' . $appname;
-                       $this->db->query("DELETE FROM $appstbl WHERE 
app_name='". $appname ."'",__LINE__,__FILE__);
+                       $this->db->query("DELETE FROM phpgw_applications WHERE 
app_name='{$appname}'",__LINE__,__FILE__);
                        $this->clear_session_cache();
                }