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

Merge pull request #34 from gulikoza/master 

Fix moving ldap entries and login error with 'fallback_dn'
This commit is contained in:
Deon George 2016-10-30 16:52:22 +08:00 committed by GitHub
parent 4fefe2aa8c 726190e5b8
commit e46579b34e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/copy.php
View File

@ -63,7 +63,7 @@ if ($request['recursive']) {
print '</small>';
} else {
if ($_SESSION[APPCONFIG]->getValue('confirm','copy')) {
if ($_SESSION[APPCONFIG]->getValue('confirm','copy') && !$request['remove']) {
$request['pageSRC'] = new TemplateRender($ldap['SRC']->getIndex(),get_request('template','REQUEST',false,null));
$request['pageSRC']->setDN($request['dnSRC']);
$request['pageSRC']->accept(true);

2
lib/ds_ldap.php
View File

@ -251,7 +251,7 @@ class ldap extends DS {
else
$userDN = $this->getLoginID($user,'login');
if (! $userDN && $this->getValue('login','fallback_dn'))
if (! $userDN && $this->getValue('login','fallback_dn') && strpos($user, '='))
$userDN = $user;
if (! $userDN)