diff options
Diffstat (limited to 'modules-available/sysconfig/addmodule_ldapauth.inc.php')
| -rw-r--r-- | modules-available/sysconfig/addmodule_ldapauth.inc.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php index 1db6cb51..126a6549 100644 --- a/modules-available/sysconfig/addmodule_ldapauth.inc.php +++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php @@ -9,7 +9,7 @@ class LdapAuth_Start extends AddModule_Base protected function renderInternal() { - $LDAPAUTH_COMMON_FIELDS = array('title', 'server', 'searchbase', 'binddn', 'bindpw', 'home', 'homeattr', 'ssl', 'fixnumeric', 'certificate', 'mapping'); + $LDAPAUTH_COMMON_FIELDS = array('title', 'server', 'searchbase', 'binddn', 'bindpw', 'home', 'homeattr', 'ssl', 'fixnumeric', 'genuid', 'certificate', 'mapping'); $data = array(); if ($this->edit !== false) { moduleToArray($this->edit, $data, $LDAPAUTH_COMMON_FIELDS); @@ -81,6 +81,7 @@ class LdapAuth_CheckConnection extends AddModule_Base 'home' => Request::post('home'), 'ssl' => Request::post('ssl'), 'fixnumeric' => Request::post('fixnumeric'), + 'genuid' => Request::post('genuid'), 'certificate' => Request::post('certificate', ''), 'taskid' => $this->scanTask['id'], 'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', false, 'array')), @@ -152,6 +153,7 @@ class LdapAuth_CheckCredentials extends AddModule_Base 'home' => Request::post('home'), 'ssl' => Request::post('ssl') === 'on', 'fixnumeric' => Request::post('fixnumeric'), + 'genuid' => Request::post('genuid'), 'fingerprint' => Request::post('fingerprint'), 'certificate' => Request::post('certificate', ''), 'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', false, 'array')), @@ -192,6 +194,7 @@ class LdapAuth_HomeDir extends AddModule_Base 'home' => Request::post('home'), 'ssl' => Request::post('ssl') === 'on', 'fixnumeric' => Request::post('fixnumeric'), + 'genuid' => Request::post('genuid'), 'fingerprint' => Request::post('fingerprint'), 'certificate' => Request::post('certificate', ''), 'originalbinddn' => Request::post('originalbinddn'), @@ -205,9 +208,11 @@ class LdapAuth_HomeDir extends AddModule_Base $data[$key . '_c'] = 'checked="checked"'; } } - $data['shareRemapMode_' . $this->edit->getData('shareRemapMode')] = 'selected="selected"'; - $data['shareDomain'] = $this->edit->getData('shareDomain'); $letter = $this->edit->getData('shareHomeDrive'); + $data['shareRemapMode_' . $this->edit->getData('shareRemapMode')] = 'selected="selected"'; + foreach (['shareDomain', 'shareHomeMountOpts', 'ldapAttrMountOpts'] as $key) { + $data[$key] = $this->edit->getData($key); + } } else { $data['shareDownloads_c'] = $data['shareMedia_c'] = $data['shareDocuments_c'] = $data['shareRemapCreate_c'] = 'checked="checked"'; $data['shareRemapMode_1'] = 'selected="selected"'; @@ -238,8 +243,6 @@ class LdapAuth_Finish extends AddModule_Base protected function preprocessInternal() { - $binddn = Request::post('binddn'); - $searchbase = Request::post('searchbase'); $title = Request::post('title'); if (empty($title)) $title = 'LDAP: ' . Request::post('server'); @@ -248,15 +251,12 @@ class LdapAuth_Finish extends AddModule_Base else $module = $this->edit; $ssl = Request::post('ssl', 'off') === 'on'; - $module->setData('server', Request::post('server')); - $module->setData('searchbase', $searchbase); - $module->setData('binddn', $binddn); - $module->setData('bindpw', Request::post('bindpw')); - $module->setData('home', Request::post('home')); - $module->setData('certificate', Request::post('certificate')); + foreach (['searchbase', 'binddn', 'server', 'bindpw', 'home', 'certificate', 'fixnumeric', 'genuid', + 'ldapAttrMountOpts', 'shareHomeMountOpts'] as $key) { + $module->setData($key, Request::post($key, '', 'string')); + } $module->setData('ssl', $ssl); $module->setData('mapping', Request::post('mapping', false, 'array')); - $module->setData('fixnumeric', Request::post('fixnumeric', '', 'string')); foreach (LdapAuth_HomeDir::getAttributes() as $key) { $value = Request::post($key); if (is_numeric($value)) { |