loncom/auth/switchserver.pm - diff

Return to switchserver.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/switchserver.pm between versions 1.16 and 1.18

version 1.16, 2007/09/08 02:43:33	version 1.18, 2007/11/14 02:54:11
Line 42 sub init_env {	Line 42 sub init_env {
return $env{'user.environment'};	return $env{'user.environment'};
}	}
my $requrl=$r->uri;	my $requrl=$r->uri;
my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));	my $handle= &Apache::lonnet::check_for_valid_session($r);
my $lonid=$cookies{'lonID'};	if ($handle ne '') {
my $cookie;
if (!$lonid) { return undef; }

my $handle=&LONCAPA::clean_handle($lonid->value);
my $lonidsdir=$r->dir_config('lonIDsDir');
if ((!-e "$lonidsdir/$handle.id") \|\| ($handle eq '')) {
$r->log_reason("Cookie $handle not valid", $r->filename);
return undef;	return undef;
}	}
	my $lonidsdir=$r->dir_config('lonIDsDir');
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);	&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);

return $r->dir_config('lonIDsDir')."/$handle.id";	return $r->dir_config('lonIDsDir')."/$handle.id";
Line 83 sub handler {	Line 76 sub handler {
['otherserver','role']);	['otherserver','role']);

my $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});	my $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
if (!$env{'form.otherserver'}) {	if (! $env{'form.otherserver'}) {
$env{'form.otherserver'}=&Apache::lonnet::spareserver(30000,undef,1);	$env{'form.otherserver'} =
	&Apache::lonnet::find_existing_session($env{'user.domain'},
	$env{'user.name'});
	if (! $env{'form.otherserver'}) {
	$env{'form.otherserver'} =
	&Apache::lonnet::spareserver(30000,undef,1);
	}

$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});	$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.16
changed lines
	Added in v.1.18