[Phpgroupware-cvs] preferences/inc class.socommon.inc.php class.so...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    preferences
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/03/26 19:58:21

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

Log message:
        no message

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/preferences/inc/class.socommon.inc.php.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/preferences/inc/class.soadmin_acl.inc.php.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/preferences/inc/class.boadmin_acl.inc.php.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: preferences/inc/class.boadmin_acl.inc.php
diff -u preferences/inc/class.boadmin_acl.inc.php:1.1 
preferences/inc/class.boadmin_acl.inc.php:1.2
--- preferences/inc/class.boadmin_acl.inc.php:1.1       Tue Mar 14 10:30:54 2006
+++ preferences/inc/class.boadmin_acl.inc.php   Sun Mar 26 19:58:21 2006
@@ -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.boadmin_acl.inc.php,v 1.1 2006/03/14 10:30:54 
sigurdne Exp $
+       * @version $Id: class.boadmin_acl.inc.php,v 1.2 2006/03/26 19:58:21 
sigurdne Exp $
        */
 
        /**
@@ -24,11 +24,12 @@
                var $sort;
                var $order;
                var $cat_id;
+               var $acl_app;
 
                function boadmin_acl($session='')
                {
                        $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
-                       $this->so               = 
CreateObject($this->currentapp . '.soadmin_acl');
+                       $this->so               = 
CreateObject('preferences.soadmin_acl');
                        $this->catbo = createobject('phpgwapi.categories');
 
                        $this->acl              = $GLOBALS['phpgw']->acl;
@@ -61,7 +62,7 @@
                                $this->start=0;
                        }
 
-                       if($acl_app)
+                       if($acl_app && !$this->acl_app)
                        {
                                $this->acl_app = $acl_app;
                        }
@@ -127,7 +128,7 @@
                        }
                }
 
-               function select_location($format='',$selected='',$grant='')
+               function 
select_location($format='',$selected='',$grant='',$allow_c_attrib='')
                {
 
                        switch($format)
@@ -140,7 +141,7 @@
                                        break;
                        }
 
-                       $locations= 
$this->so->select_location($grant,$this->acl_app);
+                       $locations= 
$this->so->select_location($grant,$this->acl_app,$allow_c_attrib);
 
                        $i = count($locations);
                        $api_cats = $this->catbo->return_array('all', 0, True, 
False, False, 'cat_name', True);
Index: preferences/inc/class.soadmin_acl.inc.php
diff -u preferences/inc/class.soadmin_acl.inc.php:1.1 
preferences/inc/class.soadmin_acl.inc.php:1.2
--- preferences/inc/class.soadmin_acl.inc.php:1.1       Tue Mar 14 10:30:54 2006
+++ preferences/inc/class.soadmin_acl.inc.php   Sun Mar 26 19:58:21 2006
@@ -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.1 2006/03/14 10:30:54 
sigurdne Exp $
+       * @version $Id: class.soadmin_acl.inc.php,v 1.2 2006/03/26 19:58:21 
sigurdne Exp $
        */
 
        /**
@@ -50,7 +50,7 @@
 
                }
 
-               function select_location($grant='', $appname = '')
+               function select_location($grant='', $appname = '', 
$allow_c_attrib = '')
                {
                        if(!$appname)
                        {
@@ -59,6 +59,11 @@
                        
                        $filter = " WHERE appname='$appname'";
                        
+                       if($allow_c_attrib)
+                       {
+                               $filter .= ' AND allow_c_attrib = 1';
+                       }
+
                        if($grant)
                        {
                                $filter .= ' AND allow_grant=1';
Index: preferences/inc/class.socommon.inc.php
diff -u preferences/inc/class.socommon.inc.php:1.1 
preferences/inc/class.socommon.inc.php:1.2
--- preferences/inc/class.socommon.inc.php:1.1  Tue Mar 14 10:30:54 2006
+++ preferences/inc/class.socommon.inc.php      Sun Mar 26 19:58:21 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage core
-       * @version $Id: class.socommon.inc.php,v 1.1 2006/03/14 10:30:54 
sigurdne Exp $
+       * @version $Id: class.socommon.inc.php,v 1.2 2006/03/26 19:58:21 
sigurdne Exp $
        */
 
        /**
@@ -79,7 +79,7 @@
                                {
                                        if($value)
                                        {
-                                               $condition[] = $column . '=' . 
$value;
+                                               $condition[] = $column . "='" . 
$value . "'";
                                        }
                                }