[Koha-cvs] koha C4/Auth.pm koha-tmpl/intranet-tmpl/prog/en...

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Antoine Farnault <toins>        07/07/17 09:28:52

Modified files:
        C4             : Auth.pm 
        koha-tmpl/intranet-tmpl/prog/en/includes: menus.inc 

Log message:
        using LoginBranchnameShort instead of LoginBranchname.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.16&r2=1.17

Patches:
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- C4/Auth.pm  11 Jul 2007 10:24:24 -0000      1.69
+++ C4/Auth.pm  17 Jul 2007 09:28:52 -0000      1.70
@@ -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.69 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.70 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -52,12 +52,15 @@
   my $query = new CGI;
 
   my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name   => "opac-main.tmpl",
+    = get_template_and_user(
+        {
+            template_name   => "opac-main.tmpl",
                              query           => $query,
                             type            => "opac",
                             authnotrequired => 1,
                             flagsrequired   => {borrow => 1},
-                         });
+       }
+    );
 
   print $query->header(
     -type => 'utf-8',
@@ -87,12 +90,15 @@
 =item get_template_and_user
 
   my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name   => "opac-main.tmpl",
+    = get_template_and_user(
+        {
+           template_name   => "opac-main.tmpl",
                              query           => $query,
                             type            => "opac",
                             authnotrequired => 1,
                             flagsrequired   => {borrow => 1},
-                         });
+       }
+    );
 
     This call passes the C<query>, C<flagsrequired> and C<authnotrequired>
     to C<&checkauth> (in this module) to perform authentification.
@@ -214,8 +220,7 @@
     }
     if ( $in->{'type'} eq "intranet" ) {
         $template->param(
-            intranetcolorstylesheet =>
-              C4::Context->preference("intranetcolorstylesheet"),
+            intranetcolorstylesheet => 
C4::Context->preference("intranetcolorstylesheet"),
             intranetstylesheet => 
C4::Context->preference("intranetstylesheet"),
             IntranetNav        => C4::Context->preference("IntranetNav"),
             intranetuserjs     => C4::Context->preference("intranetuserjs"),
@@ -224,6 +229,7 @@
             LibraryName        => C4::Context->preference("LibraryName"),
             LoginBranchcode    => 
(C4::Context->userenv?C4::Context->userenv->{"branch"}:"insecure"),
             LoginBranchname    => 
(C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),
+            LoginBranchnameShort    => 
substr((C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),0,10),
             AutoLocation       => C4::Context->preference("AutoLocation"),
             hide_marc          => C4::Context->preference("hide_marc"),
             patronimages       => C4::Context->preference("patronimages"),

Index: koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc  13 Jul 2007 13:18:07 
-0000      1.16
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc  17 Jul 2007 09:28:52 
-0000      1.17
@@ -80,7 +80,7 @@
             <b> Login information</b>
         </li>
         <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b>
-            at <b><!-- TMPL_VAR NAME="LoginBranchname" --></b></li>
+            at <b><!-- TMPL_VAR NAME="LoginBranchnameShort" --></b></li>
             <!-- TMPL_IF NAME="AutoLocation" -->
                 <li>autolocate activated</li>
         <!-- TMPL_ELSE -->