extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 02:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed doublicate key error, happening with some installs / php-versions on updating or adding acls

Browse Source
This commit is contained in:
Ralf Becker 2006-10-15 09:21:59 +00:00
parent 0368c7b551
commit afddf22135
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
phpgwapi/inc/class.acl.inc.php
View File

@ -53,7 +53,9 @@
*/
var $data = Array();
/**
* @var object/db $db internal copy of the db-object
* internal copy of the db-object
*
* @var egw_db
*/
var $db;
/**
@ -156,14 +158,9 @@
$this->db->select($this->table_name,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__);
$this->data = Array();
while(($row = $this->db->row(true)))
while(($row = $this->db->row(true,'acl_')))
{
$this->data[] = array(
'appname' => $row['acl_appname'],
'location' => $row['acl_location'],
'account' => $row['acl_account'],
'rights' => $row['acl_rights'],
);
$this->data[$row['appname'].'-'.$row['location'].'-'.$row['account']] = $row;
}
return $this->data;
}
@ -196,12 +193,13 @@
{
if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
$this->data[] = array(
$row = array(
'appname' => $appname,
'location' => $location,
'account' => (int) $this->account_id,
'rights' => (int) $rights
);
$this->data[$row['appname'].'-'.$row['location'].'-'.$row['account']] = $row;
return $this->data;
}
@ -219,9 +217,9 @@
foreach($this->data as $idx => $value)
{
if ($this->data[$idx]['appname'] == $appname &&
($location === false || $this->data[$idx]['location'] == $location) &&
$this->data[$idx]['account'] == $this->account_id)
if ($value['appname'] == $appname &&
($location === false || $value['location'] == $location) &&
$value['account'] == $this->account_id)
{
unset($this->data[$idx]);
}