From 0de955498f1cc2c3c549d76b927b8b7d2864cd6e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 19 Aug 2015 13:59:44 +0100 Subject: [PATCH] Bug 10988: Fix the svc script path --- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +- opac/svc/auth/googleoauth2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 37fc757..ab42610 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -60,7 +60,7 @@
  • New list
  • [% END %] [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %] -
  • Log in to create your own lists
  • +
  • Log in to create your own lists
  • [% ELSE %]
  • Log in to create your own lists
  • [% END # / IF loggedinusername %] @@ -116,7 +116,7 @@ [%# CAS authentication is too complicated for modal window %]
  • Log in to your account
  • [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %] -
  • Log in to your account
  • +
  • Log in to your account
  • [% ELSE %]
  • Log in to your account
  • [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt index 2954c97..e79ab82 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -142,7 +142,7 @@

    Automatic Login

    Sorry, your automatic login failed. [% invalidOAuth2Login %]

    Please note that automatic login will only work if you are using the emal address registered with this library.

    -

    If you want to, you can try to login using a different account +

    If you want to, you can try to login using a different account

    Local login

    If you can't login automatically, you can still login manually:

    [% END %] diff --git a/opac/svc/auth/googleoauth2 b/opac/svc/auth/googleoauth2 index ee8826e..07ff084 100755 --- a/opac/svc/auth/googleoauth2 +++ b/opac/svc/auth/googleoauth2 @@ -51,7 +51,7 @@ my $host = C4::Context->preference('OPACBaseURL') // ''; my $restricttodomain = C4::Context->preference('GoogleOAuth2Domain') // ''; # protocol is assumed in OPACBaseURL see bug 5010. -my $redirecturl = $host . '/cgi-bin/koha/svc/googleoauth2'; +my $redirecturl = $host . '/cgi-bin/koha/svc/auth/googleoauth2'; my $issuer = 'accounts.google.com'; my $clientid = C4::Context->preference('GoogleOAuth2ClientID'); my $clientsecret = C4::Context->preference('GoogleOAuth2ClientSecret'); -- 2.1.4