dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Verify notification delete (#595)

Browse Source
This commit is contained in:
Xavier Guimard 2016-06-01 19:19:53 +00:00
parent 3d1f71fcfb
commit 201913d603
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View File

@ -292,7 +292,7 @@ sub updatePersistentSession {
# Update current session
$self->updateSession( $req, $infos, $id );
$uid ||= $self->{sessionInfo}->{ $self->{whatToTrace} };
$uid ||= $req->{sessionInfo}->{ $self->conf->{whatToTrace} };
return () unless ($uid);
my $persistentSession = $self->getPersistentSession($uid);

7
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/Notifications.pm
View File

@ -261,7 +261,8 @@ sub getNotifBack {
}
my $result = 1;
foreach my $file ( values %$notifs ) {
foreach my $fileName ( keys %$notifs ) {
my $file = $notifs->{$fileName};
my $fileResult = 1;
my $xml = $self->parser->parse_string($file);
@ -307,9 +308,9 @@ sub getNotifBack {
}
# Notifications accepted for this file, delete it unless it's a wildcard
if ( $fileResult and exists $forUser->{$file} ) {
if ( $fileResult and exists $forUser->{$fileName} ) {
$self->lmLog( "Notification file deleted", 'debug' );
$self->notifObject->delete($file);
$self->notifObject->delete($fileName);
}
}
unless ($result) {

4
lemonldap-ng-portal/t/10-Notifications.t
View File

@ -92,7 +92,9 @@ ok(
);
ok( $res->[0] == 302, "Get redirection" )
or explain( [ $res->[0], $res->[1] ], 302 );
count(2);
$file =~ s/xml$/done/;
ok(-e $file,'Notification was deleted');
count(3);
#print STDERR Dumper($res);