Merge branch 'bug_7368' into 3.14-master

[koha.git] / circ / selectbranchprinter.pl

diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index c878742..b5adcfc 100755 (executable)
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -13,9 +13,9 @@
 # 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 warnings;
@@ -23,7 +23,7 @@ use CGI;
 
 use C4::Context;
 use C4::Output;
-use C4::Auth;
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Print;  # GetPrinters
 use C4::Koha;
 use C4::Branch; # GetBranches GetBranchesLoop
@@ -31,20 +31,66 @@ use C4::Branch; # GetBranches GetBranchesLoop
 # this will be the script that chooses branch and printer settings....
 
 my $query = CGI->new();
+
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user({
     template_name   => "circ/selectbranchprinter.tmpl",
     query           => $query,
     type            => "intranet",
     debug           => 1,
     authnotrequired => 0,
-    flagsrequired   => { circulate => "circulate_remaining_permissions" },
+    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' ) || C4::Context->userenv->{'branch'}; 
-my $printer  = $query->param('printer') || C4::Context->userenv->{'branchprinter'};
+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
+}
+
+# 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
+}
+
+$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
@@ -52,7 +98,7 @@ unless ($branches->{$branch}) {
 
 my @printkeys = sort keys %$printers;
 if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
-    $printer = $printkeys[0];
+    $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
 }
 
 my @printerloop;
@@ -67,15 +113,26 @@ foreach ( @printkeys ) {
 
 my @recycle_loop;
 foreach ($query->param()) {
-    /^branch(printer)?$/ and next;  # disclude branch and branchprinter
+    $_ 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($_),
     };
 }
 
+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(
-    referer     => $ENV{HTTP_REFERER},
+    referer     => $referer,
     printerloop => \@printerloop,
     branchloop  => GetBranchesLoop($branch),
     recycle_loop=> \@recycle_loop,