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.228 and 1.240.2.22

version 1.228, 2009/06/29 12:43:45	version 1.240.2.22, 2010/12/05 17:22:18
Line 138 use Apache::lonannounce;	Line 138 use Apache::lonannounce;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonpageflip();	use Apache::lonpageflip();
use Apache::lonnavdisplay();	use Apache::lonnavdisplay();
	use Apache::loncoursequeueadmin;
use GDBM_File;	use GDBM_File;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
use HTML::Entities;	use HTML::Entities;
Line 164 sub redirect_user {	Line 165 sub redirect_user {
my $start_page = &Apache::loncommon::start_page('Switching Role',undef,	my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
{'redirect' => [1,$url],	{'redirect' => [1,$url],
'bread_crumbs' => $brcrum,});	'bread_crumbs' => $brcrum,});
	&Apache::lonhtmlcommon::clear_breadcrumbs();
my $end_page = &Apache::loncommon::end_page();	my $end_page = &Apache::loncommon::end_page();

# Note to style police:	# Note to style police:
Line 224 sub handler {	Line 226 sub handler {
my %dcroles = ();	my %dcroles = ();
my $numdc = &check_fordc(\%dcroles,$then);	my $numdc = &check_fordc(\%dcroles,$then);
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
	my $custommenu = &Apache::loncommon::needs_gci_custom();

# ================================================================== Roles Init	# ================================================================== Roles Init
if ($env{'form.selectrole'}) {	if ($env{'form.selectrole'}) {
Line 238 sub handler {	Line 241 sub handler {
# Check if user is CC trying to select a course role	# Check if user is CC trying to select a course role
if ($env{'form.switchrole'}) {	if ($env{'form.switchrole'}) {
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {	if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
&adhoc_course_role($then);	&adhoc_course_role($refresh,$then);
}	}
}	}
my %temp=('logout_'.$env{'request.course.id'} => time);	my %temp=('logout_'.$env{'request.course.id'} => time);
Line 255 sub handler {	Line 258 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
if ($numdc > 0) {	if ($numdc > 0) {
foreach my $envkey (keys %env) {	foreach my $envkey (keys %env) {
# Is this an ad-hoc CC-role?	# Is this an ad-hoc Coordinator role?
if (my ($domain,$coursenum) =	if (my ($ccrole,$domain,$coursenum) =
($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {	($envkey =~ m-^form\.(cc\|co)\./($match_domain)/($match_courseid)$-)) {
if ($dcroles{$domain}) {	if ($dcroles{$domain}) {
&Apache::lonnet::check_adhoc_privs($domain,$coursenum,	&Apache::lonnet::check_adhoc_privs($domain,$coursenum,
$then,$now,'cc');	$then,$refresh,$now,$ccrole);
}	}
last;	last;
}	}
Line 301 sub handler {	Line 304 sub handler {
my ($server_status,$home) = &check_author_homeserver($user,$domain);	my ($server_status,$home) = &check_author_homeserver($user,$domain);
if (($server_status eq 'ok') \|\| ($server_status eq 'switchserver')) {	if (($server_status eq 'ok') \|\| ($server_status eq 'switchserver')) {
&Apache::lonnet::check_adhoc_privs($domain,$user,$then,	&Apache::lonnet::check_adhoc_privs($domain,$user,$then,
$now,'ca');	$refresh,$now,'ca');
if ($server_status eq 'switchserver') {	if ($server_status eq 'switchserver') {
my $trolecode = 'ca./'.$domain.'/'.$user;	my $trolecode = 'ca./'.$domain.'/'.$user;
my $switchserver = '/adm/switchserver?'	my $switchserver = '/adm/switchserver?'
Line 318 sub handler {	Line 321 sub handler {
}	}
}	}
}	}
	if (($env{'form.cm'}) && ($env{'form.orgurl'})) {
	$r->internal_redirect($env{'form.orgurl'});
	}
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 445 ENDENTERKEY	Line 450 ENDENTERKEY

if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {	if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
my $msg;	my $msg;
	if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
	&Apache::lonnet::appenv({'request.role.adv'=>$tadv});
my ($furl,$ferr)=	my ($furl,$ferr)=
&Apache::lonuserstate::readmap($cdom.'/'.$cnum);	&Apache::lonuserstate::readmap($cdom.'/'.$cnum);
	if ($custommenu) {
	unless (($ferr) \|\| ($env{'form.switchrole'})) {
	&Apache::lonnet::put('nohist_crslastlogin',{$env{'user.name'}.':'.$env{'user.domain'}.':'.$csec.':'.$role => $now},
	$cdom,$cnum);
	}
	}
if (($env{'form.orgurl'}) &&	if (($env{'form.orgurl'}) &&
($env{'form.orgurl'}!~/^\/adm\/flip/)) {	($env{'form.orgurl'}!~/^\/adm\/flip/)) {
my $dest=$env{'form.orgurl'};	my $dest=$env{'form.orgurl'};
Line 458 ENDENTERKEY	Line 471 ENDENTERKEY
}	}
$dest .= 'symb='.$env{'form.symb'};	$dest .= 'symb='.$env{'form.symb'};
}	}
if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
&Apache::lonnet::appenv({'request.role.adv'=>$tadv});
if (($ferr) && ($tadv)) {	if (($ferr) && ($tadv)) {
&error_page($r,$ferr,$dest);	&error_page($r,$ferr,$dest);
} else {	} else {
Line 478 ENDENTERKEY	Line 489 ENDENTERKEY
.'<p>'.&mt('Please try again.').'</p>'	.'<p>'.&mt('Please try again.').'</p>'
.'<p>'.$ferr.'</p>';	.'<p>'.$ferr.'</p>';
}	}
if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
&Apache::lonnet::appenv({'request.role.adv'=>$tadv});

if (($ferr) && ($tadv)) {	if (($ferr) && ($tadv)) {
&error_page($r,$ferr,$furl);	&error_page($r,$ferr,$furl);
Line 491 ENDENTERKEY	Line 500 ENDENTERKEY
$courseid = substr($courseid, 1);	$courseid = substr($courseid, 1);
}	}
$courseid =~ s/\//_/;	$courseid =~ s/\//_/;
if ($role eq 'cc' && $env{'course.' . $courseid .	if (($cdom !~ /^\w+citest$/) && (($role eq 'cc') \|\| ($role eq 'co'))
'.course.helper.not.run'}) {	&& ($env{'course.' . $courseid .'.course.helper.not.run'})) {
$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'}) {
Line 515 ENDENTERKEY	Line 524 ENDENTERKEY
.$env{'request.course.sec'})	.$env{'request.course.sec'})
) {	) {
my $startpage = &courseloadpage($courseid);	my $startpage = &courseloadpage($courseid);
unless ($startpage eq 'firstres') {	unless (($startpage eq 'firstres') \|\| ($cdom =~ /^\w+citest$/)) {
$msg = &mt('Entering [_1] ...',	$msg = &mt('Entering [_1] ...',
$env{'course.'.$courseid.'.description'});	$env{'course.'.$courseid.'.description'});
&redirect_user($r,&mt('New in course'),	&redirect_user($r,&mt('New in course'),
Line 530 ENDENTERKEY	Line 539 ENDENTERKEY
# Guess not ...	# Guess not ...
$furl=&Apache::lonpageflip::first_accessible_resource();	$furl=&Apache::lonpageflip::first_accessible_resource();
}	}
	if (($cdom =~ /^\w+citest$/) && ($custommenu)) {
	$furl = '/adm/navmaps';
	}
$msg = &mt('Entering [_1] ...',	$msg = &mt('Entering [_1] ...',
$env{'course.'.$courseid.'.description'});	$env{'course.'.$courseid.'.description'});
&redirect_user($r,&mt('Entering [_1]',	&redirect_user($r,&mt('Entering [_1]',
Line 572 ENDENTERKEY	Line 584 ENDENTERKEY
}	}
}	}


# =============================================================== No Roles Init	# =============================================================== No Roles Init

&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 580 ENDENTERKEY	Line 591 ENDENTERKEY
$r->send_http_header;	$r->send_http_header;
return OK if $r->header_only;	return OK if $r->header_only;

my $crumbtext = 'User Roles';	my ($crumbtext,$pagetitle,$recent,$show_course);
my $pagetitle = 'My Roles';	$show_course=&Apache::loncommon::show_course();
my $recent = &mt('Recent Roles');	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 $show_course=&Apache::loncommon::show_course();	if ($custommenu) {
if ($show_course) {	my $start_page = &Apache::loncommon::start_page('Main Menu');
$crumbtext = 'Courses';	$r->print(<<"ENDCUSTOM");
$pagetitle = 'My Courses';	$start_page
$recent = &mt('Recent Courses');	<noscript>
}	$noscript
my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];	</noscript>
my $swinfo=&Apache::lonmenu::rawconfig();	ENDCUSTOM
my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});	} else {
my $standby=&mt('Role selected. Please stand by.');	$crumbtext = 'User Roles';
$standby=~s/\n/\\n/g;	$pagetitle = 'My Roles';
my $noscript='<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 />';	$recent = &mt('Recent Roles');
	my $standby=&mt('Role selected. Please stand by.');
$r->print(<<ENDHEADER);	if ($show_course) {
	$crumbtext = 'Courses';
	$pagetitle = 'My Courses';
	$recent = &mt('Recent Courses');
	$standby = &mt('Course selected. Please stand by.');
	}
	my $brcrum = [{ href => '/adm/roles',
	text => $crumbtext,},
	];
	my $args;
	if ($numdc) {
	$args = {bread_crumbs => $brcrum};
	} else {
	$args = {bread_crumbs => $brcrum,
	bread_crumbs_menulink => '_nomenu'};
	}
	my $start_page=&Apache::loncommon::start_page($pagetitle,undef,$args);
	my $swinfo=&Apache::lonmenu::rawconfig();
	$standby=~s/\n/\\n/g;
	$r->print(<<ENDHEADER);
$start_page	$start_page
<br />
<noscript>	<noscript>
$noscript	$noscript
</noscript>	</noscript>
Line 623 function enterrole (thisform,rolecode,bu	Line 652 function enterrole (thisform,rolecode,bu
// ]]>	// ]]>
</script>	</script>
ENDHEADER	ENDHEADER
	}

# ------------------------------------------ Get Error Message from Environment	# ------------------------------------------ Get Error Message from Environment

Line 671 ENDHEADER	Line 701 ENDHEADER
if ($reinit) {	if ($reinit) {
$r->print(	$r->print(
'<h3><span class="LC_error">'.	'<h3><span class="LC_error">'.
&mt('As your session file for the course has expired, you will need to re-select the course.').'</span></h3>');	&mt('As your session file for the course or community has expired, you will need to re-select it.').'</span></h3>');
} else {	} else {
$r->print(	$r->print(
'<h3><span class="LC_error">'.	'<h3><span class="LC_error">'.
&mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');	&mt('You need to choose another user role or enter a specific course or community for this function.').
	'</span></h3>');
}	}
}	}
}	}
Line 689 ENDHEADER	Line 720 ENDHEADER
if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {	if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};	$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
}	}
$r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');	unless ($custommenu) {
$r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');	$r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
$r->print('<input type="hidden" name="selectrole" value="1" />');	$r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
$r->print('<input type="hidden" name="newrole" value="" />');	$r->print('<input type="hidden" name="selectrole" value="1" />');
	$r->print('<input type="hidden" name="newrole" value="" />');
	}
}	}

my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);	my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
Line 702 ENDHEADER	Line 735 ENDHEADER

$refresh = $now;	$refresh = $now;
&Apache::lonnet::appenv({'user.refresh.time' => $refresh});	&Apache::lonnet::appenv({'user.refresh.time' => $refresh});
	if (!$countactive && !$countfuture) {
	if (&Apache::loncommon::new_roles_update()) {
	($countactive,$countfuture,$inrole,$possiblerole) =
	&gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,
	\%roleclass,\%futureroles,\%timezones);
	}
	}
	if ($custommenu) {
	if ($env{'form.destinationurl'} eq '/adm/ci_info') {
	$r->print(&ci_info_page()).
	&Apache::loncommon::end_page();
	return OK;
	}
	my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
	$env{'browser.interface'}='faketextual';
	$env{'environment.remote'}='off';
	my $numcourses = keys(%courses);
	my $switcher;
	if ($numcourses > 0) {
	$switcher = &Apache::loncommon::gcitest_switcher('cc',%courses);
	}
	$r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).
	&Apache::loncommon::end_page());
	return OK;
	} else {
	if ($env{'form.destinationurl'} eq '/adm/ci_info') {
	delete($env{'form.destinationurl'});
	}
	}
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
$r->print(	$r->print('<p><label><input type="checkbox" name="showall"');
'<p><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
if ($env{'form.showall'}) { $r->print(' checked="checked" '); }	if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
$r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></p>');	$r->print(' />'.&mt('Show all roles').'</label>'
	.' <input type="submit" value="'.&mt('Update display').'" />'
	.'</p>');
} else {	} else {
if ($countactive > 0) {	if ($countactive > 0) {
&queued_selfenrollment($r);	$r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
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'},'"<>&');
$r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>');	unless ($env{'user.domain'} =~ /^\w+citest$/) {
	$r->print(
	'<p>'
	.&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
	.' to view all [_4] LON-CAPA courses and communities.'
	,'<b>'
	,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
	,'</a></b>',$domdesc)
	.'<br />'
	.&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
	.' you may be able to enroll if self-enrollment is permitted.'
	,'<b>','</b>')
	.'</p>'
	);
	}
}	}
}	}

# No active roles	# No active roles
if ($countactive==0) {	if ($countactive==0) {
if ($inrole) {	if ($inrole) {
$r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');	$r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
} else {	} else {
$r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');	if ($show_course) {
	if ($env{'user.domain'} =~ /^\w+citest$/) {
	$r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>');
	} elsif ($env{'user.domain'} =~ /ci$/) {
	$r->print('<h2>'.&mt('Currently not assigned as a GCI contributor').'</h2>');
	}
	} else {
	$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
	}
}	}
&findcourse_advice($r);	unless ($env{'user.domain'} =~ /^\w+citest$/) {
	&findcourse_advice($r);
	&requestcourse_advice($r);
	}
$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));	if ($show_course) {
	if ($env{'user.domain'} =~ /^\w+citest$/) {
	$r->print(&mt('The following [quant,_1,Concept Test] will be available in the future:',$countfuture));
	} else {
	$r->print(&mt('The following [quant,_1,course] will become active in the future:',$countfuture));
	}
	} else {
	$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
	}
my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,	my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,
$nochoose);	$nochoose);
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,	&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
Line 752 ENDHEADER	Line 848 ENDHEADER
}	}
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
	} elsif ($countactive==1) { # Is there only one choice?
	my $needs_switchserver;
	if ($env{'user.author'}) {
	$needs_switchserver = &check_needs_switchserver($possiblerole);
	}
	if ((!$needs_switchserver) && ($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>');
	$r->print("</form>\n");
	$r->rflush();
	$r->print('<script type="text/javascript">document.forms.rolechoice.submit();</script>');
	$r->print(&Apache::loncommon::end_page());
	return OK;
	}
	if ($needs_switchserver) {
	$r->print("<h2>".&mt('Server Switch Required')."</h2>\n".
	&mt('Construction Space access is only available from '.
	'the home server of the corresponding Author.').'<br />'.
	&mt("Click the 'Switch Server' link to go there.").'<br />');
	}
}	}
# ----------------------------------------------------------------------- Table	# ----------------------------------------------------------------------- Table
unless ((!&Apache::loncommon::show_course()) \|\| ($nochoose) \|\| ($countactive==1)) {	unless ((!$show_course) \|\| ($nochoose) \|\| ($countactive==1)) {
$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
}	}
	if ($env{'form.destinationurl'}) {
	$r->print('<input type="hidden" name="destinationurl" value="'.
	$env{'form.destinationurl'}.'" />');
	if ($env{'form.destsymb'} ne '') {
	$r->print('<input type="hidden" name="destsymb" value="'.
	$env{'form.destsymb'}.'" />');
	}
	}
my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);	my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);
if ($env{'environment.recentroles'}) {	if ($env{'environment.recentroles'}) {
my %recent_roles =	my %recent_roles =
Line 835 ENDHEADER	Line 960 ENDHEADER
$r->print(&Apache::lonnet::getannounce());	$r->print(&Apache::lonnet::getannounce());
if ($advanced) {	if ($advanced) {
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');	my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
$r->print('<p><small><i>'	$r->print('<p><small><i>'
.&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))	.&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
.'</i><br />'	.'</i><br />'
.'<a href="/adm/logout">'.&mt('Logout').'</a>  '	.'<a href="/adm/logout">'.&mt('Logout').'</a>  '
.'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'	.'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
.&mt('Course Catalog')	.&mt('Course/Community Catalog')
.'</a></small></p>');	.'</a></small></p>');
}	}
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}

	sub ci_info_page {
	my %longname = (
	GCI => 'Geoscience Concept Inventory',
	SLCI => 'Science Literacy Concept Inventory',
	);
	my $inventory = uc($env{'user.domain'});
	my %features = (
	review => 'Review and comment on existing $inventory questions',
	submit => "Submit $inventory questions of your own",
	managetest => 'Create an online test for your students',
	tutorial => 'View tutorials on creating online tests',
	);
	my $tabs = &Apache::loncommon::ci_tabs($env{'user.domain'});
	my %info = (
	GCI => '<p>For more information about writing and reviewing Concept Inventory questions please refer to the <a href="/res/gci/gci/internal/pdfs/GCIWorkbook.pdf">GCI Workbook</a>.</p>',
	);
	my $output = <<"END";
	<br clear="all">
	<div>
	<h2>Welcome to the $longname{$inventory} WebCenter</h2>
	<p>
	Use the tabs to navigate the WebCenter and...
	<ul>
	END
	if (ref($tabs) eq 'ARRAY') {
	foreach my $tab (@{$tabs}) {
	if ($features{$tab}) {
	$output .= '<li>'.$features{$tab}.'</li>'."\n";
	}
	}
	}
	$output .= <<"END";
	</ul>
	</p>
	$info{$inventory}
	</div>
	END

	}

sub gather_roles {	sub gather_roles {
my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones) = @_;	my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones) = @_;
my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');	my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');
Line 952 sub gather_roles {	Line 1117 sub gather_roles {
} elsif ($trest) {	} elsif ($trest) {
my $tcourseid=$tdom.'_'.$trest;	my $tcourseid=$tdom.'_'.$trest;
$ttype = &Apache::loncommon::course_type($tcourseid);	$ttype = &Apache::loncommon::course_type($tcourseid);
$trole = &Apache::lonnet::plaintext($role,$ttype);	$trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
if ($env{'course.'.$tcourseid.'.description'}) {	if ($env{'course.'.$tcourseid.'.description'}) {
$twhere=$env{'course.'.$tcourseid.'.description'};	$twhere=$env{'course.'.$tcourseid.'.description'};
$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;	$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
Line 971 sub gather_roles {	Line 1136 sub gather_roles {
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).	&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
'</span>';	'</span>';
$ttype = $newhash{'type'};	$ttype = $newhash{'type'};
$trole = &Apache::lonnet::plaintext($role,$ttype);	$trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
} else {	} else {
$twhere=&mt('Currently not available');	$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;	$env{'course.'.$tcourseid.'.description'}=$twhere;
Line 1087 sub roletable_headers {	Line 1252 sub roletable_headers {
}	}

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

Line 1149 sub findcourse_advice {	Line 1314 sub findcourse_advice {
} else {	} else {
$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 />');	$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 />');
}	}
$r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');	my $queued = &Apache::loncoursequeueadmin::queued_selfenrollment();
$r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');	if ($queued) {
&queued_selfenrollment($r);	$r->print($queued);
	} else {
	$r->print(&mt('You have no request for contributor access pending approval by the GCI WebCenter team.').'<ul>'.
	'<li>'.&mt('This may mean that action was taken on your request in the time since your most recent log-in.[_1]View [_2]Message[_3] to see if this is the case.','<br />','<a href="/adm/communicate">','</a>').'</li>'.
	'<li>'.&mt('If you logout and log-in again you may find you now have access to the Geoscience Concept Inventory, as a contributor.').'</li>'.
	'</ul>');
	}
return;	return;
}	}

sub queued_selfenrollment {	sub requestcourse_advice {
my ($r) = @_;	my ($r) = @_;
my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');	my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my %reqs_by_date;	my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
foreach my $item (keys(%selfenrollrequests)) {	my (%can_request,%request_doms);
if (ref($selfenrollrequests{$item}) eq 'HASH') {	&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
if ($selfenrollrequests{$item}{'status'} eq 'request') {	if (keys(%request_doms) > 0) {
if ($selfenrollrequests{$item}{'timestamp'}) {	my ($types,$typename) = &Apache::loncommon::course_types();
push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);	if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
}	$r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
}	'<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
}	my (@reqdoms,@reqtypes);
}	foreach my $type (sort(keys(%request_doms))) {
if (keys(%reqs_by_date)) {	push(@reqtypes,$type);
my $rolename = &Apache::lonnet::plaintext('st');	if (ref($request_doms{$type}) eq 'ARRAY') {
$r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'.	my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
&Apache::loncommon::start_data_table().	$r->print(
&Apache::loncommon::start_data_table_header_row().	'<li>'
'<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'.	.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
'<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'.	'<i>',
&Apache::loncommon::end_data_table_header_row());	'</i>',
my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));	'<b>'.$domstr.'</b>')
foreach my $item (@sorted) {	.'</li>'
if (ref($reqs_by_date{$item}) eq 'ARRAY') {	);
foreach my $crs (@{$reqs_by_date{$item}}) {	foreach my $dom (@{$request_doms{$type}}) {
my %courseinfo = &Apache::lonnet::coursedescription($crs);	unless (grep(/^\Q$dom\E/,@reqdoms)) {
my $usec = $selfenrollrequests{$crs}{'section'};	push(@reqdoms,$dom);
if ($usec eq '') {	}
$usec = &mt('No section');
}	}
$r->print(&Apache::loncommon::start_data_table_row().
'<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
'<td>'.$courseinfo{'description'}.'</td>'.
'<td>'.$rolename.'</td><td>'.$usec.'</td>'.
&Apache::loncommon::end_data_table_row());
}	}
}	}
	my @showtypes;
	foreach my $type (@{$types}) {
	if (grep(/^\Q$type\E$/,@reqtypes)) {
	push(@showtypes,$type);
	}
	}
	my $requrl = '/adm/requestcourse';
	if (@reqdoms == 1) {
	$requrl .= '?showdom='.$reqdoms[0];
	}
	if (@showtypes > 0) {
	$requrl.=(($requrl=~/\?/)?'&':'?').'crstype='.$showtypes[0];
	}
	if (@reqdoms == 1 \|\| @showtypes > 0) {
	$requrl .= '&state=crstype&action=new';
	}
	$r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
}	}
$r->print(&Apache::loncommon::end_data_table());
}	}
return;	return;
}	}
Line 1376 sub check_fordc {	Line 1557 sub check_fordc {
}	}

sub adhoc_course_role {	sub adhoc_course_role {
my ($then) = @_;	my ($refresh,$then) = @_;
my ($cdom,$cnum);	my ($cdom,$cnum,$crstype);
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
if (&check_forcc($cdom,$cnum,$then)) {	$crstype = &Apache::loncommon::course_type();
	if (&check_forcc($cdom,$cnum,$refresh,$then,$crstype)) {
my $setprivs;	my $setprivs;
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {	if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
$setprivs = 1;	$setprivs = 1;
} else {	} else {
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});	my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
if (($start && ($start>$then \|\| $start == -1)) \|\|	if (($start && ($start>$refresh \|\| $start == -1)) \|\|
($end && $end<$then)) {	($end && $end<$then)) {
$setprivs = 1;	$setprivs = 1;
}	}
}	}
if ($setprivs) {	if ($setprivs) {
if ($env{'form.switchrole'} =~ m-^(in\|ta\|ep\|ad\|st\|cr)([\w/])\./\Q$cdom\E/\Q$cnum\E/?(\w)$-) {	if ($env{'form.switchrole'} =~ m-^(in\|ta\|ep\|ad\|st\|cr)([\w/])\./\Q$cdom\E/\Q$cnum\E/?(\w)$-) {
my $role = $1;	my $role = $1;
Line 1420 sub adhoc_course_role {	Line 1602 sub adhoc_course_role {
}	}
&Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);	&Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
&Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);	&Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
my $adhocstart = $then-1;	my $adhocstart = $refresh-1;
$userroles{'user.role.'.$spec} = $adhocstart.'.';	$userroles{'user.role.'.$spec} = $adhocstart.'.';
&Apache::lonnet::appenv(\%userroles,[$role,'cm']);	&Apache::lonnet::appenv(\%userroles,[$role,'cm']);
}	}
Line 1430 sub adhoc_course_role {	Line 1612 sub adhoc_course_role {
}	}

sub check_forcc {	sub check_forcc {
my ($cdom,$cnum,$then) = @_;	my ($cdom,$cnum,$refresh,$then,$crstype) = @_;
my $is_cc;	my ($is_cc,$ccrole);
	if ($crstype eq 'Community') {
	$ccrole = 'co';
	} else {
	$ccrole = 'cc';
	}
if ($cdom ne '' && $cnum ne '') {	if ($cdom ne '' && $cnum ne '') {
if (&Apache::lonnet::is_course($cdom,$cnum)) {	if (&Apache::lonnet::is_course($cdom,$cnum)) {
my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum;	my $envkey = 'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum;
if (defined($env{$envkey})) {	if (defined($env{$envkey})) {
$is_cc = 1;	$is_cc = 1;
my ($tstart,$tend)=split(/\./,$env{$envkey});	my ($tstart,$tend)=split(/\./,$env{$envkey});
if ($tstart && $tstart>$then) { $is_cc = 0; }	if ($tstart && $tstart>$refresh) { $is_cc = 0; }
if ($tend && $tend <$then) { $is_cc = 0; }	if ($tend && $tend <$then) { $is_cc = 0; }
}	}
}	}
Line 1451 sub courselink {	Line 1638 sub courselink {
my $courseform=&Apache::loncommon::selectcourse_link	my $courseform=&Apache::loncommon::selectcourse_link
('rolechoice','dccourse'.$rowtype.'_'.$dcdom,	('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.	'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
$dcdom,$dcdom,undef);	$dcdom,$dcdom,undef,'Course/Community');
my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.	my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
'<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.	'<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
'<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.	'<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
Line 1461 sub courselink {	Line 1648 sub courselink {

sub coursepick_jscript {	sub coursepick_jscript {
my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",	plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",
youc => 'You can only use this screen to select courses in the current domain.',	youc => 'You can only use this screen to select courses and communities in the current domain.',
);	);
my $verify_script = <<"END";	my $verify_script = <<"END";
<script type="text/javascript">	<script type="text/javascript">
Line 1514 sub display_cc_role {	Line 1701 sub display_cc_role {
my $advanced = $env{'user.adv'};	my $advanced = $env{'user.adv'};
my $tryagain = $env{'form.tryagain'};	my $tryagain = $env{'form.tryagain'};
unless ($rolekey =~/^error\:/) {	unless ($rolekey =~/^error\:/) {
if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_courseid)$-) {	if ($rolekey =~ m{^user\.role\.(cc\|co)\./($match_domain)/($match_courseid)$}) {
my $tcourseid = $1.'_'.$2;	my $ccrole = $1;
my $trolecode = 'cc./'.$1.'/'.$2;	my $tcourseid = $2.'_'.$3;
	my $trolecode = $1.'./'.$2.'/'.$3;
my $twhere;	my $twhere;
my $ttype;	my $ttype;
my $tbg='LC_roles_is';	my $tbg='LC_roles_is';
Line 1531 sub display_cc_role {	Line 1719 sub display_cc_role {
$twhere=&mt('Currently not available');	$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;	$env{'course.'.$tcourseid.'.description'}=$twhere;
}	}
my $trole = &Apache::lonnet::plaintext('cc',$ttype);	my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
$twhere.="<br />".&mt('Domain').":".$1;	$twhere.="<br />".&mt('Domain').":".$1;
($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');	($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
}	}
Line 1547 sub adhoc_roles_row {	Line 1735 sub adhoc_roles_row {
,'<span class="LC_cusr_emph">','</span>',$dcdom)	,'<span class="LC_cusr_emph">','</span>',$dcdom)
.' ';	.' ';
my $selectcclink = &courselink($dcdom,$rowtype);	my $selectcclink = &courselink($dcdom,$rowtype);
my $ccrole = &Apache::lonnet::plaintext('cc');	my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
my $carole = &Apache::lonnet::plaintext('ca');	my $carole = &Apache::lonnet::plaintext('ca');
my $selectcalink = &coauthorlink($dcdom,$rowtype);	my $selectcalink = &coauthorlink($dcdom,$rowtype);
$output.=$ccrole.': '.$selectcclink	$output.=$ccrole.': '.$selectcclink

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

Removed from v.1.228
changed lines
	Added in v.1.240.2.22