[Koha-cvs] CVS: koha/C4 Output.pm,1.29,1.30

[Andrew Arensburger]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv4919

Modified Files:
        Output.pm 
Log Message:
Replaced expressions of the form "$x = $x <op> $y" with "$x <op>= $y".
Thus, $x = $x+2 becomes $x += 2, and so forth.


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** Output.pm   13 Oct 2002 08:30:03 -0000      1.29
--- Output.pm   13 Oct 2002 11:35:33 -0000      1.30
***************
*** 460,464 ****
        $i++;
    }
!   $string=$string."</tr>\n";          # FIXME - .=
    return($string);
  }
--- 460,464 ----
        $i++;
    }
!   $string .= "</tr>\n";
    return($string);
  }
***************
*** 482,486 ****
    my ($action,%inputs)address@hidden;
    my $string="<form action=$action method=post>\n";
!   $string=$string.mktablehdr();               # FIXME - .=
    my $key;
    my @keys=sort keys %inputs;
--- 482,486 ----
    my ($action,%inputs)address@hidden;
    my $string="<form action=$action method=post>\n";
!   $string .= mktablehdr();
    my $key;
    my @keys=sort keys %inputs;
***************
*** 493,498 ****
      #my $posn = shift(@data);
      if ($data[0] eq 'hidden'){
!       $string=$string."<input type=hidden name=$keys[$i2] 
value=\"$data[1]\">\n";
!                                       # FIXME - .=
      } else {
        my $text;
--- 493,497 ----
      #my $posn = shift(@data);
      if ($data[0] eq 'hidden'){
!       $string .= "<input type=hidden name=$keys[$i2] value=\"$data[1]\">\n";
      } else {
        my $text;
***************
*** 512,522 ****
                while ($data[$i] ne "") {
          my $val = $data[$i+1];
!                 $text = $text."<option value=$data[$i]>$val";         # FIXME 
- .=
!         $i = $i+2;            # FIXME - +=
        }
!       $text=$text."</select>";
!                               # FIXME - .=
        }
!       $string=$string.mktablerow(2,'white',$keys[$i2],$text); # FIXME - .=
        address@hidden =mktablerow(2,'white',$keys[$i2],$text);
      }
--- 511,520 ----
                while ($data[$i] ne "") {
          my $val = $data[$i+1];
!                 $text .= "<option value=$data[$i]>$val";
!                 $i += 2;
        }
!       $text .= "</select>";
        }
!       $string .= mktablerow(2,'white',$keys[$i2],$text);
        address@hidden =mktablerow(2,'white',$keys[$i2],$text);
      }
***************
*** 524,531 ****
    }
    #$string=$string.join("\n",@order);
!   $string=$string.mktablerow(2,'white','<input type=submit>','<input 
type=reset>');
!                               # FIXME - .=
!   $string=$string.mktableft;  # FIXME - .=
!   $string=$string."</form>";  # FIXME - .=
  }
  
--- 522,528 ----
    }
    #$string=$string.join("\n",@order);
!   $string .= mktablerow(2,'white','<input type=submit>','<input type=reset>');
!   $string .= mktableft;
!   $string .= "</form>";
  }
  
***************
*** 634,641 ****
                while ($data[$i] ne "") {
          my $val = $data[$i+1];
!                 $text = $text."<option value=$data[$i]>$val";         # FIXME 
- .=
!         $i = $i+2;            # FIXME - Use $i += 2.
        }
!       $text=$text."</select>";        # FIXME - .=
        }
  #      $string=$string.mktablerow(2,'white',$keys[$i2],$text);
--- 631,638 ----
                while ($data[$i] ne "") {
          my $val = $data[$i+1];
!                 $text .= "<option value=$data[$i]>$val";
!                 $i += 2;
        }
!       $text .= "</select>";
        }
  #      $string=$string.mktablerow(2,'white',$keys[$i2],$text);
***************
*** 645,652 ****
    }
    my $temp=join("\n",@order);
!   $string=$string.$temp;                                      # FIXME - .=
!   $string=$string.mktablerow(1,'white','<input type=submit>');        # FIXME 
- .=
!   $string=$string.mktableft;                                  # FIXME - .=
!   $string=$string."</form>";                                  # FIXME - .=
    # FIXME - A return statement, while not strictly necessary, would be nice.
  }
--- 642,649 ----
    }
    my $temp=join("\n",@order);
!   $string .= $temp;
!   $string .= mktablerow(1,'white','<input type=submit>');
!   $string .= mktableft;
!   $string .= "</form>";
    # FIXME - A return statement, while not strictly necessary, would be nice.
  }
***************
*** 719,747 ****
    for (my $i=0; $i<$count; $i++){
      if ($inputs[$i][0] eq 'hidden'){
!       $string=$string."<input type=hidden name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">\n";
!                               # FIXME - .=
      }
      if ($inputs[$i][0] eq 'radio') {
!       $string.="<input type=radio name=$inputs[1] 
value=$inputs[$i][2]>$inputs[$i][2]";
!                               # FIXME - .=
      }
      if ($inputs[$i][0] eq 'text') {
!       $string.="<input type=$inputs[$i][0] name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">";
!                               # FIXME - .=
      }
      if ($inputs[$i][0] eq 'textarea') {
!         $string.="<textarea name=$inputs[$i][1] wrap=physical cols=40 
rows=4>$inputs[$i][2]</textarea>";
!                               # FIXME - .=
      }
      if ($inputs[$i][0] eq 'reset'){
!       $string.="<input type=reset name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">";
!                               # FIXME - .=
      }
      if ($inputs[$i][0] eq 'submit'){
!       $string.="<input type=submit name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">";
!                               # FIXME - .=
      }
    }
!   $string=$string."</form>";  # FIXME - .=
  }
  
--- 716,738 ----
    for (my $i=0; $i<$count; $i++){
      if ($inputs[$i][0] eq 'hidden'){
!       $string .= "<input type=hidden name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">\n";
      }
      if ($inputs[$i][0] eq 'radio') {
!       $string .= "<input type=radio name=$inputs[1] 
value=$inputs[$i][2]>$inputs[$i][2]";
      }
      if ($inputs[$i][0] eq 'text') {
!       $string .= "<input type=$inputs[$i][0] name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">";
      }
      if ($inputs[$i][0] eq 'textarea') {
!         $string .= "<textarea name=$inputs[$i][1] wrap=physical cols=40 
rows=4>$inputs[$i][2]</textarea>";
      }
      if ($inputs[$i][0] eq 'reset'){
!       $string .= "<input type=reset name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">";
      }
      if ($inputs[$i][0] eq 'submit'){
!       $string .= "<input type=submit name=$inputs[$i][1] 
value=\"$inputs[$i][2]\">";
      }
    }
!   $string .= "</form>";
  }
  
***************
*** 830,834 ****
    my ($action,%inputs)address@hidden;
    my $string="<form action=$action method=post>\n";
!   $string=$string.mktablehdr();               # FIXME - .=
    my $key;
    my @order;
--- 821,825 ----
    my ($action,%inputs)address@hidden;
    my $string="<form action=$action method=post>\n";
!   $string .= mktablehdr();
    my $key;
    my @order;
***************
*** 839,844 ****
      my $ltext = shift(@data);
      if ($data[0] eq 'hidden'){
!       $string=$string."<input type=hidden name=$key value=\"$data[1]\">\n";
!                                       # FIXME - .=
      } else {
        my $text;
--- 830,834 ----
      my $ltext = shift(@data);
      if ($data[0] eq 'hidden'){
!       $string .= "<input type=hidden name=$key value=\"$data[1]\">\n";
      } else {
        my $text;
***************
*** 865,888 ****
                while ($data[$i] ne "") {
          my $val = $data[$i+1];
!                 $text = $text."<option value=\"$data[$i]\"";  # FIXME - .=
          if ($data[$i] eq $sel) {
!            $text = $text." selected";                 # FIXME - .=
          }
!           $text = $text.">$val";                      # FIXME - .=
!         $i = $i+2;                                    # FIXME - +=
        }
!       $text=$text."</select>";                        # FIXME - .=
        }
        if ($reqd eq "R") {
!         $ltext = $ltext." (Req)";                     # FIXME - .=
        }
        $order[$posn] =mktablerow(2,'white',$ltext,$text);
      }
    }
!   $string=$string.join("\n",@order);                  # FIXME - .=
!   $string=$string.mktablerow(2,'white','<input type=submit>','<input 
type=reset>');
!                                                       # FIXME - .=
!   $string=$string.mktableft;                          # FIXME - .=
!   $string=$string."</form>";                          # FIXME - .=
  }
  
--- 855,877 ----
                while ($data[$i] ne "") {
          my $val = $data[$i+1];
!                 $text .= "<option value=\"$data[$i]\"";
          if ($data[$i] eq $sel) {
!            $text .= " selected";
          }
!           $text .= ">$val";
!           $i += 2;
        }
!       $text .= "</select>";
        }
        if ($reqd eq "R") {
!         $ltext .= " (Req)";
        }
        $order[$posn] =mktablerow(2,'white',$ltext,$text);
      }
    }
!   $string .= join("\n",@order);
!   $string .= mktablerow(2,'white','<input type=submit>','<input type=reset>');
!   $string .= mktableft;
!   $string .= "</form>";
  }