version 1.38, 2009/04/23 17:33:58
|
version 1.52, 2013/06/07 16:07:49
|
Line 99 use strict;
|
Line 99 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::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
Line 108 use LONCAPA();
|
Line 107 use LONCAPA();
|
# ------------------------------------ Interface for selecting previous version |
# ------------------------------------ Interface for selecting previous version |
sub phaseone { |
sub phaseone { |
my ($r,$fn,$uname,$udom)=@_; |
my ($r,$fn,$uname,$udom)=@_; |
my $docroot=$r->dir_config('lonDocRoot'); |
|
|
|
my $urldir='/res/'.$udom.'/'.$uname.$fn; |
my $urldir = "/res/$udom/$uname".$fn; |
$urldir=~s/\/[^\/]+$/\//; |
my $resfn = $r->dir_config('lonDocRoot').$urldir; |
|
|
my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn; |
$urldir =~ s{[^/]+$}{}; |
my $resdir=$resfn; |
my $resdir = $r->dir_config('lonDocRoot').$urldir; |
$resdir=~s/\/[^\/]+$/\//; |
|
|
|
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
|
|
if (-e $resfn) { |
if (-e $resfn) { |
$r->print('<form action="/adm/retrieve" method="POST">'. |
$r->print('<form action="/adm/retrieve?inhibitmenu=yes" method="post">'. |
'<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'. |
'<input type="hidden" name="filename" value="/priv/'.$udom.'/'.$uname.$fn.'" />'. |
'<input type="hidden" name="phase" value="two" />'. |
'<input type="hidden" name="phase" value="two" />'. |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
Line 152 sub phaseone {
|
Line 149 sub phaseone {
|
my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate'); |
my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate'); |
$r->print(&Apache::loncommon::start_data_table_row(). |
$r->print(&Apache::loncommon::start_data_table_row(). |
'<td><input type="radio" name="version" value="'. |
'<td><input type="radio" name="version" value="'. |
$version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'. |
$version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td>'. |
localtime($rmtime).'</td>'); |
'<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>'); |
|
|
if (!$is_meta) { |
if (!$is_meta) { |
$r->print('<td><a href="'.$urldir.$filename.'.meta" target="cat">'. |
$r->print('<td>'. |
&mt('Metadata Version').' '.$version.'</a></td>'); |
&Apache::loncommon::modal_link($urldir.$filename.'.meta', |
|
&mt('Metadata Version [_1]',$version),550,450).'</td>'); |
} |
} |
if ($is_meta |
if ($is_meta |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
$r->print( |
$r->print('<td>'. |
'<td><a target="cat" href="/adm/diff?filename=/~'. |
&Apache::loncommon::modal_link( |
$uname.$fn. |
'/adm/diff?filename=/priv/'.$udom.'/'.$uname.$fn. |
'&versiontwo=priv&versionone='.$version. |
'&versiontwo=priv&versionone='.$version, |
'">'.&mt('Diffs with Version').' '.$version. |
&mt('Diffs with Version [_1]',$version),550,450). |
'</a></td>'); |
'</td>'); |
} |
} |
$r->print(&Apache::loncommon::end_data_table_row()); |
$r->print(&Apache::loncommon::end_data_table_row()); |
} |
} |
Line 175 sub phaseone {
|
Line 173 sub phaseone {
|
my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate'); |
my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate'); |
$r->print(&Apache::loncommon::start_data_table_row(). |
$r->print(&Apache::loncommon::start_data_table_row(). |
'<td><input type="radio" name="version" value="new" /></td>'. |
'<td><input type="radio" name="version" value="new" /></td>'. |
'<td><b>'.&mt('Currently published version').'</b></td><td>'.localtime($rmtime). |
'<td><b>'.&mt('Currently published version').'</b></td>'. |
'</td>'); |
'<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>' |
|
); |
if (!$is_meta) { |
if (!$is_meta) { |
$r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target="cat">'. |
$r->print('<td>', |
&mt('Metadata current version').'</a></td>'); |
&Apache::loncommon::modal_link($urldir.$main.'.'.$suffix.'.meta', |
|
&mt('Metadata current version'),550,450).'</td>'); |
} |
} |
if ($is_meta |
if ($is_meta |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
$r->print( |
$r->print('<td>'. |
'<td><a target="cat" href="/adm/diff?filename=/~'. |
&Apache::loncommon::modal_link( |
$uname.$fn. |
'/adm/diff?filename=/priv/'. |
'&versiontwo=priv'. |
$udom.'/'.$uname.$fn. |
'">'.&mt('Diffs with current Version').'</a></td>'); |
'&versiontwo=priv', |
|
&mt('Diffs with current Version'),550,450). |
|
'</td>'); |
} |
} |
$r->print(&Apache::loncommon::end_data_table_row(). |
$r->print(&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table(). |
&Apache::loncommon::end_data_table(). |
'<p>'.'<span class="LC_warning">'. |
'<p>'.'<span class="LC_warning">'. |
&mt('Retrieval of an old version will overwrite the file currently in construction space.').'</span></p>'); |
&mt('Retrieval of an old version will overwrite the file currently in Authoring Space.').'</span></p>'); |
if (!$is_meta) { |
if (!$is_meta) { |
$r->print('<p>'.'<span class="LC_warning">'. |
$r->print('<p>'.'<span class="LC_warning">'. |
&mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.'). |
&mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.'). |
'</span></p>'); |
'</span></p>'); |
} |
} |
$r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>'); |
$r->print('<input type="submit" value="'.&mt('Retrieve selected Version').'" /></form>'); |
} else { |
} else { |
$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>'); |
$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>'); |
} |
} |
$r->print('<p><a href="/priv/'.$uname.$fn.'">' |
|
.&mt('Back to [_1]','<span class="LC_filename">'.$fn.'</span>') |
|
.'</a></p>'); |
|
} |
} |
|
|
# ---------------------------------- Interface for presenting specified version |
# ---------------------------------- Interface for presenting specified version |
Line 220 sub phasetwo {
|
Line 220 sub phasetwo {
|
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
|
|
my $logfile; |
my $logfile; |
my $ctarget='/home/'.$uname.'/public_html'.$fn; |
my $ctarget=$r->dir_config('lonDocRoot')."/priv/$udom/$uname".$fn; |
my $vfn=$fn; |
my $vfn=$fn; |
if ($version ne 'new') { |
if ($version ne 'new') { |
$vfn=~s/\.(\Q$suffix\E)$/\.$version\.$1/; |
$vfn=~s/\.(\Q$suffix\E)$/\.$version\.$1/; |
} |
} |
|
|
my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn; |
my $csource=$r->dir_config('lonDocRoot')."/res/$udom/$uname".$vfn; |
|
|
my $logname = $ctarget; |
my $logname = $ctarget; |
if ($is_meta) { $logname =~ s/\.meta$//; } |
if ($is_meta) { $logname =~ s/\.meta$//; } |
Line 245 sub phasetwo {
|
Line 245 sub phasetwo {
|
.&mt('ok') |
.&mt('ok') |
.'</span>'); |
.'</span>'); |
print $logfile "Copied sucessfully.\n\n"; |
print $logfile "Copied sucessfully.\n\n"; |
|
$r->print(&Apache::lonhtmlcommon::scripttag('parent.location.reload();')); |
} else { |
} else { |
my $error=$!; |
my $error=$!; |
$r->print('<span class="LC_error">' |
$r->print('<span class="LC_error">' |
Line 252 sub phasetwo {
|
Line 253 sub phasetwo {
|
.'</span>'); |
.'</span>'); |
print $logfile "Copy failed: $error\n\n"; |
print $logfile "Copy failed: $error\n\n"; |
} |
} |
$r->print('</p>' |
|
.'<p><a href="/priv/'.$uname.$fn.'">' |
|
.&mt('Back to [_1]',$fn) |
|
.'</a></p>'); |
|
} else { |
} else { |
$r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>'); |
$r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>'); |
&phaseone($r,$fn,$uname,$udom); |
&phaseone($r,$fn,$uname,$udom); |
Line 289 sub handler {
|
Line 286 sub handler {
|
|
|
if ($env{'form.filename'}) { |
if ($env{'form.filename'}) { |
$fn=$env{'form.filename'}; |
$fn=$env{'form.filename'}; |
$fn=~s/^https?\:\/\/[^\/]+//; |
$fn =~ s{^https?\://[^/]+}{}; |
} else { |
} else { |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
' unspecified filename for retrieval', $r->filename); |
' unspecified filename for retrieval', $r->filename); |
Line 306 sub handler {
|
Line 303 sub handler {
|
my $uname; |
my $uname; |
my $udom; |
my $udom; |
|
|
($uname,$udom)= |
($uname,$udom) = &Apache::lonnet::constructaccess($fn); |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
unless (($uname ne '') && ($udom ne '')) { |
unless (($uname) && ($udom)) { |
|
$r->log_reason($uname.' at '.$udom. |
$r->log_reason($uname.' at '.$udom. |
' trying to publish file '.$env{'form.filename'}. |
' trying to publish file '.$env{'form.filename'}. |
' ('.$fn.') - not authorized', |
' ('.$fn.') - not authorized', |
Line 316 sub handler {
|
Line 312 sub handler {
|
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
|
|
$fn=~s{/~($LONCAPA::username_re)}{}; |
|
|
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
$r->print(&Apache::loncommon::start_page('Retrieve Published Resources')); |
# Breadcrumbs |
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => 'Authoring Space', |
|
'href' => &Apache::loncommon::authorspace($fn), |
|
}); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => 'Retrieve previous version', |
|
'href' => '', |
|
}); |
|
|
|
my $londocroot = $r->dir_config('lonDocRoot'); |
|
my $trailfile = $fn; |
|
$trailfile =~ s{^/(priv/)}{$londocroot/$1}; |
|
|
|
$r->print(&Apache::loncommon::start_page('Retrieve Published Resources') |
|
.&Apache::lonhtmlcommon::breadcrumbs() |
|
.&Apache::loncommon::head_subbox( |
|
&Apache::loncommon::CSTR_pageheader($trailfile)) |
|
); |
|
|
|
$fn=~s{/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; |
$r->print('<h1>' |
|
|
$r->print('<p>' |
.&mt('Retrieve previous versions of [_1]' |
.&mt('Retrieve previous versions of [_1]' |
,'<span class="LC_filename">'.$fn.'</span>') |
,'<span class="LC_filename">'.$fn.'</span>') |
.'</h1>'); |
.'</p>'); |
|
|
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
$r->print('<h3><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname. |
$r->print('<p><span class="LC_info">' |
&mt(' at ').$udom. |
.&mt('Co-Author [_1]' |
'</span></h3>'); |
,&Apache::loncommon::plainname($uname,$udom) |
|
.' ('.$uname.':'.$udom.')') |
|
.'</span></p>'); |
} |
} |
|
|
|
|