version 1.192, 2008/05/15 01:00:37
|
version 1.200, 2008/07/08 20:16:16
|
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'); |
} |
} |
last; |
last; |
} |
} |
# Is this a recent ad-hoc CA-role? |
# Is this an ad-hoc CA-role? |
if (my ($domain,$user) = |
if (my ($domain,$user) = |
($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) { |
($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) { |
# See if still allowed |
# Check if author blocked ca-access |
my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user); |
my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user); |
if ($blocked{'domcoord.author'} eq 'blocked') { |
if ($blocked{'domcoord.author'} eq 'blocked') { |
delete($env{$envkey}); |
delete($env{$envkey}); |
$env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access'; |
$env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access'; |
last; |
last; |
} |
} |
if (($dcroles{$domain}) && (&is_author_homeserver($user,$domain))) { |
if ($dcroles{$domain}) { |
&check_privs($domain,$user,$then,$now,'ca'); |
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
|
if (($server_status eq 'ok') || ($server_status eq 'switchserver')) { |
|
&check_privs($domain,$user,$then,$now,'ca'); |
|
if ($server_status eq 'switchserver') { |
|
my $trolecode = 'ca./'.$domain.'/'.$user; |
|
my $switchserver = '/adm/switchserver?' |
|
.'otherserver='.$home.'&role='.$trolecode; |
|
$r->internal_redirect($switchserver); |
|
} |
|
} else { |
|
delete($env{$envkey}); |
|
} |
} else { |
} else { |
delete($env{$envkey}); |
delete($env{$envkey}); |
} |
} |
last; |
last; |
} |
} |
# Is this a new ad-hoc CA-role? |
|
if (my ($domain) = |
|
($envkey =~ m-^form\.adhocca\./($match_domain)$-)) { |
|
my $user=$env{'form.adhoccauname.'.$domain}; |
|
if (!$user) { $user=$env{'form.adhoccaunamerecent.'.$domain} }; |
|
# See if that is even allowed |
|
my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user); |
|
if ($blocked{'domcoord.author'} eq 'blocked') { |
|
$env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access'; |
|
last; |
|
} |
|
if ($dcroles{$domain}) { |
|
if (($user) && ($user=~/$match_username/) && (&is_author_homeserver($user,$domain))) { |
|
&check_privs($domain,$user,$then,$now,'ca'); |
|
$env{'form.ca./'.$domain.'/'.$user}=1; |
|
} |
|
} |
|
last; |
|
} |
|
} |
} |
} |
} |
|
|
Line 521 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 694 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 770 ENDHEADER
|
Line 755 ENDHEADER
|
|
|
if ($numdc > 0) { |
if ($numdc > 0) { |
$r->print(&coursepick_jscript()); |
$r->print(&coursepick_jscript()); |
$r->print(&Apache::loncommon::coursebrowser_javascript()); |
$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); |
my $tremark=''; |
my $tremark=''; |
Line 805 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 877 sub print_rolerows {
|
Line 866 sub print_rolerows {
|
sub findcourse_advice { |
sub findcourse_advice { |
my ($r) = @_; |
my ($r) = @_; |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
if (&check_autoenroll($env{'user.domain'})) { |
if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) { |
$r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).' |
$r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).' |
<ul> |
<ul> |
<li>'.&mt('The course has yet to be created.').'</li> |
<li>'.&mt('The course has yet to be created.').'</li> |
Line 1025 sub build_roletext {
|
Line 1014 sub build_roletext {
|
return $roletext; |
return $roletext; |
} |
} |
|
|
sub is_author_homeserver { |
sub check_author_homeserver { |
my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
|
if (($uname eq '') || ($udom eq '')) { |
|
return ('fail',''); |
|
} |
my $home = &Apache::lonnet::homeserver($uname,$udom); |
my $home = &Apache::lonnet::homeserver($uname,$udom); |
|
if (&Apache::lonnet::host_domain($home) ne $udom) { |
|
return ('fail',$home); |
|
} |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
foreach my $id (@ids) { |
if (grep(/^\Q$home\E$/,@ids)) { |
if ($id eq $home) { |
return ('ok',$home); |
if (-e "/home/".$uname."/public_html") { |
} else { |
return 1; |
return ('switchserver',$home); |
} |
|
} |
|
} |
} |
return 0; |
|
} |
} |
|
|
sub check_privs { |
sub check_privs { |
Line 1081 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; |
Line 1138 sub check_forcc {
|
Line 1130 sub check_forcc {
|
} |
} |
|
|
sub courselink { |
sub courselink { |
my ($dcdom,$rowtype,$selecttype) = @_; |
my ($dcdom,$rowtype) = @_; |
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.'_'. |
Line 1190 END
|
Line 1182 END
|
return $verify_script; |
return $verify_script; |
} |
} |
|
|
|
sub coauthorlink { |
|
my ($dcdom,$rowtype) = @_; |
|
my $coauthorform=&Apache::loncommon::selectauthor_link('rolechoice',$dcdom); |
|
my $hiddenitems = '<input type="hidden" name="adhoccauname'.$rowtype.'_'.$dcdom.'" value="" />'; |
|
return $coauthorform.$hiddenitems; |
|
} |
|
|
sub display_cc_role { |
sub display_cc_role { |
my $rolekey = shift; |
my $rolekey = shift; |
my $roletext; |
my $roletext; |
Line 1228 sub adhoc_roles_row {
|
Line 1227 sub adhoc_roles_row {
|
' <td colspan="5"><table><tr><td><span class="LC_rolesinfo">' |
' <td colspan="5"><table><tr><td><span class="LC_rolesinfo">' |
.&mt('[_1]Ad hoc[_2] roles in domain [_3] --', |
.&mt('[_1]Ad hoc[_2] roles in domain [_3] --', |
'<span class="LC_cusr_emph">','</span>',$dcdom).'</span></td><td>'; |
'<span class="LC_cusr_emph">','</span>',$dcdom).'</span></td><td>'; |
my $selectlink = &courselink($dcdom,$rowtype); |
my $selectcclink = &courselink($dcdom,$rowtype); |
my $ccrole = &Apache::lonnet::plaintext('cc'); |
my $ccrole = &Apache::lonnet::plaintext('cc'); |
my $carole = &Apache::lonnet::plaintext('ca'); |
my $carole = &Apache::lonnet::plaintext('ca'); |
my $inputlink='<input type="text" size="10" name="adhoccauname'.$rowtype.'.'.$dcdom.'" />'; |
my $selectcalink = &coauthorlink($dcdom,$rowtype); |
my $gobutton='<input type="submit" name="adhocca./'.$dcdom.'" value="'.&mt('Go').'" />'; |
|
$output.= '<span class="LC_rolesinfo">'. |
$output.= '<span class="LC_rolesinfo">'. |
&mt('[_1]: [_2]',$ccrole,$selectlink). |
&mt('[_1]: [_2]',$ccrole,$selectcclink). |
'</span><br /></td><td> </td><td><span class="LC_rolesinfo">'. |
'</span><br /></td><td> </td><td><span class="LC_rolesinfo">'. |
&mt('[_1]: [_2] [_3]',$carole,$inputlink,$gobutton). |
&mt('[_1]: [_2]',$carole,$selectcalink). |
'</span><br /></td></tr></table></td></tr>'. |
'</span><br /></td></tr></table></td></tr>'. |
'<tr><td colspan="5" height="3"></td></tr>'."\n"; |
'<tr><td colspan="5" height="3"></td></tr>'."\n"; |
return $output; |
return $output; |
Line 1290 sub courseloadpage {
|
Line 1288 sub courseloadpage {
|
return $startpage; |
return $startpage; |
} |
} |
|
|
sub check_autoenroll { |
|
my ($dom) = @_; |
|
my $run_enroll = 0; |
|
my $settings; |
|
my %domconfig = |
|
&Apache::lonnet::get_dom('configuration',['autoenroll'],$dom); |
|
if (ref($domconfig{'autoenroll'}) eq 'HASH') { |
|
$settings = $domconfig{'autoenroll'}; |
|
if ($settings->{'run'} eq '1') { |
|
$run_enroll = 1; |
|
} |
|
} else { |
|
$run_enroll = &localenroll::run($dom); |
|
} |
|
return $run_enroll; |
|
} |
|
|
|
|
|
1; |
1; |
__END__ |
__END__ |
|
|