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

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/10/20 15:29:29

Modified files:
        C4             : Auth.pm 

Log message:
        sync with dev_week. 

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

Patches:
Index: Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.6
retrieving revision 1.54.2.7
diff -u -b -r1.54.2.6 -r1.54.2.7
--- Auth.pm     19 Oct 2006 10:00:50 -0000      1.54.2.6
+++ Auth.pm     20 Oct 2006 15:29:29 -0000      1.54.2.7
@@ -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.6 $' =~ /\d+/g; 
+$VERSION = do { my @v = '$Revision: 1.54.2.7 $' =~ /\d+/g; 
         shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -211,6 +211,7 @@
                         intranetcolorstylesheet => 
C4::Context->preference("intranetcolorstylesheet"),  
                         intranetstylesheet => 
C4::Context->preference("intranetstylesheet"),
                         IntranetNav => C4::Context->preference("IntranetNav"),
+                       intranetuserjs => 
C4::Context->preference("intranetuserjs"),
                         TemplateEncoding => 
C4::Context->preference("TemplateEncoding"),
                         AmazonContent    => 
C4::Context->preference("AmazonContent"),
                         LibraryName      => 
C4::Context->preference("LibraryName"),
@@ -236,6 +237,9 @@
                 AmazonContent    => 
"".C4::Context->preference("AmazonContent"),
                 LibraryName      => "".C4::Context->preference("LibraryName"),
                 branchname       => 
C4::Context->userenv?C4::Context->userenv->{"branchname"}:"", 
+               OpacPasswordChange => 
C4::Context->preference("OpacPasswordChange"),
+               opacreadinghistory => 
C4::Context->preference("opacreadinghistory"),
+               opacuserjs => C4::Context->preference("opacuserjs"), 
             );
         }
     return ( $template, $borrowernumber, $cookie );
@@ -585,12 +589,24 @@
     }
 
     my $template = gettemplate( $template_name, $type, $query );
-    $template->param(
-        INPUTS                  => address@hidden,
-        intranetcolorstylesheet =>
-          C4::Context->preference("intranetcolorstylesheet"),
+       $template->param(INPUTS => address@hidden,
+                               suggestion => 
C4::Context->preference("suggestion"),
+                virtualshelves => C4::Context->preference("virtualshelves"),
+                opaclargeimage => C4::Context->preference("opaclargeimage"),
+                LibraryName => C4::Context->preference("LibraryName"),
+                OpacNav => C4::Context->preference("OpacNav"),
+                opaccredits => C4::Context->preference("opaccredits"),
+                opacreadinghistory => 
C4::Context->preference("opacreadinghistory"),
+                opacsmallimage => C4::Context->preference("opacsmallimage"),
+                opaclayoutstylesheet => 
C4::Context->preference("opaclayoutstylesheet"),
+                opaccolorstylesheet => 
C4::Context->preference("opaccolorstylesheet"),
+                opaclanguagesdisplay => 
C4::Context->preference("opaclanguagesdisplay"),
+                               opacuserjs => 
C4::Context->preference("opacuserjs"),
+       
+                       intranetcolorstylesheet => 
C4::Context->preference("intranetcolorstylesheet"),
         intranetstylesheet => C4::Context->preference("intranetstylesheet"),
         IntranetNav        => C4::Context->preference("IntranetNav"),
+                       intranetuserjs => 
C4::Context->preference("intranetuserjs"),
         TemplateEncoding   => C4::Context->preference("TemplateEncoding"),
 
     );