version 1.347, 2011/02/15 14:54:51
|
version 1.355, 2011/10/30 22:15:20
|
Line 334 sub secondary_menu {
|
Line 334 sub secondary_menu {
|
and ( $env{'request.noversionuri'} eq '' |
and ( $env{'request.noversionuri'} eq '' |
|| !defined($env{'request.noversionuri'}))) |
|| !defined($env{'request.noversionuri'}))) |
{ |
{ |
($escurl = $env{'request.filename'}) =~ |
($escurl = $env{'request.filename'}) =~ s{^/home/httpd/html}{}; |
s{^/home/([^/]+)/public_html/(.*)$}{/priv/$1/$2}; |
|
|
|
$escurl = &escape($escurl); |
$escurl = &escape($escurl); |
} |
} |
$menu =~ s/\[url\]/$escurl/g; |
$menu =~ s/\[url\]/$escurl/g; |
Line 359 sub innerregister {
|
Line 357 sub innerregister {
|
|
|
undef(@inlineremote); |
undef(@inlineremote); |
|
|
|
my $resurl; |
if ( $env{'request.symb'} && $env{'request.course.id'} ) { |
if ( $env{'request.symb'} && $env{'request.course.id'} ) { |
|
|
my ($mapurl,$rid,$resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); |
(my $mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); |
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'}; |
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'}; |
|
|
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
Line 446 sub innerregister {
|
Line 445 sub innerregister {
|
# |
# |
# Set defaults for authors |
# Set defaults for authors |
my ($top,$bottom) = ('con-','struct'); |
my ($top,$bottom) = ('con-','struct'); |
my $action = "go('/priv/".$env{'user.name'}."');"; |
my $action = "go('/priv/".$env{'user.domain'}.'/'.$env{'user.name'}."');"; |
my $cadom = $env{'request.role.domain'}; |
my $cadom = $env{'request.role.domain'}; |
my $caname = $env{'user.name'}; |
my $caname = $env{'user.name'}; |
my $desc = "Enter my construction space"; |
my $desc = "Enter my construction space"; |
Line 454 sub innerregister {
|
Line 453 sub innerregister {
|
if ($env{'request.role'} =~ /^ca/) { |
if ($env{'request.role'} =~ /^ca/) { |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($top,$bottom) = ('co con-','struct'); |
($top,$bottom) = ('co con-','struct'); |
$action = "go('/priv/".$caname."');"; |
$action = "go('/priv/".$cadom.'/'.$caname."');"; |
$desc = "Enter construction space as co-author"; |
$desc = "Enter construction space as co-author"; |
} elsif ($env{'request.role'} =~ /^aa/) { |
} elsif ($env{'request.role'} =~ /^aa/) { |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($top,$bottom) = ('co con-','struct'); |
($top,$bottom) = ('co con-','struct'); |
$action = "go('/priv/".$caname."');"; |
$action = "go('/priv/".$cadom.'/'.$caname."');"; |
$desc = "Enter construction space as assistant co-author"; |
$desc = "Enter construction space as assistant co-author"; |
} |
} |
# Check that we are on the correct machine |
# Check that we are on the correct machine |
Line 492 sub innerregister {
|
Line 491 sub innerregister {
|
$uploaded = &is_course_upload($file,$cnum,$cdom); |
$uploaded = &is_course_upload($file,$cnum,$cdom); |
} |
} |
if (!$uploaded) { |
if (!$uploaded) { |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$1\/$2/; |
# Check that the user has permission to edit this resource |
# Check that the user has permission to edit this resource |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file); |
if (defined($cfudom)) { |
if (defined($cfudom)) { |
$home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
$home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
my $allowed=0; |
my $allowed=0; |
Line 555 sub innerregister {
|
Line 554 sub innerregister {
|
} |
} |
} |
} |
} |
} |
|
if ($env{'request.course.id'}) { |
|
if ($resurl eq "public/$cdom/$cnum/syllabus") { |
|
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) { |
|
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
$editbutton=&switch('','',6,1,'pcstr.png','Edit', |
|
'resource[_2]', |
|
"go('/adm/courseprefs?phase=display&actions=courseinfo')", |
|
'Edit this resource'); |
|
} |
|
} |
|
} |
|
} |
### |
### |
### |
### |
# Prepare the rest of the buttons |
# Prepare the rest of the buttons |
Line 563 sub innerregister {
|
Line 574 sub innerregister {
|
# |
# |
# We are in construction space |
# We are in construction space |
# |
# |
my ($uname,$thisdisfn) = |
|
($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $currdir = '/priv/'.$uname.'/'.$thisdisfn; |
my ($udom,$uname,$thisdisfn) = |
|
($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$}); |
|
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
if ($currdir =~ m-/$-) { |
if ($currdir =~ m-/$-) { |
$is_const_dir = 1; |
$is_const_dir = 1; |
} else { |
} else { |
Line 577 sub innerregister {
|
Line 590 sub innerregister {
|
# |
# |
$menuitems=(<<ENDMENUITEMS); |
$menuitems=(<<ENDMENUITEMS); |
s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory |
s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory |
s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version |
s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version |
s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource |
s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource |
s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource |
s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource |
s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document |
s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document |
ENDMENUITEMS |
ENDMENUITEMS |
} |
} |
if (ref($bread_crumbs) eq 'ARRAY') { |
if (ref($bread_crumbs) eq 'ARRAY') { |
Line 682 ENDMENUITEMS
|
Line 695 ENDMENUITEMS
|
#publish button in construction space |
#publish button in construction space |
if ($env{'request.state'} eq 'construct'){ |
if ($env{'request.state'} eq 'construct'){ |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
'advtools', @inlineremote[63]); |
'advtools', $inlineremote[63]); |
} else { |
} else { |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
'tools', @inlineremote[63]); |
'tools', $inlineremote[63]); |
} |
} |
|
|
unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { |
unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { |
Line 988 sub rawconfig {
|
Line 1001 sub rawconfig {
|
($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
} |
} |
$act =~ s/\$caname/$caname/g; |
$act =~ s/\$caname/$caname/g; |
|
$act =~ s/\$cadom/$cadom/g; |
my $home = &Apache::lonnet::homeserver($caname,$cadom); |
my $home = &Apache::lonnet::homeserver($caname,$cadom); |
my $allowed=0; |
my $allowed=0; |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
Line 1301 sub roles_selector {
|
Line 1315 sub roles_selector {
|
my ($cdom,$cnum) = @_; |
my ($cdom,$cnum) = @_; |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
my $now = time; |
my $now = time; |
my (%courseroles,%seccount); |
my (%courseroles,%seccount,%courseprivs); |
my $is_cc; |
my $is_cc; |
my $role_selector; |
my $role_selector; |
my $ccrole; |
my $ccrole; |
Line 1309 sub roles_selector {
|
Line 1323 sub roles_selector {
|
$ccrole = 'co'; |
$ccrole = 'co'; |
} else { |
} else { |
$ccrole = 'cc'; |
$ccrole = 'cc'; |
} |
} |
|
my $priv; |
|
my $destinationurl = $ENV{'REQUEST_URI'}; |
|
my $reqprivs = &required_privs(); |
|
if (ref($reqprivs) eq 'HASH') { |
|
my $destination = $destinationurl; |
|
$destination =~ s/(\?.*)$//; |
|
if (exists($reqprivs->{$destination})) { |
|
$priv = $reqprivs->{$destination}; |
|
} |
|
} |
if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) { |
if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) { |
my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}); |
my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}); |
|
|
Line 1322 sub roles_selector {
|
Line 1346 sub roles_selector {
|
} |
} |
} |
} |
if ($is_cc) { |
if ($is_cc) { |
&get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount); |
&get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,$priv); |
} else { |
} else { |
my %gotnosection; |
my %gotnosection; |
foreach my $item (keys(%env)) { |
foreach my $item (keys(%env)) { |
Line 1338 sub roles_selector {
|
Line 1362 sub roles_selector {
|
$gotnosection{$role} = 1; |
$gotnosection{$role} = 1; |
} |
} |
} |
} |
|
if ($priv ne '') { |
|
my $cnumsec = $cnum; |
|
if ($sec ne '') { |
|
$cnumsec .= "/$sec"; |
|
} |
|
$courseprivs{"$role./$cdom/$cnumsec./"} = |
|
$env{"user.priv.$role./$cdom/$cnumsec./"}; |
|
$courseprivs{"$role./$cdom/$cnumsec./$cdom/"} = |
|
$env{"user.priv.$role./$cdom/$cnumsec./$cdom/"}; |
|
$courseprivs{"$role./$cdom/$cnumsec./$cdom/$cnumsec"} = |
|
$env{"user.priv.$role./$cdom/$cnumsec./$cdom/$cnumsec"}; |
|
} |
if (ref($courseroles{$role}) eq 'ARRAY') { |
if (ref($courseroles{$role}) eq 'ARRAY') { |
if ($sec ne '') { |
if ($sec ne '') { |
if (!grep(/^\Q$sec\E$/,@{$courseroles{$role}})) { |
if (!grep(/^\Q$sec\E$/,@{$courseroles{$role}})) { |
Line 1363 sub roles_selector {
|
Line 1399 sub roles_selector {
|
} |
} |
my @roles_order = ($ccrole,'in','ta','ep','ad','st'); |
my @roles_order = ($ccrole,'in','ta','ep','ad','st'); |
if (keys(%courseroles) > 1) { |
if (keys(%courseroles) > 1) { |
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles); |
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv); |
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles"> |
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles"> |
<select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">'; |
<select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">'; |
$role_selector .= '<option value="">'.$switchtext.'</option>'; |
$role_selector .= '<option value="">'.$switchtext.'</option>'; |
Line 1379 sub roles_selector {
|
Line 1415 sub roles_selector {
|
} |
} |
$role_selector .= '</select>'."\n". |
$role_selector .= '</select>'."\n". |
'<input type="hidden" name="destinationurl" value="'. |
'<input type="hidden" name="destinationurl" value="'. |
&HTML::Entities::encode($ENV{'REQUEST_URI'}).'" />'."\n". |
&HTML::Entities::encode($destinationurl).'" />'."\n". |
'<input type="hidden" name="gotorole" value="1" />'."\n". |
'<input type="hidden" name="gotorole" value="1" />'."\n". |
'<input type="hidden" name="selectrole" value="" />'."\n". |
'<input type="hidden" name="selectrole" value="" />'."\n". |
'<input type="hidden" name="switch" value="1" />'."\n". |
'<input type="hidden" name="switch" value="1" />'."\n". |
Line 1389 sub roles_selector {
|
Line 1425 sub roles_selector {
|
} |
} |
|
|
sub get_all_courseroles { |
sub get_all_courseroles { |
my ($cdom,$cnum,$courseroles,$seccount) = @_; |
my ($cdom,$cnum,$courseroles,$seccount,$courseprivs) = @_; |
unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) { |
unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH') && |
|
(ref($courseprivs) eq 'HASH')) { |
return; |
return; |
} |
} |
my ($result,$cached) = |
my ($result,$cached) = |
Line 1398 sub get_all_courseroles {
|
Line 1435 sub get_all_courseroles {
|
if (defined($cached)) { |
if (defined($cached)) { |
if (ref($result) eq 'HASH') { |
if (ref($result) eq 'HASH') { |
if ((ref($result->{'roles'}) eq 'HASH') && |
if ((ref($result->{'roles'}) eq 'HASH') && |
(ref($result->{'seccount'}) eq 'HASH')) { |
(ref($result->{'seccount'}) eq 'HASH') && |
|
(ref($result->{'privs'}) eq 'HASH')) { |
%{$courseroles} = %{$result->{'roles'}}; |
%{$courseroles} = %{$result->{'roles'}}; |
%{$seccount} = %{$result->{'seccount'}}; |
%{$seccount} = %{$result->{'seccount'}}; |
|
%{$courseprivs} = %{$result->{'privs'}}; |
return; |
return; |
} |
} |
} |
} |
Line 1428 sub get_all_courseroles {
|
Line 1467 sub get_all_courseroles {
|
push(@{$courseroles->{$urole}},$usec); |
push(@{$courseroles->{$urole}},$usec); |
} |
} |
} |
} |
|
my $area = '/'.$cdom.'/'.$cnum; |
|
if ($usec ne '') { |
|
$area .= '/'.$usec; |
|
} |
|
if ($role =~ /^cr\//) { |
|
&Apache::lonnet::custom_roleprivs($courseprivs,$urole,$cdom,$cnum,$urole.'.'.$area,$area); |
|
} else { |
|
&Apache::lonnet::standard_roleprivs($courseprivs,$urole,$cdom,$urole.'.'.$area,$cnum,$area); |
|
} |
} |
} |
my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum,['st']); |
my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum,['st']); |
@{$courseroles->{'st'}} = (); |
@{$courseroles->{'st'}} = (); |
|
&Apache::lonnet::standard_roleprivs($courseprivs,'st',$cdom,"st./$cdom/$cnum",$cnum,"/$cdom/$cnum"); |
if (keys(%sections_count) > 0) { |
if (keys(%sections_count) > 0) { |
push(@{$courseroles->{'st'}},keys(%sections_count)); |
push(@{$courseroles->{'st'}},keys(%sections_count)); |
$seccount->{'st'} = scalar(keys(%sections_count)); |
$seccount->{'st'} = scalar(keys(%sections_count)); |
} |
} |
my $rolehash = { |
my $rolehash = { |
'roles' => $courseroles, |
'roles' => $courseroles, |
'seccount' => $seccount, |
'seccount' => $seccount, |
|
'privs' => $courseprivs, |
}; |
}; |
&Apache::lonnet::do_cache_new('getcourseroles',$cdom.'_'.$cnum,$rolehash); |
&Apache::lonnet::do_cache_new('getcourseroles',$cdom.'_'.$cnum,$rolehash); |
return; |
return; |
} |
} |
|
|
sub jump_to_role { |
sub jump_to_role { |
my ($cdom,$cnum,$seccount,$courseroles) = @_; |
my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$priv) = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
this => 'This role has section(s) associated with it.', |
this => 'This role has section(s) associated with it.', |
ente => 'Enter a specific section.', |
ente => 'Enter a specific section.', |
orlb => 'Enter a specific section, or leave blank for no section.', |
orlb => 'Enter a specific section, or leave blank for no section.', |
avai => 'Available sections are:', |
avai => 'Available sections are:', |
youe => 'You entered an invalid section choice:', |
youe => 'You entered an invalid section choice:', |
plst => 'Please try again', |
plst => 'Please try again.', |
|
role => 'The role you selected is not permitted to view the current page.', |
|
swit => 'Switch role, but display Main Menu page instead?', |
); |
); |
my $js; |
my $js; |
if (ref($courseroles) eq 'HASH') { |
if (ref($courseroles) eq 'HASH') { |
Line 1474 sub jump_to_role {
|
Line 1526 sub jump_to_role {
|
' numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n"; |
' numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n"; |
} |
} |
} |
} |
|
my $checkroles = 0; |
|
if ($priv && ref($courseprivs) eq 'HASH') { |
|
my (%disallowed,%allowed,@disallow); |
|
foreach my $role (sort(keys(%{$courseprivs}))) { |
|
my $trole; |
|
if ($role =~ m{^(.+?)\Q./$cdom/$cnum\E}) { |
|
$trole = $1; |
|
} |
|
if (($trole ne '') && ($trole ne 'cm')) { |
|
if ($courseprivs->{$role} =~ /\Q:$priv\E($|:|\&\w+)/) { |
|
$allowed{$trole} = 1; |
|
} else { |
|
$disallowed{$trole} = 1; |
|
} |
|
} |
|
} |
|
foreach my $trole (keys(%disallowed)) { |
|
unless ($allowed{$trole}) { |
|
push(@disallow,$trole); |
|
} |
|
} |
|
if (@disallow > 0) { |
|
$checkroles = 1; |
|
$js .= " var disallow = new Array('".join("','",@disallow)."');\n". |
|
" var rolecheck = 1;\n"; |
|
} |
|
} |
|
if (!$checkroles) { |
|
$js .= " var disallow = new Array();\n". |
|
" rolecheck = 0;\n"; |
|
} |
return <<"END"; |
return <<"END"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
//<![CDATA[ |
//<![CDATA[ |
Line 1481 function adhocRole(roleitem) {
|
Line 1564 function adhocRole(roleitem) {
|
$js |
$js |
var newrole = document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value; |
var newrole = document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value; |
if (newrole == '') { |
if (newrole == '') { |
return; |
return; |
} |
} |
var fullrole = newrole+'./$cdom/$cnum'; |
var fullrole = newrole+'./$cdom/$cnum'; |
var selidx = ''; |
var selidx = ''; |
Line 1490 function adhocRole(roleitem) {
|
Line 1573 function adhocRole(roleitem) {
|
selidx = i; |
selidx = i; |
} |
} |
} |
} |
|
if (rolecheck > 0) { |
|
for (var i=0; i<disallow.length; i++) { |
|
if (disallow[i] == newrole) { |
|
if (confirm("$lt{'role'}\\n$lt{'swit'}")) { |
|
document.rolechooser.destinationurl.value = '/adm/menu'; |
|
} else { |
|
document.rolechooser.elements[roleitem].selectedIndex = 0; |
|
return; |
|
} |
|
} |
|
} |
|
} |
var secok = 1; |
var secok = 1; |
var secchoice = ''; |
var secchoice = ''; |
if (selidx >= 0) { |
if (selidx >= 0) { |
Line 1527 function adhocRole(roleitem) {
|
Line 1622 function adhocRole(roleitem) {
|
return; |
return; |
} |
} |
if (fullrole == "$env{'request.role'}") { |
if (fullrole == "$env{'request.role'}") { |
|
document.rolechooser.elements[roleitem].selectedIndex = 0; |
return; |
return; |
} |
} |
itemid = retrieveIndex('gotorole'); |
itemid = retrieveIndex('gotorole'); |
Line 1552 function retrieveIndex(item) {
|
Line 1648 function retrieveIndex(item) {
|
END |
END |
} |
} |
|
|
|
sub required_privs { |
|
my $privs = { |
|
'/adm/parmset' => 'opa', |
|
'/adm/courseprefs' => 'opa', |
|
'/adm/whatsnew' => 'whn', |
|
'/adm/populate' => 'cst', |
|
'/adm/trackstudent' => 'vsa', |
|
'/adm/statistics' => 'vgr', |
|
}; |
|
unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') { |
|
$privs->{'/adm/classcalc'} => 'vgr', |
|
$privs->{'/adm/assesscalc'} => 'vgr', |
|
$privs->{'/adm/studentcalc'} => 'vgr'; |
|
} |
|
return $privs; |
|
} |
|
|
# ================================================================ Main Program |
# ================================================================ Main Program |
|
|