[Phpgroupware-cvs] preferences/inc class.soadmin_acl.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    preferences
Changes by:     Sigurd Nes <sigurdne>   06/09/16 16:55:39

Modified files:
        inc            : class.soadmin_acl.inc.php 

Log message:
        clean up

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/preferences/inc/class.soadmin_acl.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4

Patches:
Index: class.soadmin_acl.inc.php
===================================================================
RCS file: /sources/phpgroupware/preferences/inc/class.soadmin_acl.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.soadmin_acl.inc.php   25 Jul 2006 01:13:38 -0000      1.3
+++ class.soadmin_acl.inc.php   16 Sep 2006 16:55:39 -0000      1.4
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage admin
-       * @version $Id: class.soadmin_acl.inc.php,v 1.3 2006/07/25 01:13:38 
skwashd Exp $
+       * @version $Id: class.soadmin_acl.inc.php,v 1.4 2006/09/16 16:55:39 
sigurdne Exp $
        */
 
        /**
@@ -21,33 +21,7 @@
                function soadmin_acl()
                {
                        $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
-                       $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
-
-                       $this->db = CreateObject('phpgwapi.db');
-                       $this->db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
-                       $this->db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
-                       $this->db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
-                       $this->db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
-                       $this->db->Password = 
$GLOBALS['phpgw_info']['server']['db_pass'];
-
-                       $this->db2 = CreateObject('phpgwapi.db');
-                       $this->db2->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
-                       $this->db2->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
-                       $this->db2->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
-                       $this->db2->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
-                       $this->db2->Password = 
$GLOBALS['phpgw_info']['server']['db_pass'];
-
-                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
-                       {
-                               $this->join = " JOIN ";
-                               $this->like = "ILIKE";
-                       }
-                       else
-                       {
-                               $this->join = " INNER JOIN ";
-                               $this->like = "LIKE";
-                       }
-
+                       $this->db =& $GLOBALS['phpgw']->db;
                }
 
                function select_location($grant = false, $appname = '', 
$allow_c_attrib = false)
@@ -71,7 +45,7 @@
                        {
                                $filter .= ' AND allow_grant = 1';
                        }
-                       $this->db->query("SELECT id, descr FROM 
phpgw_acl_location $filter ORDER BY descr");
+                       $this->db->query("SELECT id, descr FROM 
phpgw_acl_location $filter ORDER BY id");
                        
                        while ($this->db->next_record())
                        {