From a4d89852ce9517d4b2ff00c31603ba75a84a937f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 6 Dec 2017 13:15:36 +0100
Subject: [sysconfig] Support customizing LDAP attributes

---
 .../sysconfig/templates/ad_ldap-checkconnection.html     |  7 +++++++
 .../sysconfig/templates/ad_ldap-checkcredentials.html    |  6 ++++++
 .../sysconfig/templates/ad_ldap-homedir.html             |  3 +++
 modules-available/sysconfig/templates/ldap-start.html    | 16 +++++++++++++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'modules-available/sysconfig/templates')

diff --git a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
index 35c8f1ee..630da398 100644
--- a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
+++ b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
@@ -26,6 +26,10 @@
 		<input name="ssl" value="on" type="hidden">
 		<input type="hidden" name="certificate" value="{{certificate}}">
 		{{/ssl}}
+		{{#mapping}}
+			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
+		{{/mapping}}
+
 		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<button type="submit" class="btn btn-primary">&laquo; {{lang_back}}</button>
 	</form>
@@ -47,6 +51,9 @@
 		<input id="fingerprint" name="fingerprint" value="" type="hidden">
 		<input id="certificate" type="hidden" name="certificate" value="{{certificate}}">
 		{{/ssl}}
+		{{#mapping}}
+			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
+		{{/mapping}}
 		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="originalbinddn" value="{{binddn}}" type="hidden">
 		<button id="nextbutton" type="submit" class="btn btn-primary" style="display:none">{{lang_next}} &raquo;</button>
diff --git a/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
index bf151da3..4f822a9b 100644
--- a/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
+++ b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
@@ -22,6 +22,9 @@
 		<input name="ssl" value="on" type="hidden">
 		<input type="hidden" name="certificate" value="{{certificate}}">
 		{{/ssl}}
+		{{#mapping}}
+			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
+		{{/mapping}}
 		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<button type="submit" class="btn btn-primary">&laquo; {{lang_back}}</button>
 	</form>
@@ -42,6 +45,9 @@
 		<input name="ssl" value="on" type="hidden">
 		<input type="hidden" name="certificate" value="{{certificate}}">
 		{{/ssl}}
+		{{#mapping}}
+			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
+		{{/mapping}}
 		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="fingerprint" value="{{fingerprint}}" type="hidden">
 		<input name="originalbinddn" value="{{binddn}}" type="hidden">
diff --git a/modules-available/sysconfig/templates/ad_ldap-homedir.html b/modules-available/sysconfig/templates/ad_ldap-homedir.html
index 10a43030..ad543594 100644
--- a/modules-available/sysconfig/templates/ad_ldap-homedir.html
+++ b/modules-available/sysconfig/templates/ad_ldap-homedir.html
@@ -14,6 +14,9 @@
 	<input name="ssl" value="on" type="hidden">
 	<input type="hidden" name="certificate" value="{{certificate}}">
 	{{/ssl}}
+	{{#mapping}}
+		<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
+	{{/mapping}}
 	<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 	<input name="fingerprint" value="{{fingerprint}}" type="hidden">
 
diff --git a/modules-available/sysconfig/templates/ldap-start.html b/modules-available/sysconfig/templates/ldap-start.html
index cbb142ea..223791ea 100644
--- a/modules-available/sysconfig/templates/ldap-start.html
+++ b/modules-available/sysconfig/templates/ldap-start.html
@@ -43,13 +43,27 @@
 	</div>
 	<br>
 	<div class="input-group">
-		<span style="min-width:150px;" class="input-group-addon slx-ga">Home</span>
+		<span class="input-group-addon slx-ga" style="min-width:150px">{{lang_homeFallback}}</span>
 		<input tabindex="6" name="home" value="{{home}}" type="text" class="form-control" placeholder="\\server.example.com\%s">
 		<span class="input-group-btn">
 			<a class="btn btn-default" data-toggle="modal" data-target="#help-home"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</span>
 	</div>
 	<br>
+	<div class="collapse" id="attrbox">
+		<p>{{lang_customizeAttrDesc}}</p>
+		{{#mapping}}
+			<div class="input-group">
+				<span class="input-group-addon slx-ga2">{{name}}</span>
+				<input name="mapping[{{field}}]" value="{{value}}" type="text" class="form-control" placeholder="{{name}}">
+			</div>
+		{{/mapping}}
+	</div>
+	<div class="btn btn-default center-block" onclick="$('#attrbox').show();$(this).hide()">
+		{{lang_customizeAttributes}}
+		<span class="glyphicon glyphicon-menu-down"></span>
+	</div>
+	<br>
 	<div>
 		<div class="checkbox">
 			<input id="num-cb" type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}>
-- 
cgit v1.2.3-55-g7522