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

[LAURIN arnaud]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	06/11/28 16:13:57

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

Log message:
	bugfixing for branchname of librarian
	
	the variable branchname was confused by others branchname in other programms, so rename branchname in auth.pm by LoginBranchName , no incidences for cookie

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.14&r2=1.54.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.19&r2=1.6.2.20

Patches:
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.14
retrieving revision 1.54.2.15
diff -u -b -r1.54.2.14 -r1.54.2.15
--- C4/Auth.pm	28 Nov 2006 14:07:38 -0000	1.54.2.14
+++ C4/Auth.pm	28 Nov 2006 16:13:57 -0000	1.54.2.15
@@ -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.14 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.54.2.15 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -227,7 +227,7 @@
             TemplateEncoding   => C4::Context->preference("TemplateEncoding"),
             AmazonContent      => C4::Context->preference("AmazonContent"),
             LibraryName        => C4::Context->preference("LibraryName"),
-            branchname         => C4::Context->userenv->{"branchname"},
+            LoginBranchname         => C4::Context->userenv->{"branchname"},
             AutoLocation       => C4::Context->preference("AutoLocation"),
         );
     }
@@ -257,9 +257,7 @@
             AmazonContent => "" . C4::Context->preference("AmazonContent"),
             LibraryName   => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle   => "" . $LibraryNameTitle,
-            branchname    => C4::Context->userenv
-                                ? C4::Context->userenv->{"branchname"}
-                                : "",
+            LoginBranchname    => C4::Context->userenv->{"branchname"},
             OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
             opacreadinghistory => C4::Context->preference("opacreadinghistory"),
             opacuserjs         => C4::Context->preference("opacuserjs"),

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.6.2.19
retrieving revision 1.6.2.20
diff -u -b -r1.6.2.19 -r1.6.2.20
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc	28 Nov 2006 10:11:03 -0000	1.6.2.19
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc	28 Nov 2006 16:13:57 -0000	1.6.2.20
@@ -76,7 +76,7 @@
     <li> <b> Librarian Informations </b> : </li>
     <ul>
      <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b> </li>
-    	<li> Library : <b><!-- TMPL_VAR NAME="branchname" --></b> </li>
+    	<li> Library : <b><!-- TMPL_VAR NAME="LoginBranchname" --></b> </li>
     	<!-- TMPL_IF NAME="AutoLocation" -->
     		<li>autolocate activated</li>
 	<!-- TMPL_ELSE -->