[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.acl2.inc.php class.boadmin.i...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property/inc class.acl2.inc.php class.boadmin.i... |
Date: |
Wed, 22 Mar 2006 11:17:08 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/03/22 11:17:08
Modified files:
inc : class.acl2.inc.php class.boadmin.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.acl2.inc.php.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.boadmin.inc.php.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: property/inc/class.acl2.inc.php
diff -u property/inc/class.acl2.inc.php:1.9 property/inc/class.acl2.inc.php:1.10
--- property/inc/class.acl2.inc.php:1.9 Wed Mar 22 10:38:19 2006
+++ property/inc/class.acl2.inc.php Wed Mar 22 11:17:08 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.acl2.inc.php,v 1.9 2006/03/22 10:38:19 sigurdne
Exp $
+ * @version $Id: class.acl2.inc.php,v 1.10 2006/03/22 11:17:08 sigurdne
Exp $
*/
/**
@@ -588,7 +588,8 @@
$app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
- $app_id =
$GLOBALS['phpgw']->applications->data[$app]['id'];
+ $app_id = $GLOBALS['phpgw_info']['apps'][$app]['id'];
+ //$app_id =
$GLOBALS['phpgw']->applications->data[$app]['id'];
$sql = "select grantor,grantor_type, acl_rights from
fm_acl2 where acl_appid = $app_id AND acl_type=0 and acl_location =
'$location' AND grantor is NOT NULL AND"
. " fm_acl2.acl_account in ";
Index: property/inc/class.boadmin.inc.php
diff -u property/inc/class.boadmin.inc.php:1.8
property/inc/class.boadmin.inc.php:1.9
--- property/inc/class.boadmin.inc.php:1.8 Fri Feb 3 12:05:49 2006
+++ property/inc/class.boadmin.inc.php Wed Mar 22 11:17:08 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.boadmin.inc.php,v 1.8 2006/02/03 12:05:49
sigurdne Exp $
+ * @version $Id: class.boadmin.inc.php,v 1.9 2006/03/22 11:17:08
sigurdne Exp $
*/
/**
@@ -31,7 +31,8 @@
$this->so =
CreateObject($this->currentapp.'.soadmin');
$this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$this->right = array(1,2,4,8,16,32,64,128);
- $this->app_id
=$GLOBALS['phpgw']->applications->data[$GLOBALS['phpgw_info']['flags']['currentapp']]['id'];
+ $this->app_id =
$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['id'];
+ // $this->app_id
=$GLOBALS['phpgw']->applications->data[$GLOBALS['phpgw_info']['flags']['currentapp']]['id'];
if ($session)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.acl2.inc.php class.boadmin.i...,
Sigurd Nes <=