[Koha-cvs] CVS: koha pay.pl,1.11,1.12 search.pl,1.35,1.36

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18131

Modified Files:
        pay.pl search.pl 
Log Message:
synch'ing 2.2 and head

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** pay.pl      1 Mar 2005 13:40:47 -0000       1.11
--- pay.pl      20 Jun 2005 14:39:01 -0000      1.12
***************
*** 56,60 ****
  my $check=0;
  for (my $i=0;$i<@names;$i++){
!       my$temp=$input->param($names[$i]);
        if ($temp eq 'wo'){
                $inp{$names[$i]}=$temp;
--- 56,60 ----
  my $check=0;
  for (my $i=0;$i<@names;$i++){
!       my $temp=$input->param($names[$i]);
        if ($temp eq 'wo'){
                $inp{$names[$i]}=$temp;
***************
*** 65,68 ****
--- 65,69 ----
                $user=~ s/Foxton/F/i;
                $user=~ s/Shannon/S/i;
+               # FIXME : using array +4, +5, +6 is dirty. Should use arrays 
for each accountline
                my $amount=$input->param($names[$i+4]);
                my $bornum=$input->param($names[$i+5]);
***************
*** 146,150 ****
        }
        $bornum=$input->param('bornum');
!       print $input->redirect("/cgi-bin/koha/pay.pl?bornum=$bornum");
  }
  
--- 147,151 ----
        }
        $bornum=$input->param('bornum');
!       print 
$input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
  }
  

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** search.pl   7 Apr 2004 22:43:04 -0000       1.35
--- search.pl   20 Jun 2005 14:39:11 -0000      1.36
***************
*** 20,23 ****
--- 20,30 ----
  
  # $Log$
+ # Revision 1.36  2005/06/20 14:39:11  tipaul
+ # synch'ing 2.2 and head
+ #
+ # Revision 1.35.2.1  2005/05/27 10:02:50  hdl
+ # Bug Fixing : Using old search.pl with subjectitems In normal mode display.
+ # Problem : Changing Page doesn't work.
+ #
  # Revision 1.35  2004/04/07 22:43:04  rangi
  # Fix for bug 217
***************
*** 100,104 ****
  foreach my $term (qw(keyword subject author illustrator itemnumber
                     isbn date-before class dewey branch title abstract
!                    publisher ttype))
  {
        my $value = $query->param($term);
--- 107,111 ----
  foreach my $term (qw(keyword subject author illustrator itemnumber
                     isbn date-before class dewey branch title abstract
!                    publisher ttype subjectitems))
  {
        my $value = $query->param($term);