diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notification/LDAP.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notification/LDAP.pm index c730090d0..d9e91f676 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notification/LDAP.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Notification/LDAP.pm @@ -153,7 +153,7 @@ sub delete { $ts[4]++; return _modify( $self, - '(&(objectClass=applicationProcess)(description={uid}' + '(&(objectClass=applicationProcess)(description={uid}' . $u . ')(description={ref}' . $r @@ -181,7 +181,7 @@ sub purge { my $clause; $clause = '(description={done}*)' unless ($force); return _delete( $self, - '(&(objectClass=applicationProcess)(description={uid}' + '(&(objectClass=applicationProcess)(description={uid}' . $u . ')(description={ref}' . $r diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm index b6e6869e0..74560cee9 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm @@ -556,7 +556,7 @@ sub session { foreach ( keys %session ) { next if $_ !~ /^notification_(.+)/; $res .= - '
  • ' + '
  • ' . $1 . ': ' . $session{$_} . " (" diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm index 62875a0ab..9ba710c70 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm @@ -367,22 +367,22 @@ sub struct { ) { my $tmp = { - ad => ['ldapParams'], - ldap => ['ldapParams'], - ssl => ['sslParams'], - cas => ['casParams'], - radius => ['radiusParams'], - remote => ['remoteParams'], - proxy => ['proxyParams'], - openid => ['openIdParams'], - google => ['googleParams'], - facebook=> ['facebookParams'], - twitter => ['twitterParams'], - dbi => ['dbiParams'], - apache => ['apacheParams'], - null => ['nullParams'], - slave => ['slaveParams'], - choice => [ + ad => ['ldapParams'], + ldap => ['ldapParams'], + ssl => ['sslParams'], + cas => ['casParams'], + radius => ['radiusParams'], + remote => ['remoteParams'], + proxy => ['proxyParams'], + openid => ['openIdParams'], + google => ['googleParams'], + facebook => ['facebookParams'], + twitter => ['twitterParams'], + dbi => ['dbiParams'], + apache => ['apacheParams'], + null => ['nullParams'], + slave => ['slaveParams'], + choice => [ qw(ldapParams sslParams casParams radiusParams remoteParams proxyParams openIdParams googleParams facebookParams twitterParams dbiParams apacheParams nullParams choiceParams slaveParams yubikeyParams browserIdParams) ], multi => [ @@ -564,8 +564,9 @@ sub struct { # Facebook facebookParams => { - _nodes => [qw(facebookAuthnLevel facebookAppId facebookAppSecret)], - _help => 'authFacebook', + _nodes => + [qw(facebookAuthnLevel facebookAppId facebookAppSecret)], + _help => 'authFacebook', facebookAuthnLevel => 'int:/facebookAuthnLevel', facebookAppId => 'text:facebookAppId', facebookAppSecret => 'text:facebookAppSecret', diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm index 6f12d66e3..fd4212dce 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm @@ -616,7 +616,7 @@ sub fr { error => 'Erreur', exportedAttr => 'Attributs exportés par le portail (SOAP)', exportedVars => 'Attributs à exporter', - facebookAppId => 'ID de l\'application Facebook', + facebookAppId => 'ID de l\'application Facebook', facebookAppSecret => 'Secret de l\'application Facebook', facebookAuthnLevel => 'Niveau d\'authentification', facebookParams => 'Paramètres Facebook', diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm index f40ad0379..ba48b83e2 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm @@ -761,9 +761,9 @@ sub buildHiddenForm { # Build hidden input HTML code $val .= - '';