kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix login from other usecases than calendar

Browse Source
This commit is contained in:
Milan
2018-10-14 00:09:43 +02:00
parent eaaea81ed4
commit 1ae2af09e9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/calcms/auth.pm
View File

@@ -30,15 +30,15 @@ sub get_user {
debug("get_user") if $debug; debug("get_user") if $debug;
# login or logout on action # login or logout on action
if ( defined $params->{action} ) { if ( defined $params->{authAction} ) {
if ( $params->{action} eq 'login' ) { if ( $params->{authAction} eq 'login' ) {
my $user = login( $config, $params->{user}, $params->{password} ); my $user = login( $config, $params->{user}, $params->{password} );
$cgi->delete( 'user', 'password', 'uri', 'action' ) if defined $cgi; $cgi->delete( 'user', 'password', 'uri', 'authAction' ) if defined $cgi;
return $user; return $user;
} elsif ( $params->{action} eq 'logout' ) { } elsif ( $params->{authAction} eq 'logout' ) {
$cgi = new CGI::Simple() unless defined $cgi; $cgi = new CGI::Simple() unless defined $cgi;
logout($cgi); logout($cgi);
$cgi->delete( 'user', 'password', 'uri', 'action' ); $cgi->delete( 'user', 'password', 'uri', 'authAction' );
return undef; return undef;
} }
} }
@@ -109,7 +109,7 @@ sub logout {
return show_login_form( 'Cant remove cookie', 'logged out' ); return show_login_form( 'Cant remove cookie', 'logged out' );
} }
my $uri = $ENV{HTTP_REFERER} || ''; my $uri = $ENV{HTTP_REFERER} || '';
$uri =~ s/action=logout//g; $uri =~ s/authAction=logout//g;
print $cgi->redirect($uri); print $cgi->redirect($uri);
return; return;
} }
@@ -349,8 +349,8 @@ sub show_login_form {
<input type="password" name="password"><br/> <input type="password" name="password"><br/>
</div> </div>
<div class="row"> <div class="row">
<input class="button" type="submit" name="action" value="login"> <input class="button" type="submit" name="authAction" value="login">
<input class="button" type="submit" name="action" value="logout"> <input class="button" type="submit" name="authAction" value="logout">
</div> </div>
<input type="hidden" name="uri" value="$uri"> <input type="hidden" name="uri" value="$uri">
</form> </form>