From 889f53751a56a5782a210fb97c77187f533a5fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20P=C3=A9rez=20Crespo?= <jaime.perez@uninett.no>
Date: Thu, 20 Feb 2014 20:16:17 +0000
Subject: [PATCH] Revert "Add support for binary attributes in
AttributeAddFromLDAP (Issue #620). Also, remove hardcoded attribute names,
and detect binary attributes 'automatically'."
This reverts commit ec82fe0480a1891eff80493e5a95e66984c3ac2a.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3369 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Auth/LDAP.php | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index 43efee196..23f6c051e 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -361,25 +361,6 @@ class SimpleSAML_Auth_LDAP {
);
}
- // parse each entry and process its attributes
- for ($i = 0; $i < $results['count']; $i++) {
- $entry = $results[$i];
-
- // iterate over the attributes of the entry
- for ($j = 0; $j < $entry['count']; $j++) {
- $name = $entry[$j];
- $attribute = $entry[$name];
-
- // decide whether to base64 encode or not
- for ($k = 0; $k < $attribute['count']; $k++) {
- // base64 encode binary attributes
- if (!ctype_print($attribute[$k])) {
- $results[$i][$name][$k] = base64_encode($attribute[$k]);
- }
- }
- }
- }
-
// Remove the count and return
unset($results['count']);
return $results;
@@ -541,12 +522,12 @@ class SimpleSAML_Auth_LDAP {
continue;
}
- // base64 encode binary attributes
- if (!ctype_print($value)) {
+ // Base64 encode jpegPhoto.
+ if (strtolower($name) === 'jpegphoto') {
$values[] = base64_encode($value);
- } else {
+ } else
$values[] = $value;
- }
+
}
// Adding.
--
GitLab