X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FInput.pm;h=2ee07f3f61bebb6f204e8cdb7a9e164dc2f0aa58;hb=62b76aa98c4f30ae32cb76ba0348e94d31e8464f;hp=b66c116b131075a037ed446011fdd926e73b6049;hpb=7bd99ef3657c02a60e9880a3aabb1883d50779b0;p=koha.git

diff --git a/C4/Input.pm b/C4/Input.pm
index b66c116b13..2ee07f3f61 100644
--- a/C4/Input.pm
+++ b/C4/Input.pm
@@ -14,11 +14,13 @@ package C4::Input; #assumes C4/Input
 # 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;
+
 require Exporter;
 use C4::Context;
 use CGI;
@@ -49,7 +51,7 @@ number or ISBN is valid.
 
 @ISA = qw(Exporter);
 @EXPORT = qw(
-	&checkdigit &checkvalidisbn
+	&checkdigit
 	&buildCGIsort
 );
 
@@ -62,14 +64,14 @@ checkdigit at the end of C<$cardnumber>. Returns a true value iff
 C<$cardnumber> has a valid check digit.
 
 =cut
+
 #'
-sub checkdigit {
+sub checkdigit ($;$) {
 
 	my ($infl, $nounique) =  @_;
 	$infl = uc $infl;
 
-
-	#Check to make sure the cardnumber is unique
+	# Check to make sure the cardnumber is unique
 
 	#FIXME: We should make the error for a nonunique cardnumber
 	#different from the one where the checkdigit on the number is
@@ -77,9 +79,8 @@ sub checkdigit {
 
 	unless ( $nounique )
 	{
-		my $dbh=C4::Context->dbh;
 		my $query=qq{SELECT * FROM borrowers WHERE cardnumber=?};
-		my $sth=$dbh->prepare($query);
+		my $sth=C4::Context->prepare($query);
 		$sth->execute($infl);
 		my %results = $sth->fetchrow_hashref();
 		if ( $sth->rows != 0 )
@@ -93,78 +94,31 @@ sub checkdigit {
 
 	my @weightings = (8,4,6,3,5,2,1);
 	my $sum;
-	my $i = 1;
-	my $valid = 0;
-
-	foreach $i (1..7) {
+	foreach my $i (1..7) {
 		my $temp1 = $weightings[$i-1];
 		my $temp2 = substr($infl,$i,1);
 		$sum += $temp1 * $temp2;
 	}
 	my $rem = ($sum%11);
 	if ($rem == 10) {
-	$rem = "X";
+		$rem = "X";
 	}
 	if ($rem eq substr($infl,8,1)) {
-		$valid = 1;
+		return 1;
 	}
-	return $valid;
+	return 0;
 } # sub checkdigit
 
-=item checkvalidisbn
-
-  $valid = &checkvalidisbn($isbn);
-
-Returns a true value iff C<$isbn> is a valid ISBN: it must be ten
-digits long (counting "X" as a digit), and must have a valid check
-digit at the end.
-
-=cut
-#'
-#--------------------------------------
-# Determine if a number is a valid ISBN number, according to length
-#   of 10 digits and valid checksum
-sub checkvalidisbn {
-	use strict;
-	my ($q)=@_ ;	# Input: ISBN number
-	
-	my $isbngood = 0; # Return: true or false
-	
-	$q=~s/x$/X/g;   # upshift lower case X
-	$q=~s/[^X\d]//g;
-	$q=~s/X.//g;
-	
-		#return 0 if $q is not ten digits long
-		if (length($q)!=10) {
-			return 0;
-		}
-		
-		#If we get to here, length($q) must be 10
-	my $checksum=substr($q,9,1);
-	my $isbn=substr($q,0,9);
-	my $i;
-	my $c=0;
-	for ($i=0; $i<9; $i++) {
-		my $digit=substr($q,$i,1);
-		$c+=$digit*(10-$i);
-	}
-	$c %= 11;
-	($c==10) && ($c='X');
-	$isbngood = $c eq $checksum;
-	return $isbngood;
-
-} # sub checkvalidisbn
-
 =item buildCGISort
 
-  $CGIScrollingList = &BuildCGISort($name string, $input_name string);
+  $CGIScrollingList = &buildCGISort($name string, $input_name string);
 
 Returns the scrolling list with name $input_name, built on authorised Values named $name.
 Returns NULL if no authorised values found
 
 =cut
+
 sub buildCGIsort {
-    use strict;
 	my ($name,$input_name,$data) = @_;
 	my $dbh=C4::Context->dbh;
 	my $query=qq{SELECT * FROM authorised_values WHERE category=? order by lib};
@@ -174,22 +128,22 @@ sub buildCGIsort {
 	if ($sth->rows>0){
 		my @values;
 		my %labels;
-		
+
 		for (my $i =0;$i<$sth->rows;$i++){
 			my $results = $sth->fetchrow_hashref;
- 			push @values, $results->{authorised_value};
- 			$labels{$results->{authorised_value}}=$results->{lib};
+			push @values, $results->{authorised_value};
+			$labels{$results->{authorised_value}}=$results->{lib};
 		}
- 		unshift(@values,"");
 		$CGISort= CGI::scrolling_list(
- 					-name => $input_name,
- 					-values => \@values,
- 					-labels => \%labels,
+					-name => $input_name,
+					-id =>   $input_name,
+					-values => \@values,
+					-labels => \%labels,
 					-default=> $data,
- 					-size => 1,
- 					-multiple => 0);
+					-size => 1,
+					-multiple => 0);
 	}
-	$sth->finish; 
+	$sth->finish;
 	return $CGISort;
 }
 END { }       # module clean-up code here (global destructor)
@@ -201,6 +155,6 @@ __END__
 
 =head1 AUTHOR
 
-Koha Developement team <info@koha.org>
+Koha Development Team <http://koha-community.org/>
 
 =cut