version 1.234, 2009/10/25 14:48:43
|
version 1.240, 2009/11/03 03:01:47
|
Line 255 sub handler {
|
Line 255 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 491 ENDENTERKEY
|
Line 491 ENDENTERKEY
|
$courseid = substr($courseid, 1); |
$courseid = substr($courseid, 1); |
} |
} |
$courseid =~ s/\//_/; |
$courseid =~ s/\//_/; |
if ($role eq 'cc' && $env{'course.' . $courseid . |
if ((($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 675 ENDHEADER
|
Line 675 ENDHEADER
|
} 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 or community 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 703 ENDHEADER
|
Line 704 ENDHEADER
|
$refresh = $now; |
$refresh = $now; |
&Apache::lonnet::appenv({'user.refresh.time' => $refresh}); |
&Apache::lonnet::appenv({'user.refresh.time' => $refresh}); |
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 722 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 or community 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 1108 sub roletable_headers {
|
Line 1110 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 1170 sub findcourse_advice {
|
Line 1172 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('<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 the course catalog 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); |
&queued_selfenrollment($r); |
return; |
return; |
} |
} |
Line 1187 sub requestcourse_advice {
|
Line 1189 sub requestcourse_advice {
|
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 create 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(&mt('[_1] in domain: [_2]', |
$r->print( |
'<li><i>'.$typename->{$type}.'</i>','<b>'.$domstr.'</b></li>')); |
'<li>' |
|
.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]', |
|
'<i>', |
|
'</i>', |
|
'<b>'.$domstr.'</b>') |
|
.'</li>' |
|
); |
foreach my $dom (@{$request_doms{$type}}) { |
foreach my $dom (@{$request_doms{$type}}) { |
unless (grep(/^\Q$dom\E/,@reqdoms)) { |
unless (grep(/^\Q$dom\E/,@reqdoms)) { |
push(@reqdoms,$dom); |
push(@reqdoms,$dom); |
Line 1446 sub check_fordc {
|
Line 1454 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 1499 sub adhoc_course_role {
|
Line 1508 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 1520 sub courselink {
|
Line 1534 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 1530 sub courselink {
|
Line 1544 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 or community 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 and communities 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"; |
Line 1583 sub display_cc_role {
|
Line 1597 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 1600 sub display_cc_role {
|
Line 1615 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 1616 sub adhoc_roles_row {
|
Line 1631 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 |