skip user input processing if profile is loaded

This commit is contained in:
Roland Gruber 2008-01-15 18:13:34 +00:00
parent 0420e173ef
commit 8df6bab139
1 changed files with 6 additions and 2 deletions

View File

@ -837,12 +837,12 @@ class accountContainer {
$result = array(); $result = array();
$stopProcessing = false; // when set to true, no module options are displayed $stopProcessing = false; // when set to true, no module options are displayed
$errorsOccured = false; $errorsOccured = false;
$this->loadProfileIfRequested(); $profileLoaded = $this->loadProfileIfRequested();
if ($this->subpage=='') $this->subpage='attributes'; if ($this->subpage=='') $this->subpage='attributes';
if (isset($_POST['accountContainerReset'])) { if (isset($_POST['accountContainerReset'])) {
$result = $this->load_account($this->dn_orig); $result = $this->load_account($this->dn_orig);
} }
else { elseif (!$profileLoaded) {
// change dn suffix // change dn suffix
if (isset($_REQUEST['suffix']) && ($_REQUEST['suffix'] != '')) { if (isset($_REQUEST['suffix']) && ($_REQUEST['suffix'] != '')) {
$this->dn = $_REQUEST['suffix']; $this->dn = $_REQUEST['suffix'];
@ -1086,6 +1086,8 @@ class accountContainer {
/** /**
* Checks if the user requested to load a profile. * Checks if the user requested to load a profile.
*
* @return boolean true, if profile was loaded
*/ */
private function loadProfileIfRequested() { private function loadProfileIfRequested() {
if (isset($_POST['accountContainerLoadProfile']) && isset($_POST['accountContainerSelectLoadProfile'])) { if (isset($_POST['accountContainerLoadProfile']) && isset($_POST['accountContainerSelectLoadProfile'])) {
@ -1102,7 +1104,9 @@ class accountContainer {
if (isset($profile['ldap_suffix'][0])) { if (isset($profile['ldap_suffix'][0])) {
$this->dn = $profile['ldap_suffix'][0]; $this->dn = $profile['ldap_suffix'][0];
} }
return true;
} }
return false;
} }
/** /**