From d4483f961f58ca1b263992c3c42cbbba5ee1a8fd Mon Sep 17 00:00:00 2001 From: Deon George Date: Sat, 21 Nov 2009 11:04:37 +1100 Subject: [PATCH] SF Bug #2885907 - samba domain sid blank --- lib/TemplateRender.php | 2 -- lib/functions.php | 15 +++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php index 1f1a276..b666e8f 100644 --- a/lib/TemplateRender.php +++ b/lib/TemplateRender.php @@ -266,8 +266,6 @@ class TemplateRender extends PageRender { */ case 'MultiList': case 'PickList': - $args[2] = strtolower($args[2]); - # arg5 overrides our container if (empty($args[5])) $container = $server->getContainerPath($container,$args[0]); diff --git a/lib/functions.php b/lib/functions.php index 4f1acd2..598a83e 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -2882,11 +2882,12 @@ function return_ldap_hash($base,$filter,$key,$attrs,$sort=true) { if (is_array($values[$key])) foreach ($values[$key] as $i => $k) foreach ($attrs as $attr) { - if (isset($values[$attr])) { + $lattr = strtolower($attr); + if (isset($values[$lattr])) { $v = ''; - if (is_array($values[$attr]) && isset($values[$attr][$i])) - $v = $values[$attr][$i]; + if (is_array($values[$lattr]) && isset($values[$lattr][$i])) + $v = $values[$lattr][$i]; if (is_string($v) && (strlen($v) > 0)) $results[$k][$attr] = $v; @@ -2894,9 +2895,11 @@ function return_ldap_hash($base,$filter,$key,$attrs,$sort=true) { } else - foreach ($attrs as $attr) - if (isset($values[$attr])) - $results[$values[$key]][$attr] = $values[$attr]; + foreach ($attrs as $attr) { + $lattr = strtolower($attr); + if (isset($values[$lattr])) + $results[$values[$key]][$attr] = $values[$lattr]; + } return $results; }