# 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., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# 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 CGI qw/:standard/;
+use warnings;
+use CGI;
use C4::Context;
-use C4::Circulation;
use C4::Output;
-use C4::Auth;
-use C4::Print;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Print; # GetPrinters
use C4::Koha;
-use C4::Branch; # GetBranches
+use C4::Branch; # GetBranches GetBranchesLoop
-# this is a reorganisation of circulationold.pl
-# dividing it up into three scripts......
-# this will be the first one that chooses branch and printer settings....
+# this will be the script that chooses branch and printer settings....
-#general design stuff...
+my $query = CGI->new();
-# try to get the branch and printer settings from the http....
-my $query = new CGI;
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user({
+ template_name => "circ/selectbranchprinter.tmpl",
+ query => $query,
+ type => "intranet",
+ debug => 1,
+ authnotrequired => 0,
+ flagsrequired => { catalogue => 1, },
+});
+
+my $sessionID = $query->cookie("CGISESSID");
+my $session = get_session($sessionID);
+
+# try to get the branch and printer settings from http, fallback to userenv
my $branches = GetBranches();
my $printers = GetPrinters();
-my $branch = $query->param('branch');
+my $branch = $query->param('branch' );
my $printer = $query->param('printer');
+# fallbacks for $branch and $printer after possible session updates
+
+my $userenv_branch = C4::Context->userenv->{'branch'} || '';
+my $userenv_printer = C4::Context->userenv->{'branchprinter'} || '';
+my @updated;
+
+# $session lddines here are doing the updating
+if ($branch and $branches->{$branch}) {
+ if (! $userenv_branch or $userenv_branch ne $branch ) {
+ my $branchname = GetBranchName($branch);
+ $template->param(LoginBranchname => $branchname); # update template for new branch
+ $template->param(LoginBranchcode => $branch); # update template for new branch
+ $session->param('branchname', $branchname); # update sesssion in DB
+ $session->param('branch', $branch); # update sesssion in DB
+ push @updated, {
+ updated_branch => 1,
+ old_branch => $userenv_branch,
+ };
+ } # else branch the same, no update
+} else {
+ $branch = $userenv_branch; # fallback value
+}
-# set header with cookie....
+# FIXME: branchprinter is not retained by session. This feature was not adequately
+# ported from Koha 2.2.3 where it had been a separate cookie.
+# So this needs to be fixed for Koha 3 or removed outright.
+# --atz (w/ info from chris cormack)
+
+if ($printer) {
+ if (! $userenv_printer or $userenv_printer ne $printer ) {
+ $session->param('branchprinter', $printer); # update sesssion in DB
+ $template->param('new_printer', $printer); # update template
+ push @updated, {
+ updated_printer => 1,
+ old_printer => $userenv_printer,
+ };
+ } # else printer is the same, no update
+} else {
+ $printer = $userenv_printer; # fallback value
+}
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
- {
- template_name => "circ/selectbranchprinter.tmpl",
- query => $query,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { circulate => 1 },
- }
-);
+$template->param(updated => \@updated) if (scalar @updated);
+unless ($branches->{$branch}) {
+ $branch = (keys %$branches)[0]; # if branch didn't really exist, then replace it w/ one that does
+}
-($branch) || ( $branch = C4::Context->userenv->{'branch'} );
-($printer) || ( $printer = C4::Context->userenv->{'branchprinter'} );
-( $branches->{$branch} ) || ( $branch = ( keys %$branches )[0] );
-( $printers->{$printer} ) || ( $printer = ( keys %$printers )[0] );
-
-# if you force a selection....
-my $oldbranch = $branch;
-my $oldprinter = $printer;
-
-# set up select options....
-my $branchcount = 0;
-my $printercount = 0;
-my @branchloop;
-for my $br (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
- next unless $br =~ /\S/; # next unless $br is not blank.
-
- $branchcount++;
- my %branch;
- $branch{selected} = ( $br eq $oldbranch );
- $branch{name} = $branches->{$br}->{'branchname'};
- $branch{value} = $br;
- push( @branchloop, \%branch );
+my @printkeys = sort keys %$printers;
+if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
+ $printer = $printkeys[0]; # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
}
+
my @printerloop;
-foreach ( keys %$printers ) {
- (next) unless ($_); # next unless if this printer is blank.
- $printercount++;
- my %printer;
- $printer{selected} = ( $_ eq $oldprinter );
- $printer{name} = $printers->{$_}->{'printername'};
- $printer{value} = $_;
- push( @printerloop, \%printer );
+foreach ( @printkeys ) {
+ next unless ($_); # skip printer if blank.
+ push @printerloop, {
+ selected => ( $_ eq $printer ),
+ name => $printers->{$_}->{'printername'},
+ value => $_,
+ };
}
-# if there is only one....
-my $printername;
-my $branchname;
-
-my $oneprinter = ( $printercount == 1 );
-my $onebranch = ( $branchcount == 1 );
-if ( $printercount == 1 ) {
- my ($tmpprinter) = keys %$printers;
- $printername = $printers->{$tmpprinter}->{printername};
-}
-if ( $branchcount == 1 ) {
- my ($tmpbranch) = keys %$branches;
- $branchname = $branches->{$tmpbranch}->{branchname};
+my @recycle_loop;
+foreach ($query->param()) {
+ $_ or next; # disclude blanks
+ $_ eq "branch" and next; # disclude branch
+ $_ eq "printer" and next; # disclude printer
+ $_ eq "oldreferer" and next; # disclude oldreferer
+ push @recycle_loop, {
+ param => $_,
+ value => $query->param($_),
+ };
}
-################################################################################
-# Start writing page....
+my $referer = $query->param('oldreferer') || $ENV{HTTP_REFERER};
+$referer =~ /selectbranchprinter\.pl/ and undef $referer; # avoid sending them back to this same page.
+
+if (scalar @updated and not scalar @recycle_loop) {
+ # we updated something, and there were no extra params to POST: quick redirect
+ print $query->redirect($referer || '/cgi-bin/koha/circ/circulation.pl');
+}
$template->param(
- oneprinter => $oneprinter,
- onebranch => $onebranch,
- printername => $printername,
- branchname => $branchname,
- printerloop => \@printerloop,
- branchloop => \@branchloop,
+ referer => $referer,
+ printerloop => \@printerloop,
+ branchloop => GetBranchesLoop($branch),
+ recycle_loop=> \@recycle_loop,
);
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff