From 58912e335c7dfdfd16db3fe88d3cfbe9ae50ebb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Fri, 11 Oct 2013 09:01:54 +0000
Subject: [PATCH] Add URL in AuthChoice, to post form on another vhost (#291)

---
 lemonldap-ng-manager/example/skins/default/js/manager.js | 8 +++++---
 lemonldap-ng-manager/example/skins/default/manager.tpl   | 4 ++++
 lemonldap-ng-portal/example/skins/impact/login.tpl       | 2 +-
 lemonldap-ng-portal/example/skins/pastel/login.tpl       | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Choice.pm   | 8 ++++++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lemonldap-ng-manager/example/skins/default/js/manager.js b/lemonldap-ng-manager/example/skins/default/js/manager.js
index a6648b82a..aae58a6d4 100644
--- a/lemonldap-ng-manager/example/skins/default/js/manager.js
+++ b/lemonldap-ng-manager/example/skins/default/js/manager.js
@@ -1406,7 +1406,7 @@ function authChoiceRoot(id){
 function newChoiceR(){
 	var newIdValue=newId(currentId);
 	simpleTreeCollection[0].addNode(newIdValue,text4newKey,function(d,s){
-		$('>span',s).attr('onClick','authChoice("'+newIdValue+'")').attr('name',text4newKey).attr('value','Null|Null|Null').attr('id','text_'+newIdValue);
+		$('>span',s).attr('onClick','authChoice("'+newIdValue+'")').attr('name',text4newKey).attr('value','Null|Null|Null|').attr('id','text_'+newIdValue);
 		authChoice(newIdValue);
 	});
 	return false;
@@ -1414,7 +1414,7 @@ function newChoiceR(){
 function newChoice(){
 	var newIdValue=newId(currentId);
 	simpleTreeCollection[0].newNodeAfter(newIdValue,text4newKey,function(d,s){
-		$('>span',s).attr('onClick','authChoice("'+newIdValue+'")').attr('name',text4newKey).attr('value','Null|Null|Null').attr('id','text_'+newIdValue);
+		$('>span',s).attr('onClick','authChoice("'+newIdValue+'")').attr('name',text4newKey).attr('value','Null|Null|Null|').attr('id','text_'+newIdValue);
 		authChoice(newIdValue);
 	});
 	return false;
@@ -1429,6 +1429,7 @@ function authChoice(id){
 	formateSelectAuth('authChoiceAuth',t[0]);
 	formateSelectUser('authChoiceUser',t[1]);
 	formateSelectPassword('authChoicePassword',t[2]);
+	$('#authChoiceURL').attr('value',t[3]);
 	display('authChoice',lmtext(id));
 	$('#newchoice,#delchoice').show();
 }
@@ -1437,8 +1438,9 @@ function setlmauthchoice(id){
 	var auth=$('#authChoiceAuth').attr('value');
 	var user=$('#authChoiceUser').attr('value');
 	var password=$('#authChoicePassword').attr('value');
+	var url=$('#authChoiceURL').attr('value');
 	setlmtext(id,key);
-	setlmdata(id,auth+'|'+user+'|'+password);
+	setlmdata(id,auth+'|'+user+'|'+password+'|'+url);
 }
 
 /* Application list */
diff --git a/lemonldap-ng-manager/example/skins/default/manager.tpl b/lemonldap-ng-manager/example/skins/default/manager.tpl
index 026a3dfb5..b16ce43fb 100644
--- a/lemonldap-ng-manager/example/skins/default/manager.tpl
+++ b/lemonldap-ng-manager/example/skins/default/manager.tpl
@@ -577,6 +577,10 @@
        <td><lang en="Password module" fr="Module de mots de passe"/></td>
        <td><select id="authChoicePassword"></select></td>
       </tr>
+      <tr>
+       <td><lang en="URL" fr="URL"/></td>
+       <td><input type="text" id="authChoiceURL" /></td>
+      </tr>
      </table>
      <br />
      <button onclick="setlmauthchoice(currentId);return false;" >
diff --git a/lemonldap-ng-portal/example/skins/impact/login.tpl b/lemonldap-ng-portal/example/skins/impact/login.tpl
index e44733906..35d7de4e1 100644
--- a/lemonldap-ng-portal/example/skins/impact/login.tpl
+++ b/lemonldap-ng-portal/example/skins/impact/login.tpl
@@ -37,7 +37,7 @@
 
       <div id="<TMPL_VAR NAME="key">">
 
-      <form action="#" method="post" class="login">
+      <form action="<TMPL_VAR NAME="url">" method="post" class="login">
 
       <!-- Hidden fields -->
       <TMPL_VAR NAME="HIDDEN_INPUTS">
diff --git a/lemonldap-ng-portal/example/skins/pastel/login.tpl b/lemonldap-ng-portal/example/skins/pastel/login.tpl
index 6a34bdc83..ac8bfd3d9 100644
--- a/lemonldap-ng-portal/example/skins/pastel/login.tpl
+++ b/lemonldap-ng-portal/example/skins/pastel/login.tpl
@@ -24,7 +24,7 @@
 
 	<div id="<TMPL_VAR NAME="key">">
 
-	<form action="#" method="post" class="login">
+	<form action="<TMPL_VAR NAME="url">" method="post" class="login">
 
 	<!-- Hidden fields -->
 	<TMPL_VAR NAME="HIDDEN_INPUTS">
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Choice.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Choice.pm
index 78732c6af..34f2ecd8d 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Choice.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Choice.pm
@@ -181,13 +181,17 @@ sub _buildAuthLoop {
         $name =~ s/\_/ /g;
 
         # Find modules associated to authChoice
-        my ( $auth, $userDB, $passwordDB ) =
+        my ( $auth, $userDB, $passwordDB, $url ) =
           split( /\|/, $self->{authChoiceModules}->{$_} );
 
         if ( $auth and $userDB and $passwordDB ) {
 
+            # Default URL
+            $url ||= "#";
+
             # Options to store in the loop
-            my $optionsLoop = { name => $name, key => $_, module => $auth };
+            my $optionsLoop =
+              { name => $name, key => $_, module => $auth, url => $url };
 
             # Get displayType for this module
             my $modulePrefix = 'Lemonldap::NG::Portal::';