From 14b2dfede39c4f514c484a8010dfcd8b5aa5d1cf Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 6 Dec 2017 13:26:00 +0100
Subject: [sysconfig] Improve UI
---
modules-available/sysconfig/addmodule_ldapauth.inc.php | 8 +++++---
modules-available/sysconfig/templates/ldap-start.html | 18 ++++++++++--------
2 files changed, 15 insertions(+), 11 deletions(-)
(limited to 'modules-available')
diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php
index 32b6b37b..310be063 100644
--- a/modules-available/sysconfig/addmodule_ldapauth.inc.php
+++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php
@@ -7,7 +7,7 @@
class LdapAuth_Start extends AddModule_Base
{
- public static function getMapping($config = false)
+ public static function getMapping($config = false, &$empty = true)
{
$list = array(
['name' => 'uid', 'field' => 'uid'],
@@ -19,8 +19,9 @@ class LdapAuth_Start extends AddModule_Base
);
if (is_array($config)) {
foreach ($list as &$item) {
- if (isset($config[$item['field']])) {
+ if (!empty($config[$item['field']])) {
$item['value'] = $config[$item['field']];
+ $empty = false;
}
if ($item['field'] === 'homemount' && !empty($config['homeattr']) && empty($config['value'])) {
$item['value'] = $config['homeattr'];
@@ -47,7 +48,8 @@ class LdapAuth_Start extends AddModule_Base
$data['server'] = $out[1];
}
$data['step'] = 'LdapAuth_CheckConnection';
- $data['mapping'] = self::getMapping(isset($data['mapping']) ? $data['mapping'] : false);
+ $data['map_empty'] = true;
+ $data['mapping'] = self::getMapping(isset($data['mapping']) ? $data['mapping'] : false, $data['map_empty']);
Render::addDialog(Dictionary::translateFile('config-module', 'ldapAuth_title'), false, 'ldap-start', $data);
}
diff --git a/modules-available/sysconfig/templates/ldap-start.html b/modules-available/sysconfig/templates/ldap-start.html
index 223791ea..940316b9 100644
--- a/modules-available/sysconfig/templates/ldap-start.html
+++ b/modules-available/sysconfig/templates/ldap-start.html
@@ -10,32 +10,32 @@
- {{lang_moduleTitle}}
+ {{lang_moduleTitle}}
- Server *
+ Server *
- {{lang_bindDN}}
+ {{lang_bindDN}}
- {{lang_password}}
+ {{lang_password}}
-