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.240.2.6 and 1.251

version 1.240.2.6, 2009/12/25 00:26:16	version 1.251, 2010/06/02 16:26:21
Line 57 course they should act on, etc. Both in	Line 57 course they should act on, etc. Both in
handler determines via C<lonnet>'s C<&allowed> function that a certain	handler determines via C<lonnet>'s C<&allowed> function that a certain
action is not allowed, C<lonroles> is used as error handler. This	action is not allowed, C<lonroles> is used as error handler. This
allows the user to select another role which may have permission to do	allows the user to select another role which may have permission to do
what they were trying to do. C<lonroles> can also be accessed via the	what they were trying to do.
B<CRS> button in the Remote Control.

=begin latex	=begin latex

Line 138 use Apache::lonannounce;	Line 137 use Apache::lonannounce;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonpageflip();	use Apache::lonpageflip();
use Apache::lonnavdisplay();	use Apache::lonnavdisplay();
use Apache::lonmainmenu();	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;


sub redirect_user {	sub redirect_user {
my ($r,$title,$url,$msg,$launch_nav) = @_;	my ($r,$title,$url,$msg) = @_;
$msg = $title if (! defined($msg));	$msg = $title if (! defined($msg));
&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();
my $navwindow;
if ($launch_nav eq 'on') {
$navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
($url =~ m-^/adm/whatsnew-));
} else {
$navwindow.=&Apache::lonnavmaps::close();
}

# Breadcrumbs	# Breadcrumbs
my $brcrum = [{'href' => $url,	my $brcrum = [{'href' => $url,
Line 165 sub redirect_user {	Line 156 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 173 sub redirect_user {	Line 163 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>
$navwindow
<p>$msg</p>	<p>$msg</p>
$end_page	$end_page
ENDREDIR	ENDREDIR
Line 226 sub handler {	Line 210 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 276 sub handler {	Line 259 sub handler {
my ($server_status,$home) = &check_author_homeserver($user,$domain);	my ($server_status,$home) = &check_author_homeserver($user,$domain);
if ($server_status eq 'switchserver') {	if ($server_status eq 'switchserver') {
my $trolecode = 'au./'.$domain.'/';	my $trolecode = 'au./'.$domain.'/';
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;	my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
$r->internal_redirect($switchserver);	$r->internal_redirect($switchserver);
}	}
last;	last;
Line 287 sub handler {	Line 270 sub handler {
my ($server_status,$home) = &check_author_homeserver($user,$domain);	my ($server_status,$home) = &check_author_homeserver($user,$domain);
if ($server_status eq 'switchserver') {	if ($server_status eq 'switchserver') {
my $trolecode = 'ca./'.$domain.'/'.$user;	my $trolecode = 'ca./'.$domain.'/'.$user;
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;	my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
$r->internal_redirect($switchserver);	$r->internal_redirect($switchserver);
}	}
last;	last;
Line 308 sub handler {	Line 291 sub handler {
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?'
.'otherserver='.$home.'&role='.$trolecode;	.'otherserver='.$home.'&role='.$trolecode;
$r->internal_redirect($switchserver);	$r->internal_redirect($switchserver);
}	}
} else {	} else {
Line 321 sub handler {	Line 304 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 450 ENDENTERKEY	Line 431 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 (($env{'form.orgurl'}) &&	if (($env{'form.orgurl'}) &&
Line 465 ENDENTERKEY	Line 444 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 483 ENDENTERKEY	Line 464 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 494 ENDENTERKEY	Line 477 ENDENTERKEY
$courseid = substr($courseid, 1);	$courseid = substr($courseid, 1);
}	}
$courseid =~ s/\//_/;	$courseid =~ s/\//_/;
if (($cdom ne 'gcitest') && (($role eq 'cc') \|\| ($role eq 'co'))	if ((($role eq 'cc') \|\| ($role eq 'co'))
&& ($env{'course.' . $courseid .'.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
Line 505 ENDENTERKEY	Line 488 ENDENTERKEY
my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&');	my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&');
$dest .= '?symb='.$esc_symb;	$dest .= '?symb='.$esc_symb;
}	}
&redirect_user($r,&mt('Entering [_1]',	&redirect_user($r, &mt('Entering [_1]',
$env{'course.'.$courseid.'.description'}),	$env{'course.'.$courseid.'.description'}),
$dest,$msg,	$dest, $msg);
$env{'environment.remotenavmap'});
return OK;	return OK;
}	}
if (&Apache::lonnet::allowed('whn',	if (&Apache::lonnet::allowed('whn',
Line 518 ENDENTERKEY	Line 500 ENDENTERKEY
.$env{'request.course.sec'})	.$env{'request.course.sec'})
) {	) {
my $startpage = &courseloadpage($courseid);	my $startpage = &courseloadpage($courseid);
unless (($startpage eq 'firstres') \|\| ($cdom eq 'gcitest')) {	unless ($startpage eq 'firstres') {
$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'),
'/adm/whatsnew?refpage=start',$msg,	'/adm/whatsnew?refpage=start', $msg);
$env{'environment.remotenavmap'});
return OK;	return OK;
}	}
}	}
Line 533 ENDENTERKEY	Line 514 ENDENTERKEY
# Guess not ...	# Guess not ...
$furl=&Apache::lonpageflip::first_accessible_resource();	$furl=&Apache::lonpageflip::first_accessible_resource();
}	}
if (($cdom eq 'gcitest') && ($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]',
$env{'course.'.$courseid.'.description'}),	$env{'course.'.$courseid.'.description'}),
$furl,$msg,	$furl, $msg);
$env{'environment.remotenavmap'});
}	}
return OK;	return OK;
}	}
Line 578 ENDENTERKEY	Line 555 ENDENTERKEY
}	}
}	}


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

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

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

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

Line 707 ENDHEADER	Line 673 ENDHEADER
if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {	if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};	$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
}	}
unless ($custommenu) {	$r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
$r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');	$r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
$r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');	$r->print('<input type="hidden" name="selectrole" value="1" />');
$r->print('<input type="hidden" name="selectrole" value="1" />');	$r->print('<input type="hidden" name="newrole" value="" />');
$r->print('<input type="hidden" name="newrole" value="" />');
}
}	}

my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);	my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
Line 722 ENDHEADER	Line 686 ENDHEADER

$refresh = $now;	$refresh = $now;
&Apache::lonnet::appenv({'user.refresh.time' => $refresh});	&Apache::lonnet::appenv({'user.refresh.time' => $refresh});
if ($custommenu) {
if ($env{'form.destinationurl'} eq '/adm/gci_info') {
$r->print(&gci_info_page()).
&Apache::loncommon::end_page();
return OK;
}
my %courses = &Apache::loncommon::existing_gcitest_courses();
$env{'browser.interface'}='faketextual';
$env{'environment.remote'}='off';
my $numcourses = keys(%courses);
my $switcher;
if ($numcourses > 0) {
$switcher = &Apache::lonmainmenu::gcitest_switcher(%courses);
my $current;
if ($env{'request.course.id'}) {
$current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
'/'.$env{'course.'.$env{'request.course.id'}.'.num'};
}
my $switcher_js = &Apache::lonmainmenu::gcitest_switcher_js($current,$numcourses);
$r->print(<<"ENDSCRIPT");
<script type="text/javascript">
// <![CDATA[
$switcher_js
// ]]>
</script>
ENDSCRIPT
}
$r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).
&Apache::loncommon::end_page());
return OK;
} else {
if ($env{'form.destinationurl'} eq '/adm/gci_info') {
delete($env{'form.destinationurl'});
}
}
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
$r->print('<p><label><input type="checkbox" name="showall"');	$r->print('<p><label><input type="checkbox" name="showall"');
if ($env{'form.showall'}) { $r->print(' checked="checked" '); }	if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
Line 765 ENDSCRIPT	Line 694 ENDSCRIPT
.'</p>');	.'</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(	$r->print(
Line 821 ENDSCRIPT	Line 750 ENDSCRIPT
}	}
$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

	if ($numdc > 0) {
	$r->print(&coursepick_jscript());
	$r->print(&Apache::loncommon::coursebrowser_javascript().
	&Apache::loncommon::authorbrowser_javascript());
	}

unless ((!&Apache::loncommon::show_course()) \|\| ($nochoose) \|\| ($countactive==1)) {	unless ((!&Apache::loncommon::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");
}	}
Line 855 ENDSCRIPT	Line 770 ENDSCRIPT
$env{'form.destsymb'}.'" />');	$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 =
&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});	&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
my $output='';	my $output='';
foreach (sort(keys(%recent_roles))) {	foreach my $role (sort(keys(%recent_roles))) {
if (ref($roletext{'user.role.'.$_}) eq 'ARRAY') {	if (ref($roletext{'user.role.'.$role}) eq 'ARRAY') {
$output.= &Apache::loncommon::start_data_table_row().	$output.= &Apache::loncommon::start_data_table_row().
$roletext{'user.role.'.$_}->[0].	$roletext{'user.role.'.$role}->[0].
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::continue_data_table_row().
$roletext{'user.role.'.$_}->[1].
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
if ($_ =~ m-dc\./($match_domain)/-	if ($roletext{'user.role.'.$role}->[1] ne '') {
	$output .= &Apache::loncommon::continue_data_table_row().
	$roletext{'user.role.'.$role}->[1].
	&Apache::loncommon::end_data_table_row();
	}
	if ($role =~ m{dc\./($match_domain)/}
&& $dcroles{$1}) {	&& $dcroles{$1}) {
$output .= &adhoc_roles_row($1,'recent');	$output .= &adhoc_roles_row($1,'recent');
}	}
} elsif ($numdc > 0) {	} elsif ($numdc > 0) {
unless ($_ =~/^error\:/) {	unless ($role =~/^error\:/) {
$output.=&display_cc_role('user.role.'.$_);	my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role);
	$output.= &Apache::loncommon::start_data_table_row().
	$roletext.
	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::continue_data_table_row().
	$role_text_end.
	&Apache::loncommon::end_data_table_row();
}	}
}	}
}	}
if ($output) {	if ($output) {
$r->print(&Apache::loncommon::start_data_table_empty_row()	$r->print(&Apache::loncommon::start_data_table_empty_row()
Line 889 ENDSCRIPT	Line 813 ENDSCRIPT
$doheaders ++;	$doheaders ++;
}	}
}	}

if ($numdc > 0) {
$r->print(&coursepick_jscript());
$r->print(&Apache::loncommon::coursebrowser_javascript().
&Apache::loncommon::authorbrowser_javascript());
}
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);	&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);
if ($countactive > 1) {	if ($countactive > 1) {
my $tremark='';	my $tremark='';
Line 945 ENDSCRIPT	Line 863 ENDSCRIPT
return OK;	return OK;
}	}

sub gci_info_page {
return <<"END";
<h2>Welcome to the Geoscience Concept Inventory WebCenter</h2>
<p>
Use the tabs to navigate the WebCenter and...
<ul>
<li>Review and comment on existing GCI questions</li>
<li>Submit a GCI question of your own</li>
<li>Create an online test for your students</li>
</ul>
</p>
<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>.

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 1034 sub gather_roles {	Line 935 sub gather_roles {
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;	$switchserver='otherserver='.$home.'&role='.$trolecode;
}	}
#next if ($home eq 'no_host');	#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);	$home = &Apache::lonnet::hostname($home);
Line 1054 sub gather_roles {	Line 955 sub gather_roles {
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;	$switchserver='otherserver='.$home.'&role='.$trolecode;
}	}
#next if ($home eq 'no_host');	#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);	$home = &Apache::lonnet::hostname($home);
Line 1067 sub gather_roles {	Line 968 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;
	$twhere = &HTML::Entities::encode($twhere,'"<>&');
unless ($twhere eq &mt('Currently not available')) {	unless ($twhere eq &mt('Currently not available')) {
$twhere.=' <span class="LC_fontsize_small">'.	$twhere.=' <span class="LC_fontsize_small">'.
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).	&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
Line 1081 sub gather_roles {	Line 983 sub gather_roles {
if (%newhash) {	if (%newhash) {
$sortkey=$role."\0".$tdom."\0".$newhash{'description'}.	$sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
"\0".$envkey;	"\0".$envkey;
$twhere=$newhash{'description'}.	$twhere=&HTML::Entities::encode($newhash{'description'},'"<>&').
' <span class="LC_fontsize_small">'.	' <span class="LC_fontsize_small">'.
&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 1218 sub print_rolerows {	Line 1120 sub print_rolerows {
if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') {	if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') {
$output.= &Apache::loncommon::start_data_table_row().	$output.= &Apache::loncommon::start_data_table_row().
$roletext->{$sortrole->{$which}}->[0].	$roletext->{$sortrole->{$which}}->[0].
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::continue_data_table_row().
$roletext->{$sortrole->{$which}}->[1].
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
	if ($roletext->{$sortrole->{$which}}->[1] ne '') {
	$output .= &Apache::loncommon::continue_data_table_row().
	$roletext->{$sortrole->{$which}}->[1].
	&Apache::loncommon::end_data_table_row();
	}
}	}
if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) {	if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) {
if (ref($dcroles) eq 'HASH') {	if (ref($dcroles) eq 'HASH') {
Line 1266 sub findcourse_advice {	Line 1170 sub findcourse_advice {
}	}
$r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.	$r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
'<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');	'<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
$r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');	$r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
&queued_selfenrollment($r);	&Apache::loncoursequeueadmin::queued_selfenrollment());
return;	return;
}	}

Line 1324 sub requestcourse_advice {	Line 1228 sub requestcourse_advice {
return;	return;
}	}

sub queued_selfenrollment {
my ($r) = @_;
my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
my %reqs_by_date;
foreach my $item (keys(%selfenrollrequests)) {
if (ref($selfenrollrequests{$item}) eq 'HASH') {
if ($selfenrollrequests{$item}{'status'} eq 'request') {
if ($selfenrollrequests{$item}{'timestamp'}) {
push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
}
}
}
}
if (keys(%reqs_by_date)) {
my $rolename = &Apache::lonnet::plaintext('st');
$r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'.
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'.
'<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'.
&Apache::loncommon::end_data_table_header_row());
my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));
foreach my $item (@sorted) {
if (ref($reqs_by_date{$item}) eq 'ARRAY') {
foreach my $crs (@{$reqs_by_date{$item}}) {
my %courseinfo = &Apache::lonnet::coursedescription($crs);
my $usec = $selfenrollrequests{$crs}{'section'};
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());
}
}
}
$r->print(&Apache::loncommon::end_data_table());
}
return;
}

sub privileges_info {	sub privileges_info {
my ($which) = @_;	my ($which) = @_;
my $output;	my $output;
Line 1691 sub display_cc_role {	Line 1552 sub display_cc_role {
unless ($rolekey =~/^error\:/) {	unless ($rolekey =~/^error\:/) {
if ($rolekey =~ m{^user\.role\.(cc\|co)\./($match_domain)/($match_courseid)$}) {	if ($rolekey =~ m{^user\.role\.(cc\|co)\./($match_domain)/($match_courseid)$}) {
my $ccrole = $1;	my $ccrole = $1;
my $tcourseid = $2.'_'.$3;	my $tdom = $2;
my $trolecode = $1.'./'.$2.'/'.$3;	my $trest = $3;
	my $tcourseid = $tdom.'_'.$trest;
	my $trolecode = $ccrole.'./'.$tdom.'/'.$trest;
my $twhere;	my $twhere;
my $ttype;	my $ttype;
my $tbg='LC_roles_is';	my $tbg='LC_roles_is';
Line 1700 sub display_cc_role {	Line 1563 sub display_cc_role {
if (%newhash) {	if (%newhash) {
$twhere=$newhash{'description'}.	$twhere=$newhash{'description'}.
' <span style="LC_fontsize_small">'.	' <span style="LC_fontsize_small">'.
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1).	&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
'</span>';	'</span>';
$ttype = $newhash{'type'};	$ttype = $newhash{'type'};
} else {	} else {
$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($ccrole,$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,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
}	}
}	}
return ($roletext,$roletext_end);	return ($roletext,$roletext_end);
Line 1727 sub adhoc_roles_row {	Line 1590 sub adhoc_roles_row {
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
.' \| '.$carole.': '.$selectcalink	.' \| '.$carole.': '.$selectcalink.'</td>'
.&Apache::loncommon::end_data_table_row();	.&Apache::loncommon::end_data_table_row();
return $output;	return $output;
}	}
Line 1785 course they should act on, etc. Both in	Line 1648 course they should act on, etc. Both in
handler determines via C<lonnet>'s C<&allowed> function that a certain	handler determines via C<lonnet>'s C<&allowed> function that a certain
action is not allowed, C<lonroles> is used as error handler. This	action is not allowed, C<lonroles> is used as error handler. This
allows the user to select another role which may have permission to do	allows the user to select another role which may have permission to do
what they were trying to do. C<lonroles> can also be accessed via the	what they were trying to do.
B<CRS> button in the Remote Control.

=begin latex	=begin latex

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

Removed from v.1.240.2.6
changed lines
	Added in v.1.251