use strict;
use CGI;
-use C4::Date;
+use C4::Dates;
use C4::Auth;
use C4::Context;
use C4::Output;
push( @results, $data );
$cnt++;
}
-
- # $sth->execute;
$sth->finish;
return ( $cnt, \@results );
}
);
if ($op) {
- $template->param(
- script_name => $script_name,
- $op => 1
- ); # we show only the TMPL_VAR names $op
-}
-else {
- $template->param(
- script_name => $script_name,
- else => 1
- ); # we show only the TMPL_VAR names $op
+ $template->param($op => 1);
+} else {
+ $template->param(else => 1);
}
+# we show only the TMPL_VAR names $op
-$template->param( action => $script_name );
+$template->param(
+ script_name => $script_name,
+ action => $script_name
+);
################## ADD_FORM ##################################
# called by default. Used to create form to add or modify a record
if ( $op eq 'add_form' ) {
#---- if primkey exists, it's a modify action, so read values to modify...
my $letter;
if ($code) {
- my $sth =
- $dbh->prepare("select * from letter where module=? and code=?");
+ my $sth = $dbh->prepare("select * from letter where module=? and code=?");
$sth->execute( $module, $code );
$letter = $sth->fetchrow_hashref;
$sth->finish;
# build field list
my @SQLfieldname;
- my %line = ( 'value' => "LibrarianFirstname", 'text' => 'LibrarianFirstname' );
- push @SQLfieldname, \%line;
- my %line = ( 'value' => "LibrarianSurname", 'text' => 'LibrarianSurname' );
- push @SQLfieldname, \%line;
- my %line = ( 'value' => "LibrarianEmailaddress", 'text' => 'LibrarianEmailaddress' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "LibrarianFirstname", 'text' => 'LibrarianFirstname' };
+ push @SQLfieldname, { 'value' => "LibrarianSurname", 'text' => 'LibrarianSurname' };
+ push @SQLfieldname, { 'value' => "LibrarianEmailaddress", 'text' => 'LibrarianEmailaddress' };
my $sth2 = $dbh->prepare("SHOW COLUMNS from branches");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---BRANCHES---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---BRANCHES---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = ( 'value' => "branches." . $field, 'text' => "branches." . $field );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "branches." . $field, 'text' => "branches." . $field };
}
# add acquisition specific tables
- if ( index( $module, "acquisition" ) > 0 ) {
- my $sth2 = $dbh->prepare("SHOW COLUMNS from aqbooksellers");
+ if ( index( $module, "acquisition" ) > 0 ) { # FIXME: imprecise comparison
+ $sth2 = $dbh->prepare("SHOW COLUMNS from aqbooksellers");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---BOOKSELLERS---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---BOOKSELLERS---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = (
+ push @SQLfieldname, {
'value' => "aqbooksellers." . $field,
'text' => "aqbooksellers." . $field
- );
- push @SQLfieldname, \%line;
+ };
}
- my $sth2 = $dbh->prepare("SHOW COLUMNS from aqorders");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from aqorders");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---ORDERS---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---ORDERS---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = (
+ push @SQLfieldname, {
'value' => "aqorders." . $field,
'text' => "aqorders." . $field
- );
- push @SQLfieldname, \%line;
+ };
}
# add issues specific tables
}
- elsif ( index( $module, "issues" ) > 0 ) {
- my $sth2 = $dbh->prepare("SHOW COLUMNS from aqbooksellers");
+ elsif ( index( $module, "issues" ) > 0 ) { # FIXME: imprecise comparison
+ $sth2 = $dbh->prepare("SHOW COLUMNS from aqbooksellers");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---BOOKSELLERS---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---BOOKSELLERS---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = (
+ push @SQLfieldname, {
'value' => "aqbooksellers." . $field,
'text' => "aqbooksellers." . $field
- );
- push @SQLfieldname, \%line;
+ };
}
- my $sth2 = $dbh->prepare("SHOW COLUMNS from serial");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from serial");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---SERIALS---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---SERIALS---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = ( 'value' => "serial." . $field, 'text' => "serial." . $field );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "serial." . $field, 'text' => "serial." . $field };
}
- my $sth2 = $dbh->prepare("SHOW COLUMNS from subscription");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from subscription");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---SUBSCRIPTION---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---SUBSCRIPTION---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = (
+ push @SQLfieldname, {
'value' => "subscription." . $field,
'text' => "subscription." . $field
- );
- push @SQLfieldname, \%line;
+ };
}
-
- # add biblio specific tables.
+ push @SQLfieldname, { 'value' => "", 'text' => '---Biblio---' };
+ foreach(qw(title author serial)) {
+ push @SQLfieldname, { 'value' => "biblio.$_", 'text' => ucfirst($_) };
+ }
}
else {
- my $sth2 = $dbh->prepare("SHOW COLUMNS from biblio");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from biblio");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---BIBLIO---' );
+ push @SQLfieldname, { 'value' => "", 'text' => '---BIBLIO---' };
- push @SQLfieldname, \%line;
while ( ( my $field ) = $sth2->fetchrow_array ) {
-
-# note : %line is redefined, otherwise \%line contains the same value for every entry of the list
- my %line = ( 'value' => "biblio." . $field, 'text' => "biblio." . $field );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "biblio." . $field, 'text' => "biblio." . $field };
}
- my $sth2 = $dbh->prepare("SHOW COLUMNS from biblioitems");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from biblioitems");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---BIBLIOITEMS---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---BIBLIOITEMS---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = (
+ push @SQLfieldname, {
'value' => "biblioitems." . $field,
'text' => "biblioitems." . $field
- );
- push @SQLfieldname, \%line;
+ };
}
- my %line = ( 'value' => "", 'text' => '---ITEMS---' );
- push @SQLfieldname, \%line;
- my %line = ( 'value' => "items.content", 'text' => 'items.content' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---ITEMS---' };
+ push @SQLfieldname, { 'value' => "items.content", 'text' => 'items.content' };
- my $sth2 = $dbh->prepare("SHOW COLUMNS from borrowers");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from borrowers");
$sth2->execute;
- my %line = ( 'value' => "", 'text' => '---BORROWERS---' );
- push @SQLfieldname, \%line;
+ push @SQLfieldname, { 'value' => "", 'text' => '---BORROWERS---' };
while ( ( my $field ) = $sth2->fetchrow_array ) {
- my %line = (
+ push @SQLfieldname, {
'value' => "borrowers." . $field,
'text' => "borrowers." . $field
- );
- push @SQLfieldname, \%line;
+ };
}
}
if ($code) {
( $module ? $module : $letter->{module} ) => 1,
SQLfieldname => \@SQLfieldname,
);
-
- # END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
}
$sth->finish;
print $input->redirect("letter.pl");
exit;
-
- # END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
}
$sth->execute($code);
my $data = $sth->fetchrow_hashref;
$sth->finish;
- $template->param( module => $data->{module} );
- $template->param( code => $code );
- $template->param( name => $data->{'name'} );
- $template->param( content => $data->{'content'} );
-
- # END $OP eq DELETE_CONFIRM
+ $template->param( code => $code );
+ foreach (qw(module name content)) {
+ $template->param( $_ => $data->{$_} );
+ }
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
}
$sth->finish;
print $input->redirect("/cgi-bin/koha/tools/letter.pl");
return;
-
- # END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
}
else { # DEFAULT
$i++
)
{
- if ( $toggle ) {
- $toggle = 0;
- }
- else {
- $toggle = 1;
- }
+ $toggle = ($toggle) ? 0 : 1;
my %row_data;
$row_data{toggle} = $toggle;
- $row_data{module} = $results->[$i]{'module'};
- $row_data{code} = $results->[$i]{'code'};
- $row_data{name} = $results->[$i]{'name'};
+ foreach (qw(module code name)) {
+ $row_data{$_} = $results->[$i]{$_};
+ }
push( @loop_data, \%row_data );
}
$template->param( letter => \@loop_data );
projects / koha.git / blobdiff