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.231.4.15 and 1.240.2.4

version 1.231.4.15, 2010/08/20 03:40:01	version 1.240.2.4, 2009/12/20 04:11:27
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::lonmainmenu();
use GDBM_File;	use GDBM_File;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
use HTML::Entities;	use HTML::Entities;
Line 158 sub redirect_user {	Line 159 sub redirect_user {
$navwindow.=&Apache::lonnavmaps::close();	$navwindow.=&Apache::lonnavmaps::close();
}	}

	# Breadcrumbs
	my $brcrum = [{'href' => $url,
	'text' => 'Switching Role'},];
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,});
my $end_page = &Apache::loncommon::end_page();	my $end_page = &Apache::loncommon::end_page();

# Note to style police:	# Note to style police:
Line 185 sub error_page {	Line 190 sub error_page {
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
$r->send_http_header;	$r->send_http_header;
return OK if $r->header_only;	return OK if $r->header_only;
$r->print(&Apache::loncommon::start_page('Problems during Course Initialization').	# Breadcrumbs
	my $brcrum = [{'href' => $dest,
	'text' => 'Problems during Course Initialization'},];
	$r->print(&Apache::loncommon::start_page('Problems during Course Initialization',
	undef,
	{'bread_crumbs' => $brcrum,})
	);
	$r->print(
'<script type="text/javascript">'.	'<script type="text/javascript">'.
'// <![CDATA['.	'// <![CDATA['.
&Apache::lonmenu::rawconfig().	&Apache::lonmenu::rawconfig().
'// ]]>'.	'// ]]>'.
'</script>'.	'</script>'.
'<p class="LC_error">'.&mt('The following problems occurred:').	'<p class="LC_error">'.&mt('The following problems occurred:').
'<br />'.	'<br />'.
$error.	$error.
'</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.	'</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'
&Apache::loncommon::end_page());	);
	$r->print(&Apache::loncommon::end_page());
}	}

sub handler {	sub handler {
Line 212 sub handler {	Line 225 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 225 sub handler {	Line 239 sub handler {
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
# 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'}) {
my $switch_is_active;	if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
if (defined($env{'user.role.'.$env{'form.switchrole'}})) {
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
if (!$end \|\| $end > $now) {
if (!$start \|\| $start < $refresh) {
$switch_is_active = 1;
}
}
}
unless ($switch_is_active) {
&adhoc_course_role($refresh,$then);	&adhoc_course_role($refresh,$then);
}	}
}	}
Line 270 sub handler {	Line 275 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 281 sub handler {	Line 286 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 302 sub handler {	Line 307 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 315 sub handler {	Line 320 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 442 ENDENTERKEY	Line 449 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 455 ENDENTERKEY	Line 464 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 475 ENDENTERKEY	Line 482 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 488 ENDENTERKEY	Line 493 ENDENTERKEY
$courseid = substr($courseid, 1);	$courseid = substr($courseid, 1);
}	}
$courseid =~ s/\//_/;	$courseid =~ s/\//_/;
if ((($role eq 'cc') \|\| ($role eq 'co'))	if (($cdom ne 'gcitest') && (($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
} elsif ($env{'request.course.id'}) {	} elsif ($env{'request.course.id'}) {
Line 512 ENDENTERKEY	Line 517 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 eq 'gcitest')) {
$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 527 ENDENTERKEY	Line 532 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]',
Line 569 ENDENTERKEY	Line 577 ENDENTERKEY
}	}
}	}


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

&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 577 ENDENTERKEY	Line 584 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';
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) {
$r->print(<<ENDHEADER);	my $start_page = &Apache::loncommon::start_page('Main Menu',undef,
	{'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 620 function enterrole (thisform,rolecode,bu	Line 638 function enterrole (thisform,rolecode,bu
// ]]>	// ]]>
</script>	</script>
ENDHEADER	ENDHEADER
	}

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

Line 687 ENDHEADER	Line 706 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 700 ENDHEADER	Line 721 ENDHEADER

$refresh = $now;	$refresh = $now;
&Apache::lonnet::appenv({'user.refresh.time' => $refresh});	&Apache::lonnet::appenv({'user.refresh.time' => $refresh});
	if ($custommenu) {
	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;
	}
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 708 ENDHEADER	Line 755 ENDHEADER
.'</p>');	.'</p>');
} else {	} else {
if ($countactive > 0) {	if ($countactive > 0) {
$r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());	&queued_selfenrollment($r);
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(
'<p>'	'<p>'
.&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'	.&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
Line 736 ENDHEADER	Line 782 ENDHEADER
$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');	$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
}	}
&findcourse_advice($r);	&findcourse_advice($r);
&requestcourse_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));	$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
Line 765 ENDHEADER	Line 811 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
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 789 ENDHEADER	Line 850 ENDHEADER
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 my $role (sort(keys(%recent_roles))) {	foreach (sort(keys(%recent_roles))) {
if (ref($roletext{'user.role.'.$role}) eq 'ARRAY') {	if (ref($roletext{'user.role.'.$_}) eq 'ARRAY') {
$output.= &Apache::loncommon::start_data_table_row().	$output.= &Apache::loncommon::start_data_table_row().
$roletext{'user.role.'.$role}->[0].	$roletext{'user.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 ($roletext{'user.role.'.$role}->[1] ne '') {	if ($_ =~ m-dc\./($match_domain)/-
$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 ($role =~/^error\:/) {	unless ($_ =~/^error\:/) {
my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role);	$output.=&display_cc_role('user.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 826 ENDHEADER	Line 879 ENDHEADER
$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 933 sub gather_roles {	Line 992 sub gather_roles {
if ($role =~ /^cr\//) {	if ($role =~ /^cr\//) {
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);	my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
if ($tremark) { $tremark.='<br />'; }	if ($tremark) { $tremark.='<br />'; }
$tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);	$tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
}	}
$trole=Apache::lonnet::plaintext($role);	$trole=Apache::lonnet::plaintext($role);
my $ttype;	my $ttype;
Line 948 sub gather_roles {	Line 1007 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 968 sub gather_roles {	Line 1027 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 981 sub gather_roles {	Line 1040 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,$tcourseid);	$trole = &Apache::lonnet::plaintext($role,$ttype);
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 996 sub gather_roles {	Line 1054 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=&HTML::Entities::encode($newhash{'description'},'"<>&').	$twhere=$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,$tcourseid);	$trole = &Apache::lonnet::plaintext($role,$ttype);
} else {	} else {
$twhere=&mt('Currently not available');	$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;	$env{'course.'.$tcourseid.'.description'}=$twhere;
Line 1133 sub print_rolerows {	Line 1191 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 1183 sub findcourse_advice {	Line 1239 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>');
&Apache::loncoursequeueadmin::queued_selfenrollment());	&queued_selfenrollment($r);
return;	return;
}	}

Line 1196 sub requestcourse_advice {	Line 1252 sub requestcourse_advice {
&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);	&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
if (keys(%request_doms) > 0) {	if (keys(%request_doms) > 0) {
my ($types,$typename) = &Apache::loncommon::course_types();	my ($types,$typename) = &Apache::loncommon::course_types();
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {	if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
$r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.	$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>');	'<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
my (@reqdoms,@reqtypes);	my (@reqdoms,@reqtypes);
foreach my $type (sort(keys(%request_doms))) {	foreach my $type (sort(keys(%request_doms))) {
push(@reqtypes,$type);	push(@reqtypes,$type);
if (ref($request_doms{$type}) eq 'ARRAY') {	if (ref($request_doms{$type}) eq 'ARRAY') {
my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));	my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
$r->print(	$r->print(
Line 1234 sub requestcourse_advice {	Line 1290 sub requestcourse_advice {
}	}
if (@reqdoms == 1 \|\| @showtypes > 0) {	if (@reqdoms == 1 \|\| @showtypes > 0) {
$requrl .= '&state=crstype&action=new';	$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('</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>');
}	}
}	}
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 1565 sub display_cc_role {	Line 1664 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 $tdom = $2;	my $tcourseid = $2.'_'.$3;
my $trest = $3;	my $trolecode = $1.'./'.$2.'/'.$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 1576 sub display_cc_role {	Line 1673 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'),$trest,$tdom).	&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1).
'</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,$tcourseid);	my $trole = &Apache::lonnet::plaintext($ccrole,$ttype);
$twhere.="<br />".&mt('Domain').":".$tdom;	$twhere.="<br />".&mt('Domain').":".$1;
($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');	($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
}	}
}	}
return ($roletext,$roletext_end);	return ($roletext,$roletext_end);
Line 1603 sub adhoc_roles_row {	Line 1700 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.'</td>'	.' \| '.$carole.': '.$selectcalink
.&Apache::loncommon::end_data_table_row();	.&Apache::loncommon::end_data_table_row();
return $output;	return $output;
}	}

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

Removed from v.1.231.4.15
changed lines
	Added in v.1.240.2.4