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

bug 1546 - REPLACE statements

Browse source 
A REPLACE statement in tools/letter.pl was indirectly corrupting data
in the message_transports table.  It has been replaced with code that
does an UPDATE or INSERT depending on whether the row existed or not.

Also, to protect data in the message_transports table further, letters
which have entries in the message_transports table are no longer
deletable.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
John Beppu 2009-02-26 13:19:28 -06:00 committed by Galen Charlton
parent 9db0774cfd
commit 1328dc0f4a
2 changed files with 50 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
View file

@ -152,7 +152,11 @@ $(document).ready(function() {
<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=<!-- TMPL_VAR name="module" -->&amp;code=<!-- TMPL_VAR NAME="code" -->">Edit</a>
</td>
<td>
<!-- TMPL_IF NAME="protected" -->
-
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;module=<!-- TMPL_VAR name="module"-->&amp;code=<!-- TMPL_VAR NAME="code" -->">Delete</a>
<!-- /TMPL_IF -->
</td>
</tr>
<!-- /TMPL_LOOP --></tbody>

57
tools/letter.pl
View file

@ -78,6 +78,25 @@ sub column_picks ($) {
return @SQLfieldname;
}
# letter_exists($module, $code)
# - return true if a letter with the given $module and $code exists
sub letter_exists {
my ($module, $code) = @_;
my $dbh = C4::Context->dbh;
my $sql = q{SELECT * FROM letter WHERE module = ? AND code = ?};
my $letters = $dbh->selectall_arrayref($sql, { Slice => {} }, $module, $code);
return scalar(@$letters);
}
# $protected_letters = protected_letters()
# - return a hashref of letter_codes representing letters that should never be deleted
sub protected_letters {
my $dbh = C4::Context->dbh;
my $sql = q{SELECT DISTINCT letter_code FROM message_transports};
my $codes = $dbh->selectall_arrayref($sql);
return { map { $_->[0] => 1 } @$codes };
}
my $input = new CGI;
my $searchfield = $input->param('searchfield');
$searchfield = '' unless defined($searchfield);
@ -178,14 +197,28 @@ if ( $op eq 'add_form' ) {
# called by add_form, used to insert/modify data in DB
}
elsif ( $op eq 'add_validate' ) {
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(
"REPLACE letter (module,code,name,title,content) VALUES (?,?,?,?,?)");
$sth->execute(
$input->param('module'), $input->param('code'),
$input->param('name'), $input->param('title'),
$input->param('content')
);
my $dbh = C4::Context->dbh;
my $module = $input->param('module');
my $code = $input->param('code');
my $name = $input->param('name');
my $title = $input->param('title');
my $content = $input->param('content');
if (letter_exists($module, $code)) {
# UPDATE
$dbh->do(
q{UPDATE letter SET module = ?, code = ?, name = ?, title = ?, content = ? WHERE module = ? AND code = ?},
undef,
$module, $code, $name, $title, $content,
$module, $code
);
} else {
# INSERT
$dbh->do(
q{INSERT INTO letter (module,code,name,title,content) VALUES (?,?,?,?,?)},
undef,
$module, $code, $name, $title, $content
);
}
print $input->redirect("letter.pl");
exit;
################## DELETE_CONFIRM ##################################
@ -220,11 +253,13 @@ else { # DEFAULT
}
my ($results) = StringSearch($searchfield);
my @loop_data = ();
my $protected_letters = protected_letters();
foreach my $result (@$results) {
my %row_data;
foreach my $key (qw(module code name)) {
$row_data{$key} = $result->{$key};
}
foreach my $key (qw(module code name)) {
$row_data{$key} = $result->{$key};
$row_data{'protected'} = $protected_letters->{$result->{code}};
}
push(@loop_data, \%row_data );
}
$template->param( letter => \@loop_data );