Bugzilla – Attachment 46720 Details for
Bug 15542
Patron's information are not always displayed the same way
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15542 [QA Followup] - Tidy member-password.pl
Bug-15542-QA-Followup---Tidy-member-passwordpl.patch (text/plain), 9.68 KB, created by
Kyle M Hall (khall)
on 2016-01-15 17:42:56 UTC
(
hide
)
Description:
Bug 15542 [QA Followup] - Tidy member-password.pl
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-01-15 17:42:56 UTC
Size:
9.68 KB
patch
obsolete
>From 91313a10bcaba47c049a61f15d2461440c2b4f42 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 15 Jan 2016 17:37:17 +0000 >Subject: [PATCH] Bug 15542 [QA Followup] - Tidy member-password.pl > >No other patches in process modify member-password.pl, now would be >a great time to tidy it! > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > members/member-password.pl | 190 ++++++++++++++++++++++++--------------------- > 1 file changed, 101 insertions(+), 89 deletions(-) > >diff --git a/members/member-password.pl b/members/member-password.pl >index 8adf058..cf0314f 100755 >--- a/members/member-password.pl >+++ b/members/member-password.pl >@@ -22,119 +22,131 @@ use Digest::MD5 qw(md5_base64); > my $input = new CGI; > > my $theme = $input->param('theme') || "default"; >- # only used if allowthemeoverride is set > >-my ($template, $loggedinuser, $cookie, $staffflags) >- = get_template_and_user({template_name => "members/member-password.tt", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => {borrowers => 1}, >- debug => 1, >- }); >+# only used if allowthemeoverride is set > >-my $flagsrequired; >-$flagsrequired->{borrowers}=1; >+my ( $template, $loggedinuser, $cookie, $staffflags ) = get_template_and_user( >+ { >+ template_name => "members/member-password.tt", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => { borrowers => 1 }, >+ debug => 1, >+ } >+); > >-#my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, 'intranet'); >+my $flagsrequired; >+$flagsrequired->{borrowers} = 1; > >-my $member=$input->param('member'); >-my $cardnumber = $input->param('cardnumber'); >+my $member = $input->param('member'); >+my $cardnumber = $input->param('cardnumber'); > my $destination = $input->param('destination'); >+my $newpassword = $input->param('newpassword'); >+my $newpassword2 = $input->param('newpassword2'); >+ > my @errors; >-my ($bor)=GetMember('borrowernumber' => $member); >-if(( $member ne $loggedinuser ) && ($bor->{'category_type'} eq 'S' ) ) { >- push(@errors,'NOPERMISSION') unless($staffflags->{'superlibrarian'} || $staffflags->{'staffaccess'} ); >- # need superlibrarian for koha-conf.xml fakeuser. >+ >+my ($bor) = GetMember( 'borrowernumber' => $member ); >+ >+if ( ( $member ne $loggedinuser ) && ( $bor->{'category_type'} eq 'S' ) ) { >+ push( @errors, 'NOPERMISSION' ) >+ unless ( $staffflags->{'superlibrarian'} || $staffflags->{'staffaccess'} ); >+ >+ # need superlibrarian for koha-conf.xml fakeuser. > } >-my $newpassword = $input->param('newpassword'); >-my $newpassword2 = $input->param('newpassword2'); > >-push(@errors,'NOMATCH') if ( ( $newpassword && $newpassword2 ) && ($newpassword ne $newpassword2) ); >+push( @errors, 'NOMATCH' ) if ( ( $newpassword && $newpassword2 ) && ( $newpassword ne $newpassword2 ) ); > > my $minpw = C4::Context->preference('minPasswordLength'); >-push(@errors,'SHORTPASSWORD') if( $newpassword && $minpw && (length($newpassword) < $minpw ) ); >- >-if ( $newpassword && !scalar(@errors) ) { >- my $digest=Koha::AuthUtils::hash_password($input->param('newpassword')); >- my $uid = $input->param('newuserid'); >- my $dbh=C4::Context->dbh; >- if (changepassword($uid,$member,$digest)) { >- $template->param(newpassword => $newpassword); >- if ($destination eq 'circ') { >- print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber"); >- } else { >- print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member"); >- } >- } else { >- push(@errors,'BADUSERID'); >+push( @errors, 'SHORTPASSWORD' ) if ( $newpassword && $minpw && ( length($newpassword) < $minpw ) ); >+ >+if ( $newpassword && !scalar(@errors) ) { >+ my $digest = Koha::AuthUtils::hash_password( $input->param('newpassword') ); >+ my $uid = $input->param('newuserid'); >+ my $dbh = C4::Context->dbh; >+ if ( changepassword( $uid, $member, $digest ) ) { >+ $template->param( newpassword => $newpassword ); >+ if ( $destination eq 'circ' ) { >+ print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber"); >+ } >+ else { >+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member"); >+ } > } >-} else { >+ else { >+ push( @errors, 'BADUSERID' ); >+ } >+} >+else { > my $userid = $bor->{'userid'}; > >- my $chars='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; >- my $length=int(rand(2))+C4::Context->preference("minPasswordLength"); >- my $defaultnewpassword=''; >- for (my $i=0; $i<$length; $i++) { >- $defaultnewpassword.=substr($chars, int(rand(length($chars))),1); >+ my $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; >+ my $length = int( rand(2) ) + C4::Context->preference("minPasswordLength"); >+ my $defaultnewpassword = ''; >+ for ( my $i = 0 ; $i < $length ; $i++ ) { >+ $defaultnewpassword .= substr( $chars, int( rand( length($chars) ) ), 1 ); > } > >- $template->param( defaultnewpassword => $defaultnewpassword ); >+ $template->param( defaultnewpassword => $defaultnewpassword ); > } >- if ( $bor->{'category_type'} eq 'C') { >- my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); >- my $cnt = scalar(@$catcodes); >- $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1; >- $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; >- } >- >+ >+if ( $bor->{'category_type'} eq 'C' ) { >+ my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); >+ my $cnt = scalar(@$catcodes); >+ $template->param( 'CATCODE_MULTI' => 1 ) if $cnt > 1; >+ $template->param( 'catcode' => $catcodes->[0] ) if $cnt == 1; >+} >+ > $template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' ); >-my ($picture, $dberror) = GetPatronImage($bor->{'borrowernumber'}); >+ >+my ( $picture, $dberror ) = GetPatronImage( $bor->{'borrowernumber'} ); > $template->param( picture => 1 ) if $picture; > >-if (C4::Context->preference('ExtendedPatronAttributes')) { >- my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'}); >+if ( C4::Context->preference('ExtendedPatronAttributes') ) { >+ my $attributes = GetBorrowerAttributes( $bor->{'borrowernumber'} ); > $template->param( > ExtendedPatronAttributes => 1, >- extendedattributes => $attributes >+ extendedattributes => $attributes > ); > } > >- $template->param( othernames => $bor->{'othernames'}, >- surname => $bor->{'surname'}, >- firstname => $bor->{'firstname'}, >- borrowernumber => $bor->{'borrowernumber'}, >- cardnumber => $bor->{'cardnumber'}, >- categorycode => $bor->{'categorycode'}, >- category_type => $bor->{'category_type'}, >- categoryname => $bor->{'description'}, >- address => $bor->{address}, >- address2 => $bor->{'address2'}, >- streettype => $bor->{streettype}, >- city => $bor->{'city'}, >- state => $bor->{'state'}, >- zipcode => $bor->{'zipcode'}, >- country => $bor->{'country'}, >- phone => $bor->{'phone'}, >- phonepro => $bor->{'phonepro'}, >- mobile => $bor->{'mobile'}, >- email => $bor->{'email'}, >- emailpro => $bor->{'emailpro'}, >- branchcode => $bor->{'branchcode'}, >- branchname => GetBranchName($bor->{'branchcode'}), >- userid => $bor->{'userid'}, >- destination => $destination, >- is_child => ($bor->{'category_type'} eq 'C'), >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- minPasswordLength => $minpw, >- RoutingSerials => C4::Context->preference('RoutingSerials'), >- ); >- >-if( scalar(@errors )){ >- $template->param( errormsg => 1 ); >- foreach my $error (@errors) { >- $template->param($error) || $template->param( $error => 1); >- } >+$template->param( >+ othernames => $bor->{'othernames'}, >+ surname => $bor->{'surname'}, >+ firstname => $bor->{'firstname'}, >+ borrowernumber => $bor->{'borrowernumber'}, >+ cardnumber => $bor->{'cardnumber'}, >+ categorycode => $bor->{'categorycode'}, >+ category_type => $bor->{'category_type'}, >+ categoryname => $bor->{'description'}, >+ address => $bor->{address}, >+ address2 => $bor->{'address2'}, >+ streettype => $bor->{streettype}, >+ city => $bor->{'city'}, >+ state => $bor->{'state'}, >+ zipcode => $bor->{'zipcode'}, >+ country => $bor->{'country'}, >+ phone => $bor->{'phone'}, >+ phonepro => $bor->{'phonepro'}, >+ mobile => $bor->{'mobile'}, >+ email => $bor->{'email'}, >+ emailpro => $bor->{'emailpro'}, >+ branchcode => $bor->{'branchcode'}, >+ branchname => GetBranchName( $bor->{'branchcode'} ), >+ userid => $bor->{'userid'}, >+ destination => $destination, >+ is_child => ( $bor->{'category_type'} eq 'C' ), >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ minPasswordLength => $minpw, >+ RoutingSerials => C4::Context->preference('RoutingSerials'), >+); >+ >+if ( scalar(@errors) ) { >+ $template->param( errormsg => 1 ); >+ foreach my $error (@errors) { >+ $template->param($error) || $template->param( $error => 1 ); >+ } > > } > >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15542
:
46475
|
46477
|
46487
|
46490
|
46491
|
46492
|
46493
|
46494
|
46495
|
46717
|
46718
|
46719
|
46720
|
46721