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.269.2.40 and 1.334

version 1.269.2.40, 2022/02/24 15:09:05	version 1.334, 2017/09/29 19:18:14
Line 140 use Apache::lonnavdisplay();	Line 140 use Apache::lonnavdisplay();
use Apache::loncoursequeueadmin;	use Apache::loncoursequeueadmin;
use Apache::longroup;	use Apache::longroup;
use Apache::lonrss;	use Apache::lonrss;
	use Apache::lonplacementtest;
use GDBM_File;	use GDBM_File;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
use HTML::Entities;	use HTML::Entities;

sub start_loading_course {
my ($r,$title) = @_;
&Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();
# Breadcrumbs
my $brcrum = [{'href' => '',
'text' => $title},];
my $start_page = &Apache::loncommon::start_page($title,undef,
{'bread_crumbs' => $brcrum,
'bread_crumbs_nomenu' => 1,
'links_disabled' => 1});
$r->print(<<ENDREDIR);
$start_page
<script type="text/javascript">
// <![CDATA[
$swinfo

document.body.addEventListener('click', function (event) {
// filter out clicks on any other elements
if (event.target.nodeName == 'A' && event.target.getAttribute('aria-disabled') == 'true') {
event.preventDefault();
}
});
// ]]>
</script>
ENDREDIR
return;
}

sub finish_loading_course {
my ($r,$msg,$url) = @_;
my $link = '<div id="LC_course_loaded" style="display:none"><a href="'.
&HTML::Entities::encode($url,'"<>&').'">'.&mt('Continue').'</a></div>';
my $end_page = &Apache::loncommon::end_page();
my $js_url = &js_escape($url);
$r->print(<<END);
$msg
<script type="text/javascript">
// <![CDATA[
\$(document).ready(function() {
\$("#LC_course_loaded").css("display","block");
\$('.isDisabled > a').removeAttr("aria-disabled");
\$('.isDisabled').removeClass("isDisabled");
var url = "$js_url";
\$(location).attr('href',url);
});
// ]]>
</script>
$link
$end_page
END
return;
}

sub redirect_user {	sub redirect_user {
my ($r,$title,$url,$msg) = @_;	my ($r,$title,$url,$msg) = @_;
Line 206 sub redirect_user {	Line 152 sub redirect_user {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
$r->send_http_header;	$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();

# Breadcrumbs	# Breadcrumbs
my $brcrum = [{'href' => $url,	my $brcrum = [{'href' => $url,
Line 221 sub redirect_user {	Line 166 sub redirect_user {
$url=~s/ /\%20/g;	$url=~s/ /\%20/g;
$r->print(<<ENDREDIR);	$r->print(<<ENDREDIR);
$start_page	$start_page
<script type="text/javascript">
// <![CDATA[
$swinfo
// ]]>
</script>
<p>$msg</p>	<p>$msg</p>
$end_page	$end_page
ENDREDIR	ENDREDIR
Line 234 ENDREDIR	Line 174 ENDREDIR

sub error_page {	sub error_page {
my ($r,$error,$dest)=@_;	my ($r,$error,$dest)=@_;
my %lt = &Apache::lonlocal::texthash(	&Apache::loncommon::content_type($r,'text/html');
pdc => 'Problems during Course Initialization',	&Apache::loncommon::no_cache($r);
tfp => 'The following problems occurred:',	$r->send_http_header;
con => 'Continue',	return OK if $r->header_only;
	# Breadcrumbs
	my $brcrum = [{'href' => $dest,
	'text' => 'Problems during Course Initialization'},];
	$r->print(&Apache::loncommon::start_page('Problems during Course Initialization',
	undef,
	{'bread_crumbs' => $brcrum,})
);	);
my $end_page = &Apache::loncommon::end_page();	$r->print(
$dest = &HTML::Entities::encode($dest,'"<>&');	'<script type="text/javascript">'.
$r->print(<<END);	'// <![CDATA['.
<h3>$lt{'pdc'}</h3>	&Apache::lonmenu::rawconfig().
<p class="LC_error">$lt{'tfp'}	'// ]]>'.
<br />	'</script>'.
$error	'<p class="LC_error">'.&mt('The following problems occurred:').
</p><br /><a href="$dest">$lt{'con'}</a>	'<br />'.
$end_page	$error.
END	'</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'
return;	);
	$r->print(&Apache::loncommon::end_page());
}	}

sub handler {	sub handler {
Line 257 sub handler {	Line 204 sub handler {
my $r = shift;	my $r = shift;

# Check for critical messages and redirect if present.	# Check for critical messages and redirect if present.
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);	my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'roles');
if ($redirect) {	if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location => $url);	$r->header_out(Location => $url);
Line 275 sub handler {	Line 222 sub handler {
$update = $then;	$update = $then;
}	}

my ($blocked_by_ip,$blocked_type,$clientip);
$clientip = &Apache::lonnet::get_requestor_ip($r);

if ($env{'form.selectrole'}) {
my ($role,$cdom,$cnum,$rest);
if ($env{'form.switchrole'} =~ m{^(co\|cc\|in\|ta\|ep\|ad\|st\|cr).*?\./($match_domain)/($match_courseid)(/(\w+)\|$)}) {
($role,$cdom,$cnum,$rest) = ($1,$2,$3,$4);
} elsif ($env{'form.newrole'} =~ m{^(co\|cc\|in\|ta\|ep\|ad\|st\|cr).*?\./($match_domain)/($match_courseid)(/(\w+)\|$)}) {
($role,$cdom,$cnum,$rest) = ($1,$2,$3,$4);
}
if ($cdom ne '') {
my ($has_evb,$check_ipaccess,$showrole);
$showrole = 1;
my $checkrole = "cm./$cdom/$cnum";
if ($rest ne '') {
$checkrole .= "/$rest";
}
if ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
($role ne 'st')) {
$has_evb = 1;
}
unless ($has_evb) {
my @machinedoms = &Apache::lonnet::current_machine_domains();
my $udom = $env{'user.domain'};
if ($udom eq $cdom) {
$check_ipaccess = 1;
} elsif (($udom ne '') && (grep(/^\Q$udom\E$/,@machinedoms))) {
$check_ipaccess = 1;
} else {
my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
my $internet_names = &Apache::lonnet::get_internet_names($lonhost);
my $cprim = &Apache::lonnet::domain($cdom,'primary');
my $cintdom = &Apache::lonnet::internet_dom($cprim);
if (($cintdom ne '') && (ref($internet_names) eq 'ARRAY')) {
if (grep(/^\Q$cintdom\E$/,@{$internet_names})) {
$check_ipaccess = 1;
}
}
}
if ($check_ipaccess) {
my ($ipaccessref,$cached)=&Apache::lonnet::is_cached_new('ipaccess',$cdom);
unless (defined($cached)) {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['ipaccess'],$cdom);
$ipaccessref = &Apache::lonnet::do_cache_new('ipaccess',$cdom,$domconfig{'ipaccess'},1800);
}
if (ref($ipaccessref) eq 'HASH') {
foreach my $id (keys(%{$ipaccessref})) {
if (ref($ipaccessref->{$id}) eq 'HASH') {
my $range = $ipaccessref->{$id}->{'ip'};
if ($range) {
my $type = 'exclude';
if (&Apache::lonnet::ip_match($clientip,$range)) {
$type = 'include';
}
if (ref($ipaccessref->{$id}->{'courses'}) eq 'HASH') {
if ($ipaccessref->{$id}->{'courses'}{$cdom.'_'.$cnum}) {
if ($type eq 'include') {
$showrole = 1;
last;
} else {
$showrole = 0;
}
} else {
if ($type eq 'include') {
$showrole = 0;
} else {
$showrole = 1;
}
}
}
}
}
}
}
}
}
unless ($showrole) {
$blocked_by_ip = 1;
$blocked_type = &Apache::loncommon::course_type($cdom.'_'.$cnum);
delete($env{'form.selectrole'});
delete($env{'form.newrole'});
}
}
}

&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});

# -------------------------------------------------- Check if setting hot list	# -------------------------------------------------- Check if setting hot list
my $hotlist;	my $hotlist;
if ($env{'form.action'} eq 'verify_and_change_rolespref') {	if ($env{'form.action'} eq 'verify_and_change_rolespref') {
$hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r);	$hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r);
Line 394 sub handler {	Line 255 sub handler {

my $envkey;	my $envkey;
my %dcroles = ();	my %dcroles = ();
my %helpdeskroles = ();	my %helpdeskroles = ();
my ($numdc,$numhelpdesk,$numadhoc) =	my ($numdc,$numhelpdesk,$numadhoc) =
&check_for_adhoc(\%dcroles,\%helpdeskroles,$update,$then);	&check_for_adhoc(\%dcroles,\%helpdeskroles,$update,$then);
my $loncaparev = $r->dir_config('lonVersion');	my $loncaparev = $r->dir_config('lonVersion');

Line 453 sub handler {	Line 314 sub handler {
if ($custom_adhoc) {	if ($custom_adhoc) {
my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($cdom.'_'.$cnum,1);	my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($cdom.'_'.$cnum,1);
if (ref($possroles) eq 'ARRAY') {	if (ref($possroles) eq 'ARRAY') {
if (grep(/^\Q$rolename\E$/,@{$possroles})) {	if (grep(/^\Q$rolename\E$/,@{$possroles})) {
if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now,	if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now,
"cr/$cdom/$cdom".'-domainconfig/'.$rolename,undef,$sec)) {	"cr/$cdom/$cdom".'-domainconfig/'.$rolename,undef,$sec)) {
&Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time});	&Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time});
Line 465 sub handler {	Line 326 sub handler {
# Check if user is a DC trying to enter a course or author space and needs privs to be created	# Check if user is a DC trying to enter a course or author space and needs privs to be created
# Check if user is a DH or DA trying to enter a course and needs privs to be created	# Check if user is a DH or DA trying to enter a course and needs privs to be created
foreach my $envkey (keys(%env)) {	foreach my $envkey (keys(%env)) {
if ($numdc) {
# Is this an ad-hoc Coordinator role?	# Is this an ad-hoc Coordinator role?
	if ($numdc) {
if (my ($ccrole,$domain,$coursenum) =	if (my ($ccrole,$domain,$coursenum) =
($envkey =~ m-^form\.(cc\|co)\./($match_domain)/($match_courseid)$-)) {	($envkey =~ m-^form\.(cc\|co)\./($match_domain)/($match_courseid)$-)) {
if ($dcroles{$domain}) {	if ($dcroles{$domain}) {
Line 557 sub handler {	Line 418 sub handler {
}	}
last;	last;
}	}
}	}
}	}
}	}

foreach $envkey (keys(%env)) {	foreach $envkey (keys(%env)) {
next if ($envkey!~/^user\.role\./);	next if ($envkey!~/^user\.role\./);
my ($where,$trolecode,$role,$tstatus,$tend,$tstart);	my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
Line 629 sub handler {	Line 489 sub handler {
my $end_page=&Apache::loncommon::end_page();	my $end_page=&Apache::loncommon::end_page();
my $buttontext=&mt('Enter Course');	my $buttontext=&mt('Enter Course');
my $message=&mt('Successfully registered key');	my $message=&mt('Successfully registered key');
my $ip = &Apache::lonnet::get_requestor_ip();
my $assignresult=	my $assignresult=
&Apache::lonnet::assign_access_key(	&Apache::lonnet::assign_access_key(
$env{'form.newkey'},	$env{'form.newkey'},
Line 638 sub handler {	Line 497 sub handler {
$env{'user.domain'},	$env{'user.domain'},
$env{'user.name'},	$env{'user.name'},
&mt('Assigned from [_1] at [_2] for [_3]'	&mt('Assigned from [_1] at [_2] for [_3]'
,$ip	,$ENV{'REMOTE_ADDR'}
,&Apache::lonlocal::locallocaltime()	,&Apache::lonlocal::locallocaltime()
,$trolecode)	,$trolecode)
);	);
Line 715 ENDENTERKEY	Line 574 ENDENTERKEY
}	}
}	}
}	}
my $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);	my $msg;
$crstype = lc($crstype);	my ($furl,$ferr)=
my $preamble = '<div id="LC_update_'.$cdom.'_'.$cnum.'" class="LC_info">'.	&Apache::lonuserstate::readmap($cdom.'/'.$cnum);
'<br />'.	unless ($ferr) {
&mt("Please be patient while your $crstype loads").	unless (($env{'form.switchrole'}) \|\|
'<br /></div>'.
'<div style="padding:0;clear:both;margin:0;border:0"></div>';
my $closure = <<ENDCLOSE;
<script type="text/javascript">
// <![CDATA[
\$("#LC_update_${cdom}_${cnum}").hide('slow');
// ]]>
</script>
ENDCLOSE
my $title = &mt("Loading $crstype");
&start_loading_course($r,$title);
my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Loading ...'));
$r->rflush();
my ($msg,$critmsg_check);
$critmsg_check = 1;
my ($furl,$ferr)=
&Apache::lonuserstate::readmap($cdom.'/'.$cnum,$critmsg_check);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->print($closure);
$r->rflush();
if ($ferr) {
$furl = '/adm/roles?tryagain=1';
} else {
&Apache::lonnet::appenv({'request.course.timechecked'=>$now});
unless (($env{'form.switchrole'}) \|\|
($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) {	($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) {
&Apache::lonnet::put('nohist_crslastlogin',	&Apache::lonnet::put('nohist_crslastlogin',
{$env{'user.name'}.':'.$env{'user.domain'}.	{$env{'user.name'}.':'.$env{'user.domain'}.
Line 788 ENDCLOSE	Line 620 ENDCLOSE
}	}
if (($env{'form.orgurl'}) &&	if (($env{'form.orgurl'}) &&
($env{'form.orgurl'}!~/^\/adm\/flip/) &&	($env{'form.orgurl'}!~/^\/adm\/flip/) &&
($env{'form.orgurl'} ne '/adm/roles')) {	($env{'form.orgurl'} ne '/adm/roles')) {
my $dest=$env{'form.orgurl'};	my $dest=$env{'form.orgurl'};
if ($env{'form.symb'}) {	if ($env{'form.symb'}) {
if ($dest =~ /\?/) {	if ($dest =~ /\?/) {
Line 800 ENDCLOSE	Line 632 ENDCLOSE
}	}
if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }	if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
&Apache::lonnet::appenv({'request.role.adv'=>$tadv});	&Apache::lonnet::appenv({'request.role.adv'=>$tadv});
if ($ferr) {
if ($env{'form.orgurl'}) {
$furl .= '&orgurl='.&HTML::Entities::encode($env{'form.orgurl'},'<>&"');
}
if ($env{'form.symb'}) {
$furl .= '&symb='.&HTML::Entities::encode($env{'form.symb'},'<>&"');
}
}
if (($ferr) && ($tadv)) {	if (($ferr) && ($tadv)) {
&error_page($r,$ferr,$furl);	&error_page($r,$ferr,$dest);
} else {	} else {
if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
if (($env{'form.orgurl'} ne '') && ($env{'form.symb'} ne '')) {
unless (&Apache::lonnet::symbverify($env{'form.symb'},$env{'form.orgurl'})) {
$dest=$env{'form.orgurl'};
}
}
}
if ($dest =~ m{^/adm/coursedocs\?folderpath}) {	if ($dest =~ m{^/adm/coursedocs\?folderpath}) {
if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {	if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);	my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
Line 825 ENDCLOSE	Line 642 ENDCLOSE
$cdom.'_'.$cnum);	$cdom.'_'.$cnum);
}	}
}	}
if ($ferr) {	$r->internal_redirect($dest);
if (!$env{'request.course.id'}) {
&Apache::lonnet::appenv(
{"request.course.id" => $cdom.'_'.$cnum});
$r->print('<p class="LC_error">'.
&mt('Could not initialize [_1] at this time.',
$env{'course.'.$cdom.'_'.$cnum.'.description'}).
'</p>'.
'<p><a href="'.$furl.'">'.
&mt('Please try again.').'</a></p>'.
&Apache::loncommon::end_page());
}
} else {
$msg = '<p>'.&mt('Entering [_1] ...',
$env{'course.'.$cdom.'_'.$cnum.'.description'}).
'</p>';
&finish_loading_course($r,$msg,$dest);
}
}	}
$r->rflush();
return OK;	return OK;
} else {	} else {
if (!$env{'request.course.id'}) {	if (!$env{'request.course.id'}) {
&Apache::lonnet::appenv(	&Apache::lonnet::appenv(
{"request.course.id" => $cdom.'_'.$cnum});	{"request.course.id" => $cdom.'_'.$cnum});
}	$furl='/adm/roles?tryagain=1';
	$msg='<p><span class="LC_error">'
	.&mt('Could not initialize [_1] at this time.',
	$env{'course.'.$cdom.'_'.$cnum.'.description'})
	.'</span></p>'
	.'<p>'.&mt('Please try again.').'</p>'
	.'<p>'.$ferr.'</p>';
	}
if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }	if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
&Apache::lonnet::appenv({'request.role.adv'=>$tadv});	&Apache::lonnet::appenv({'request.role.adv'=>$tadv});
if ($ferr) {
if ($tadv) {	if (($ferr) && ($tadv)) {
&error_page($r,$ferr,$furl);	&error_page($r,$ferr,$furl);
} else {
$r->print('<p class="LC_error">'.
&mt('Could not initialize [_1] at this time.',
$env{'course.'.$cdom.'_'.$cnum.'.description'}).
'</p>'.
'<p><a href="'.$furl.'">'.&mt('Please try again.').'</a></p>'.
&Apache::loncommon::end_page());
}
} else {	} else {
# Check to see if the user is a CC entering a course	# Check to see if the user is a CC entering a course
# for the first time	# for the first time
Line 872 ENDCLOSE	Line 670 ENDCLOSE
$furl = "/adm/helper/course.initialization.helper";	$furl = "/adm/helper/course.initialization.helper";
# Send the user to the course they selected	# Send the user to the course they selected
} elsif ($env{'request.course.id'}) {	} elsif ($env{'request.course.id'}) {
	if ((&Apache::loncommon::course_type() eq 'Placement') &&
	(!$env{'request.role.adv'})) {
	my ($score,$incomplete) =
	&Apache::lonplacementtest::check_completion(undef,undef,1);
	if (($incomplete) && ($incomplete < 100)) {
	&redirect_user($r, &mt('Entering [_1]',
	$env{'course.'.$cdom.'_'.$cnum.'.description'}),
	'/adm/placement', $msg);
	return OK;
	}
	}
my ($dest,$destsymb,$checkenc);	my ($dest,$destsymb,$checkenc);
$dest = $env{'form.destinationurl'};	$dest = $env{'form.destinationurl'};
$destsymb = $env{'form.destsymb'};	$destsymb = $env{'form.destsymb'};
Line 888 ENDCLOSE	Line 697 ENDCLOSE
($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {	($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
if ($ENV{'SERVER_PORT'} == 443) {	if ($ENV{'SERVER_PORT'} == 443) {
my $hostname = $r->hostname();	my $hostname = $r->hostname();
unless ((&Apache::lonnet::uses_sts()) \|\|	if ($hostname ne '') {
(&Apache::lonnet::waf_allssl($hostname))) {	$dest = 'http://'.$hostname.$dest;
if ($hostname ne '') {
$dest = 'http://'.$hostname.$dest;
}
}	}
}	}
}	}
Line 900 ENDCLOSE	Line 706 ENDCLOSE
if ($env{'request.role.adv'}) {	if ($env{'request.role.adv'}) {
$dest = &Apache::lonenc::unencrypted($dest);	$dest = &Apache::lonenc::unencrypted($dest);
if ($destsymb eq '') {	if ($destsymb eq '') {
($destsymb) = ($dest =~ /(?:\?\|\&)symb=([^\&]*)/);	($destsymb) = ($dest =~ /(?:\?\|\&)symb=([^\&]*)/);
$destsymb = &unescape($destsymb);	$destsymb = &unescape($destsymb);
}	}
}	}
Line 925 ENDCLOSE	Line 731 ENDCLOSE
}	}
}	}
}	}
unless (($dest =~ m{^/enc/}) \|\| ($dest =~ /(\?\|\&)symb=.+___\d+___.+/)) {	unless (($dest =~ m{^/enc/}) \|\| ($dest =~ /(\?\|\&)symb=.+___\d+___.+/)) {
if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) {	if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) {
my $esc_symb = &escape($destsymb);	my $esc_symb = &escape($destsymb);
$dest .= (($dest =~/\?/)? '&':'?').'symb='.$esc_symb;	$dest .= (($dest =~/\?/)? '&':'?').'symb='.$esc_symb;
}	}
}	}
$msg = '<p>'.&mt('Entering [_1] ...',	&redirect_user($r, &mt('Entering [_1]',
$env{'course.'.$cdom.'_'.$cnum.'.description'}).	$env{'course.'.$cdom.'_'.$cnum.'.description'}),
'</p>';	$dest, $msg);
&finish_loading_course($r,$msg,$dest);
$r->rflush();
return OK;	return OK;
}	}
if (&Apache::lonnet::allowed('whn',	if (&Apache::lonnet::allowed('whn',
Line 946 ENDCLOSE	Line 750 ENDCLOSE
) {	) {
my $startpage = &courseloadpage($env{'request.course.id'});	my $startpage = &courseloadpage($env{'request.course.id'});
unless ($startpage eq 'firstres') {	unless ($startpage eq 'firstres') {
$msg = '<p>'.&mt('Entering [_1] ...',	$msg = &mt('Entering [_1] ...',
$env{'course.'.$cdom.'_'.$cnum.'.description'}).	$env{'course.'.$env{'request.course.id'}.'.description'});
'</p>';	&redirect_user($r, &mt('New in course'),
&finish_loading_course($r,$msg,'/adm/whatsnew?refpage=start');	'/adm/whatsnew?refpage=start', $msg);
$r->rflush();	return OK;
return OK;
}	}
}	}
}	}
# Are we allowed to look at the first resource?	# Are we allowed to look at the first resource?
#	my $access;
# $furl returned by lonuserstate::readmap() has format:	if ($furl =~ m{^(/adm/wrapper\|)/ext/}) {
# $url?symb=escaped($symb). If the resource has the	# If it's an external resource,
# encrypturl parameter in effect, the entire string	# strip off the symb argument and possible query
# $url?symb=escaped($symb) is encrypted as a string	my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?\|\&)symb=(.+)$});
# beginning /enc/.	# Unencode $symb
#	$symb = &unescape($symb);
my ($access,$unencfurl,$unencsymb);	# Then check for permission
if ($furl =~ m{^(.+)(?:\?\|\&)symb=([^&]+)(?:$\|&)}) {	$access = &Apache::lonnet::allowed('bre',$exturl,$symb);
my ($poss_url,$poss_symb) = ($1,$2);	# For other resources just check for permission
$unencsymb = &unescape($poss_symb);
$unencfurl = $poss_url;
} elsif ($furl =~ m{^/enc/}) {
my $unenc = &Apache::lonenc::unencrypted($furl);
if ($unenc =~ m{^(.+)(?:\?\|\&)symb=([^&]+)(?:$\|&)}) {
($unencfurl,$unencsymb) = ($1,$2);
$unencsymb = &unescape($unencsymb);
} else {
$unencfurl = $unenc;
}
} else {	} else {
$unencfurl = $furl;	$access = &Apache::lonnet::allowed('bre',$furl);
}	}
if ($unencsymb) {	if (!$access) {
my $symb = &Apache::lonnet::symbclean($unencsymb);
if (($symb ne '') && (&Apache::lonnet::symbverify($symb,$unencfurl))) {
$access = &Apache::lonnet::allowed('bre',$unencfurl,$symb);
} else {
$access = &Apache::lonnet::allowed('bre',$unencfurl);
}
} else {
$access = &Apache::lonnet::allowed('bre',$unencfurl);
}
if ((!$access) \|\| ($access eq 'B')) {
$furl = &Apache::lonpageflip::first_accessible_resource();	$furl = &Apache::lonpageflip::first_accessible_resource();
if ($furl eq '') {	} elsif ($access eq 'B') {
$furl = '/adm/navmaps?showOnlyHomework=1';	$furl = '/adm/navmaps?showOnlyHomework=1';
}
}	}
$msg = '<p>'.&mt('Entering [_1] ...',	$msg = &mt('Entering [_1] ...',
$env{'course.'.$cdom.'_'.$cnum.'.description'}).	$env{'course.'.$cdom.'_'.$cnum.'.description'});
'</p>';	&redirect_user($r, &mt('Entering [_1]',
&finish_loading_course($r,$msg,$furl);	$env{'course.'.$cdom.'_'.$cnum.'.description'}),
	$furl, $msg);
}	}
$r->rflush();	return OK;
return OK;
}	}
}	}
#	#
Line 1064 ENDCLOSE	Line 846 ENDCLOSE
$crumbtext = 'Courses';	$crumbtext = 'Courses';
$pagetitle = 'My Courses';	$pagetitle = 'My Courses';
$recent = &mt('Recent Courses');	$recent = &mt('Recent Courses');
$standby = &mt('Course selected. Please stand by.');	$standby = &mt('Course selected. Please stand by.');
}	}
my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];	my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];

Line 1077 ENDCLOSE	Line 859 ENDCLOSE
if ($domdefs{'catauth'}) {	if ($domdefs{'catauth'}) {
$cattype = $domdefs{'catauth'};	$cattype = $domdefs{'catauth'};
}	}
my ($funcs,$crumbsright);	my $placementonly;
$funcs = &get_roles_functions($showcount,$cattype);	if ($showcount == 1) {
if ($env{'browser.mobile'}) {	if ($env{'request.course.id'}) {
$crumbsright = $funcs;	if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
undef($funcs);	$placementonly = 1;
	}
	} else {
	foreach my $rolecode (keys(%roles_in_env)) {
	my ($cid) = ($rolecode =~ m{^\Quser.role.st./\E($match_domain/$match_courseid)(?:/\|$)});
	if ($cid) {
	my %coursedescription =
	&Apache::lonnet::coursedescription($cid,{'one_time' => '1'});
	if ($coursedescription{'type'} eq 'Placement') {
	$placementonly = 1;
	}
	last;
	}
	}
	}
	}
	my ($start_page,$funcs);
	if ($placementonly) {
	$start_page=&Apache::loncommon::start_page($pagetitle,undef,
	{bread_crumbs=>$brcrum,crstype=>'Placement'});
	} else {
	$funcs = &get_roles_functions($showcount,$cattype);
	my $crumbsright;
	if ($env{'browser.mobile'}) {
	$crumbsright = $funcs;
	undef($funcs);
	}
	$start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum,
	bread_crumbs_component=>$crumbsright});
}	}
my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum,
bread_crumbs_component=>$crumbsright});
&js_escape(\$standby);	&js_escape(\$standby);
my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';	my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';

Line 1118 function rolesView (caller) {	Line 926 function rolesView (caller) {
document.rolechoice.display.value = caller;	document.rolechoice.display.value = caller;
} else {	} else {
if ((caller == 'doupdate') \|\| (caller == 'requestauthor') \|\|	if ((caller == 'doupdate') \|\| (caller == 'requestauthor') \|\|
(caller == 'queued')) {	(caller == 'queued')) {
document.rolechoice.state.value = caller;	document.rolechoice.state.value = caller;
}	}
}	}
Line 1202 ENDHEADER	Line 1010 ENDHEADER
}	}
if ($hotlist) {	if ($hotlist) {
$showresult .= $hotlist;	$showresult .= $hotlist;
}	}
$showresult .= '</div>';	$showresult .= '</div>';
$r->print($showresult);	$r->print($showresult);
} elsif ($env{'form.state'} eq 'queued') {	} elsif ($env{'form.state'} eq 'queued') {
Line 1218 ENDHEADER	Line 1026 ENDHEADER
$r->print('<input type="hidden" name="newrole" value="" />');	$r->print('<input type="hidden" name="newrole" value="" />');
$r->print('<input type="hidden" name="display" value="'.$display.'" />');	$r->print('<input type="hidden" name="display" value="'.$display.'" />');
$r->print('<input type="hidden" name="state" value="" />');	$r->print('<input type="hidden" name="state" value="" />');
if ($blocked_by_ip) {
my $blocked_role = 'student';
if ($blocked_type eq 'Community') {
$blocked_role = 'member';
}
$r->print('<h3><span class="LC_error">'.
&mt('The [_1] you selected is not available for access with a [_2] role from your current IP address: [_3].',
lc($blocked_type),$blocked_role,$clientip).
'</span></h3>');
}
}	}
$r->rflush();	$r->rflush();

Line 1237 ENDHEADER	Line 1035 ENDHEADER
\%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);	\%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);
$refresh = $now;	$refresh = $now;
&Apache::lonnet::appenv({'user.refresh.time' => $refresh});	&Apache::lonnet::appenv({'user.refresh.time' => $refresh});
if ((($cattype eq 'std') \|\| ($cattype eq 'domonly')) && (!$env{'user.adv'})) {	if ($countactive == 1) {
	if ($env{'request.course.id'}) {
	if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
	$placementonly = 1;
	}
	} elsif ($possiblerole) {
	if ($possiblerole =~ m{^st\./($match_domain)/($match_courseid)(?:/\|$)}) {
	if ($env{'course.'.$1.'_'.$2.'.type'} eq 'Placement') {
	$placementonly = 1;
	}
	}
	}
	}
	if ((($cattype eq 'std') \|\| ($cattype eq 'domonly')) && (!$env{'user.adv'}) &&
	(!$placementonly)) {
if ($countactive > 0) {	if ($countactive > 0) {
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');	my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');	my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
Line 1261 ENDHEADER	Line 1073 ENDHEADER

# No active roles	# No active roles
if ($countactive==0) {	if ($countactive==0) {
my $elapsed = 0;	&requestcourse_advice($r,$cattype,$inrole);
if ($now && $update) {
$elapsed = $now - $update;
}
&requestcourse_advice($r,$cattype,$inrole,$elapsed);
$r->print('</form>');	$r->print('</form>');
if ($countfuture) {	if ($countfuture) {
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));	$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
Line 1294 ENDHEADER	Line 1102 ENDHEADER
}	}
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
	} elsif (($placementonly) && ($env{'request.role'} eq 'cm')) {
	$r->print('<h3>'.&mt('Please stand by.').'</h3>
	<input type="hidden" name="'.$possiblerole.'" value="1" />
	<noscript><br />
	<input type="submit" name="submit" value="'.&mt('Continue').'" />
	</noscript></form>');
	$r->rflush();
	$r->print('<script type="text/javascript">document.forms.rolechoice.submit();</script>');
	$r->print(&Apache::loncommon::end_page());
	return OK;
}	}
# ----------------------------------------------------------------------- Table	# ----------------------------------------------------------------------- Table

Line 1441 sub gather_roles {	Line 1259 sub gather_roles {
my $advanced = $env{'user.adv'};	my $advanced = $env{'user.adv'};
my $tryagain = $env{'form.tryagain'};	my $tryagain = $env{'form.tryagain'};
my @ids = &Apache::lonnet::current_machine_ids();	my @ids = &Apache::lonnet::current_machine_ids();
	my (%willtrust,%trustchecked);
if (ref($roles_in_env) eq 'HASH') {	if (ref($roles_in_env) eq 'HASH') {
my %adhocdesc;	my %adhocdesc;
foreach my $envkey (sort(keys(%{$roles_in_env}))) {	foreach my $envkey (sort(keys(%{$roles_in_env}))) {
Line 1509 sub gather_roles {	Line 1328 sub gather_roles {
if (($role eq 'ca') \|\| ($role eq 'aa')) {	if (($role eq 'ca') \|\| ($role eq 'aa')) {
my $home = &Apache::lonnet::homeserver($trest,$tdom);	my $home = &Apache::lonnet::homeserver($trest,$tdom);
my $allowed=0;	my $allowed=0;
	my $prohibited;
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }	foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {	if (!$allowed) {
$button=0;	$button=0;
$switchserver='otherserver='.$home.'&role='.$trolecode;	unless ($trustchecked{$tdom}) {
	if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) &&
	(&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) {
	$willtrust{$tdom} = 1;
	$trustchecked{$tdom} = 1;
	}
	}
	if ($willtrust{$tdom}) {
	$switchserver='otherserver='.$home.'&role='.$trolecode;
	} else {
	$prohibited = 1;
	$tremark .= &mt('Session switch required but prohibited.');
	}
}	}
#next if ($home eq 'no_host');	#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);	$home = &Apache::lonnet::hostname($home);
Line 1521 sub gather_roles {	Line 1353 sub gather_roles {
': '.$tdom.'<br />'.	': '.$tdom.'<br />'.
' '.&mt('Server').': '.$home;	' '.&mt('Server').': '.$home;
$env{'course.'.$tdom.'_'.$trest.'.description'}='ca';	$env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
$tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');	unless ($prohibited) {
	$tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
	}
$sortkey=$role."$trest:$tdom";	$sortkey=$role."$trest:$tdom";
} elsif ($role eq 'au') {	} elsif ($role eq 'au') {
# Authors	# Authors
Line 1620 sub gather_roles {	Line 1454 sub gather_roles {
$skipcal = 1;	$skipcal = 1;
}	}
}	}
	if ($ttype eq 'Placement') {
	$ttype = 'Placement Test';
	}
if ($tsection) {	if ($tsection) {
$twhere.='<br />'.&mt('Section').': '.$tsection;	$twhere.='<br />'.&mt('Section').': '.$tsection;
}	}
Line 1735 sub roletable_headers {	Line 1572 sub roletable_headers {
}	}

sub roletypes {	sub roletypes {
my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');	my @types = ('Domain','Authoring Space','Course','Placement Test','Community','Unavailable','System');
return @types;	return @types;
}	}

Line 1786 sub print_rolerows {	Line 1623 sub print_rolerows {
}	}

sub findcourse_advice {	sub findcourse_advice {
my ($r,$cattype,$elapsed) = @_;	my ($r,$cattype) = @_;
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');	my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');	my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {	if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
$r->print('<p>'.&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'	$r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
<ul>	<ul>
<li>'.&mt('The course has yet to be created.').'</li>	<li>'.&mt('The course has yet to be created.').'</li>
<li>'.&mt('Automatic enrollment of registered students has not been enabled for the course.').'</li>	<li>'.&mt('Automatic enrollment of registered students has not been enabled for the course.').'</li>
<li>'.&mt('You are in a section of course for which automatic enrollment in the corresponding LON-CAPA course is not active.').'</li>	<li>'.&mt('You are in a section of course for which automatic enrollment in the corresponding LON-CAPA course is not active.').'</li>
<li>'.&mt('The start date for automated enrollment has yet to be reached.').'</li>	<li>'.&mt('The start date for automated enrollment has yet to be reached.').'</li>
<li>'.&mt('You registered for the course recently and there is a time lag between the time you register, and the time this information becomes available for the update of LON-CAPA course rosters.').'</li>	<li>'.&mt('You registered for the course recently and there is a time lag between the time you register, and the time this information becomes available for the update of LON-CAPA course rosters.').'</li>
<li>'.&mt('Automated enrollment added you to the course in the time since you last logged-in.').' '.&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'</li>	</ul>');
</ul></p>');
} else {	} else {
$r->print('<p>'.&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'</p>');	$r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
if ($elapsed > 600) {
$r->print('<p>'.&mt('You may also have been assigned to a course in the time since you last logged-in, or checked for changes.').
'<br />'.
&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'</p>');
}
}	}
if (($cattype eq 'std') \|\| ($cattype eq 'domonly')) {	if (($cattype eq 'std') \|\| ($cattype eq 'domonly')) {
$r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.	$r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
Line 1817 sub findcourse_advice {	Line 1648 sub findcourse_advice {
}	}

sub requestcourse_advice {	sub requestcourse_advice {
my ($r,$cattype,$inrole,$elapsed) = @_;	my ($r,$cattype,$inrole) = @_;
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');	my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');	my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
my (%can_request,%request_doms,$output);	my (%can_request,%request_doms,$output);
Line 1878 sub requestcourse_advice {	Line 1709 sub requestcourse_advice {
} else {	} else {
$r->print('<h3>'.&mt('Currently no active roles, courses or communities').'</h3>');	$r->print('<h3>'.&mt('Currently no active roles, courses or communities').'</h3>');
}	}
&findcourse_advice($r,$cattype,$elapsed);	&findcourse_advice($r,$cattype);
}	}
return;	return;
}	}
Line 1998 sub build_roletext {	Line 1829 sub build_roletext {
$trolecode."','".$buttonname.'\');" /></td>';	$trolecode."','".$buttonname.'\');" /></td>';
}	}
}	}
if (($trolecode !~ m/^(dc\|ca\|au\|aa)\./) && (!$skipcal)) {	if (($trolecode !~ m/^(dc\|ca\|au\|aa)\./) && (!$skipcal)) {
$tremark.=&Apache::lonannounce::showday(time,1,	$tremark.=&Apache::lonannounce::showday(time,1,
&Apache::lonannounce::readcalendar($tdom.'_'.$trest));	&Apache::lonannounce::readcalendar($tdom.'_'.$trest));
}	}
Line 2036 sub check_for_adhoc {	Line 1867 sub check_for_adhoc {
my $numdc = 0;	my $numdc = 0;
my $numhelpdesk = 0;	my $numhelpdesk = 0;
my $numadhoc = 0;	my $numadhoc = 0;
my $num_custom_adhoc = 0;	my $num_custom_adhoc = 0;
if (($env{'user.adv'}) \|\| ($env{'user.rar'})) {	if (($env{'user.adv'}) \|\| ($env{'user.rar'})) {
foreach my $envkey (sort(keys(%env))) {	foreach my $envkey (sort(keys(%env))) {
if ($envkey=~/^user\.role\.(dc\|dh\|da)\.\/($match_domain)\/$/) {	if ($envkey=~/^user\.role\.(dc\|dh\|da)\.\/($match_domain)\/$/) {
Line 2255 sub display_cc_role {	Line 2086 sub display_cc_role {
} else {	} else {
$twhere=&mt('Currently not available');	$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;	$env{'course.'.$tcourseid.'.description'}=$twhere;
$skipcal = 1;	$skipcal = 1;
}	}
my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);	my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
$twhere.="<br />".&mt('Domain').":".$tdom;	$twhere.="<br />".&mt('Domain').":".$tdom;
Line 2294 sub adhoc_customroles_row {	Line 2125 sub adhoc_customroles_row {
if ($tstart && $tstart>$limit) { $liverole = 0; }	if ($tstart && $tstart>$limit) { $liverole = 0; }
if ($tend && $tend <$limit) { $liverole = 0; }	if ($tend && $tend <$limit) { $liverole = 0; }
return unless ($liverole);	return unless ($liverole);
my %domdefaults = &Apache::lonnet::get_domain_defaults($dhdom);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dhdom);
if (ref($domdefaults{'adhocroles'}) eq 'HASH') {	if (ref($domdefaults{'adhocroles'}) eq 'HASH') {
if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) {	if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) {
return &Apache::loncommon::continue_data_table_row()	return &Apache::loncommon::continue_data_table_row()
Line 2624 sub update_session_roles {	Line 2455 sub update_session_roles {
&curr_role_status($currstart,$currend,$refresh,$update);	&curr_role_status($currstart,$currend,$refresh,$update);
my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/);	my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/);
my ($role,$rest)=split(m{\./},$rolekey,2);	my ($role,$rest)=split(m{\./},$rolekey,2);
$rest = '/'.$rest;	$rest = '/'.$rest;
if (&Apache::lonnet::delenv($envkey,undef,[$role])) {	if (&Apache::lonnet::delenv($envkey,undef,[$role])) {
if ($status_in_env eq 'active') {	if ($status_in_env eq 'active') {
if ($role eq 'gr') {	if ($role eq 'gr') {
Line 2824 sub update_session_roles {	Line 2655 sub update_session_roles {
}	}
my $groupdesc;	my $groupdesc;
unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') {	unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') {
%{$curr_groups{$cdom.'_'.$cnum}} =	%{$curr_groups{$cdom.'_'.$cnum}} =
&Apache::longroup::coursegroups($cdom,$cnum);	&Apache::longroup::coursegroups($cdom,$cnum);
}	}
unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') &&	unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') &&
($groupdescs{$cdom.'_'.$cnum}{$group})) {	($groupdescs{$cdom.'_'.$cnum}{$group})) {

my %groupinfo =	my %groupinfo =
&Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group});	&Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group});
$groupdescs{$cdom.'_'.$cnum}{$group} =	$groupdescs{$cdom.'_'.$cnum}{$group} =
&unescape($groupinfo{'description'});	&unescape($groupinfo{'description'});
}	}
$groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group};	$groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group};
Line 2951 sub update_session_roles {	Line 2782 sub update_session_roles {
my $cdom = $env{'course.'.$cid.'.domain'};	my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};	my $cnum = $env{'course.'.$cid.'.num'};
my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);	my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
my %groupdesc;	my %groupdesc;
if (ref($groupchange{$crs}) eq 'HASH') {	if (ref($groupchange{$crs}) eq 'HASH') {
$groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>');	$groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>');
foreach my $group (sort(keys(%{$groupchange{$crs}}))) {	foreach my $group (sort(keys(%{$groupchange{$crs}}))) {
Line 3184 sub get_queued {	Line 3015 sub get_queued {
if (ref($history{'details'}) eq 'HASH') {	if (ref($history{'details'}) eq 'HASH') {
$description = $history{details}{'cdescr'};	$description = $history{details}{'cdescr'};
}	}
@{$reqcrs{$reqtime}} = ($description,$showtype);	@{$reqcrs{$reqtime}} = ($description,$showtype);
}	}
}	}
my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs));	my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs));

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

Removed from v.1.269.2.40
changed lines
	Added in v.1.334