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

SF Bug #3531956 - Search / Show Attributes must be lowercase

Browse Source
This commit is contained in:
Deon George 2012-09-05 22:44:46 +10:00
parent f1ed59a35e
commit bbedf18b7e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Query.php
View File

@ -247,8 +247,8 @@ class Query extends xmlTemplate {
# If our display order is empty, then dynamically build it # If our display order is empty, then dynamically build it
if (! count($result)) { if (! count($result)) {
foreach ($this->results as $details) foreach ($this->results as $details)
foreach ($details as $attrs) foreach ($details as $attrs)
$result = array_merge($result,array_keys(array_change_key_case($attrs))); $result = array_merge($result,array_keys(array_change_key_case($attrs)));
$result = array_unique($result); $result = array_unique($result);
sort($result); sort($result);

4
lib/QueryRender.php
View File

@ -280,6 +280,8 @@ class QueryRender extends PageRender {
# Iterate over each attribute for this entry # Iterate over each attribute for this entry
foreach (explode(',',$ado) as $attr) { foreach (explode(',',$ado) as $attr) {
$attr = strtolower($attr);
# Ignore DN, we've already displayed it. # Ignore DN, we've already displayed it.
if ($attr == 'dn') if ($attr == 'dn')
continue; continue;
@ -459,7 +461,7 @@ class QueryRender extends PageRender {
$results = array(); $results = array();
foreach (explode(',',$this->template->getAttrDisplayOrder()) as $attr) foreach (explode(',',$this->template->getAttrDisplayOrder()) as $attr)
$results[$attr] = $attribute_factory->newAttribute($attr,array('values'=>array()),$this->getServerID()); $results[strtolower($attr)] = $attribute_factory->newAttribute($attr,array('values'=>array()),$this->getServerID());
return $results; return $results;
} }