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

SAML: manage internationalization

Browse Source
This commit is contained in:
Thomas CHEMINEAU 2010-04-26 15:39:38 +00:00
parent 975a585a51
commit 6ef67cc5ea
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/IssuerDBSAML.pm
View File

@ -687,7 +687,7 @@ sub issuerForAuthUser {
# Proceed to logout on all others SP
my $logout_dump = $logout->dump;
my $provider_nb =
$self->sendLogoutRequestToServiceProviders($logout);
$self->sendLogoutRequestToServiceProviders($logout);
# Rebuild Lasso::Logout object. All data have already been checked.
$logout = Lasso::Logout::new_from_dump( $server, $logout_dump );
@ -781,12 +781,11 @@ sub sendLogoutResponseAfterLogoutRequest {
# Redirect immediately
if ( !$seconds ) {
$self->_subProcess(qw(autoRedirect));
$self->lmLog( "Logout response was not sent trough GET", 'error' );
$self->_subProcess(qw(autoRedirect));
$self->lmLog( "Logout response was not sent trough GET", 'error' );
return PE_ERROR;
}
}
# Redirect in few seconds
else {
@ -849,6 +848,7 @@ sub sendLogoutResponseAfterLogoutRequest {
sub sendLogoutRequestToServiceProviders {
my $self = shift;
my $logout = shift;
my $method = shift;
my $server = $self->{_lassoServer};
my $providerCount = 0;
my $info = '';
@ -860,11 +860,10 @@ sub sendLogoutRequestToServiceProviders {
$self->resetProviderIdIndex($logout);
# Header of the block which will be displayed to the user, if needed.
#$info .= &Lemonldap::NG::Portal::_i18n::msg(
# PM_SAML_SPLOGOUT,
# $ENV{HTTP_ACCEPT_LANGUAGE}
# ) . '<ul>';
$info .= 'Logout in progress, please wait few seconds...<ul>';
$info .= &Lemonldap::NG::Portal::_i18n::msg(
PM_SAML_SPLOGOUT,
$ENV{HTTP_ACCEPT_LANGUAGE}
) . '<ul>';
# Foreach SP found in session, get it from configuration, and send the
# appropriate logout request (HTTP,POST,SOAP).
@ -887,7 +886,9 @@ sub sendLogoutRequestToServiceProviders {
#my $method =
# $self->getFirstHttpMethod( $server, $providerID, $protocolType );
my $method = Lasso::Constants::HTTP_METHOD_REDIRECT;
if ( !$method ) {
$method = Lasso::Constants::HTTP_METHOD_REDIRECT;
}
# Initiate the logout request
unless ( $self->initLogoutRequest( $logout, $providerID, $method ) ) {

2
modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
View File

@ -123,7 +123,7 @@ our @EXPORT = qw( PE_INFO PE_REDIRECT PE_DONE PE_OK PE_SESSIONEXPIRED
PE_LOGOUT_OK
PM_USER PM_DATE PM_IP PM_SESSIONS_DELETED PM_OTHER_SESSIONS
PM_REMOVE_OTHER_SESSIONS PM_PP_GRACE PM_PP_EXP_WARNING
PM_SAML_IDPSELECT PM_SAML_IDPCHOOSEN PM_REMEMBERCHOICE
PM_SAML_IDPSELECT PM_SAML_IDPCHOOSEN PM_REMEMBERCHOICE PM_SAML_SPLOGOUT
);
our %EXPORT_TAGS = ( 'all' => [ @EXPORT, 'import' ], );