[Koha-cvs] CVS: koha/C4 Auth.pm,1.46,1.47 Context.pm,1.25,1.26

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5029/C4

Modified Files:
	Auth.pm Context.pm 
Log Message:
adding emailaddress to user context.
Now, we can use userenv->{emailaddress} to get the librarian email address everywhere.

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** Auth.pm	4 Aug 2005 14:35:54 -0000	1.46
--- Auth.pm	5 Aug 2005 14:43:44 -0000	1.47
***************
*** 304,308 ****
  					$hash{surname},
  					$hash{branch},
! 					$hash{flags}
  				);
  		}
--- 304,309 ----
  					$hash{surname},
  					$hash{branch},
! 					$hash{flags},
! 					$hash{emailaddress},
  				);
  		}
***************
*** 389,397 ****
  			if ($return == 1){
  				my $sth=$dbh->prepare(
! 					"select cardnumber,borrowernumber,userid,firstname,surname,flags,branchcode
  					from borrowers where userid=?"
  				);
  				$sth->execute($userid);
! 				my ($cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode) = $sth->fetchrow;
  				my $hash = C4::Context::set_userenv(
  					$bornum,
--- 390,398 ----
  			if ($return == 1){
  				my $sth=$dbh->prepare(
! 					"select cardnumber,borrowernumber,userid,firstname,surname,flags,branchcode,emailaddress
  					from borrowers where userid=?"
  				);
  				$sth->execute($userid);
! 				my ($cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow;
  				my $hash = C4::Context::set_userenv(
  					$bornum,
***************
*** 401,405 ****
  					$surname,
  					$branchcode,
! 					$userflags
  				);
  				$envcookie=$query->cookie(-name => 'userenv',
--- 402,407 ----
  					$surname,
  					$branchcode,
! 					$userflags,
! 					$emailaddress,
  				);
  				$envcookie=$query->cookie(-name => 'userenv',
***************
*** 413,417 ****
  					C4::Context->config('user'),
  					C4::Context->config('user'),
! 					"",1
  				);
  				$envcookie=$query->cookie(-name => 'userenv',
--- 415,419 ----
  					C4::Context->config('user'),
  					C4::Context->config('user'),
! 					"",1,'nobody at nowhere_koha.com'
  				);
  				$envcookie=$query->cookie(-name => 'userenv',

Index: Context.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Context.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** Context.pm	4 Aug 2005 13:31:22 -0000	1.25
--- Context.pm	5 Aug 2005 14:43:44 -0000	1.26
***************
*** 633,636 ****
--- 633,637 ----
  	my $var = $context->{"activeuser"};
  	return $context->{"userenv"}->{$var} if (defined $context->{"userenv"}->{$var});
+ 	warn "NO CONTEXT for $var";
  }
  
***************
*** 649,653 ****
  #'
  sub set_userenv{
! 	my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $userflags)= @_;
  	my $var=$context->{"activeuser"};
  	my $cell = {
--- 650,654 ----
  #'
  sub set_userenv{
! 	my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $userflags, $emailaddress)= @_;
  	my $var=$context->{"activeuser"};
  	my $cell = {
***************
*** 658,662 ****
  		"surname"    => $usersurname,
  		"branch"     => $userbranch,
! 		"flags"      => $userflags
  	};
  	$context->{userenv}->{$var} = $cell;
--- 659,664 ----
  		"surname"    => $usersurname,
  		"branch"     => $userbranch,
! 		"flags"      => $userflags,
! 		"emailaddress"	=> $emailaddress,
  	};
  	$context->{userenv}->{$var} = $cell;