Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Fix so that if you edit a borrower from circ, or change a password from circ you are taken back there

Browse source 
Toolbar needs to be made for members too, its using the same one as circ, which isnt right, will do this next

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Chris Cormack 2007-11-12 14:33:33 -06:00 committed by Joshua Ferraro
parent a3f840d8dd
commit 15356575c2
4 changed files with 51 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
View file

@ -91,7 +91,7 @@ function confirm_reregistration() {
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<li><a id="addnote" href="/cgi-bin/koha/members/addnotes.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Add Note</a></li>
<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li>
<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->&destination=circ">Change Password</a></li>
<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">Print Page</a></li>
<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">Print Slip</a></li>
<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew Account</a></li><!-- TMPL_IF NAME="CAN_user_permission" --><li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><!-- /TMPL_IF --><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>

3
koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
View file

@ -21,7 +21,8 @@
<!-- TMPL_ELSE -->
<form method="post" action="/cgi-bin/koha/members/member-password.pl">
<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->">
<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->">
<!-- TMPL_IF NAME="warn" -->
<p class="warning">You have entered a User ID that already exists. Please choose another one.</p>
<!-- /TMPL_IF -->

62
members/member-password.pl
View file

@ -33,6 +33,9 @@ $flagsrequired->{borrowers}=1;
my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
my $member=$input->param('member');
my $cardnumber = $input->param('cardnumber');
my $destination = $input->param('destination');
my %member2;
$member2{'borrowernumber'}=$member;
# my $issues=GetBorrowerIssues(\%member2);
@ -45,19 +48,26 @@ my ($bor,$flags)=GetMemberDetails( $member,'');
my $newpassword = $input->param('newpassword');
if ( $newpassword ) {
my $digest=md5_base64($input->param('newpassword'));
my $uid = $input->param('newuserid');
my $dbh=C4::Context->dbh;
if (changepassword($uid,$member,$digest)) {
$template->param(newpassword => $newpassword);
print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member");
} else {
my $digest=md5_base64($input->param('newpassword'));
my $uid = $input->param('newuserid');
my $dbh=C4::Context->dbh;
warn $destination;
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 {
$template->param(othernames => $bor->{'othernames'},
surname => $bor->{'surname'},
firstname => $bor->{'firstname'},
userid => $bor->{'userid'},
defaultnewpassword => $newpassword );
}
}
} else {
my $userid = $bor->{'userid'};
@ -67,23 +77,25 @@ if ( $newpassword ) {
for (my $i=0; $i<$length; $i++) {
$defaultnewpassword.=substr($chars, int(rand(length($chars))),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'},
category_description => $bor->{'description'},
address => $bor->{'address'},
address2 => $bor->{'address2'},
city => $bor->{'city'},
zipcode => $bor->{'zipcode'},
phone => $bor->{'phone'},
email => $bor->{'email'},
branchcode => $bor->{'branchcode'},
userid => $bor->{'userid'},
defaultnewpassword => $defaultnewpassword );
$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'},
category_description => $bor->{'description'},
address => $bor->{'address'},
address2 => $bor->{'address2'},
city => $bor->{'city'},
zipcode => $bor->{'zipcode'},
phone => $bor->{'phone'},
email => $bor->{'email'},
branchcode => $bor->{'branchcode'},
userid => $bor->{'userid'},
destination => $destination,
defaultnewpassword => $defaultnewpassword
);
}

17
members/memberentry.pl
View file

@ -206,20 +206,25 @@ if ($op eq 'insert'){
my @orgs=split(/\|/,$data{'organisations'});
add_member_orgs($borrowernumber,\@orgs);
}
if($destination eq "circ"){
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
if ($destination eq "circ") {
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
} else {
if ($loginexist == 0) {
print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
}
if ($loginexist == 0) {
print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
}
}
}
}
if ($op eq 'save'){
# test to know if another user have the same password and same login
unless ($nok){
&ModMember(%newdata);
&ModMember(%newdata);
if ($destination eq "circ") {
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
}
else {
print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
}
}
}