[Koha-cvs] koha/C4 Auth.pm [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	06/12/22 17:19:52

Modified files:
	C4             : Auth.pm 

Log message:
	Adding branchname in data.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.19&r2=1.54.2.20

Patches:
Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.19
retrieving revision 1.54.2.20
diff -u -b -r1.54.2.19 -r1.54.2.20
--- Auth.pm	22 Dec 2006 17:10:10 -0000	1.54.2.19
+++ Auth.pm	22 Dec 2006 17:19:52 -0000	1.54.2.20
@@ -37,7 +37,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.54.2.19 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.54.2.20 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -501,7 +501,7 @@
                     $sth->execute($cardnumber);
                     (
                         $borrowernumber, $firstname,  $surname,
-                        $userflags,      $branchcode, $branchcode,
+                        $userflags,      $branchcode, $branchname,
                         $branchprinter,  $emailaddress
                       )
                       = $sth->fetchrow
@@ -512,7 +512,7 @@
                         $sth->execute($userid);
                         (
                             $borrowernumber, $firstname, $surname, $userflags,
-                            $branchcode, $branchprinter, $emailaddress
+                            $branchcode, $branchname, $branchprinter, $emailaddress
                           )
                           = $sth->fetchrow
                           if ( $sth->rows );
@@ -530,7 +530,7 @@
                 foreach my $br ( keys %$branches ) {
 
                     # now we work with the treatment of ip
-                    my $domain = $branches->{$br}->{branchip};
+                    my $domain = $branches->{$br}->{'branchip'};
                     if ( $domain && $ip =~ /^$domain/ ) {
                         $branchcode = $branches->{$br}->{'branchcode'};