loncom/auth/lonroles.pm - diff

Return to lonroles.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonroles.pm between versions 1.84 and 1.92

version 1.84, 2004/01/29 00:44:06	version 1.92, 2004/05/21 19:16:35
Line 25	Line 25
#	#
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
# (Directory Indexer
# (Login Screen
# YEAR=1999
# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
# 11/23 Gerd Kortemeyer)
# YEAR=2000
# 1/14,03/06,06/01,07/22,07/24,07/25,
# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28,
# 12/08,12/28,
# YEAR=2001
# 01/15/01 Gerd Kortemeyer
# 03/02,05/03,05/25,05/30,06/01,07/06,08/06 Gerd Kortemeyer
# 12/29 Gerd Kortemeyer
#
###	###

package Apache::lonroles;	package Apache::lonroles;
Line 61 sub redirect_user {	Line 47 sub redirect_user {
$r->send_http_header;	$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();	my $swinfo=&Apache::lonmenu::rawconfig();
my $bodytag=&Apache::loncommon::bodytag('Switching Role');	my $bodytag=&Apache::loncommon::bodytag('Switching Role');
$r->print (<<ENDREDIR);	# Note to style police:
	# This must only replace the spaces, nothing else, or it bombs elsewhere.
	$url=~s/ /\%20/g;
	$r->print (<<ENDREDIR);
<head><title>$title</title>	<head><title>$title</title>
<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$url">	<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$url">
</head>	</head>
Line 123 sub handler {	Line 112 sub handler {
# check for keyed access	# check for keyed access
if (($role eq 'st') &&	if (($role eq 'st') &&
($ENV{'course.'.$cdom.'_'.$cnum.'.keyaccess'} eq 'yes')) {	($ENV{'course.'.$cdom.'_'.$cnum.'.keyaccess'} eq 'yes')) {
unless (&Apache::lonnet::validate_access_key(	# who is key authority?
	my $authdom=$cdom;
	my $authnum=$cnum;
	if ($ENV{'course.'.$cdom.'_'.$cnum.'.keyauth'}) {
	($authnum,$authdom)=
	split(/\W/,$ENV{'course.'.$cdom.'_'.$cnum.'.keyauth'});
	}
	# check with key authority
	unless (&Apache::lonnet::validate_access_key(
$ENV{'environment.key.'.$cdom.'_'.$cnum},	$ENV{'environment.key.'.$cdom.'_'.$cnum},
$cdom,$cnum)) {	$authdom,$authnum)) {
# there is no valid key	# there is no valid key
if ($ENV{'form.newkey'}) {	if ($ENV{'form.newkey'}) {
# student attempts to register a new key	# student attempts to register a new key
	&Apache::loncommon::content_type($r,'text/html');
	&Apache::loncommon::no_cache($r);
	$r->send_http_header;
	my $swinfo=&Apache::lonmenu::rawconfig();
	my $bodytag=&Apache::loncommon::bodytag
	('Verifying Access Key to Unlock this Course');
	my $buttontext=&mt('Enter Course');
	my $message=&mt('Successfully registered key');
	my $assignresult=
	&Apache::lonnet::assign_access_key(
	$ENV{'form.newkey'},
	$authdom,$authnum,
	$cdom,$cnum,
	$ENV{'user.domain'},
	$ENV{'user.name'},
	'Assigned from '.$ENV{'REMOTE_ADDR'}.' at '.localtime().' for '.
	$trolecode);
	unless ($assignresult eq 'ok') {
	$assignresult=~s/^error\:\s*//;
	$message=&mt($assignresult).
	'<br /><a href="/adm/logout">'.
	&mt('Logout').'</a>';
	$buttontext=&mt('Re-Enter Key');
	}
	$r->print(<<ENDENTEREDKEY);
	<head><title>Verifying Course Access Key</title>
	</head>
	<html>
	$bodytag
	<script>
	$swinfo
	</script>
	<form method="post">
	<input type="hidden" name="selectrole" value="1" />
	<input type="hidden" name="$trolecode" value="1" />
	<font size="+2">$message</font><br />
	<input type="submit" value="$buttontext" />
	</form>
	</body></html>
	ENDENTEREDKEY
	return OK;
} else {	} else {
# print form to enter a new key	# print form to enter a new key
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 146 $bodytag	Line 184 $bodytag
$swinfo	$swinfo
</script>	</script>
<form method="post">	<form method="post">
<input type="hidden" name="selectrole" value="$ENV{'form.selectrole'}" />	<input type="hidden" name="selectrole" value="1" />
	<input type="hidden" name="$trolecode" value="1" />
<input type="text" size="20" name="newkey" value="$ENV{'form.newkey'}" />	<input type="text" size="20" name="newkey" value="$ENV{'form.newkey'}" />
<input type="submit" value="Enter key" />	<input type="submit" value="Enter key" />
</form>	</form>
Line 156 ENDENTERKEY	Line 195 ENDENTERKEY
}	}
}	}
}	}
	&Apache::lonnet::log($ENV{'user.domain'},
	$ENV{'user.name'},
	$ENV{'user.home'},
	"Role ".$trolecode);
my $tadv=0;	my $tadv=0;
if (($trolecode!~/^st/) &&	if (($trolecode!~/^st/) &&
($trolecode!~/^ta/) &&	($trolecode!~/^ta/) &&
Line 384 ENDHEADER	Line 427 ENDHEADER
$tbg='#11CC55';	$tbg='#11CC55';
$tfont='#002200';	$tfont='#002200';
$inrole=1;	$inrole=1;
	$countactive++;
$tremark.=&mt('Currently selected. ');	$tremark.=&mt('Currently selected. ');
}	}
my $trole;	my $trole;
Line 538 ENDHEADER	Line 582 ENDHEADER
$r->print('</form></body></html>');	$r->print('</form></body></html>');
return OK;	return OK;
# Is there only one choice?	# Is there only one choice?
} elsif ($countactive==1) {	} elsif (($countactive==1) && ($ENV{'request.role'} eq 'cm')) {
$r->print('<h3>'.&mt('Please stand by.').'</h3>'.	$r->print('<h3>'.&mt('Please stand by.').'</h3>'.
'<input type="hidden" name="'.$possiblerole.'" value="1" />');	'<input type="hidden" name="'.$possiblerole.'" value="1" />');
$r->print("</form>\n");	$r->print("</form>\n");
Line 664 ENDHEADER	Line 708 ENDHEADER
$r->print(&Apache::lonnet::getannounce());	$r->print(&Apache::lonnet::getannounce());
if ($advanced) {	if ($advanced) {
$r->print('<p><small><i>This is LON-CAPA '.	$r->print('<p><small><i>This is LON-CAPA '.
$r->dir_config('lonVersion').'</i></small></p>');	$r->dir_config('lonVersion').'</i><br />'.
	'<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
}	}
$r->print("</body></html>\n");	$r->print("</body></html>\n");
return OK;	return OK;

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

Removed from v.1.84
changed lines
	Added in v.1.92