From 45f62325abc4cb84df437ce3717765ec9711b724 Mon Sep 17 00:00:00 2001 From: "valentin.pocotilenco" <valentin.pocotilenco@renam.md> Date: Wed, 4 Oct 2023 00:03:00 +0300 Subject: [PATCH] non critical updates --- app/Libraries/EarcUtils.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/Libraries/EarcUtils.php b/app/Libraries/EarcUtils.php index 2ff841b..e564620 100755 --- a/app/Libraries/EarcUtils.php +++ b/app/Libraries/EarcUtils.php @@ -255,15 +255,11 @@ class EarcUtils public static function canBeRedundant($attributeName, $released_attributes) { if (($attributeName == 'schacHomeOrganization' && (array_key_exists('eduPersonPrincipalName', $released_attributes) || array_key_exists('eduPersonScopedAffiliation', $released_attributes))) || - ($attributeName == 'cn' && (array_key_exists('sn', $released_attributes) && array_key_exists('givenName', $released_attributes))) || + ($attributeName == 'cn' && ((array_key_exists('sn', $released_attributes) && array_key_exists('givenName', $released_attributes)) || array_key_exists('displayName', $released_attributes))) || ($attributeName == 'eduPersonAffiliation' && (array_key_exists('eduPersonScopedAffiliation', $released_attributes))) || - ($attributeName == 'cn' && array_key_exists('displayName', $released_attributes)) || - ($attributeName == 'sn' && array_key_exists('displayName', $released_attributes)) || - ($attributeName == 'sn' && array_key_exists('cn', $released_attributes)) || - ($attributeName == 'givenName' && array_key_exists('displayName', $released_attributes)) || - ($attributeName == 'givenName' && array_key_exists('cn', $released_attributes)) || - ($attributeName == 'displayName' && (array_key_exists('sn', $released_attributes) && array_key_exists('givenName', $released_attributes))) || - ($attributeName == 'displayName' && array_key_exists('cn', $released_attributes)) + ($attributeName == 'sn' && (array_key_exists('displayName', $released_attributes) || array_key_exists('cn', $released_attributes))) || + ($attributeName == 'givenName' && (array_key_exists('displayName', $released_attributes) || array_key_exists('cn', $released_attributes))) || + ($attributeName == 'displayName' && ((array_key_exists('sn', $released_attributes) && array_key_exists('givenName', $released_attributes)) || array_key_exists('cn', $released_attributes))) ) { return true; } else { @@ -309,6 +305,7 @@ class EarcUtils foreach ($sp['attributeNames'] as $attributeName) { if (!array_key_exists($attributeName, $released_attributes) && self::canBeRedundant($attributeName, $released_attributes)) { $ret = '-'; + break; } } break; -- GitLab