summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Auth/LDAP.php6
-rw-r--r--lib/api/kolab_api_service_domain.php8
-rw-r--r--lib/api/kolab_api_service_domains.php8
-rw-r--r--lib/api/kolab_api_service_group.php8
-rw-r--r--lib/api/kolab_api_service_ou.php8
-rw-r--r--lib/api/kolab_api_service_resource.php8
-rw-r--r--lib/api/kolab_api_service_role.php8
-rw-r--r--lib/api/kolab_api_service_sharedfolder.php8
-rw-r--r--lib/api/kolab_api_service_type.php18
-rw-r--r--lib/api/kolab_api_service_user.php8
-rw-r--r--lib/kolab_client_task.php4
11 files changed, 46 insertions, 46 deletions
diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 59432ef..4bf2a8f 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -1339,8 +1339,8 @@ class LDAP extends Net_LDAP3 {
}
$rights = array(
- 'entryLevelRights' => $standard_rights,
- 'attributeLevelRights' => array(),
+ 'entrylevelrights' => $standard_rights,
+ 'attributelevelrights' => array(),
);
$subject = $this->search($subject_dn);
@@ -1354,7 +1354,7 @@ class LDAP extends Net_LDAP3 {
$attributes = array_merge((array)$attributes['may'], (array)$attributes['must']);
foreach ($attributes as $attribute) {
- $rights['attributeLevelRights'][$attribute] = $standard_rights;
+ $rights['attributelevelrights'][$attribute] = $standard_rights;
}
return $rights;
diff --git a/lib/api/kolab_api_service_domain.php b/lib/api/kolab_api_service_domain.php
index 9190e62..9781eeb 100644
--- a/lib/api/kolab_api_service_domain.php
+++ b/lib/api/kolab_api_service_domain.php
@@ -50,19 +50,19 @@ class kolab_api_service_domain extends kolab_api_service
$effective_rights = $auth->list_rights($domain_base_dn);
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['find'] = "r";
$rights['info'] = "r";
}
diff --git a/lib/api/kolab_api_service_domains.php b/lib/api/kolab_api_service_domains.php
index 2373877..6b4c4c3 100644
--- a/lib/api/kolab_api_service_domains.php
+++ b/lib/api/kolab_api_service_domains.php
@@ -58,19 +58,19 @@ class kolab_api_service_domains extends kolab_api_service
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['list'] = "r";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['list'] = "r";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['list'] = "r";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['list'] = "r";
}
diff --git a/lib/api/kolab_api_service_group.php b/lib/api/kolab_api_service_group.php
index 3b3d547..5609cf1 100644
--- a/lib/api/kolab_api_service_group.php
+++ b/lib/api/kolab_api_service_group.php
@@ -43,19 +43,19 @@ class kolab_api_service_group extends kolab_api_service
$effective_rights = $auth->list_rights('group');
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['info'] = "r";
$rights['find'] = "r";
$rights['members_list'] = "r";
diff --git a/lib/api/kolab_api_service_ou.php b/lib/api/kolab_api_service_ou.php
index 7d0c7d7..aa3c03c 100644
--- a/lib/api/kolab_api_service_ou.php
+++ b/lib/api/kolab_api_service_ou.php
@@ -41,19 +41,19 @@ class kolab_api_service_ou extends kolab_api_service
$effective_rights = $auth->list_rights('ou');
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['info'] = "r";
$rights['find'] = "r";
$rights['members_list'] = "r";
diff --git a/lib/api/kolab_api_service_resource.php b/lib/api/kolab_api_service_resource.php
index 4e96070..7855aec 100644
--- a/lib/api/kolab_api_service_resource.php
+++ b/lib/api/kolab_api_service_resource.php
@@ -43,19 +43,19 @@ class kolab_api_service_resource extends kolab_api_service
$effective_rights = $auth->list_rights('resource');
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['info'] = "r";
$rights['find'] = "r";
}
diff --git a/lib/api/kolab_api_service_role.php b/lib/api/kolab_api_service_role.php
index f6353b0..2873a12 100644
--- a/lib/api/kolab_api_service_role.php
+++ b/lib/api/kolab_api_service_role.php
@@ -43,19 +43,19 @@ class kolab_api_service_role extends kolab_api_service
$effective_rights = $auth->list_rights('role');
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['info'] = "r";
$rights['find'] = "r";
$rights['members_list'] = "r";
diff --git a/lib/api/kolab_api_service_sharedfolder.php b/lib/api/kolab_api_service_sharedfolder.php
index b828f81..2dcc33b 100644
--- a/lib/api/kolab_api_service_sharedfolder.php
+++ b/lib/api/kolab_api_service_sharedfolder.php
@@ -43,19 +43,19 @@ class kolab_api_service_sharedfolder extends kolab_api_service
$effective_rights = $auth->list_rights('sharedfolder');
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['info'] = "r";
$rights['find'] = "r";
}
diff --git a/lib/api/kolab_api_service_type.php b/lib/api/kolab_api_service_type.php
index 0089589..65b60be 100644
--- a/lib/api/kolab_api_service_type.php
+++ b/lib/api/kolab_api_service_type.php
@@ -40,19 +40,19 @@ class kolab_api_service_type extends kolab_api_service
$effective_rights = $this->type_effective_rights();
$rights = array();
- if (in_array('add', (array)$effective_rights['entryLevelRights'])) {
+ if (in_array('add', (array)$effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', (array)$effective_rights['entryLevelRights'])) {
+ if (in_array('delete', (array)$effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', (array)$effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', (array)$effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
}
- if (in_array('read', (array)$effective_rights['entryLevelRights'])) {
+ if (in_array('read', (array)$effective_rights['entrylevelrights'])) {
$rights['info'] = "r";
}
@@ -84,7 +84,7 @@ class kolab_api_service_type extends kolab_api_service
}
$effective_rights = $this->type_effective_rights();
- if (!in_array('add', (array)$effective_rights['entryLevelRights'])) {
+ if (!in_array('add', (array)$effective_rights['entrylevelrights'])) {
return false;
}
@@ -146,7 +146,7 @@ class kolab_api_service_type extends kolab_api_service
$object_id = $postdata['id'];
$effective_rights = $this->type_effective_rights();
- if (!in_array('delete', (array)$effective_rights['entryLevelRights'])) {
+ if (!in_array('delete', (array)$effective_rights['entrylevelrights'])) {
return false;
}
@@ -178,7 +178,7 @@ class kolab_api_service_type extends kolab_api_service
}
$effective_rights = $this->type_effective_rights();
- if (!in_array('modrdn', (array)$effective_rights['entryLevelRights'])) {
+ if (!in_array('modrdn', (array)$effective_rights['entrylevelrights'])) {
return false;
}
@@ -224,10 +224,10 @@ class kolab_api_service_type extends kolab_api_service
if (strtolower($_SESSION['user']->get_userid()) == 'cn=directory manager') {
$attr_acl = array('read', 'write', 'delete');
$effective_rights = array(
- 'entryLevelRights' => array(
+ 'entrylevelrights' => array(
'read', 'add', 'delete', 'modrdn',
),
- 'attributeLevelRights' => array(
+ 'attributelevelrights' => array(
'key' => $attr_acl,
'name' => $attr_acl,
'description' => $attr_acl,
diff --git a/lib/api/kolab_api_service_user.php b/lib/api/kolab_api_service_user.php
index d63636d..ae3b442 100644
--- a/lib/api/kolab_api_service_user.php
+++ b/lib/api/kolab_api_service_user.php
@@ -43,20 +43,20 @@ class kolab_api_service_user extends kolab_api_service
$rights = array();
- if (in_array('add', $effective_rights['entryLevelRights'])) {
+ if (in_array('add', $effective_rights['entrylevelrights'])) {
$rights['add'] = "w";
}
- if (in_array('delete', $effective_rights['entryLevelRights'])) {
+ if (in_array('delete', $effective_rights['entrylevelrights'])) {
$rights['delete'] = "w";
}
- if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+ if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
$rights['edit'] = "w";
$rights['password'] = "w";
}
- if (in_array('read', $effective_rights['entryLevelRights'])) {
+ if (in_array('read', $effective_rights['entrylevelrights'])) {
$rights['info'] = "r";
$rights['find'] = "r";
}
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 46eecaf..1b3908e 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -767,8 +767,8 @@ class kolab_client_task
$result = $this->api_get($type . '.effective_rights', array('id' => $id));
$result = array(
- 'attribute' => $result->get('attributeLevelRights'),
- 'entry' => $result->get('entryLevelRights'),
+ 'attribute' => $result->get('attributelevelrights'),
+ 'entry' => $result->get('entrylevelrights'),
);
return $result;