Attachment 61676 Details for Bug 12026 – Bug 12026: [Follow up] Added Documentation

[patch] Bug 12026: [Follow up] Added Documentation

Bug-12026-Follow-up-Added-Documentation.patch (text/plain), 2.19 KB, created by Olli-Antti Kivilahti on 2017-03-29 14:33:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli-Antti Kivilahti

Created: 2017-03-29 14:33:03 UTC

Size: 2.19 KB

patch

obsolete

>From 93535070d2b9fed41a647a65c5ac98361d871c5e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 30 Jul 2014 14:53:27 +0000
>Subject: [PATCH] Bug 12026: [Follow up] Added Documentation
>
>Updated to work with match point selection
>
>- The base bug that this patch enhances has added the ability to choose
>  your match point in the configuration file. This patch adds code to
>  take that change into account.
>
>Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
>---
> C4/Auth_with_shibboleth.pm | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
>index ce2942e..b9b98d3 100644
>--- a/C4/Auth_with_shibboleth.pm
>+++ b/C4/Auth_with_shibboleth.pm
>@@ -105,7 +105,7 @@ sub checkpw_shib {
>     }
> 
>     if ( $shib->{'autocreate'} ) {
>-        return _autocreate( $dbh, $shib, $userid );
>+        return _autocreate( $dbh, $shib, $match );
>     } else {
>         # If we reach this point, the user is not a valid koha user
>         $debug and warn "User $userid is not a valid Koha user";
>@@ -114,9 +114,9 @@ sub checkpw_shib {
> }
> 
> sub _autocreate {
>-    my ( $dbh, $shib, $userid ) = @_;
>+    my ( $dbh, $shib, $match ) = @_;
> 
>-    my %borrower = ( userid => $userid );
>+    my %borrower = ( $shibbolethMatchField => $match );
> 
>     while ( my ( $key, $entry ) = each %{$shib->{'mapping'}} ) {
>         $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
>@@ -296,6 +296,14 @@ Given a database handle and a shib_login attribute, this routine checks for a ma
> 
>   my ( $retval, $retcard, $retuserid ) = C4::Auth_with_shibboleth::checkpw_shib( $shib_login );
> 
>+=head2 _autocreate
>+
>+  my ( $retval, $retcard, $retuserid ) = _autocreate( $dbh, $shib, $userid );
>+
>+Given a database handle, a shibboleth attribute reference and a userid this internal routine will add the given user to koha and return their user credentials
>+
>+This routine is NOT exported
>+
> =head1 SEE ALSO
> 
> =cut
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 12026: 26769 | 26788 | 28408 | 30351 | 30352 | 30376 | 31054 | 31055 | 35551 | 35552 | 56241 | 56242 | 56243 | 57486 | 57563 | 57564 | 57565 | 57566 | 61268 | 61269 | 61270 | 61271 | 61363 | 61364 | 61365 | 61366 | 61367 | 61435 | 61436 | 61437 | 61438 | 61444 | 61445 | 61446 | 61447 | 61448 | 61449 | 61521 | 61522 | 61523 | 61524 | 61525 | 61526 | 61527 | 61596 | 61598 | 61599 | 61675 | 61676 | 61677 | 61678 | 61679 | 61680 | 61683 | 61684 | 62521 | 62522