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.61 and 1.66

version 1.61, 2004/01/13 16:29:40	version 1.66, 2005/04/07 06:56:21
Line 25	Line 25
#	#
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
# 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15
# 16/11,12/16,
# 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,
# 05/28,05/29 Gerd Kortemeyer
# 07/28,08/03 Gerd Kortemeyer
# 8/20 Gerd Kortemeyer

package Apache::lonauth;	package Apache::lonauth;

Line 43 use CGI::Cookie();	Line 36 use CGI::Cookie();
use DynaLoader; # for Crypt::DES version	use DynaLoader; # for Crypt::DES version
use Crypt::DES;	use Crypt::DES;
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonnet();	use Apache::lonnet;
use Apache::lonmenu();	use Apache::lonmenu();
use Fcntl qw(:flock);	use Fcntl qw(:flock);
use Apache::lonlocal;	use Apache::lonlocal;
Line 107 sub success {	Line 100 sub success {
if (($userenv{'interface'}) && (!$FORM{'interface'})) {	if (($userenv{'interface'}) && (!$FORM{'interface'})) {
$FORM{'interface'}=$userenv{'interface'};	$FORM{'interface'}=$userenv{'interface'};
}	}
$ENV{'environment.remote'}=$userenv{'remote'};	$env{'environment.remote'}=$userenv{'remote'};
	if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }

# --------------- Do not trust query string to be put directly into environment	# --------------- Do not trust query string to be put directly into environment
foreach ('imagesuppress','appletsuppress',	foreach ('imagesuppress','appletsuppress',
'embedsuppress','fontenhance','blackwhite',	'embedsuppress','fontenhance','blackwhite',
Line 141 sub success {	Line 136 sub success {
print $idf "request.course.uri=\n";	print $idf "request.course.uri=\n";
print $idf "request.course.sec=\n";	print $idf "request.course.sec=\n";
print $idf "request.role=cm\n";	print $idf "request.role=cm\n";
print $idf "request.role.adv=$ENV{'user.adv'}\n";	print $idf "request.role.adv=$env{'user.adv'}\n";
print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";	print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";
if ($FORM{'interface'}) {	if ($FORM{'interface'}) {
$FORM{'interface'}=~s/\W//gs;	$FORM{'interface'}=~s/\W//gs;
print $idf "browser.interface=$FORM{'interface'}\n";	print $idf "browser.interface=$FORM{'interface'}\n";
$ENV{'browser.interface'}=$FORM{'interface'};	$env{'browser.interface'}=$FORM{'interface'};
foreach ('imagesuppress','appletsuppress',	foreach ('imagesuppress','appletsuppress',
'embedsuppress','fontenhance','blackwhite') {	'embedsuppress','fontenhance','blackwhite') {
if (($FORM{$_} eq 'true') \|\|	if (($FORM{$_} eq 'true') \|\|
Line 158 sub success {	Line 153 sub success {
if ($userroles ne '') { print $idf "$userroles"; }	if ($userroles ne '') { print $idf "$userroles"; }
$idf->close();	$idf->close();
}	}
$ENV{'request.role'}='cm';	$env{'request.role'}='cm';
$ENV{'request.role.adv'}=$ENV{'user.adv'};	$env{'request.role.adv'}=$env{'user.adv'};
$ENV{'browser.type'}=$clientbrowser;	$env{'browser.type'}=$clientbrowser;
# -------------------------------------------------------------------- Log this	# -------------------------------------------------------------------- Log this

&Apache::lonnet::log($domain,$username,$authhost,	&Apache::lonnet::log($domain,$username,$authhost,
Line 181 sub success {	Line 176 sub success {
# -------------------------------------------------------- Menu script and info	# -------------------------------------------------------- Menu script and info
my $windowinfo=&Apache::lonmenu::open($clientos);	my $windowinfo=&Apache::lonmenu::open($clientos);
my $startupremote=&Apache::lonmenu::startupremote($lowerurl);	my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
	my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
my $setflags=&Apache::lonmenu::setflags();	my $setflags=&Apache::lonmenu::setflags();
my $maincall=&Apache::lonmenu::maincall();	my $maincall=&Apache::lonmenu::maincall();
my $bodytag=&Apache::loncommon::bodytag('Successful Login');	my $bodytag=&Apache::loncommon::bodytag('Successful Login');
my $add=&addcontent();	my $add=&addcontent();
	my $continuelink;
	if (($env{'browser.interface'} eq 'textual') \|\|
	($env{'environment.remote'} eq 'off')) {
	$continuelink="<a href=\"$lowerurl\">".&mt('Continue')."</a>";
	}
# ------------------------------------------------- Output for successful login	# ------------------------------------------------- Output for successful login

$r->send_cgi_header(<<ENDHEADER);	$r->send_cgi_header(<<ENDHEADER);
Line 210 $windowinfo	Line 211 $windowinfo
<h1>$lt{'wel'}</h1>	<h1>$lt{'wel'}</h1>
$lt{'mes'}.<p>	$lt{'mes'}.<p>
<a href="/adm/$lt{'log'}">$lt{'pro'}?</a></p>	<a href="/adm/$lt{'log'}">$lt{'pro'}?</a></p>
	$remoteinfo
$maincall	$maincall
	$continuelink
</body>	</body>
</html>	</html>
ENDSUCCESS	ENDSUCCESS
Line 231 ENDFHEADER	Line 234 ENDFHEADER
<head>	<head>
<title>Unsuccessful Login to the LearningOnline Network with CAPA</title>	<title>Unsuccessful Login to the LearningOnline Network with CAPA</title>
</head>	</head>
<html>
$bodytag	$bodytag
<h1>Sorry ...</h1>	<h1>Sorry ...</h1>
<p><b>$message</b></p>	<p><b>$message</b></p>
Line 268 ENDRFHEADER	Line 270 ENDRFHEADER
<head>	<head>
<title>Rerouting Login to the LearningOnline Network with CAPA</title>	<title>Rerouting Login to the LearningOnline Network with CAPA</title>
</head>	</head>
<html>
$bodytag	$bodytag
<h1>Sorry ...</h1>	<h1>Sorry ...</h1>
Please <a href="/">log in again</a>.	Please <a href="/">log in again</a>.
Line 310 ENDFHEADER	Line 311 ENDFHEADER
<head>	<head>
<title>Already logged in</title>	<title>Already logged in</title>
</head>	</head>
<html>
$bodytag	$bodytag
<h1>You are already logged in</h1>	<h1>You are already logged in</h1>
<p>Please either <a href="/adm/roles">continue the current session</a> or	<p>Please either <a href="/adm/roles">continue the current session</a> or

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

Removed from v.1.61
changed lines
	Added in v.1.66