Attachment 10488 Details for Bug 6679 – Bug 6679 - fix 12 perlcritic violations in C4/Auth_with_ldap.pm

[patch] Bug 6679 - fix 12 perlcritic violations in C4/Auth_with_ldap.pm

Bug-6679---fix-12-perlcritic-violations-in-C4Authw.patch (text/plain), 3.20 KB, created by Mason James on 2012-06-26 12:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mason James

Created: 2012-06-26 12:40:01 UTC

Size: 3.20 KB

patch

obsolete

>From 8df2703de2ba595972490f2ffcd8c59087a2d67b Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>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

Actions: View | Diff | Splinter Review

Attachments on bug 6679: 4883 | 4884 | 4885 | 4886 | 4887 | 4888 | 5445 | 5446 | 5483 | 5487 | 6121 | 6122 | 6123 | 6139 | 6140 | 6141 | 6142 | 6143 | 6144 | 6270 | 6271 | 6663 | 6670 | 6675 | 6676 | 6677 | 6678 | 8542 | 8897 | 8898 | 8899 | 8950 | 8951 | 9746 | 9747 | 9748 | 9749 | 9750 | 10050 | 10051 | 10052 | 10053 | 10054 | 10075 | 10076 | 10077 | 10078 | 10079 | 10484 | 10485 | 10486 | 10487 | 10488 | 10489 | 10491 | 10492 | 10493 | 10494 | 10495 | 10496 | 10497 | 10499 | 10500 | 10501 | 10502 | 10503 | 10504 | 10505 | 10506 | 10507 | 10508 | 10509 | 10510 | 10512 | 10513 | 10514 | 10515 | 10517 | 10521 | 10522 | 10523 | 10524 | 10525 | 10526 | 10527 | 10935 | 10936 | 10938 | 10940 | 10944 | 10945 | 10946 | 10947 | 10948 | 10949 | 10950 | 10952 | 10953 | 10955 | 10957 | 10958 | 10959 | 10960 | 10961 | 10962 | 10963 | 10964 | 10965 | 10966 | 10967 | 10972 | 10976 | 10979 | 10980 | 10981 | 12224 | 12363 | 12490 | 12491 | 12492 | 34191 | 34192 | 34193 | 34194 | 34195 | 34196 | 34197 | 39100 | 39101 | 39102 | 39392 | 39393 | 39394 | 39395 | 39396 | 39397 | 39398 | 42770 | 47086 | 47087 | 47088 | 47089 | 47090 | 47178 | 47179 | 47180 | 47181 | 47205 | 47206 | 47207 | 47208