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.233 and 1.240.2.3

version 1.233, 2009/10/23 16:14:36	version 1.240.2.3, 2009/12/15 05:04:17
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 224 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 255 sub handler {	Line 257 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,$refresh,$now,'cc');	$then,$refresh,$now,$ccrole);
}	}
last;	last;
}	}
Line 318 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 491 ENDENTERKEY	Line 495 ENDENTERKEY
$courseid = substr($courseid, 1);	$courseid = substr($courseid, 1);
}	}
$courseid =~ s/\//_/;	$courseid =~ s/\//_/;
if ($role eq 'cc' && $env{'course.' . $courseid .	if (($cdom ne 'gcitest') && (($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 519 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 530 ENDENTERKEY	Line 534 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 572 ENDENTERKEY	Line 579 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 586 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 623 function enterrole (thisform,rolecode,bu	Line 640 function enterrole (thisform,rolecode,bu
// ]]>	// ]]>
</script>	</script>
ENDHEADER	ENDHEADER
	}

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

Line 671 ENDHEADER	Line 689 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 708 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 723 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(	$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);	&queued_selfenrollment($r);
Line 720 ENDHEADER	Line 768 ENDHEADER
,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'	,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
,'</a></b>',$domdesc)	,'</a></b>',$domdesc)
.'<br />'	.'<br />'
.&mt('If a course is [_1]not[_2] in your list of current courses below,'	.&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.'	.' you may be able to enroll if self-enrollment is permitted.'
,'<b>','</b>')	,'<b>','</b>')
.'</p>'	.'</p>'
Line 731 ENDHEADER	Line 779 ENDHEADER
# 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>');	$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
}	}
&findcourse_advice($r);	&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));	$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
Line 764 ENDHEADER	Line 813 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 ((!&Apache::loncommon::show_course()) \|\| ($nochoose) \|\| ($countactive==1)) {
Line 1107 sub roletable_headers {	Line 1177 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 1169 sub findcourse_advice {	Line 1239 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/Community 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 />');	$r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
$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>');	'<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>');
&queued_selfenrollment($r);	&queued_selfenrollment($r);
return;	return;
}	}

	sub requestcourse_advice {
	my ($r) = @_;
	my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
	my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
	my (%can_request,%request_doms);
	&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
	if (keys(%request_doms) > 0) {
	my ($types,$typename) = &Apache::loncommon::course_types();
	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))) {
	push(@reqtypes,$type);
	if (ref($request_doms{$type}) eq 'ARRAY') {
	my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
	$r->print(
	'<li>'
	.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
	'<i>',
	'</i>',
	'<b>'.$domstr.'</b>')
	.'</li>'
	);
	foreach my $dom (@{$request_doms{$type}}) {
	unless (grep(/^\Q$dom\E/,@reqdoms)) {
	push(@reqdoms,$dom);
	}
	}
	}
	}
	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>');
	}
	}
	return;
	}

sub queued_selfenrollment {	sub queued_selfenrollment {
my ($r) = @_;	my ($r) = @_;
my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');	my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
Line 1397 sub check_fordc {	Line 1521 sub check_fordc {

sub adhoc_course_role {	sub adhoc_course_role {
my ($refresh,$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,$refresh,$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;
Line 1450 sub adhoc_course_role {	Line 1575 sub adhoc_course_role {
}	}

sub check_forcc {	sub check_forcc {
my ($cdom,$cnum,$refresh,$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});
Line 1471 sub courselink {	Line 1601 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 1481 sub courselink {	Line 1611 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 1534 sub display_cc_role {	Line 1664 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 1551 sub display_cc_role {	Line 1682 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);
$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 1567 sub adhoc_roles_row {	Line 1698 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.233
changed lines
	Added in v.1.240.2.3