summaryrefslogtreecommitdiffstats
path: root/modules-available/sysconfig
diff options
context:
space:
mode:
authorSimon Rettberg2017-04-27 15:49:49 +0200
committerSimon Rettberg2017-04-27 15:49:49 +0200
commit1c7187e758409c8f722032226726a9c89f8b84b2 (patch)
tree379e976669e7f41ada2c8b8ccf665c8ac89d2c33 /modules-available/sysconfig
parent[locationinfo] Check for valid serverid when saving location config (diff)
downloadslx-admin-1c7187e758409c8f722032226726a9c89f8b84b2.tar.gz
slx-admin-1c7187e758409c8f722032226726a9c89f8b84b2.tar.xz
slx-admin-1c7187e758409c8f722032226726a9c89f8b84b2.zip
[sysconfig] Load shareDomain and credentialPassthrough when editing AD/LDAP
This fixes #3121
Diffstat (limited to 'modules-available/sysconfig')
-rw-r--r--modules-available/sysconfig/addmodule_adauth.inc.php1
-rw-r--r--modules-available/sysconfig/addmodule_ldapauth.inc.php1
-rw-r--r--modules-available/sysconfig/templates/ad_ldap-homedir.html4
3 files changed, 4 insertions, 2 deletions
diff --git a/modules-available/sysconfig/addmodule_adauth.inc.php b/modules-available/sysconfig/addmodule_adauth.inc.php
index 82df5bad..5de834d9 100644
--- a/modules-available/sysconfig/addmodule_adauth.inc.php
+++ b/modules-available/sysconfig/addmodule_adauth.inc.php
@@ -410,6 +410,7 @@ class AdAuth_HomeDir extends AddModule_Base
}
}
$data['shareRemapMode_' . $this->edit->getData('shareRemapMode')] = 'selected="selected"';
+ $data['shareDomain'] = $this->edit->getData('shareDomain');
$letter = $this->edit->getData('shareHomeDrive');
} else {
$data['shareDownloads_c'] = $data['shareMedia_c'] = $data['shareDocuments_c'] = $data['shareRemapCreate_c'] = 'checked="checked"';
diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php
index c61c710c..33253d08 100644
--- a/modules-available/sysconfig/addmodule_ldapauth.inc.php
+++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php
@@ -194,6 +194,7 @@ class LdapAuth_HomeDir extends AddModule_Base
}
}
$data['shareRemapMode_' . $this->edit->getData('shareRemapMode')] = 'selected="selected"';
+ $data['shareDomain'] = $this->edit->getData('shareDomain');
$letter = $this->edit->getData('shareHomeDrive');
} else {
$data['shareDownloads_c'] = $data['shareMedia_c'] = $data['shareDocuments_c'] = $data['shareRemapCreate_c'] = 'checked="checked"';
diff --git a/modules-available/sysconfig/templates/ad_ldap-homedir.html b/modules-available/sysconfig/templates/ad_ldap-homedir.html
index 2ced563d..06fb65c8 100644
--- a/modules-available/sysconfig/templates/ad_ldap-homedir.html
+++ b/modules-available/sysconfig/templates/ad_ldap-homedir.html
@@ -18,7 +18,7 @@
<div class="slx-bold">{{lang_credentialPassing}}</div>
<div class="checkbox">
- <input type="checkbox" class="form-control" id="inputcredentialPassthrough" name="credentialPassthrough">
+ <input type="checkbox" class="form-control" id="inputcredentialPassthrough" name="credentialPassthrough" {{credentialPassthrough_c}}>
<label for="inputcredentialPassthrough">{{lang_credentialPassing}}</label>
</div>
<div><i>{{lang_credPassingNotes}}</i></div>
@@ -42,7 +42,7 @@
<div class="form-group row">
<label for="inputshareDomain" class="control-label col-xs-4">{{lang_shareDomainLabel}}</label>
<div class="col-xs-8">
- <input type="text" class="form-control" id="inputshareDomain" name="shareDomain">
+ <input type="text" class="form-control" id="inputshareDomain" name="shareDomain" value="{{shareDomain}}">
<p><i>{{lang_shareDomainNote}}</i></p>
</div>
</div>