version 1.350, 2011/09/26 04:27:44
|
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 447 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 455 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 493 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 576 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 590 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 1001 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 1425 sub roles_selector {
|
Line 1426 sub roles_selector {
|
|
|
sub get_all_courseroles { |
sub get_all_courseroles { |
my ($cdom,$cnum,$courseroles,$seccount,$courseprivs) = @_; |
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')) { |
(ref($courseprivs) eq 'HASH')) { |
return; |
return; |
} |
} |
Line 1500 sub jump_to_role {
|
Line 1501 sub jump_to_role {
|
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.', |
role => 'The role you selected is not permitted to view the current page.', |
swit => 'Switch role, but display Main Menu page instead?', |
swit => 'Switch role, but display Main Menu page instead?', |
); |
); |