version 1.193, 2008/05/19 17:55:38
|
version 1.199, 2008/07/05 23:27:34
|
Line 137 sub handler {
|
Line 137 sub handler {
|
# Is this an ad-hoc CC-role? |
# Is this an ad-hoc CC-role? |
if (my ($domain,$coursenum) = |
if (my ($domain,$coursenum) = |
($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) { |
($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) { |
# See if that is even allowed |
|
my %crsenv=&Apache::lonnet::get('environment',['internal.courseowner'],$domain,$coursenum); |
|
# First find course owner |
|
my ($owneruser,$ownerdomain)=split(/\:/,$crsenv{'internal.courseowner'}); |
|
# Check if course owner blocked cc-access |
|
if (($owneruser) && ($ownerdomain)) { |
|
my %blocked=&Apache::lonnet::get('environment',['domcoord.cc'],$ownerdomain,$owneruser); |
|
if ($blocked{'domcoord.cc'} eq 'blocked') { |
|
$env{'user.error.msg'}=':::1:Course owner '.$owneruser.' in domain '.$ownerdomain.' blocked domain coordinator access'; |
|
last; |
|
} |
|
} |
|
if ($dcroles{$domain}) { |
if ($dcroles{$domain}) { |
&check_privs($domain,$coursenum,$then,$now,'cc'); |
&check_privs($domain,$coursenum,$then,$now,'cc'); |
} |
} |
Line 513 ENDHEADER
|
Line 501 ENDHEADER
|
$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="" />'); |
} |
} |
if ($env{'user.adv'}) { |
|
$r->print( |
|
'<br /><span class="LC_rolesinfo"><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"'); |
|
if ($env{'form.showall'}) { $r->print(' checked="checked" '); } |
|
$r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></span>'); |
|
} |
|
|
|
my (%roletext,%sortrole,%roleclass); |
my (%roletext,%sortrole,%roleclass); |
my $countactive=0; |
my $countactive=0; |
my $countfuture=0; |
my $countfuture=0; |
Line 686 ENDHEADER
|
Line 667 ENDHEADER
|
} |
} |
} |
} |
} |
} |
|
if ($env{'user.adv'}) { |
|
$r->print( |
|
'<br /><span class="LC_rolesinfo"><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"'); |
|
if ($env{'form.showall'}) { $r->print(' checked="checked" '); } |
|
$r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></span>'); |
|
} else { |
|
if ($countactive > 0) { |
|
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
|
$r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>'); |
|
} |
|
} |
|
|
# No active roles |
# No active roles |
if ($countactive==0) { |
if ($countactive==0) { |
if ($inrole) { |
if ($inrole) { |
Line 798 ENDHEADER
|
Line 791 ENDHEADER
|
} |
} |
$r->print(&Apache::lonnet::getannounce()); |
$r->print(&Apache::lonnet::getannounce()); |
if ($advanced) { |
if ($advanced) { |
$r->print('<p><small><i>This is LON-CAPA '. |
$r->print('<p><small><i>' |
$r->dir_config('lonVersion').'</i><br />'. |
.&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion')) |
'<a href="/adm/logout">'.&mt('Logout').'</a></small></p>'); |
.'</i><br />' |
|
.'<a href="/adm/logout">'.&mt('Logout').'</a> ' |
|
.'<a href="/adm/coursecatalog">'.&mt('Course Catalog') |
|
.'</small></p>'); |
} |
} |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
Line 1077 sub adhoc_course_role {
|
Line 1073 sub adhoc_course_role {
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
if (&check_forcc($cdom,$cnum,$then)) { |
if (&check_forcc($cdom,$cnum,$then)) { |
my $setprivs; |
my $setprivs; |
if (!defined($env{'user.role.'.$env{'form.selectrole'}})) { |
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) { |
$setprivs = 1; |
$setprivs = 1; |
} else { |
} else { |
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.selectrole'}}); |
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}}); |
if (($start && ($start>$then || $start == -1)) || |
if (($start && ($start>$then || $start == -1)) || |
($end && $end<$then)) { |
($end && $end<$then)) { |
$setprivs = 1; |
$setprivs = 1; |
} |
} |
} |
} |
if ($setprivs) { |
if ($setprivs) { |
if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E(/?\w*)$-) { |
if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { |
my $role = $1; |
my $role = $1; |
my $custom_role = $2; |
my $custom_role = $2; |
my $usec = $3; |
my $usec = $3; |
if ($role eq 'cr') { |
if ($role eq 'cr') { |
if ($custom_role =~ m-^$match_domain/$match_courseid/\w+$-) { |
if ($custom_role =~ m-^/$match_domain/$match_username/\w+$-) { |
$role .= $custom_role; |
$role .= $custom_role; |
} else { |
} else { |
return; |
return; |