From 8df2703de2ba595972490f2ffcd8c59087a2d67b Mon Sep 17 00:00:00 2001 From: Mason James Date: Wed, 27 Jun 2012 00:38:42 +1200 Subject: [PATCH] Bug 6679 - fix 12 perlcritic violations in C4/Auth_with_ldap.pm Content-Type: text/plain; charset="utf-8" http://koha-community.org Subroutine prototypes used at line 73, column 1. See page 194 of PBP. (Severity: 5) "return" statement with explicit "undef" at line 74, column 24. See page 199 of PBP. (Severity: 5) --- C4/Auth_with_ldap.pm | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm index 0d00218..2f2bb27 100644 --- a/C4/Auth_with_ldap.pm +++ b/C4/Auth_with_ldap.pm @@ -47,7 +47,7 @@ BEGIN { # ~ then gets the LDAP entry # ~ and calls the memberadd if necessary -sub ldapserver_error ($) { +sub ldapserver_error { return sprintf('No ldapserver "%s" defined in KOHA_CONF: ' . $ENV{KOHA_CONF}, shift); } @@ -70,8 +70,8 @@ my %config = ( update => defined($ldap->{update} ) ? $ldap->{update} : 1, # update from LDAP to Koha database for existing user ); -sub description ($) { - my $result = shift or return undef; +sub description { + my $result = shift or return; return "LDAP error #" . $result->code . ": " . $result->error_name . "\n" . "# " . $result->error_text . "\n"; @@ -197,7 +197,7 @@ return(1, $cardnumber, $userid); # Edit KOHA_CONF so $memberhash{'xxx'} fits your ldap structure. # Ensure that mandatory fields are correctly filled! # -sub ldap_entry_2_hash ($$) { +sub ldap_entry_2_hash { my $userldapentry = shift; my %borrower = ( cardnumber => shift ); my %memberhash; @@ -209,7 +209,7 @@ sub ldap_entry_2_hash ($$) { hashdump("LDAP key: ",$userldapentry->{$_}); } } - my $x = $userldapentry->{attrs} or return undef; + my $x = $userldapentry->{attrs} or return; foreach (keys %$x) { $memberhash{$_} = join ' ', @{$x->{$_}}; $debug and print STDERR sprintf("building \$memberhash{%s} = ", $_, join(' ', @{$x->{$_}})), "\n"; @@ -242,7 +242,7 @@ sub ldap_entry_2_hash ($$) { return %borrower; } -sub exists_local($) { +sub exists_local { my $arg = shift; my $dbh = C4::Context->dbh; my $select = "SELECT borrowernumber,cardnumber,userid,password FROM borrowers "; @@ -271,16 +271,16 @@ sub _do_changepassword { my ($md5password, $cardnum) = $sth->fetchrow; ($digest eq $md5password) and return $cardnum; warn "Password mismatch after update to cardnumber=$cardnum (borrowernumber=$borrowerid)"; - return undef; + return; } die "Unexpected error after password update to userid/borrowernumber: $userid / $borrowerid."; } -sub update_local($$$$) { - my $userid = shift or return undef; - my $digest = md5_base64(shift) or return undef; - my $borrowerid = shift or return undef; - my $borrower = shift or return undef; +sub update_local { + my $userid = shift or return; + my $digest = md5_base64(shift) or return; + my $borrowerid = shift or return; + my $borrower = shift or return; my @keys = keys %$borrower; my $dbh = C4::Context->dbh; my $query = "UPDATE borrowers\nSET " . -- 1.7.2.5