From 295c4bd4f7e0f6b7d06bb194b38fe4040a305795 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Thu, 10 Jun 2021 10:29:44 +0200
Subject: [PATCH] =?UTF-8?q?prise=20en=20compte=20du=20port=20de=20l'ead=20?=
 =?UTF-8?q?configur=C3=A9=20dans=20genconfig=20(fixes=20#32749)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/91_ninegate.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dicos/91_ninegate.xml b/dicos/91_ninegate.xml
index 6b698e41..c3115bb3 100644
--- a/dicos/91_ninegate.xml
+++ b/dicos/91_ninegate.xml
@@ -76,7 +76,7 @@
             <variable name='ninegate_test_sonde' type='oui/non' hidden='True'/>
             <variable name='ninegate_test_conf_cadolesldap' type='oui/non' hidden='True'/>
             <variable name='ninegate_test_conf_ldap' type='oui/non' hidden='True'/>
-
+            <variable name="ninegate_widead_port" type='port' description="Port d'accès EAD personnalisé" hidden='True'><value>4200</value></variable>
 
 
 
@@ -925,10 +925,20 @@
             <target type='variable'>ninegate_widead_url</target>
         </condition>   
 
+        <fill name='calc_multi_condition' target='ninegate_widead_port'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_ead_reverseproxy</param>
+            <param type='eole' name='match' hidden='False'>port_ead_reverseproxy</param>
+            <param name='mismatch'>4200</param>
+            <param name='default_match'>4200</param>
+        </fill>
+
         <fill name='concat' target='ninegate_widead_url'>
             <param>https://</param>
             <param type='eole'>web_url</param>
-            <param>:4200</param>
+            <param>:</param>
+            <param type='eole'>ninegate_widead_port</param>
+            <param>/connect/?server=1</param>
         </fill>
         
         <!-- AFFICHAGE EN FONCTION DU WIDGET EOE -->