Kyle M Hall
47e4f3ed84
There is a flaw in C4::Members::Messaging::GetMessagingPreferences where the system assumes that every transport will use the same letter. This is not necessarily true. Even with the default preferences of just 'email' and 'sms', we should be able to have different letters for each, as one has a maximum character length ( sms ) and one does not. GetMessagingPreferences currently uses the letter code of the last result of its query as the letter code for every transport type. The returned data is a hashref with a key 'transport_types' that is an array of transport_types this borrower has selected for the given alert. This commit modifies GetMessagingPreferences such that the the 'transport_types' array is now a hash where the name of the transport type is now a key to the value of the letter code set for that transport type. It also modifies code calling GetMessagingPreferences where necessary, and as a side benefit will correctly get the letter codes for email and sms correctly, if they are defined differently. http://bugs.koha-community.org/show_bug.cgi?id=4246 Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> In use in production by two libraries: Middletown and Washoe who give their sign off but don't have git to do so. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
259 lines
12 KiB
Perl
Executable file
259 lines
12 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to administer the categories table
|
|
#written 20/02/2002 by paul.poulain@free.fr
|
|
|
|
# ALGO :
|
|
# this script use an $op to know what to do.
|
|
# if $op is empty or none of the above values,
|
|
# - the default screen is build (with all records, or filtered datas).
|
|
# - the user can clic on add, modify or delete record.
|
|
# if $op=add_form
|
|
# - if primkey exists, this is a modification,so we read the $primkey record
|
|
# - builds the add/modify form
|
|
# if $op=add_validate
|
|
# - the user has just send datas, so we create/modify the record
|
|
# if $op=delete_form
|
|
# - we show the record having primkey=$primkey and ask for deletion validation form
|
|
# if $op=delete_confirm
|
|
# - we delete the record having primkey=$primkey
|
|
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it under the
|
|
# terms of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with Koha; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
use strict;
|
|
#use warnings; FIXME - Bug 2505
|
|
use CGI;
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Dates;
|
|
use C4::Form::MessagingPreferences;
|
|
|
|
sub StringSearch {
|
|
my ($searchstring,$type)=@_;
|
|
my $dbh = C4::Context->dbh;
|
|
$searchstring=~ s/\'/\\\'/g;
|
|
my @data=split(' ',$searchstring);
|
|
my $count=@data;
|
|
my $sth=$dbh->prepare("Select * from categories where (description like ?) order by category_type,description,categorycode");
|
|
$sth->execute("$data[0]%");
|
|
my @results;
|
|
while (my $data=$sth->fetchrow_hashref){
|
|
push(@results,$data);
|
|
}
|
|
# $sth->execute;
|
|
$sth->finish;
|
|
return (scalar(@results),\@results);
|
|
}
|
|
|
|
my $input = new CGI;
|
|
my $searchfield=$input->param('description');
|
|
my $script_name="/cgi-bin/koha/admin/categorie.pl";
|
|
my $categorycode=$input->param('categorycode');
|
|
my $op = $input->param('op');
|
|
|
|
my ($template, $loggedinuser, $cookie)
|
|
= get_template_and_user({template_name => "admin/categorie.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => {parameters => 1},
|
|
debug => 1,
|
|
});
|
|
|
|
|
|
$template->param(script_name => $script_name,
|
|
categorycode => $categorycode,
|
|
searchfield => $searchfield);
|
|
|
|
|
|
################## ADD_FORM ##################################
|
|
# called by default. Used to create form to add or modify a record
|
|
if ($op eq 'add_form') {
|
|
$template->param(add_form => 1);
|
|
|
|
#---- if primkey exists, it's a modify action, so read values to modify...
|
|
my $data;
|
|
if ($categorycode) {
|
|
my $dbh = C4::Context->dbh;
|
|
my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?");
|
|
$sth->execute($categorycode);
|
|
$data=$sth->fetchrow_hashref;
|
|
$sth->finish;
|
|
}
|
|
|
|
$data->{'enrolmentperioddate'} = undef if ($data->{'enrolmentperioddate'} eq '0000-00-00');
|
|
|
|
$template->param(description => $data->{'description'},
|
|
enrolmentperiod => $data->{'enrolmentperiod'},
|
|
enrolmentperioddate => C4::Dates::format_date($data->{'enrolmentperioddate'}),
|
|
upperagelimit => $data->{'upperagelimit'},
|
|
dateofbirthrequired => $data->{'dateofbirthrequired'},
|
|
enrolmentfee => sprintf("%.2f",$data->{'enrolmentfee'}),
|
|
overduenoticerequired => $data->{'overduenoticerequired'},
|
|
issuelimit => $data->{'issuelimit'},
|
|
reservefee => sprintf("%.2f",$data->{'reservefee'}),
|
|
hidelostitems => $data->{'hidelostitems'},
|
|
category_type => $data->{'category_type'},
|
|
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
|
|
SMSSendDriver => C4::Context->preference("SMSSendDriver"),
|
|
TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"),
|
|
"type_".$data->{'category_type'} => 1,
|
|
);
|
|
if (C4::Context->preference('EnhancedMessagingPreferences')) {
|
|
C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode } , $template);
|
|
}
|
|
# END $OP eq ADD_FORM
|
|
################## ADD_VALIDATE ##################################
|
|
# called by add_form, used to insert/modify data in DB
|
|
} elsif ($op eq 'add_validate') {
|
|
$template->param(add_validate => 1);
|
|
my $is_a_modif = $input->param("is_a_modif");
|
|
my $dbh = C4::Context->dbh;
|
|
if($input->param('enrolmentperioddate')){
|
|
$input->param('enrolmentperioddate' => C4::Dates::format_date_in_iso($input->param('enrolmentperioddate')) );
|
|
}
|
|
|
|
if ($is_a_modif) {
|
|
my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=? WHERE categorycode=?");
|
|
$sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','categorycode'));
|
|
$sth->finish;
|
|
} else {
|
|
my $sth=$dbh->prepare("INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?,?)");
|
|
$sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type'));
|
|
$sth->finish;
|
|
}
|
|
if (C4::Context->preference('EnhancedMessagingPreferences')) {
|
|
C4::Form::MessagingPreferences::handle_form_action($input,
|
|
{ categorycode => $input->param('categorycode') }, $template);
|
|
}
|
|
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>";
|
|
exit;
|
|
|
|
# END $OP eq ADD_VALIDATE
|
|
################## DELETE_CONFIRM ##################################
|
|
# called by default form, used to confirm deletion of data in DB
|
|
} elsif ($op eq 'delete_confirm') {
|
|
$template->param(delete_confirm => 1);
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my $sth=$dbh->prepare("select count(*) as total from borrowers where categorycode=?");
|
|
$sth->execute($categorycode);
|
|
my $total = $sth->fetchrow_hashref;
|
|
$sth->finish;
|
|
$template->param(total => $total->{'total'});
|
|
|
|
my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?");
|
|
$sth2->execute($categorycode);
|
|
my $data=$sth2->fetchrow_hashref;
|
|
$sth2->finish;
|
|
if ($total->{'total'} >0) {
|
|
$template->param(totalgtzero => 1);
|
|
}
|
|
|
|
$template->param( description => $data->{'description'},
|
|
enrolmentperiod => $data->{'enrolmentperiod'},
|
|
enrolmentperioddate => C4::Dates::format_date($data->{'enrolmentperioddate'}),
|
|
upperagelimit => $data->{'upperagelimit'},
|
|
dateofbirthrequired => $data->{'dateofbirthrequired'},
|
|
enrolmentfee => sprintf("%.2f",$data->{'enrolmentfee'}),
|
|
overduenoticerequired => $data->{'overduenoticerequired'},
|
|
issuelimit => $data->{'issuelimit'},
|
|
reservefee => sprintf("%.2f",$data->{'reservefee'}),
|
|
hidelostitems => $data->{'hidelostitems'},
|
|
category_type => $data->{'category_type'},
|
|
);
|
|
# END $OP eq DELETE_CONFIRM
|
|
################## DELETE_CONFIRMED ##################################
|
|
# called by delete_confirm, used to effectively confirm deletion of data in DB
|
|
} elsif ($op eq 'delete_confirmed') {
|
|
$template->param(delete_confirmed => 1);
|
|
my $dbh = C4::Context->dbh;
|
|
my $categorycode=uc($input->param('categorycode'));
|
|
my $sth=$dbh->prepare("delete from categories where categorycode=?");
|
|
$sth->execute($categorycode);
|
|
$sth->finish;
|
|
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>";
|
|
exit;
|
|
|
|
# END $OP eq DELETE_CONFIRMED
|
|
} else { # DEFAULT
|
|
$template->param(else => 1);
|
|
my @loop;
|
|
my ($count,$results)=StringSearch($searchfield,'web');
|
|
for (my $i=0; $i < $count; $i++){
|
|
my %row = (
|
|
categorycode => $results->[$i]{'categorycode'},
|
|
description => $results->[$i]{'description'},
|
|
enrolmentperiod => $results->[$i]{'enrolmentperiod'},
|
|
enrolmentperioddate => C4::Dates::format_date($results->[$i]{'enrolmentperioddate'}),
|
|
upperagelimit => $results->[$i]{'upperagelimit'},
|
|
dateofbirthrequired => $results->[$i]{'dateofbirthrequired'},
|
|
enrolmentfee => sprintf("%.2f",$results->[$i]{'enrolmentfee'}),
|
|
overduenoticerequired => $results->[$i]{'overduenoticerequired'},
|
|
issuelimit => $results->[$i]{'issuelimit'},
|
|
reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}),
|
|
hidelostitems => $results->[$i]{'hidelostitems'},
|
|
category_type => $results->[$i]{'category_type'},
|
|
"type_".$results->[$i]{'category_type'} => 1);
|
|
if (C4::Context->preference('EnhancedMessagingPreferences')) {
|
|
my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'});
|
|
$row{messaging_prefs} = $brief_prefs if @$brief_prefs;
|
|
}
|
|
push @loop, \%row;
|
|
}
|
|
$template->param(loop => \@loop);
|
|
# check that I (institution) and C (child) exists. otherwise => warning to the user
|
|
my $dbh = C4::Context->dbh;
|
|
my $sth=$dbh->prepare("select category_type from categories where category_type='C'");
|
|
$sth->execute;
|
|
my ($categoryChild) = $sth->fetchrow;
|
|
$template->param(categoryChild => $categoryChild);
|
|
$sth=$dbh->prepare("select category_type from categories where category_type='I'");
|
|
$sth->execute;
|
|
my ($categoryInstitution) = $sth->fetchrow;
|
|
$template->param(categoryInstitution => $categoryInstitution);
|
|
$sth->finish;
|
|
|
|
|
|
} #---- END $OP eq DEFAULT
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
exit 0;
|
|
|
|
sub _get_brief_messaging_prefs {
|
|
my $categorycode = shift;
|
|
my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
|
|
my $results = [];
|
|
PREF: foreach my $option ( @$messaging_options ) {
|
|
my $pref = C4::Members::Messaging::GetMessagingPreferences( { categorycode => $categorycode,
|
|
message_name => $option->{'message_name'} } );
|
|
next unless $pref->{'transports'};
|
|
my $brief_pref = {
|
|
message_attribute_id => $option->{'message_attribute_id'},
|
|
message_name => $option->{'message_name'},
|
|
$option->{'message_name'} => 1
|
|
};
|
|
foreach my $transport ( keys %{$pref->{'transports'}} ) {
|
|
push @{ $brief_pref->{'transports'} }, { transport => $transport };
|
|
}
|
|
push @$results, $brief_pref;
|
|
}
|
|
return $results;
|
|
}
|