[Koha-cvs] CVS: koha/circ circulation.pl,1.25,1.26 selectbranchprinter.pl,1.1,1.2

[Finlay Thompson]

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv19075

Modified Files:
	circulation.pl selectbranchprinter.pl 
Log Message:

fixed a little bug with cookies and setting the branch and printer settings.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** circulation.pl	18 May 2002 05:05:53 -0000	1.25
--- circulation.pl	18 May 2002 05:37:26 -0000	1.26
***************
*** 31,40 ****
  
  #set up cookie.....
  my $branchcookie;
  my $printercookie;
! unless ($query->cookie('branch')) {
      $branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
- }
- unless ($query->cookie('printer')) {
      $printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
  }
--- 31,39 ----
  
  #set up cookie.....
+ my $info = '';
  my $branchcookie;
  my $printercookie;
! if ($query->param('setcookies')) {
      $branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
      $printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
  }
***************
*** 325,329 ****
  my $todaysissues='';
  my $previssues='';
- my $info='';
  if ($borrower) {
      my $issueslist = getissues($borrower);
--- 324,327 ----

Index: selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** selectbranchprinter.pl	18 May 2002 05:02:25 -0000	1.1
--- selectbranchprinter.pl	18 May 2002 05:37:28 -0000	1.2
***************
*** 51,54 ****
--- 51,55 ----
  foreach (keys %$branches) {
      (next) unless ($_);
+     (next) unless ($branches->{$_}->{'IS'});
      $branchcount++;
      my $selected='';
***************
*** 117,121 ****
  </td></tr>
  </table>
! <input type="submit" value="Change Settings" type="changesettings">
  </form>
  </center>
--- 118,123 ----
  </td></tr>
  </table>
! <input type="hidden" name="setcookies" value=1>
! <input type="submit" value="Submit" type="changesettings">
  </form>
  </center>