From 0ff57c5188cb6b9941029bb5cd2781c78d7533dc Mon Sep 17 00:00:00 2001
From: Valentin <valentin.pocotilenco>
Date: Tue, 10 Oct 2023 12:55:18 +0300
Subject: [PATCH] Revert "non critical updates"
This reverts commit 45f62325abc4cb84df437ce3717765ec9711b724.
---
app/Libraries/EarcUtils.php | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/Libraries/EarcUtils.php b/app/Libraries/EarcUtils.php
index e564620..2ff841b 100755
--- a/app/Libraries/EarcUtils.php
+++ b/app/Libraries/EarcUtils.php
@@ -255,11 +255,15 @@ 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)) || array_key_exists('displayName', $released_attributes))) ||
+ ($attributeName == 'cn' && (array_key_exists('sn', $released_attributes) && array_key_exists('givenName', $released_attributes))) ||
($attributeName == 'eduPersonAffiliation' && (array_key_exists('eduPersonScopedAffiliation', $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)))
+ ($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))
) {
return true;
} else {
@@ -305,7 +309,6 @@ class EarcUtils
foreach ($sp['attributeNames'] as $attributeName) {
if (!array_key_exists($attributeName, $released_attributes) && self::canBeRedundant($attributeName, $released_attributes)) {
$ret = '-';
- break;
}
}
break;
--
GitLab