From d06de68d9ee05fadbab8586f7ee17ac28839a0c9 Mon Sep 17 00:00:00 2001
From: finlayt <finlayt>
Date: Sat, 18 May 2002 05:37:26 +0000
Subject: [PATCH] fixed a little bug with cookies and setting the branch and
 printer settings.

---
 circ/circulation.pl         | 6 ++----
 circ/selectbranchprinter.pl | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 3168b54fdb..6ba69144bb 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -30,12 +30,11 @@ my $printer = $query->param("printer");
 ($printer) || ($printer=$query->cookie('printer')) ;
 
 #set up cookie.....
+my $info = '';
 my $branchcookie;
 my $printercookie;
-unless ($query->cookie('branch')) {
+if ($query->param('setcookies')) {
     $branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
-}
-unless ($query->cookie('printer')) {
     $printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
 }
 
@@ -324,7 +323,6 @@ EOF
 # make the issued books table.....
 my $todaysissues='';
 my $previssues='';
-my $info='';
 if ($borrower) {
     my $issueslist = getissues($borrower);
     my $tcolor = '';
diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index 1307340394..30dcc1656a 100644
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -50,6 +50,7 @@ my $branchoptions;
 my $printeroptions;
 foreach (keys %$branches) {
     (next) unless ($_);
+    (next) unless ($branches->{$_}->{'IS'});
     $branchcount++;
     my $selected='';
     ($selected='selected') if ($_ eq $oldbranch);
@@ -116,7 +117,8 @@ $branchform
 $printerform
 </td></tr>
 </table>
-<input type="submit" value="Change Settings" type="changesettings">
+<input type="hidden" name="setcookies" value=1>
+<input type="submit" value="Submit" type="changesettings">
 </form>
 </center>
 
-- 
2.20.1