Attachment 61446 Details for Bug 12026 – Bug 12026: [Followup] Rebasing

[patch] Bug 12026: [Followup] Rebasing

Bug-12026-Followup-Rebasing.patch (text/plain), 2.43 KB, created by Martin Renvoize (ashimema) on 2017-03-22 13:58:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2017-03-22 13:58:38 UTC

Size: 2.43 KB

patch

obsolete

>From 576ef945a6867d836147d8d71808948f5f28022d Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 12 Oct 2016 10:08:31 +0000
>Subject: [PATCH] Bug 12026: [Followup] Rebasing
>
>Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Auth_with_shibboleth.pm | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
>index b9b98d3..1a68c96 100644
>--- a/C4/Auth_with_shibboleth.pm
>+++ b/C4/Auth_with_shibboleth.pm
>@@ -104,8 +104,8 @@ sub checkpw_shib {
>         return ( 1, $borrower->get_column('cardnumber'), $borrower->get_column('userid') );
>     }
> 
>-    if ( $shib->{'autocreate'} ) {
>-        return _autocreate( $dbh, $shib, $match );
>+    if ( $config->{'autocreate'} ) {
>+        return _autocreate( $config, $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,11 +114,11 @@ sub checkpw_shib {
> }
> 
> sub _autocreate {
>-    my ( $dbh, $shib, $match ) = @_;
>+    my ( $config, $match ) = @_;
> 
>     my %borrower = ( $shibbolethMatchField => $match );
> 
>-    while ( my ( $key, $entry ) = each %{$shib->{'mapping'}} ) {
>+    while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) {
>         $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
>     }
> 
>@@ -292,13 +292,13 @@ Returns the shibboleth login attribute should it be found present in the http se
> 
> =head2 checkpw_shib
> 
>-Given a database handle and a shib_login attribute, this routine checks for a matching local user and if found returns true, their cardnumber and their userid.  If a match is not found, then this returns false.
>+Given a shib_login attribute, this routine checks for a matching local user and if found returns true, their cardnumber and their userid.  If a match is not found, then this returns false.
> 
>   my ( $retval, $retcard, $retuserid ) = C4::Auth_with_shibboleth::checkpw_shib( $shib_login );
> 
> =head2 _autocreate
> 
>-  my ( $retval, $retcard, $retuserid ) = _autocreate( $dbh, $shib, $userid );
>+  my ( $retval, $retcard, $retuserid ) = _autocreate( $config, $match );
> 
> 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
> 
>-- 
>2.1.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