[Phpgroupware-cvs] [19023] Move the location code to the class.location.inc.php code

[Caeies]

Revision: 19023
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19023
Author:   Caeies
Date:     2009-01-07 18:26:05 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Move the location code to the class.location.inc.php code

Modified Paths:
--------------
    core/trunk/preferences/inc/class.soadmin_acl.inc.php

Modified: core/trunk/preferences/inc/class.soadmin_acl.inc.php
===================================================================
--- core/trunk/preferences/inc/class.soadmin_acl.inc.php        2009-01-07 
18:25:22 UTC (rev 19022)
+++ core/trunk/preferences/inc/class.soadmin_acl.inc.php        2009-01-07 
18:26:05 UTC (rev 19023)
@@ -26,32 +26,11 @@
 
                function select_location($grant = false, $appname = '', 
$allow_c_attrib = false)
                {
-                       $location = array();
-                       
                        if ( !$appname )
                        {
                                $appname = $this->currentapp;
                        }
-                       $appname = $this->db->db_addslashes($appname);
-                       
-                       $filter = " WHERE appname='{$appname}'";
-                       
-                       if($allow_c_attrib)
-                       {
-                               $filter .= ' AND allow_c_attrib = 1';
-                       }
-
-                       if($grant)
-                       {
-                               $filter .= ' AND allow_grant = 1';
-                       }
-                       $this->db->query("SELECT id, descr FROM 
phpgw_acl_location $filter ORDER BY id");
-                       
-                       while ($this->db->next_record())
-                       {
-                               $location[$this->db->f('id')] = 
$this->db->f('descr', true);
-                       }
-                       return $location;
+                       return 
$GLOBALS['phpgw']->locations->get_locations_by_apps($appname, $allow_c_attrib, 
$grant);
                }
        }
 ?>