version 1.257, 2009/04/01 14:43:06
|
version 1.258, 2009/04/14 23:52:11
|
Line 523 sub innerregister {
|
Line 523 sub innerregister {
|
### resource |
### resource |
### |
### |
my $editbutton = ''; |
my $editbutton = ''; |
|
my $noeditbutton = 1; |
|
my ($cnum,$cdom); |
|
if ($env{'request.course.id'}) { |
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
} |
if ($env{'user.author'}) { |
if ($env{'user.author'}) { |
if ($env{'request.role'}=~/^(aa|ca|au)/) { |
if ($env{'request.role'}=~/^(aa|ca|au)/) { |
# Set defaults for authors |
# Set defaults for authors |
Line 550 sub innerregister {
|
Line 556 sub innerregister {
|
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); |
$editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); |
|
$noeditbutton = 0; |
} |
} |
} |
} |
## |
## |
Line 558 sub innerregister {
|
Line 565 sub innerregister {
|
my $cfile=''; |
my $cfile=''; |
my $cfuname=''; |
my $cfuname=''; |
my $cfudom=''; |
my $cfudom=''; |
|
my $uploaded; |
if ($env{'request.filename'}) { |
if ($env{'request.filename'}) { |
my $file=&Apache::lonnet::declutter($env{'request.filename'}); |
my $file=&Apache::lonnet::declutter($env{'request.filename'}); |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; |
if (defined($cnum) && defined($cdom)) { |
# Check that the user has permission to edit this resource |
$uploaded = &is_course_upload($file,$cnum,$cdom); |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); |
} |
if (defined($cfudom)) { |
if (!$uploaded) { |
my $home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; |
my $allowed=0; |
# Check that the user has permission to edit this resource |
my @ids=&Apache::lonnet::current_machine_ids(); |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (defined($cfudom)) { |
if ($allowed) { |
my $home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
$cfile=$file; |
my $allowed=0; |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
|
if ($allowed) { |
|
$cfile=$file; |
|
} |
} |
} |
} |
} |
} |
} |
# Finally, turn the button on or off |
# Finally, turn the button on or off |
if ($cfile && !$const_space) { |
if ($cfile && !$const_space) { |
$editbutton=&switch |
$editbutton=&switch |
('','',6,1,'pcstr.gif','edit[_1]','resource[_2]', |
('','',6,1,'pcstr.gif','edit[_1]','resource[_2]', |
"go('".$cfile."');","Edit this resource"); |
"go('".$cfile."');","Edit this resource"); |
|
$noeditbutton = 0; |
} elsif ($editbutton eq '') { |
} elsif ($editbutton eq '') { |
$editbutton=&clear(6,1); |
$editbutton=&clear(6,1); |
} |
} |
} |
} |
|
if (($noeditbutton) && ($env{'request.filename'})) { |
|
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
my $file=&Apache::lonnet::declutter($env{'request.filename'}); |
|
if (defined($cnum) && defined($cdom)) { |
|
if (&is_course_upload($file,$cnum,$cdom)) { |
|
my $cfile = &edit_course_upload($file,$cnum,$cdom); |
|
if ($cfile) { |
|
$editbutton=&switch |
|
('','',6,1,'pcstr.gif','edit[_1]', |
|
'resource[_2]',"go('".$cfile."');", |
|
'Edit this resource'); |
|
} |
|
} |
|
} |
|
} |
|
} |
### |
### |
### |
### |
# Prepare the rest of the buttons |
# Prepare the rest of the buttons |
Line 816 ENDDONOTREGTHIS
|
Line 846 ENDDONOTREGTHIS
|
return $result; |
return $result; |
} |
} |
|
|
|
sub is_course_upload { |
|
my ($file,$cnum,$cdom) = @_; |
|
my $uploadpath = &LONCAPA::propath($cdom,$cnum); |
|
$uploadpath =~ s{^\/}{}; |
|
if (($file =~ m{^\Q$uploadpath\E/userfiles/docs/}) || |
|
($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/docs/})) { |
|
return 1; |
|
} |
|
return; |
|
} |
|
|
|
sub edit_course_upload { |
|
my ($file,$cnum,$cdom) = @_; |
|
my $cfile; |
|
if ($file =~/\.(htm|html|css|js|txt)$/) { |
|
my $ext = $1; |
|
my $url = &Apache::lonnet::hreflocation('',$file); |
|
my $home = &Apache::lonnet::homeserver($cnum,$cdom); |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
my $dest; |
|
if ($home && grep(/^\Q$home\E$/,@ids)) { |
|
$dest = $url.'?forceedit=1'; |
|
} else { |
|
unless (&Apache::lonnet::get_locks()) { |
|
$dest = '/adm/switchserver?otherserver='. |
|
$home.'&role='.$env{'request.role'}. |
|
'&url='.$url.'&forceedit=1'; |
|
} |
|
} |
|
if ($dest) { |
|
$cfile = &HTML::Entities::encode($dest,'"<>&'); |
|
} |
|
} |
|
return $cfile; |
|
} |
|
|
sub loadevents() { |
sub loadevents() { |
if ($env{'request.state'} eq 'construct' || |
if ($env{'request.state'} eq 'construct' || |
$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } |
$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } |