WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed loading LDAP suffix from profile

This commit is contained in:
Roland Gruber 2011-05-14 13:51:08 +00:00
parent 5b8e3624f6
commit e800ad68da
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lam/lib/modules.inc
View File

@ -775,11 +775,11 @@ class accountContainer {
} }
elseif (!$profileLoaded) { elseif (!$profileLoaded) {
// change dn suffix // change dn suffix
if (isset($_REQUEST['suffix']) && ($_REQUEST['suffix'] != '')) { if (isset($_GET['suffix']) && ($_GET['suffix'] != '') && ($this->dn == null)) {
$this->dn = $_REQUEST['suffix']; $this->dn = $_GET['suffix'];
} }
if (isset($_REQUEST['accountContainerSuffix']) && ($_REQUEST['accountContainerSuffix'] != '')) { if (isset($_POST['accountContainerSuffix']) && ($_POST['accountContainerSuffix'] != '')) {
$this->dn = $_REQUEST['accountContainerSuffix']; $this->dn = $_POST['accountContainerSuffix'];
} }
// change RDN // change RDN
if (isset($_POST['accountContainerRDN'])) { if (isset($_POST['accountContainerRDN'])) {
@ -1257,7 +1257,7 @@ class accountContainer {
$this->rdn = $profile['ldap_rdn'][0]; $this->rdn = $profile['ldap_rdn'][0];
} }
} }
if (isset($profile['ldap_suffix'][0])) { if (isset($profile['ldap_suffix'][0]) && ($profile['ldap_suffix'][0] != '-')) {
$this->dn = $profile['ldap_suffix'][0]; $this->dn = $profile['ldap_suffix'][0];
} }
return true; return true;
@ -1538,7 +1538,7 @@ class accountContainer {
$this->rdn = $profile['ldap_rdn'][0]; $this->rdn = $profile['ldap_rdn'][0];
} }
} }
if (isset($profile['ldap_suffix'][0])) { if (isset($profile['ldap_suffix'][0]) && ($profile['ldap_suffix'][0] != '-')) {
$this->dn = $profile['ldap_suffix'][0]; $this->dn = $profile['ldap_suffix'][0];
} }
// get titles // get titles

2
lam/templates/profedit/profilepage.php
View File

@ -178,7 +178,7 @@ $dnContent->addElement(new htmlSpacer(null, '10px'), true);
// get root suffix // get root suffix
$rootsuffix = $_SESSION['config']->get_Suffix($type); $rootsuffix = $_SESSION['config']->get_Suffix($type);
// get subsuffixes // get subsuffixes
$suffixes = array(); $suffixes = array('-' => '-');
$typeObj = new $type(); $typeObj = new $type();
$possibleSuffixes = $typeObj->getSuffixList(); $possibleSuffixes = $typeObj->getSuffixList();
foreach ($possibleSuffixes as $suffix) { foreach ($possibleSuffixes as $suffix) {