loncom/auth/lonauth.pm - diff

Return to lonauth.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonauth.pm between versions 1.30 and 1.36

version 1.30, 2002/05/06 21:55:25	version 1.36, 2003/02/03 18:03:52
Line 30	Line 30
# 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,	# 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,
# 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,	# 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
# 05/28,05/29 Gerd Kortemeyer	# 05/28,05/29 Gerd Kortemeyer
# 07/24 Scott Harrison
# 07/28,08/03 Gerd Kortemeyer	# 07/28,08/03 Gerd Kortemeyer
# 8/15 Scott Harrison
# 8/20 Gerd Kortemeyer	# 8/20 Gerd Kortemeyer

package Apache::lonauth;	package Apache::lonauth;
Line 83 sub success {	Line 81 sub success {
my $clientbrowser='unknown';	my $clientbrowser='unknown';
my $clientversion='0';	my $clientversion='0';
my $clientmathml='';	my $clientmathml='';
	my $clientunicode='0';
for ($i=0;$i<=$#browsertype;$i++) {	for ($i=0;$i<=$#browsertype;$i++) {
my ($bname,$match,$notmatch,$vreg,$minv)=split(/\:/,$browsertype[$i]);	my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]);
if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) {	if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) {
$clientbrowser=$bname;	$clientbrowser=$bname;
$httpbrowser=~/$vreg/i;	$httpbrowser=~/$vreg/i;
$clientversion=$1;	$clientversion=$1;
$clientmathml=($clientversion>=$minv);	$clientmathml=($clientversion>=$minv);
}	$clientunicode=($clientversion>=$univ);
	}
}	}
my $clientos='unknown';	my $clientos='unknown';
if (($httpbrowser=~/linux/i) \|\|	if (($httpbrowser=~/linux/i) \|\|
Line 103 sub success {	Line 103 sub success {
if (($httpbrowser=~/mac/i) \|\|	if (($httpbrowser=~/mac/i) \|\|
($httpbrowser=~/powerpc/i)) { $clientos='mac'; }	($httpbrowser=~/powerpc/i)) { $clientos='mac'; }
if ($httpbrowser=~/win/i) { $clientos='win'; }	if ($httpbrowser=~/win/i) { $clientos='win'; }
	if ($httpbrowser=~/embed/i) { $clientos='pda'; }

# ------------------------------------------------------------- Get environment	# ------------------------------------------------------------- Get environment

my $userenv=Apache::lonnet::reply("dump:$domain:$username:environment",	my $userenv;
$authhost);	my %userenv=Apache::lonnet::dump('environment',$domain,$username);
if (($userenv eq 'con_lost') \|\|	my ($tmp) = keys(%userenv);
($userenv =~ /^error\:/)) {	if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {
$userenv='';	foreach my $key (keys(%userenv)) {
}	$userenv.="environment.$key=$userenv{$key}\n";
$userenv=~s/\&/\nenvironment\./g;	}
if ($userenv ne '') {
$userenv='environment.'.$userenv;
}	}
# --------------------------------------------------------- Write first profile	# --------------------------------------------------------- Write first profile

Line 133 sub success {	Line 132 sub success {
print $idf "browser.type=$clientbrowser\n";	print $idf "browser.type=$clientbrowser\n";
print $idf "browser.version=$clientversion\n";	print $idf "browser.version=$clientversion\n";
print $idf "browser.mathml=$clientmathml\n";	print $idf "browser.mathml=$clientmathml\n";
	print $idf "browser.unicode=$clientunicode\n";
print $idf "browser.os=$clientos\n";	print $idf "browser.os=$clientos\n";
print $idf "request.course.fn=\n";	print $idf "request.course.fn=\n";
print $idf "request.course.uri=\n";	print $idf "request.course.uri=\n";
Line 162 sub success {	Line 162 sub success {

$cookie="lonID=$cookie; path=/";	$cookie="lonID=$cookie; path=/";
# -------------------------------------------------------- Menu script and info	# -------------------------------------------------------- Menu script and info
my $windowinfo=&Apache::lonmenu::open();	my $windowinfo=&Apache::lonmenu::open($clientos);
# ------------------------------------------------------------- Info for Remote	my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
my $configmenu=&Apache::lonmenu::rawconfig($r);	my $setflags=&Apache::lonmenu::setflags();
	my $maincall=&Apache::lonmenu::maincall();
# ------------------------------------------------- Output for successful login	# ------------------------------------------------- Output for successful login

$r->send_cgi_header(<<ENDHEADER);	$r->send_cgi_header(<<ENDHEADER);
Line 176 ENDHEADER	Line 177 ENDHEADER
<html>	<html>
<head>	<head>
<title>Successful Login to the LearningOnline Network with CAPA</title>	<title>Successful Login to the LearningOnline Network with CAPA</title>
<script>	$startupremote

// --------------------------------------------- Checks if server frame defined

function checkdef() {
if ((menuloaded==0) && (tim==0)) { setTimeout('checkdef()',100); }
}

// ---------------------------------------------------------- The wait function
var canceltim;
function wait() {
if ((menuloaded==1) \|\| (tim==1)) {
if (tim==0) {
clearTimeout(canceltim);
$configmenu
window.location='$lowerurl';
} else {
alert("Remote Control Timed Out.");
}
} else {
setTimeout('wait();',100);
}
}

function main() {
canceltim=setTimeout('tim=1;',80000);
checkdef();
wait();
}

</script>
</head>	</head>
<body bgcolor="#FFFFFF">	<body bgcolor="#FFFFFF">
<script>	$setflags
menuloaded=0;
tim=0;
</script>
$windowinfo	$windowinfo
<h1>Welcome!</h1>	<h1>Welcome!</h1>
<script>	Welcome to the Learning<i>Online</i> Network with CAPA.
main();	Please wait while your session
</script>	is being set up.<p>
	<a href="/adm/loginproblems.html">Problems?</a></p>
	$maincall
</body>	</body>
</html>	</html>
ENDSUCCESS	ENDSUCCESS

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

Removed from v.1.30
changed lines
	Added in v.1.36