version 1.139, 2011/12/23 14:54:26
|
version 1.144, 2012/10/29 17:38:55
|
Line 33 use strict;
|
Line 33 use strict;
|
use Apache::File; |
use Apache::File; |
use File::Copy; |
use File::Copy; |
use Apache::Constants qw(:common :http :methods); |
use Apache::Constants qw(:common :http :methods); |
use Apache::loncacc; |
|
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
use Apache::londiff(); |
use Apache::londiff(); |
Line 52 sub handler {
|
Line 51 sub handler {
|
my $uname; |
my $uname; |
my $udom; |
my $udom; |
|
|
($uname,$udom)=&Apache::loncacc::constructaccess($r->uri); |
($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); |
unless (($uname) && ($udom)) { |
unless (($uname) && ($udom)) { |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
Line 458 sub putdirectory {
|
Line 457 sub putdirectory {
|
my $disfilename = $dirname; |
my $disfilename = $dirname; |
# Don't display directory itself, and there is no way up from root directory |
# Don't display directory itself, and there is no way up from root directory |
unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { |
unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { |
my $kaputt=0; |
my $kaputt=0; |
if (ref($bombs) eq 'HASH') { |
if (ref($bombs) eq 'HASH') { |
foreach my $key (keys(%{$bombs})) { |
foreach my $key (keys(%{$bombs})) { |
if ($key =~ m{^\Q$targetdir/$disfilename\E/}) { $kaputt=1; last; } |
my $currentdir = &Apache::lonnet::declutter("$targetdir/$disfilename"); |
} |
if (($key) =~ m{^\Q$currentdir\E/}) { $kaputt=1; last; } |
|
} |
} |
} |
# |
# |
# Get the metadata from that directory's default.meta to display titles |
# Get the metadata from that directory's default.meta to display titles |
Line 522 sub putresource {
|
Line 522 sub putresource {
|
my $pubstatus = 'unpublished'; |
my $pubstatus = 'unpublished'; |
my $status=&mt('Unpublished'); |
my $status=&mt('Unpublished'); |
my $css_class='LC_browser_file'; |
my $css_class='LC_browser_file'; |
my $title=' '; |
my $title=''; |
my $publish_button=&mt('Publish'); |
my $publish_button=&mt('Publish'); |
my $cstr_dir = $r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.'/'.$thisdisfn.'/'; |
my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn; |
my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); |
my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); |
|
|
if (-e $resdir.'/'.$filename) { |
if (-e $resdir.'/'.$filename) { |
Line 590 sub putresource {
|
Line 590 sub putresource {
|
&mt('Diffs'),600,500); |
&mt('Diffs'),600,500); |
} |
} |
} |
} |
|
|
$title.="\n".'<br /><a href="'.$linkfilename.'.meta">'. |
|
($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>'; |
|
|
|
if (!$meta_same) { |
if (!$meta_same) { |
$title = &mt('Metadata Modified').'<br />'.$title. |
$title = &mt('Metadata Modified').'<br />'.$title. |
'<br /><a href="/adm/diff?filename=/priv/'.$linkfilename.'.meta'. |
'<br />'. |
'&versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>'; |
&Apache::loncommon::modal_link( |
$title.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>'; |
'/adm/diff?filename='.$linkfilename.'.meta'.'&versiontwo=priv', |
|
&mt('Metadata Diffs'),600,500); |
|
$title.="\n".'<br />'. |
|
&Apache::loncommon::modal_link( |
|
'/adm/retrieve?filename='.$linkfilename.'.meta&inhibitmenu=yes&add_modal=yes', |
|
&mt('Retrieve Metadata'),600,500); |
} |
} |
$status.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'" target="_parent">'.&mt('Retrieve').'</a>'; |
$status.="\n".'<br />'. |
|
&Apache::loncommon::modal_link( |
|
'/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500); |
} |
} |
|
# Allow editing metadata of published and unpublished resources |
|
$title .= "\n".'<br />' if ($title); |
|
$title .= '<a href="'.$linkfilename.'.meta">'. |
|
($$bombs{&Apache::lonnet::declutter($targetdir.'/'.$filename)}? |
|
'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />': |
|
&mt('Edit Metadata')). |
|
'</a>'; |
|
|
my $editlink=''; |
my $editlink=''; |
my $editlink2=''; |
my $editlink2=''; |
if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { |
if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { |