Merge branch 'v2.0'

doc/sources/admin/configvhost.rst

@@ -505,7 +505,8 @@ Some options are available:
    rules,...)*
 -  **Access to trace**: can be used for overwriting REMOTE_CUSTOM with a custom function.
    Provide a comma separated parameters list with custom function path and args.
-   By example: My::accessToTrace, Doctor, Who
+   Args can be vars or session attributes, macros, ...
+   By example: My::accessToTrace, Doctor, Who, _whatToTrace
 -  **Type**: handler type (normal,
    :doc:`ServiceToken Handler<servertoserver>`,
    :doc:`DevOps Handler<devopshandler>`,...)
@@ -536,7 +537,7 @@ Some options are available:
           my $params  = $hash->{params};
           my $session = $hash->{session};
 
-          return "$custom alias $params->[0]_$params->[1]:$session->{groups}";
+          return "$custom alias $params->[0]_$params->[1]:$session->{groups}:$session->{$params->[2]}";
       }
 
       1;

doc/sources/admin/portalmenu.rst

@@ -38,7 +38,7 @@ Categories and applications
 ---------------------------
 
 :doc:`Configuring the virtual hosts<configvhost>` is not sufficient to
-display an application in the menu. Indeed, a virtual host can contain
+display an application in the menu. Indeed, a virtual host can serve
 several applications (http://vhost.example.com/appli1,
 http://vhost.example.com/appli2).
 

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm

@@ -954,8 +954,8 @@ sub tests {
                     $hasPwdBE ||= 1 unless $mods[2] eq 'Null';
                 }
                 return ( -1,
-                    'Password module is enabled without AuthChoice password backend' )
-                  unless $hasPwdBE;
+'Password module is enabled without AuthChoice password backend'
+                ) unless $hasPwdBE;
             }
             return 1;
         },
@@ -990,7 +990,10 @@ sub tests {
 
         # AuthChoice parameters must exist
         AuthChoiceParams => sub {
-            return 1 unless %{ $conf->{authChoiceModules} };
+            return 1
+              unless ( $conf->{authChoiceModules}
+                and %{ $conf->{authChoiceModules} }
+                and $conf->{authentication} eq 'Choice' );
             foreach (qw(AuthBasic FindUser)) {
                 if ( $conf->{"authChoice$_"} ) {
                     my $test  = $conf->{"authChoice$_"};

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/CAS.pm

@@ -414,7 +414,11 @@ sub validateST {
         $casResponse->getElementsByTagName('cas:authenticationFailure') )
     {
         $self->logger->error( "Failed to validate Service Ticket $ticket: "
+<<<<<<< HEAD
               . $failure->string_value =~ s/\R//r );
+=======
+              . $xml->{'cas:authenticationFailure'}->{content} );
+>>>>>>> v2.0
         return 0;
     }