Remember origin URL in register workflow (#1349)

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Register.pm

@@ -97,6 +97,8 @@ sub init {
 sub register {
     my ( $self, $req ) = @_;
 
+    $self->p->controlUrl($req);
+
     # Check parameters
     $req->error( $self->_register($req) );
 
@@ -289,6 +291,7 @@ sub _register {
           . $self->conf->{authChoiceParam} . '='
           . $req->datas->{_authChoice}
           if ( $req->datas->{_authChoice} );
+        $url .= '&url=' . $req->datas->{_url} if ( $req->datas->{_url} );
 
         # Build mail content
         my $tr      = $self->translate($req);
@@ -357,7 +360,17 @@ sub _register {
     # Use HTML template
     $body = $self->loadTemplate( 'mail_register_done', filter => $tr );
 
+    # Build portal url
+    my $url = $self->conf->{portal};
+    $url =~ s#/*$##;
+    $url .= '/?skin=' . $self->p->getSkin($req);
+    $url .=
+      '&' . $self->conf->{authChoiceParam} . '=' . $req->datas->{_authChoice}
+      if ( $req->datas->{_authChoice} );
+    $url .= '&url=' . $req->datas->{_url} if ( $req->datas->{_url} );
+
     # Replace variables in body
+    $body =~ s/\$url/$url/g;
     $body =~ s/\$(\w+)/$req->datas->{registerInfo}->{$1}/ge;
 
     # Send mail
@@ -376,6 +389,7 @@ sub display {
         SKIN_BG         => $self->conf->{portalSkinBackground},
         AUTH_ERROR      => $req->error,
         AUTH_ERROR_TYPE => $req->error_type,
+        AUTH_URL        => $req->datas->{_url},
         CHOICE_PARAM    => $self->conf->{authChoiceParam},
         CHOICE_VALUE    => $req->datas->{_authChoice},
         EXPMAILDATE     => $req->datas->{expMailDate},

lemonldap-ng-portal/site/templates/bootstrap/register.tpl

@@ -14,6 +14,7 @@
     <div class="form">
 
     <input type="hidden" name="skin" value="<TMPL_VAR NAME="SKIN">" />
+    <input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
     <TMPL_IF NAME="CHOICE_VALUE">
       <input type="hidden" id="authKey" name="<TMPL_VAR NAME="CHOICE_PARAM">" value="<TMPL_VAR NAME="CHOICE_VALUE">" />
     </TMPL_IF>
@@ -61,6 +62,7 @@
     <div class="form">
 
       <input type="hidden" name="skin" value="<TMPL_VAR NAME="SKIN">" />
+      <input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
       <TMPL_IF NAME="CHOICE_VALUE">
         <input type="hidden" id="authKey" name="<TMPL_VAR NAME="CHOICE_PARAM">" value="<TMPL_VAR NAME="CHOICE_VALUE">" />
       </TMPL_IF>
@@ -123,7 +125,7 @@
   </div>
 
   <div class="buttons">
-    <a href="<TMPL_VAR NAME="PORTAL_URL">?skin=<TMPL_VAR NAME="SKIN">" class="btn btn-primary" role="button">
+    <a href="<TMPL_VAR NAME="PORTAL_URL">?skin=<TMPL_VAR NAME="SKIN"><TMPL_IF NAME="CHOICE_VALUE">&<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="CHOICE_VALUE"></TMPL_IF><TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>" class="btn btn-primary" role="button">
       <span class="glyphicon glyphicon-home"></span>
       <span trspan="back2Portal">Go back to portal</span>
     </a>

lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl

@@ -39,7 +39,7 @@
   </TMPL_IF>
 
   <TMPL_IF NAME="DISPLAY_REGISTER">
-  <a class="btn btn-warning" href="<TMPL_VAR NAME="REGISTER_URL">?skin=<TMPL_VAR NAME="SKIN"><TMPL_IF NAME="key">&<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF>">
+  <a class="btn btn-warning" href="<TMPL_VAR NAME="REGISTER_URL">?skin=<TMPL_VAR NAME="SKIN"><TMPL_IF NAME="key">&<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF><TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>">
     <span class="glyphicon glyphicon-plus-sign"></span>
     <span trspan="createAccount">Create an account</span>
   </a>

lemonldap-ng-portal/site/templates/common/mail_register_done.tpl

@@ -14,5 +14,6 @@
 <span><img src="cid:key:../common/key.png" /></span>
 <b>$password</b>
 </p>
+<p><a href="$url"><span trspan"goToPortal">Click here to access to portal</span></a></p>
 
 <TMPL_INCLUDE NAME="mail_footer.tpl">