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

SF Bug #1008 getContainerPath doesn't properly traverse to baseDN and back & #1009 - return_ldap_hash should not return container object in result set

Browse Source
This commit is contained in:
Nic Bernstein 2013-03-19 13:37:57 +11:00 committed by Deon George
parent cfbee19721
commit 5ba2cf67e9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/TemplateRender.php
View File

@ -264,6 +264,9 @@ class TemplateRender extends PageRender {
* *
* * arg 8 (for MultiList) * * arg 8 (for MultiList)
* - size of displayed list (default: 10 lines) * - size of displayed list (default: 10 lines)
*
* * arg 9
* - if whether to include parent in sub query TRUE|FALSE
*/ */
case 'MultiList': case 'MultiList':
case 'PickList': case 'PickList':
@ -322,6 +325,9 @@ class TemplateRender extends PageRender {
$vals = array(); $vals = array();
foreach ($picklistvalues as $key => $values) { foreach ($picklistvalues as $key => $values) {
if (! empty($args[9]) && $container == $key)
continue;
$display = $args[3]; $display = $args[3];
foreach ($matchall[1] as $key => $arg) { foreach ($matchall[1] as $key => $arg) {

2
lib/ds_ldap.php
View File

@ -910,7 +910,7 @@ class ldap extends DS {
$dn = $this->getContainer($dn); $dn = $this->getContainer($dn);
if ($dn == $top) if ($dn == $top)
break; continue;
} elseif($value) } elseif($value)
$dn = sprintf('%s,%s',$value,$dn); $dn = sprintf('%s,%s',$value,$dn);