loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

version 1.1243, 2013/10/14 17:14:48	version 1.1244, 2013/12/05 05:19:18
Line 606 sub transfer_profile_to_env {	Line 606 sub transfer_profile_to_env {

# ---------------------------------------------------- Check for valid session	# ---------------------------------------------------- Check for valid session
sub check_for_valid_session {	sub check_for_valid_session {
my ($r,$name) = @_;	my ($r,$name,$userref) = @_;
my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));	my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
if ($name eq '') {	if ($name eq '') {
$name = 'lonID';	$name = 'lonID';
Line 637 sub check_for_valid_session {	Line 637 sub check_for_valid_session {
\|\| !defined($disk_env{'user.domain'})) {	\|\| !defined($disk_env{'user.domain'})) {
return undef;	return undef;
}	}
if (($r->user() eq '') && ($apache >= 2.4)) {	if ($apache >= 2.4) {
if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) {	if ($r->user() eq '') {
$r->user($disk_env{'user.name'});	if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) {
} else {	$r->user($disk_env{'user.name'});
$r->user($disk_env{'user.name'}.':'.$disk_env{'user.domain'});	} else {
	$r->user($disk_env{'user.name'}.':'.$disk_env{'user.domain'});
	}
	}
	if (($r->user() ne '') && (ref($userref))) {
	$$userref = $r->user();
}	}
}	}
return $handle;	return $handle;