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

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/11/20 17:50:07

Modified files:
        C4             : Auth.pm Auth_with_ldap.pm 

Log message:
        userflags 'reservforself is deprecated'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.8&r2=1.54.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth_with_ldap.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.1&r2=1.5.2.2

Patches:
Index: Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.8
retrieving revision 1.54.2.9
diff -u -b -r1.54.2.8 -r1.54.2.9
--- Auth.pm     17 Nov 2006 14:57:21 -0000      1.54.2.8
+++ Auth.pm     20 Nov 2006 17:50:07 -0000      1.54.2.9
@@ -36,7 +36,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.8 $' =~ /\d+/g; 
+$VERSION = do { my @v = '$Revision: 1.54.2.9 $' =~ /\d+/g; 
         shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -143,7 +143,7 @@
             $template->param( CAN_user_permission       => 1 );
             $template->param( CAN_user_reserveforothers => 1 );
             $template->param( CAN_user_borrow           => 1 );
-            $template->param( CAN_user_reserveforself   => 1 );
+         #  $template->param( CAN_user_reserveforself   => 1 );
             $template->param( CAN_user_editcatalogue    => 1 );
             $template->param( CAN_user_updatecharge     => 1 );
             $template->param( CAN_user_acquisition      => 1 );
@@ -181,10 +181,6 @@
             $template->param( CAN_user_borrow => 1 );
         }
 
-        if ( $flags && $flags->{reserveforself} == 1 ) {
-            $template->param( CAN_user_reserveforself => 1 );
-        }
-
         if ( $flags && $flags->{editcatalogue} == 1 ) {
             $template->param( CAN_user_editcatalogue => 1 );
         }
@@ -501,9 +497,8 @@
 #  new op dev :
 # launch a sequence to check if we have a ip for the branch, if we have one we 
replace the branchcode of the userenv by the branch bound in the ip.
                 my $ip       = $ENV{'REMOTE_ADDR'};
-                my $branches = GetBranches('IS');
+                my $branches = GetBranches();
                 my @branchesloop;
-                my $branchprinter;
                 foreach my $br ( keys %$branches ) {
 
                     #          now we work with the treatment of ip

Index: Auth_with_ldap.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth_with_ldap.pm,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- Auth_with_ldap.pm   17 Nov 2006 14:57:21 -0000      1.5.2.1
+++ Auth_with_ldap.pm   20 Nov 2006 17:50:07 -0000      1.5.2.2
@@ -53,7 +53,7 @@
                              query           => $query,
                             type            => "opac",
                             authnotrequired => 1,
-                            flagsrequired   => {borrow => 1},
+                            flagsrequired   => {circulate => 1},
                          });
 
   print $query->header(
@@ -100,7 +100,7 @@
                              query           => $query,
                             type            => "opac",
                             authnotrequired => 1,
-                            flagsrequired   => {borrow => 1},
+                            flagsrequired   => {circulate => 1},
                          });
 
     This call passes the C<query>, C<flagsrequired> and C<authnotrequired>
@@ -148,8 +148,8 @@
                        $template->param(CAN_user_borrowers => 1);
                        $template->param(CAN_user_permission => 1);
                        $template->param(CAN_user_reserveforothers => 1);
-                       $template->param(CAN_user_borrow => 1);
-                       $template->param(CAN_user_reserveforself => 1);
+               #       $template->param(CAN_user_borrow => 1);
+               #       $template->param(CAN_user_reserveforself => 1);
                        $template->param(CAN_user_editcatalogue => 1);
                        $template->param(CAN_user_updatecharge => 1);
                        $template->param(CAN_user_acquisition => 1);
@@ -183,11 +183,6 @@
                if ($flags && $flags->{borrow} == 1) {
                        $template->param(CAN_user_borrow => 1); }
                
-
-               if ($flags && $flags->{reserveforself} == 1) {
-                       $template->param(CAN_user_reserveforself => 1); }
-               
-
                if ($flags && $flags->{editcatalogue} == 1) {
                        $template->param(CAN_user_editcatalogue => 1); }