Skip to content
GitLab
Commit 87a108f2 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5673 Fixed PHP errors on login in some cases

parent 05036b36
dev 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 14 deletions
+16 -14
applications/admin/applications/class_applicationManagement.inc
+ 16
− 14
View file @ 87a108f2
...@@ -60,20 +60,22 @@ class applicationManagement extends simpleManagement ...@@ -60,20 +60,22 @@ class applicationManagement extends simpleManagement
); );
} else { /* allowed */ } else { /* allowed */
$apps = array(); $apps = array();
$roles = objects::ls( if (is_object($ui) && isset($ui->dn)) {
'role', $roles = objects::ls(
array('fdApplicationAllowed' => '*'), 'role',
NULL, array('fdApplicationAllowed' => '*'),
'(&(objectClass=fdApplicationRights)(roleOccupant='.$ui->dn.'))' NULL,
); '(&(objectClass=fdApplicationRights)(roleOccupant='.$ui->dn.'))'
foreach ($roles as $role) { );
foreach ($role['fdApplicationAllowed'] as $appdn) { foreach ($roles as $role) {
if (!isset($apps[$appdn])) { foreach ($role['fdApplicationAllowed'] as $appdn) {
$ldap->cat($appdn); if (!isset($apps[$appdn])) {
if ($ldap->count()) { $ldap->cat($appdn);
$attrs = $ldap->fetch(); if ($ldap->count()) {
if (in_array_ics('fdWebApplication', $attrs['objectClass'])) { $attrs = $ldap->fetch();
$apps[$appdn] = $attrs; if (in_array_ics('fdWebApplication', $attrs['objectClass'])) {
$apps[$appdn] = $attrs;
}
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment