deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

SF Bug #2885907 - samba domain sid blank

Browse Source
This commit is contained in:
Deon George 2009-11-21 11:04:37 +11:00
parent b1139658bf
commit d4483f961f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/TemplateRender.php
View File

@ -266,8 +266,6 @@ class TemplateRender extends PageRender {
*/ */
case 'MultiList': case 'MultiList':
case 'PickList': case 'PickList':
$args[2] = strtolower($args[2]);
# arg5 overrides our container # arg5 overrides our container
if (empty($args[5])) if (empty($args[5]))
$container = $server->getContainerPath($container,$args[0]); $container = $server->getContainerPath($container,$args[0]);

15
lib/functions.php
View File

@ -2882,11 +2882,12 @@ function return_ldap_hash($base,$filter,$key,$attrs,$sort=true) {
if (is_array($values[$key])) if (is_array($values[$key]))
foreach ($values[$key] as $i => $k) foreach ($values[$key] as $i => $k)
foreach ($attrs as $attr) { foreach ($attrs as $attr) {
if (isset($values[$attr])) { $lattr = strtolower($attr);
if (isset($values[$lattr])) {
$v = ''; $v = '';
if (is_array($values[$attr]) && isset($values[$attr][$i])) if (is_array($values[$lattr]) && isset($values[$lattr][$i]))
$v = $values[$attr][$i]; $v = $values[$lattr][$i];
if (is_string($v) && (strlen($v) > 0)) if (is_string($v) && (strlen($v) > 0))
$results[$k][$attr] = $v; $results[$k][$attr] = $v;
@ -2894,9 +2895,11 @@ function return_ldap_hash($base,$filter,$key,$attrs,$sort=true) {
} }
else else
foreach ($attrs as $attr) foreach ($attrs as $attr) {
if (isset($values[$attr])) $lattr = strtolower($attr);
$results[$values[$key]][$attr] = $values[$attr]; if (isset($values[$lattr]))
$results[$values[$key]][$attr] = $values[$lattr];
}
return $results; return $results;
} }