version 1.488, 2012/06/30 23:11:11
|
version 1.496, 2012/10/01 12:06:46
|
Line 69 sub mapread {
|
Line 69 sub mapread {
|
} |
} |
|
|
sub storemap { |
sub storemap { |
my ($coursenum,$coursedom,$map)=@_; |
my ($coursenum,$coursedom,$map,$contentchg)=@_; |
|
my $report; |
|
if (($contentchg) && ($map =~ /^default/)) { |
|
$report = 1; |
|
} |
my ($outtext,$errtext)= |
my ($outtext,$errtext)= |
&LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. |
&LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. |
$map,1); |
$map,1,$report); |
if ($errtext) { return ($errtext,2); } |
if ($errtext) { return ($errtext,2); } |
|
|
$hadchanges=1; |
$hadchanges=1; |
Line 305 sub group_import {
|
Line 309 sub group_import {
|
join(':', ($name, $url, $ext, 'normal', 'res')); |
join(':', ($name, $url, $ext, 'normal', 'res')); |
} |
} |
} |
} |
return &storemap($coursenum, $coursedom, $folder.'.'.$container); |
return &storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
} |
} |
|
|
sub breadcrumbs { |
sub breadcrumbs { |
Line 365 sub breadcrumbs {
|
Line 369 sub breadcrumbs {
|
} |
} |
|
|
sub log_docs { |
sub log_docs { |
return &Apache::lonnet::instructor_log('docslog',@_); |
return &Apache::lonnet::write_log('course','docslog',@_); |
} |
} |
|
|
{ |
{ |
Line 438 sub docs_change_log {
|
Line 442 sub docs_change_log {
|
'</script>'."\n"; |
'</script>'."\n"; |
$r->print(&Apache::loncommon::start_page('Content Change Log',$js)); |
$r->print(&Apache::loncommon::start_page('Content Change Log',$js)); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log')); |
$r->print(&startContentScreen('docs')); |
$r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs'))); |
my %orderhash; |
my %orderhash; |
my $container='sequence'; |
my $container='sequence'; |
my $pathitem; |
my $pathitem; |
Line 457 sub docs_change_log {
|
Line 461 sub docs_change_log {
|
my $jumpto = $readfile; |
my $jumpto = $readfile; |
$jumpto =~ s{^/}{}; |
$jumpto =~ s{^/}{}; |
my $tid = 1; |
my $tid = 1; |
|
if ($supplementalflag) { |
|
$tid = 2; |
|
} |
my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype); |
my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype); |
$r->print($breadcrumbtrail. |
$r->print($breadcrumbtrail. |
&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto, |
&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto, |
Line 609 sub docs_change_log {
|
Line 616 sub docs_change_log {
|
} |
} |
|
|
sub update_paste_buffer { |
sub update_paste_buffer { |
my ($coursenum,$coursedom) = @_; |
my ($coursenum,$coursedom,$folder) = @_; |
|
|
return if (!defined($env{'form.markcopy'})); |
return if (!defined($env{'form.markcopy'})); |
return if (!defined($env{'form.copyfolder'})); |
return if (!defined($env{'form.copyfolder'})); |
Line 630 sub update_paste_buffer {
|
Line 637 sub update_paste_buffer {
|
} |
} |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
|
|
&Apache::lonnet::appenv({'docs.markedcopy_title' => $title, |
(my $cmd,undef)=split('_',$env{'form.cmd'}); |
'docs.markedcopy_url' => $url}); |
|
|
my %addtoenv = ( |
|
'docs.markedcopy_title' => $title, |
|
'docs.markedcopy_url' => $url, |
|
'docs.markedcopy_cmd' => $cmd, |
|
); |
|
&Apache::lonnet::delenv('docs.markedcopy_nested'); |
|
&Apache::lonnet::delenv('docs.markedcopy_nestednames'); |
|
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) { |
|
my $prefix = $1; |
|
my $subdir =$2; |
|
if ($subdir eq '') { |
|
$subdir = $prefix; |
|
} |
|
my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps); |
|
&contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps, |
|
\%hierarchy,\%titles,\%allmaps); |
|
if (ref($hierarchy{$url}) eq 'HASH') { |
|
my ($nested,$nestednames); |
|
&recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames); |
|
$nested =~ s/\&$//; |
|
$nestednames =~ s/\Q___&&&___\E$//; |
|
if ($nested ne '') { |
|
$addtoenv{'docs.markedcopy_nested'} = $nested; |
|
} |
|
if ($nestednames ne '') { |
|
$addtoenv{'docs.markedcopy_nestednames'} = $nestednames; |
|
} |
|
} |
|
} |
|
&Apache::lonnet::appenv(\%addtoenv); |
delete($env{'form.markcopy'}); |
delete($env{'form.markcopy'}); |
} |
} |
|
|
|
sub recurse_uploaded_maps { |
|
my ($url,$dir,$hierarchy,$titlesref,$nestref,$namesref) = @_; |
|
if (ref($hierarchy->{$url}) eq 'HASH') { |
|
my @maps = map { $hierarchy->{$url}{$_}; } sort { $a <=> $b } (keys(%{$hierarchy->{$url}})); |
|
my @titles = map { $titlesref->{$url}{$_}; } sort { $a <=> $b } (keys(%{$titlesref->{$url}})); |
|
my (@uploaded,@names,%shorter); |
|
for (my $i=0; $i<@maps; $i++) { |
|
my ($inner) = ($maps[$i] =~ m{^/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_(\d+)\.(?:page|sequence)$}); |
|
if ($inner ne '') { |
|
push(@uploaded,$inner); |
|
push(@names,&escape($titles[$i])); |
|
$shorter{$maps[$i]} = $inner; |
|
} |
|
} |
|
$$nestref .= "$dir:".join(',',@uploaded).'&'; |
|
$$namesref .= "$dir:".(join(',',@names)).'___&&&___'; |
|
foreach my $map (@maps) { |
|
if ($shorter{$map} ne '') { |
|
&recurse_uploaded_maps($map,$shorter{$map},$hierarchy,$titlesref,$nestref,$namesref); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
sub print_paste_buffer { |
sub print_paste_buffer { |
my ($r,$container,$folder) = @_; |
my ($r,$container,$folder,$coursedom,$coursenum) = @_; |
return if (!defined($env{'docs.markedcopy_url'})); |
return if (!defined($env{'docs.markedcopy_url'})); |
|
|
my $is_external; |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent); |
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
$is_external = 1; |
$is_external = 1; |
} |
} |
|
|
my $canpaste; |
my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map); |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
$canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); |
$canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); |
|
unless ($canpaste) { |
|
$nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.'); |
|
} |
} else { |
} else { |
$canpaste = 1; |
$canpaste = 1; |
} |
} |
|
|
my $pasteinfo; |
|
if ($canpaste) { |
if ($canpaste) { |
$pasteinfo = '<form name="pasteform" action="/adm/coursedocs" method="post">' |
if ($env{'docs.markedcopy_url'} =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { |
.'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '; |
my $srcdom = $1; |
} else { |
my $srcnum = $2; |
$pasteinfo = &mt('Paste buffer contains:').' '; |
my $rem = $3; |
|
if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { |
|
$othercourse = 1; |
|
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
|
if ($canpaste) { |
|
$othercrs = '<br />'.&mt('(from another course).'); |
|
} |
|
} else { |
|
$canpaste = 0; |
|
$nopaste = &mt('Paste from another course unavailable.') |
|
} |
|
} |
|
if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) { |
|
my $prefix = $1; |
|
$parent = $2; |
|
if ($folder !~ /^\Q$prefix\E/) { |
|
$areachange = 1; |
|
} |
|
$is_uploaded_map = 1; |
|
} |
|
} |
} |
} |
|
|
$r->print('<fieldset>' |
$r->print('<fieldset>' |
.'<legend>'.&mt('Clipboard').'</legend>' |
.'<legend>'.&mt('Clipboard').'</legend>'); |
.$pasteinfo |
my ($type,$buffer); |
); |
|
|
|
my $type; |
|
if ($is_external) { |
if ($is_external) { |
$type = &mt('External Resource'); |
$type = &mt('External Resource'); |
$r->print($type.': '. |
$buffer = $type.': '. |
&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('. |
&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('. |
&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'); |
&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'; |
} else { |
} else { |
my $icon = &Apache::loncommon::icon($extension); |
my $icon = &Apache::loncommon::icon($extension); |
if ($extension eq 'sequence' && |
if ($extension eq 'sequence' && |
$env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { |
$env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { |
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
$icon .= '/navmap.folder.closed.gif'; |
$icon .= '/navmap.folder.closed.gif'; |
} |
} |
$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />'; |
$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />'; |
$r->print($icon.$type.': '. &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}))); |
$buffer = $icon.$type.': '. &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})); |
} |
} |
if ($canpaste) { |
if ($canpaste) { |
|
$r->print('<form name="pasteform" action="/adm/coursedocs" method="post">'.$buffer); |
|
if (($is_uploaded_map) && (!$areachange)) { |
|
if ((!$othercourse) && ($env{'docs.markedcopy_cmd'} eq 'cut')) { |
|
$r->print((' 'x 4).'<span id="pasteoptionstext">'. |
|
'<a href="javascript:showPasteOptions();" class="LC_menubuttons_link">'. |
|
&mt('Show Paste Options').'</a></span><br />'. |
|
'<div id="pasteoptions" class="LC_dccid">'.(' 'x 4). |
|
'<label>'. |
|
'<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'. |
|
&mt('Copy to new folder').'</label>'.(' ' x2). |
|
'<label>'. |
|
'<input type="radio" name="docs.markedcopy_options" value="move" />'. |
|
&mt('Move old folder').'</label><br />'); |
|
if ($env{'docs.markedcopy_nested'}) { |
|
$r->print('<br />'.&mt('Folder to paste contains sub-folders'). |
|
'<br /><table border="0">'); |
|
my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested'}); |
|
my @titles = split(/\Q___&&&___\E/,$env{'docs.markedcopy_nestednames'}); |
|
my $lastdir = $parent; |
|
my %depths = ( |
|
$lastdir => 0, |
|
); |
|
my (%display,%deps); |
|
for (my $i=0; $i<@pastemaps; $i++) { |
|
($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]); |
|
my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]); |
|
my @subfolders = split(/,/,$subfolderstr); |
|
$deps{$lastdir} = \@subfolders; |
|
my @subfoldertitles = map { &unescape($_); } split(/,/,$esctitlestr); |
|
my $depth = $depths{$lastdir} + 1; |
|
my $offset = int($depth * 4); |
|
my $indent = (' ' x $offset); |
|
for (my $j=0; $j<@subfolders; $j++) { |
|
$depths{$subfolders[$j]} = $depth; |
|
$display{$subfolders[$j]} = |
|
'<tr><td>'.$indent.$subfoldertitles[$j].' </td>'. |
|
'<td><label>'. |
|
'<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.(' ' x2). |
|
'<label>'. |
|
'<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="move" />'. |
|
&mt('Move old').'</label>'. |
|
'</td></tr>'; |
|
} |
|
} |
|
&recurse_print($r,$parent,\%deps,\%display); |
|
$r->print('</table>'); |
|
} |
|
$r->print('</div>'); |
|
} |
|
} |
|
$r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs); |
if ($container eq 'page') { |
if ($container eq 'page') { |
$r->print(' |
$r->print(' |
<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" /> |
<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" /> |
<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" /> |
<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" /> |
'); |
'); |
} else { |
} else { |
$r->print(' |
$r->print(' |
<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /> |
<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /> |
'); |
'); |
} |
} |
$r->print('</form>'); |
$r->print('</form>'); |
} else { |
} else { |
$r->print('<br /><p class="LC_info">'.&mt('Paste into Supplemental Content unavailable for this type of content.').'</p>'); |
$r->print(&mt('Paste buffer contains:').' '.$buffer. |
|
'<br /><p class="LC_info">'.$nopaste.'</p>'); |
} |
} |
$r->print('</fieldset>'); |
$r->print('</fieldset>'); |
} |
} |
|
|
|
sub recurse_print { |
|
my ($r,$dir,$deps,$display) = @_; |
|
$r->print($display->{$dir}."\n"); |
|
if (ref($deps->{$dir}) eq 'ARRAY') { |
|
foreach my $subdir (@{$deps->{$dir}}) { |
|
&recurse_print($r,$subdir,$deps,$display); |
|
} |
|
} |
|
} |
|
|
sub supp_pasteable { |
sub supp_pasteable { |
my ($url) = @_; |
my ($url) = @_; |
if (($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//}) || |
if (($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//}) || |
Line 711 sub supp_pasteable {
|
Line 854 sub supp_pasteable {
|
return; |
return; |
} |
} |
|
|
|
sub paste_popup_js { |
|
my %lt = &Apache::lonlocal::texthash( |
|
show => 'Show Paste Options', |
|
hide => 'Hide Paste Options', |
|
); |
|
return <<"END"; |
|
|
|
function showPasteOptions() { |
|
document.getElementById('pasteoptions').style.display='block'; |
|
document.getElementById('pasteoptions').style.textAlign='left'; |
|
document.getElementById('pasteoptions').style.textFace='normal'; |
|
document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:hidePasteOptions();" class="LC_menubuttons_link">$lt{'hide'}</a><br />'; |
|
return; |
|
} |
|
|
|
function hidePasteOptions() { |
|
document.getElementById('pasteoptions').style.display='none'; |
|
document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:showPasteOptions()" class="LC_menubuttons_link">$lt{'show'}</a>'; |
|
return; |
|
} |
|
|
|
END |
|
|
|
} |
|
|
|
|
sub do_paste_from_buffer { |
sub do_paste_from_buffer { |
my ($coursenum,$coursedom,$folder) = @_; |
my ($coursenum,$coursedom,$folder,$container,$errors) = @_; |
|
|
|
# Early out if paste buffer is empty |
if (!$env{'form.pastemarked'}) { |
if (!$env{'form.pastemarked'}) { |
return; |
return (); |
} |
} |
|
|
# Supplemental content may only include certain types of content |
# Supplemental content may only include certain types of content |
|
# Early out if pasted content is not supported in Supplemental area |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
unless (&supp_pasteable($env{'docs.markedcopy_url'})) { |
unless (&supp_pasteable($env{'docs.markedcopy_url'})) { |
return &mt('Paste failed: content type is not supported within Supplemental Content'); |
return (&mt('Paste failed: content type is not supported within Supplemental Content')); |
} |
} |
} |
} |
|
|
# paste resource to end of list |
# Prepare to paste resource at end of list |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); |
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); |
# Maps need to be copied first |
|
my ($oldurl,%removefrommap,%addedmaps,%rewrites,%copies,%dbcopies,%zombies,%params); |
my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove); |
if ($url=~/\.(page|sequence)$/) { |
if ($url=~/\.(page|sequence)$/) { |
# If pasting a map, check if map contains other maps |
$is_map = 1; |
&contained_map_check($url,$folder,\%removefrommap,\%addedmaps); |
} |
if (keys(%addedmaps) > 0) { |
if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) { |
&reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"}); |
$srcdom = $1; |
} |
$srcnum = $2; |
my %allmaps; |
my $oldprefix = $3; |
my $navmap = Apache::lonnavmaps::navmap->new(); |
# When paste buffer was populated using an active role in a different course |
if (defined($navmap)) { |
# check for mdc privilege in the course from which the resource was pasted |
foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { |
if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { |
$allmaps{$res->src()} = 1; |
unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
|
return (&mt('Paste failed: Item is from a different course which you do not have rights to edit.')); |
} |
} |
} |
} |
if ($url=~ m{^/uploaded/}) { |
# When pasting content from Main Content to Supplemental Content and vice versa |
$title=&mt('Copy of').' '.$title; |
# URLs will contain different paths (which depend on whether pasted item is |
|
# a folder/page or a document. |
|
if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) { |
|
$prefixchg = 1; |
|
%before = ( map => 'default', |
|
doc => 'docs'); |
|
%after = ( map => 'supplemental', |
|
doc => 'supplemental' ); |
|
} elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) { |
|
$prefixchg = 1; |
|
%before = ( map => 'supplemental', |
|
doc => 'supplemental'); |
|
%after = ( map => 'default', |
|
doc => 'docs'); |
|
} |
|
|
|
# If pasting an uploaded map, get list of contained uploaded maps. |
|
my @nested; |
|
if ($env{'docs.markedcopy_nested'}) { |
|
my ($type) = ($oldprefix =~ /^(default|supplemental)/); |
|
my @items = split(/\&/,$env{'docs.markedcopy_nested'}); |
|
my @deps = map { /\d+:([\d,]+$)/ } @items; |
|
foreach my $dep (@deps) { |
|
if ($dep =~ /,/) { |
|
push(@nested,split(/,/,$dep)); |
|
} else { |
|
push(@nested,$dep); |
|
} |
|
} |
|
foreach my $item (@nested) { |
|
if ($env{'form.docs.markedcopy_'.$item} eq 'move') { |
|
$tomove{$type.'_'.$item} = 1; |
|
} |
|
} |
} |
} |
my $newid=$$.int(rand(100)).time; |
} |
my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/); |
|
if ($oldid =~ m{^(/uploaded/$match_domain/$match_courseid/)(\D+)(\d+)$}) { |
# Maps need to be copied first |
my $path = $1; |
my ($oldurl,%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies, |
my $prefix = $2; |
%dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls); |
my $ancestor = $3; |
$oldurl = $url; |
if (length($ancestor) > 10) { |
if ($is_map) { |
$ancestor = substr($ancestor,-10,10); |
if ($folder =~ /^default/) { |
} |
my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum); |
$oldid = $path.$prefix.$ancestor; |
if ($lastchange > $env{'request.course.tied'}) { |
my $counter = 0; |
&reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"}); |
my $newurl=$oldid.$newid.'.'.$ext; |
|
my $is_unique = &uniqueness_check($newurl); |
|
if ($allmaps{$newurl}) { |
|
$is_unique = 0; |
|
} |
} |
while (!$is_unique && $allmaps{$newurl} && $counter < 100) { |
} |
$counter ++; |
# If pasting a map, check if map contains other maps |
$newid ++; |
my (%allmaps,%hierarchy,%titles); |
$newurl = $oldid.$newid; |
if ($folder =~ /^default/) { |
$is_unique = &uniqueness_check($newurl); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
} |
if (defined($navmap)) { |
if ($is_unique) { |
foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { |
if ($path =~ m{^/uploaded/($match_domain)/($match_courseid)/$}) { |
$allmaps{$res->src()} = 1; |
my $srcdom = $1; |
} |
my $srcnum = $2; |
} |
if (($srcdom ne $coursedom) && ($srcnum ne $coursenum)) { |
} |
if (&Apache::lonnet::allowed('mdc',$srcdom.'_'.$srcnum)) { |
&contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
&url_paste_fixups($oldid,$ext,$coursedom,$coursenum, |
\%addedmaps,\%hierarchy,\%titles,\%allmaps); |
\%allmaps, \%rewrites,\%copies,\%dbcopies,\%zombies,\%params); |
if ($url=~ m{^/uploaded/}) { |
} else { |
my $newurl; |
return &mt('Paste failed: Item is from a different course which you do not have rights to edit'); |
unless ($env{'form.docs.markedcopy_options'} eq 'move') { |
|
($newurl,my $error) = |
|
&get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum, |
|
$srcdom,$srcnum,\$title,\%allmaps,\%newurls); |
|
if ($error) { |
|
return ($error); |
|
} |
|
if ($newurl ne '') { |
|
if ($newurl ne $url) { |
|
if ($newurl =~ /(?:default|supplemental)_(\d+).(?:sequence|page)$/) { |
|
$newsubdir{$url} = $1; |
} |
} |
|
$mapchanges{$url} = 1; |
} |
} |
} |
} |
} else { |
|
if ($url=~/\.page$/) { |
|
return &mt('Paste failed: an error occurred creating a unique URL for the composite page'); |
|
} else { |
|
return &mt('Paste failed: an error occurred creating a unique URL for the folder'); |
|
} |
|
} |
} |
my $storefn=$newurl; |
if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) || |
$storefn=~s{^/\w+/$match_domain/$match_username/}{}; |
(($newurl ne '') && ($newurl ne $url))) { |
my $paste_map_result = |
unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum, |
&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
\%allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies, |
&Apache::lonnet::getfile($url)); |
\%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove, |
if ($paste_map_result eq '/adm/notfound.html') { |
\%newsubdir,\%newurls)) { |
if ($url=~/\.page$/) { |
$mapmoves{$url} = 1; |
return &mt('Paste failed: an error occurred saving the composite page'); |
|
} else { |
|
return &mt('Paste failed: an error occurred saving the folder'); |
|
} |
} |
|
$url = $newurl; |
|
} elsif ($env{'docs.markedcopy_nested'}) { |
|
&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites, |
|
\%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves, |
|
\%mapchanges,\%tomove,\%newsubdir,\%newurls); |
} |
} |
$url = $newurl; |
|
} elsif ($url=~m {^/res/}) { |
} elsif ($url=~m {^/res/}) { |
# published maps can only exists once, so remove it from paste buffer when done |
# published maps can only exists once, so remove it from paste buffer when done |
&Apache::lonnet::delenv('docs.markedcopy'); |
&Apache::lonnet::delenv('docs.markedcopy'); |
if ($allmaps{$url}) { |
# if pasting published map (main content are only) check map is not already in course |
return &mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.'); |
if ($folder =~ /^default/) { |
|
if ($allmaps{$url}) { |
|
return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.')); |
|
} |
} |
} |
} |
} |
} |
} |
Line 816 sub do_paste_from_buffer {
|
Line 1026 sub do_paste_from_buffer {
|
my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum); |
my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum); |
my $now = time(); |
my $now = time(); |
$db_name =~ s{_\d*$ }{_$now}x; |
$db_name =~ s{_\d*$ }{_$now}x; |
my $result=&Apache::lonnet::put($db_name,\%contents, |
my $dbresult=&Apache::lonnet::put($db_name,\%contents, |
$coursedom,$coursenum); |
$coursedom,$coursenum); |
$url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; |
if ($dbresult eq 'ok') { |
$title=&mt('Copy of').' '.$title; |
$url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; |
|
$title=&mt('Copy of').' '.$title; |
|
} else { |
|
return (&mt('Paste failed: An error occurred when copying the simple page.')); |
|
} |
} |
} |
} |
} |
$title = &LONCAPA::map::qtunescape($title); |
$title = &LONCAPA::map::qtunescape($title); |
my $ext='false'; |
my $ext='false'; |
if ($url=~m{^http(|s)://}) { $ext='true'; } |
if ($url=~m{^http(|s)://}) { $ext='true'; } |
$url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
|
|
|
# For uploaded files (excluding pages/sequences) path in copied file is changed |
|
# if paste is from Main to Supplemental (or vice versa), or if pasting between |
|
# courses. |
|
|
|
my $newidx; |
|
unless ($is_map) { |
# Now insert the URL at the bottom |
# Now insert the URL at the bottom |
my $newidx = &LONCAPA::map::getresidx($url); |
$newidx = &LONCAPA::map::getresidx($url); |
my $relpath; |
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(.+)$}) { |
if (($folder =~ /^supplemental/) && |
my $relpath = $1; |
($url =~ m{^/uploaded/$coursedom/$coursenum/docs/(.+)})) { |
if ($relpath ne '') { |
$relpath = $1; |
my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$}); |
} elsif (($folder =~ /^default/) && |
my ($newloc,$newdocsdir) = ($folder =~ /^(default|supplemental)_?(\d*)/); |
($url =~ m{^/uploaded/$coursedom/$coursenum/supplemental/(.+)})) { |
my $newprefix = $newloc; |
$relpath = $1; |
if ($newloc eq 'default') { |
} |
$newprefix = 'docs'; |
if ($relpath ne '') { |
} |
my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$}); |
if ($newdocsdir eq '') { |
my ($newloc,$newsubdir) = ($folder =~ /^(default|supplemental)_?(\d*)/); |
$newdocsdir = 'default'; |
my $newprefix = $newloc; |
} |
if ($newloc eq 'default') { |
if (($prefixchg) || ($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { |
$newprefix = 'docs'; |
my $newpath = "$newprefix/$newdocsdir/$newidx/$rem"; |
} |
$url = |
if ($newsubdir eq '') { |
&Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath, |
$newsubdir = 'default'; |
&Apache::lonnet::getfile($oldurl)); |
} |
if ($url eq '/adm/notfound.html') { |
my $newpath = "$newprefix/$newsubdir/$newidx/$rem"; |
return (&mt('Paste failed: an error occurred saving the file.')); |
$url = |
} else { |
&Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath, |
my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$}); |
&Apache::lonnet::getfile($url)); |
$newsubpath =~ s{/+$}{/}; |
if ($url eq '/adm/notfound.html') { |
$docmoves{$oldurl} = $newsubpath; |
return &mt('Paste failed: an error occurred saving the file.'); |
} |
} |
} |
} |
} |
my $noparams = 0; |
} |
if ((ref($params{$oldurl}) eq 'HASH') && ($relpath ne '') && ($folder =~ /^supplemental/)) { |
|
$noparams = 1; |
|
} |
} |
&apply_fixups($coursedom,$coursenum,$oldurl,$url,$noparams,\%rewrites,\%copies,\%dbcopies,\%zombies,\%params); |
# Apply any changes to maps, or copy dependencies for uploaded HTML pages |
if ($env{'docs.markedcopy_supplemental'}) { |
my ($result,$save_err); |
if ($folder =~ /^supplemental/) { |
$result = |
$title = $env{'docs.markedcopy_supplemental'}; |
&apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl, |
} else { |
$url,\%removefrommap,\%removeparam,\%rewrites,\%retitles, |
(undef,undef,$title) = |
\%copies,\%dbcopies,\%zombies,\%params,\%docmoves, |
&Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'}); |
\%mapmoves,\%newsubdir,$errors,\%before,\%after); |
|
if ($result eq 'ok') { |
|
if ($is_map) { |
|
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
|
$folder.'.'.$container); |
|
return $errtext if ($fatal); |
|
|
|
if ($#LONCAPA::map::order<1) { |
|
my $idx=&LONCAPA::map::getresidx(); |
|
if ($idx<=0) { $idx=1; } |
|
$LONCAPA::map::order[0]=$idx; |
|
$LONCAPA::map::resources[$idx]=''; |
|
} |
|
$newidx = &LONCAPA::map::getresidx($url); |
} |
} |
} else { |
if ($env{'docs.markedcopy_supplemental'}) { |
if ($folder=~/^supplemental/) { |
if ($folder !~ /^supplemental/) { |
$title=time.'___&&&___'.$env{'user.name'}.'___&&&___'. |
(undef,undef,$title) = |
$env{'user.domain'}.'___&&&___'.$title; |
&Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'}); |
|
} |
|
} else { |
|
if ($folder=~/^supplemental/) { |
|
$title=time.'___&&&___'.$env{'user.name'}.'___&&&___'. |
|
$env{'user.domain'}.'___&&&___'.$title; |
|
} |
} |
} |
} |
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
|
push(@LONCAPA::map::order, $newidx); |
|
|
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
|
push(@LONCAPA::map::order, $newidx); |
|
return 'ok'; |
|
# Store the result |
# Store the result |
|
my ($errtext,$fatal) = |
|
&storemap($coursenum,$coursedom,$folder.'.'.$container,1); |
|
if ($fatal) { |
|
$save_err = $errtext; |
|
} |
|
} |
|
|
|
if ($env{'form.docs.markedcopy_options'} eq 'move') { |
|
&Apache::lonnet::delenv('docs.markedcopy'); |
|
&Apache::lonnet::delenv('docs.markedcopy_nested'); |
|
&Apache::lonnet::delenv('docs.markedcopy_nestednames'); |
|
} |
|
return ($result,$save_err); |
|
} |
|
|
|
sub get_newmap_url { |
|
my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, |
|
$titleref,$allmaps,$newurls) = @_; |
|
my $newurl; |
|
if ($url=~ m{^/uploaded/}) { |
|
$$titleref=&mt('Copy of').' '.$$titleref; |
|
} |
|
my $now = time; |
|
my $suffix=$$.int(rand(100)).$now; |
|
my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/); |
|
if ($oldid =~ m{^(/uploaded/$match_domain/$match_courseid/)(\D+)(\d+)$}) { |
|
my $path = $1; |
|
my $prefix = $2; |
|
my $ancestor = $3; |
|
if (length($ancestor) > 10) { |
|
$ancestor = substr($ancestor,-10,10); |
|
} |
|
my $newid; |
|
if ($prefixchg) { |
|
if ($folder =~ /^supplemental/) { |
|
$prefix =~ s/^default/supplemental/; |
|
} else { |
|
$prefix =~ s/^supplemental/default/; |
|
} |
|
} |
|
if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) { |
|
$newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext; |
|
} else { |
|
$newurl = "/uploaded/$coursedom/$coursenum/$prefix".$now.'.'.$ext; |
|
} |
|
my $counter = 0; |
|
my $is_unique = &uniqueness_check($newurl); |
|
if ($folder =~ /^default/) { |
|
if ($allmaps->{$newurl}) { |
|
$is_unique = 0; |
|
} |
|
} |
|
while ((!$is_unique || $allmaps->{$newurl} || $newurls->{$newurl}) && ($counter < 100)) { |
|
$counter ++; |
|
$suffix ++; |
|
if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) { |
|
$newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext; |
|
} else { |
|
$newurl = "/uploaded/$coursedom/$coursenum/$prefix".$ancestor.$suffix.'.'.$ext; |
|
} |
|
$is_unique = &uniqueness_check($newurl); |
|
} |
|
if ($is_unique) { |
|
$newurls->{$newurl} = 1; |
|
} else { |
|
if ($url=~/\.page$/) { |
|
return (undef,&mt('Paste failed: an error occurred creating a unique URL for the composite page')); |
|
} else { |
|
return (undef,&mt('Paste failed: an error occurred creating a unique URL for the folder')); |
|
} |
|
} |
|
} |
|
return ($newurl); |
} |
} |
|
|
sub dbcopy { |
sub dbcopy { |
Line 911 sub uniqueness_check {
|
Line 1220 sub uniqueness_check {
|
} |
} |
|
|
sub contained_map_check { |
sub contained_map_check { |
my ($url,$folder,$removefrommap,$addedmaps) = @_; |
my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles, |
|
$allmaps) = @_; |
my $content = &Apache::lonnet::getfile($url); |
my $content = &Apache::lonnet::getfile($url); |
unless ($content eq '-1') { |
unless ($content eq '-1') { |
my $parser = HTML::TokeParser->new(\$content); |
my $parser = HTML::TokeParser->new(\$content); |
Line 923 sub contained_map_check {
|
Line 1233 sub contained_map_check {
|
my $ressrc = $token->[2]->{'src'}; |
my $ressrc = $token->[2]->{'src'}; |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
unless (&supp_pasteable($ressrc)) { |
unless (&supp_pasteable($ressrc)) { |
$removefrommap->{$url}{$token->[2]->{'id'}}; |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
next; |
next; |
} |
} |
} |
} |
if ($ressrc =~ /\.(sequence|page)$/) { |
if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { |
if (ref($addedmaps->{$ressrc}) eq 'ARRAY') { |
if ($1 eq 'uploaded') { |
push(@{$addedmaps->{$ressrc}},$url); |
$hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
$titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'}; |
} else { |
} else { |
$addedmaps->{$ressrc} = [$url]; |
if ($allmaps->{$ressrc}) { |
|
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
} elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') { |
|
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
} else { |
|
$addedmaps->{$ressrc} = [$url]; |
|
} |
} |
} |
&contained_map_check($ressrc,$folder,$removefrommap,$addedmaps); |
&contained_map_check($ressrc,$folder,$removefrommap,$removeparam, |
|
$addedmaps,$hierarchy,$titles,$allmaps); |
} |
} |
} elsif ($token->[1] !~ /^resource|map|link$/) { |
} elsif ($token->[1] eq 'param') { |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
$removefrommap->{$url}{$token->[1]}; |
if (ref($removeparam->{$url}{$token->[2]->{'to'}}) eq 'ARRAY') { |
|
push(@{$removeparam->{$url}{$token->[2]->{'to'}}},$token->[2]->{'name'}); |
|
} else { |
|
$removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}]; |
|
} |
} |
} |
} |
} |
} |
} |
Line 955 sub reinit_role {
|
Line 1277 sub reinit_role {
|
} |
} |
|
|
sub url_paste_fixups { |
sub url_paste_fixups { |
my ($oldurl,$ext,$cdom,$cnum,$allmaps,$rewrites,$copies,$dbcopies,$zombies,$params) = @_; |
my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies, |
my $file = &Apache::lonnet::getfile("$oldurl.$ext"); |
$dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_; |
|
my $checktitle; |
|
if (($prefixchg) && |
|
($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) { |
|
$checktitle = 1; |
|
} |
|
my $skip; |
|
if ($oldurl =~ m{^\Q/uploaded/$cdom/$cnum/\E(default|supplemental)(_?\d*)\.(?:page|sequence)$}) { |
|
my $mapid = $1.$2; |
|
if ($tomove->{$mapid}) { |
|
$skip = 1; |
|
} |
|
} |
|
my $file = &Apache::lonnet::getfile($oldurl); |
return if ($file eq '-1'); |
return if ($file eq '-1'); |
my $parser = HTML::TokeParser->new(\$file); |
my $parser = HTML::TokeParser->new(\$file); |
$parser->attr_encoded(1); |
$parser->attr_encoded(1); |
|
my $changed = 0; |
while (my $token = $parser->get_token) { |
while (my $token = $parser->get_token) { |
next if ($token->[0] ne 'S'); |
next if ($token->[0] ne 'S'); |
if ($token->[1] eq 'resource') { |
if ($token->[1] eq 'resource') { |
my $ressrc = $token->[2]->{'src'}; |
my $ressrc = $token->[2]->{'src'}; |
next if ($ressrc eq ''); |
next if ($ressrc eq ''); |
next if ($token->[2]->{'type'} eq 'external'); |
|
my $id = $token->[2]->{'id'}; |
my $id = $token->[2]->{'id'}; |
|
my $title = $token->[2]->{'title'}; |
|
if ($checktitle) { |
|
if ($title =~ m{\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) { |
|
$retitles->{$oldurl}{$ressrc} = $id; |
|
} |
|
} |
|
next if ($token->[2]->{'type'} eq 'external'); |
if ($token->[2]->{'type'} eq 'zombie') { |
if ($token->[2]->{'type'} eq 'zombie') { |
|
next if ($skip); |
$zombies->{$oldurl}{$ressrc} = $id; |
$zombies->{$oldurl}{$ressrc} = $id; |
} elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)}) { |
$changed = 1; |
my $srccdom = $1; |
} elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { |
my $srccnum = $2; |
my $srcdom = $1; |
|
my $srcnum = $2; |
my $rem = $3; |
my $rem = $3; |
if (($srccdom ne $cdom) || ($srccnum ne $cnum)) { |
my $newurl; |
|
my $mapname; |
|
if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) { |
|
my $prefix = $1; |
|
$mapname = $prefix.$2; |
|
if ($tomove->{$mapname}) { |
|
&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps, |
|
$rewrites,$retitles,$copies,$dbcopies,$zombies, |
|
$params,$mapmoves,$mapchanges,$tomove,$newsubdir, |
|
$newurls); |
|
next; |
|
} else { |
|
($newurl,my $error) = |
|
&get_newmap_url($ressrc,$folder,$prefixchg,$cdom,$cnum, |
|
$srcdom,$srcnum,\$title,$allmaps,$newurls); |
|
if ($newurl =~ /(?:default|supplemental)_(\d+)\.(?:sequence|page)$/) { |
|
$newsubdir->{$ressrc} = $1; |
|
} |
|
if ($error) { |
|
next; |
|
} |
|
} |
|
} |
|
if (($srcdom ne $cdom) || ($srcnum ne $cnum) || ($prefixchg) || |
|
($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) { |
|
|
if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) { |
if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) { |
$rewrites->{$oldurl}{$ressrc} = $id; |
$rewrites->{$oldurl}{$ressrc} = $id; |
&url_paste_fixups($ressrc,$3,$cdom,$cnum,$allmaps,$rewrites,$copies,$dbcopies,$zombies,$params); |
$mapchanges->{$ressrc} = 1; |
|
unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps, |
|
$rewrites,$retitles,$copies,$dbcopies,$zombies, |
|
$params,$mapmoves,$mapchanges,$tomove,$newsubdir, |
|
$newurls)) { |
|
$mapmoves->{$ressrc} = 1; |
|
} |
|
$changed = 1; |
} else { |
} else { |
|
$rewrites->{$oldurl}{$ressrc} = $id; |
$copies->{$oldurl}{$ressrc} = $id; |
$copies->{$oldurl}{$ressrc} = $id; |
|
$changed = 1; |
} |
} |
} |
} |
} elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) { |
} elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) { |
my $srccdom = $1; |
next if ($skip); |
my $srccnum = $2; |
my $srcdom = $1; |
if (($srccdom ne $cdom) || ($srccnum ne $cnum)) { |
my $srcnum = $2; |
|
if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
$rewrites->{$oldurl}{$ressrc} = $id; |
$rewrites->{$oldurl}{$ressrc} = $id; |
$dbcopies->{$oldurl}{$ressrc} = $id; |
$dbcopies->{$oldurl}{$ressrc} = $id; |
|
$changed = 1; |
} |
} |
} elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) { |
} elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) { |
my $srccdom = $1; |
next if ($skip); |
my $srccnum = $2; |
my $srcdom = $1; |
if (($srccdom ne $cdom) || ($srccnum ne $cnum)) { |
my $srcnum = $2; |
|
if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
$rewrites->{$oldurl}{$ressrc} = $id; |
$rewrites->{$oldurl}{$ressrc} = $id; |
$dbcopies->{$oldurl}{$ressrc} = $id; |
$dbcopies->{$oldurl}{$ressrc} = $id; |
|
$changed = 1; |
} |
} |
} |
} |
} elsif ($token->[1] eq 'param') { |
} elsif ($token->[1] eq 'param') { |
|
next if ($skip); |
my $to = $token->[2]->{'to'}; |
my $to = $token->[2]->{'to'}; |
if ($to ne '') { |
if ($to ne '') { |
if (ref($params->{$oldurl}{$to}) eq 'ARRAY') { |
if (ref($params->{$oldurl}{$to}) eq 'ARRAY') { |
push (@{$params->{$oldurl}{$to}},$token->[2]->{'name'}); |
push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'}); |
} else { |
} else { |
@{$params->{$oldurl}{$to}} = ($token->[2]->{'name'}); |
@{$params->{$oldurl}{$to}} = ($token->[2]->{'name'}); |
} |
} |
} |
} |
} |
} |
} |
} |
return; |
return $changed; |
} |
} |
|
|
sub apply_fixups { |
sub apply_fixups { |
my ($cdom,$cnum,$oldurl,$url,$noparams,$rewrites,$copies,$dbcopies,$zombies,$params) = @_; |
my ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap, |
my (%newdb,%newdoc); |
$removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params, |
if (ref($dbcopies->{$oldurl}) eq 'HASH') { |
$docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_; |
foreach my $item (keys(%{$dbcopies->{$oldurl}})) { |
foreach my $key (keys(%{$copies}),keys(%{$docmoves})) { |
$newdb{$item} = &dbcopy($item); |
my @allcopies; |
} |
if (ref($copies->{$key}) eq 'HASH') { |
} |
my %added; |
if (ref($copies->{$oldurl}) eq 'HASH') { |
foreach my $innerkey (keys(%{$copies->{$key}})) { |
foreach my $item (keys(%{$copies->{$oldurl}})) { |
if (($innerkey ne '') && (!$added{$innerkey})) { |
my $content = &Apache::lonnet::getfile($item); |
push(@allcopies,$innerkey); |
my $newcontent; |
$added{$innerkey} = 1; |
unless ($content eq '-1') { |
} |
my $mm = new File::MMagic; |
} |
my $mimetype = $mm->checktype_contents($content); |
undef(%added); |
if ($mimetype eq 'text/html') { |
} |
my (%allfiles,%codebase,$state); |
if ($key eq $oldurl) { |
my ($embedded,$num,$delnum) = |
if ((exists($docmoves->{$key}))) { |
&Apache::loncommon::ask_for_embedded_content( |
unless (grep(/^\Q$oldurl\E/,@allcopies)) { |
'/adm/dependencies',$state,\%allfiles,\%codebase, |
push(@allcopies,$oldurl); |
{'error_on_invalid_names' => 1, |
} |
'ignore_remote_references' => 1, |
} |
'docs_url' => $oldurl}); |
} |
if ($embedded) { |
if (@allcopies > 0) { |
#FIXME Need to check for dependencies and copy and update refs. |
foreach my $item (@allcopies) { |
|
my ($relpath,$oldsubdir,$fname) = |
|
($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(default|\d+)/.*/)([^/]+)$}); |
|
if ($fname ne '') { |
|
my $content = &Apache::lonnet::getfile($item); |
|
unless ($content eq '-1') { |
|
my $storefn; |
|
if (($key eq $oldurl) && (ref($docmoves) eq 'HASH') && (exists($docmoves->{$key}))) { |
|
$storefn = $docmoves->{$key}; |
|
} else { |
|
$storefn = $relpath; |
|
$storefn =~s{^/uploaded/$match_domain/$match_courseid/}{}; |
|
if ($prefixchg) { |
|
$storefn =~ s/^\Q$before->{'doc'}\E/$after->{'doc'}/; |
|
} |
|
if ($newsubdir->{$key}) { |
|
$storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir->{$key}#; |
|
} |
|
} |
|
©_dependencies($item,$storefn,$relpath,$errors,\$content); |
|
my $copyurl = |
|
&Apache::lonclonecourse::writefile($env{'request.course.id'}, |
|
$storefn.$fname,$content); |
|
if ($copyurl eq '/adm/notfound.html') { |
|
if ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) { |
|
return &mt('Paste failed: an error occurred copying the file.'); |
|
} elsif (ref($errors) eq 'HASH') { |
|
$errors->{$item} = 1; |
|
} |
|
} |
} |
} |
$newcontent = $content; |
|
} else { |
|
$newcontent = $content; |
|
} |
} |
my $storefn=$item; |
|
$storefn=~s{^/\w+/$match_domain/$match_courseid/}{}; |
|
$newdoc{$item} = &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,$newcontent); |
|
} |
} |
} |
} |
} |
} |
if (((ref($rewrites->{$oldurl}) eq 'HASH') || (ref($zombies->{$oldurl}) eq 'HASH')) || |
foreach my $key (keys(%{$mapmoves})) { |
($noparams) || (keys(%newdb) > 0) || (keys(%newdoc) > 0)) { |
my $storefn=$key; |
my $map = &Apache::lonnet::getfile($url); |
$storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
my $newcontent; |
if ($prefixchg) { |
unless ($map eq '-1') { |
$storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/; |
my $parser = HTML::TokeParser->new(\$map); |
} |
$parser->attr_encoded(1); |
if ($newsubdir->{$key}) { |
while (my $token = $parser->get_token) { |
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/; |
if ($token->[0] eq 'S') { |
} |
next if ($token->[2]->{'type'} eq 'zombie'); |
my $mapcontent = &Apache::lonnet::getfile($key); |
next if (($token->[1] eq 'param') && $noparams); |
if ($mapcontent eq '-1') { |
if ($token->[1] eq 'resource') { |
if (ref($errors) eq 'HASH') { |
my $src = $token->[2]->{'src'}; |
$errors->{$key} = 1; |
my $id = $token->[2]->{'id'}; |
} |
if (($rewrites->{$oldurl}{$src} eq $id) || ($newdb{$src} ne '') |
} else { |
|| ($newdoc{$src} ne '')) { |
my $newmap = |
if (ref($rewrites->{$oldurl}) eq 'HASH') { |
&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
if ($rewrites->{$oldurl}{$src} eq $id) { |
$mapcontent); |
$token->[2]->{'src'} =~ s{^(/uploaded|adm|public)/$match_domain/$match_courseid/}{$1/$cdom/$cnum}; |
if ($newmap eq '/adm/notfound.html') { |
|
if (ref($errors) eq 'HASH') { |
|
$errors->{$key} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my %updates; |
|
if ($is_map) { |
|
foreach my $key (keys(%{$rewrites})) { |
|
$updates{$key} = 1; |
|
} |
|
foreach my $key (keys(%{$zombies})) { |
|
$updates{$key} = 1; |
|
} |
|
foreach my $key (keys(%{$removefrommap})) { |
|
$updates{$key} = 1; |
|
} |
|
foreach my $key (keys(%{$removeparam})) { |
|
$updates{$key} = 1; |
|
} |
|
foreach my $key (keys(%{$dbcopies})) { |
|
$updates{$key} = 1; |
|
} |
|
foreach my $key (keys(%{$retitles})) { |
|
$updates{$key} = 1; |
|
} |
|
foreach my $key (keys(%updates)) { |
|
my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
|
if (ref($rewrites->{$key}) eq 'HASH') { |
|
%torewrite = %{$rewrites->{$key}}; |
|
} |
|
if (ref($retitles->{$key}) eq 'HASH') { |
|
%toretitle = %{$retitles->{$key}}; |
|
} |
|
if (ref($removefrommap->{$key}) eq 'HASH') { |
|
%toremove = %{$removefrommap->{$key}}; |
|
} |
|
if (ref($removeparam->{$key}) eq 'HASH') { |
|
%remparam = %{$removeparam->{$key}}; |
|
} |
|
if (ref($zombies->{$key}) eq 'HASH') { |
|
%zombie = %{$zombies->{$key}}; |
|
} |
|
if (ref($dbcopies->{$key}) eq 'HASH') { |
|
foreach my $item (keys(%{$dbcopies->{$key}})) { |
|
$newdb{$item} = &dbcopy($item); |
|
} |
|
} |
|
if (ref($params->{$key}) eq 'HASH') { |
|
%currparam = %{$params->{$key}}; |
|
} |
|
my ($errtext,$fatal) = &LONCAPA::map::mapread($key); |
|
if ($fatal) { |
|
return $errtext; |
|
} |
|
for (my $i=0; $i<@LONCAPA::map::zombies; $i++) { |
|
if (defined($LONCAPA::map::zombies[$i])) { |
|
my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::zombies[$i]); |
|
if ($zombie{$src} eq $i) { |
|
undef($LONCAPA::map::zombies[$i]); |
|
} |
|
} |
|
} |
|
for (my $i=0; $i<@LONCAPA::map::resources; $i++) { |
|
if (defined($LONCAPA::map::resources[$i])) { |
|
my $changed; |
|
my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]); |
|
if ($toremove{$src} eq $i) { |
|
splice(@LONCAPA::map::order,$i,1); |
|
if (ref($currparam{$i}) eq 'ARRAY') { |
|
foreach my $name (@{$currparam{$i}}) { |
|
&LONCAPA::map::delparameter($i,'parameter_'.$name); |
|
} |
|
} |
|
next; |
|
} |
|
my $origsrc = $src; |
|
if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) { |
|
if ($title =~ m{^\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) { |
|
$changed = 1; |
|
} |
|
} |
|
if ((exists($torewrite{$src})) && ($torewrite{$src} eq $i)) { |
|
$src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/}; |
|
if ($origsrc =~ m{^/uploaded/}) { |
|
if ($prefixchg) { |
|
if ($src =~ /\.(page|sequence)$/) { |
|
$src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'map'}\E#$1$after->{'map'}#; |
|
} else { |
|
$src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'doc'}\E#$1$after->{'doc'}#; |
} |
} |
} elsif ($newdb{$src} ne '') { |
|
$token->[2]->{'src'} = $newdb{$src}; |
|
} |
} |
$newcontent .= "<$token->[1] "; |
if ($newsubdir->{$origsrc}) { |
foreach my $attr (@{$token->[3]}) { |
if ($src =~ /\.(page|sequence)$/) { |
$newcontent .= ' '.$attr.'="'.$token->[2]->{$attr},'"' |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir->{$origsrc}#; |
|
} else { |
|
$src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir->{$origsrc}#; |
|
} |
|
} |
|
} |
|
$changed = 1; |
|
} elsif ($newdb{$src} ne '') { |
|
$src = $newdb{$src}; |
|
$changed = 1; |
|
} |
|
if ($changed) { |
|
$LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type)); |
|
} |
|
} |
|
} |
|
foreach my $idx (keys(%remparam)) { |
|
if (ref($remparam{$idx}) eq 'ARRAY') { |
|
foreach my $name (@{$remparam{$idx}}) { |
|
&LONCAPA::map::delparameter($idx,'parameter_'.$name); |
|
} |
|
} |
|
} |
|
my $storefn; |
|
if ($key eq $oldurl) { |
|
$storefn = $url; |
|
$storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
|
} else { |
|
$storefn = $key; |
|
$storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
|
if ($prefixchg) { |
|
$storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/; |
|
} |
|
if ($newsubdir->{$key}) { |
|
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/; |
|
} |
|
} |
|
my $report; |
|
if ($folder !~ /^supplemental/) { |
|
$report = 1; |
|
} |
|
my ($outtext,$errtext) = |
|
&LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report); |
|
if ($errtext) { |
|
return &mt('Paste failed: an error occurred saving the folder or page.'); |
|
} |
|
} |
|
} |
|
return 'ok'; |
|
} |
|
|
|
sub copy_dependencies { |
|
my ($item,$storefn,$relpath,$errors,$contentref) = @_; |
|
my $content; |
|
if (ref($contentref)) { |
|
$content = $$contentref; |
|
} else { |
|
$content = &Apache::lonnet::getfile($item); |
|
} |
|
unless ($content eq '-1') { |
|
my $mm = new File::MMagic; |
|
my $mimetype = $mm->checktype_contents($content); |
|
if ($mimetype eq 'text/html') { |
|
my (%allfiles,%codebase,$state); |
|
my $res = &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,\$content); |
|
if ($res eq 'ok') { |
|
my ($numexisting,$numpathchanges,$existing); |
|
(undef,$numexisting,$numpathchanges,$existing) = |
|
&Apache::loncommon::ask_for_embedded_content( |
|
'/adm/coursedocs',$state,\%allfiles,\%codebase, |
|
{'error_on_invalid_names' => 1, |
|
'ignore_remote_references' => 1, |
|
'docs_url' => $item, |
|
'context' => 'paste'}); |
|
if ($numexisting > 0) { |
|
if (ref($existing) eq 'HASH') { |
|
foreach my $dep (keys(%{$existing})) { |
|
my $depfile = $dep; |
|
unless ($depfile =~ m{^\Q$relpath\E}) { |
|
$depfile = $relpath.$dep; |
|
} |
|
my $depcontent = &Apache::lonnet::getfile($depfile); |
|
unless ($depcontent eq '-1') { |
|
my $storedep = $dep; |
|
$storedep =~ s{^\Q$relpath\E}{}; |
|
my $dep_url = |
|
&Apache::lonclonecourse::writefile( |
|
$env{'request.course.id'}, |
|
$storefn.$storedep,$depcontent); |
|
if ($dep_url eq '/adm/notfound.html') { |
|
if (ref($errors) eq 'HASH') { |
|
$errors->{$depfile} = 1; |
|
} |
|
} else { |
|
©_dependencies($depfile,$storefn,$relpath,$errors,\$depcontent); |
|
} |
} |
} |
$newcontent .= ' />'; |
|
} else { |
|
$newcontent .= $token->[4]."\n"; |
|
} |
} |
} |
} |
} elsif ($token->[0] eq 'E') { |
|
$newcontent .= $token->[2]."\n"; |
|
} |
} |
} |
} |
} |
} |
my $storefn=$url; |
|
$storefn=~s{^/\w+/$match_domain/$match_courseid/}{}; |
|
my $storeres = |
|
&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
|
$newcontent); |
|
} |
} |
return; |
return; |
} |
} |
Line 1212 sub editor {
|
Line 1791 sub editor {
|
} |
} |
|
|
if ($env{'form.pastemarked'}) { |
if ($env{'form.pastemarked'}) { |
my $paste_res = |
my %paste_errors; |
&do_paste_from_buffer($coursenum,$coursedom,$folder); |
my ($paste_res,$save_error) = |
if ($paste_res eq 'ok') { |
&do_paste_from_buffer($coursenum,$coursedom,$folder,$container, |
($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); |
\%paste_errors); |
return $errtext if ($fatal); |
if ($save_error ne '') { |
} elsif ($paste_res ne '') { |
return $save_error; |
|
} |
|
if ($paste_res ne 'ok') { |
$r->print('<p><span class="LC_error">'.$paste_res.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$paste_res.'</span></p>'); |
} |
} |
|
if (keys(%paste_errors) > 0) { |
|
$r->print('<p span class="LC_warning">'."\n". |
|
&mt('The following files are either dependencies of a web page or references within a folder and/or composite page which could not be copied during the paste operation:')."\n". |
|
'<ul>'."\n"); |
|
foreach my $key (sort(keys(%paste_errors))) { |
|
$r->print('<li>'.$key.'</li>'."\n"); |
|
} |
|
$r->print('</ul></p>'."\n"); |
|
} |
} |
} |
|
|
$r->print($upload_output); |
$r->print($upload_output); |
|
|
if (&handle_edit_cmd()) { |
if (&handle_edit_cmd()) { |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
my $contentchg; |
|
if ($env{'form.cmd'} =~ /^(del|cut)_/) { |
|
$contentchg = 1; |
|
} |
|
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
return $errtext if ($fatal); |
return $errtext if ($fatal); |
} |
} |
# Group import/search |
# Group import/search |
Line 1252 sub editor {
|
Line 1846 sub editor {
|
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; |
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; |
} |
} |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
$folder.'.'.$container); |
$folder.'.'.$container,1); |
return $errtext if ($fatal); |
return $errtext if ($fatal); |
} else { |
} else { |
$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); |
Line 1344 sub editor {
|
Line 1938 sub editor {
|
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
$r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto, |
$r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto, |
$readfile)); |
$readfile)); |
&print_paste_buffer($r,$container,$folder); |
&print_paste_buffer($r,$container,$folder,$coursedom,$coursenum); |
} else { |
} else { |
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
#Function Box for Supplemental Content for users with mdc priv. |
#Function Box for Supplemental Content for users with mdc priv. |
Line 1432 sub process_file_upload {
|
Line 2026 sub process_file_upload {
|
$comment.':'.$url.':'.$ext.':normal:res'; |
$comment.':'.$url.':'.$ext.':normal:res'; |
$LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx; |
$LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx; |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
$folder.'.'.$container); |
$folder.'.'.$container,1); |
if ($fatal) { |
if ($fatal) { |
$$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>'; |
$$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>'; |
return; |
return; |
Line 1590 sub entryline {
|
Line 2184 sub entryline {
|
'cp' => 'Copy'); |
'cp' => 'Copy'); |
my $nocopy=0; |
my $nocopy=0; |
my $nocut=0; |
my $nocut=0; |
if ($url=~/\.(page|sequence)$/) { |
if ($url=~ m{^/res/.+\.(page|sequence)$}) { |
if ($url =~ m{/res/}) { |
# no copy for published maps |
# no copy for published maps |
$nocopy=1; |
$nocopy = 1; |
|
} else { |
|
foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) { |
|
my ($title,$url,$ext,$type)=split(/\:/,$item); |
|
if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) { |
|
$nocopy=1; |
|
last; |
|
} |
|
} |
|
} |
|
} |
} |
if ($url=~/^\/res\/lib\/templates\//) { |
if ($url=~/^\/res\/lib\/templates\//) { |
$nocopy=1; |
$nocopy=1; |
Line 2224 ENDHEADERS
|
Line 2808 ENDHEADERS
|
'<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'. |
'<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'. |
'</b>'); |
'</b>'); |
foreach my $key (sort(keys(%changes))) { |
foreach my $key (sort(keys(%changes))) { |
if ($changes{$key}>$starttime) { |
#excludes not versionable problems from resource version history: |
|
if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) { |
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
my $currentversion=&Apache::lonnet::getversion($key); |
my $currentversion=&Apache::lonnet::getversion($key); |
if ($currentversion<0) { |
if ($currentversion<0) { |
Line 2753 sub handler {
|
Line 3338 sub handler {
|
onload => "javascript:resize_scrollbox('contentscroll','1','1');", |
onload => "javascript:resize_scrollbox('contentscroll','1','1');", |
}; |
}; |
} |
} |
|
if ($env{'docs.markedcopy_url'}) { |
|
$script .= &paste_popup_js(); |
|
} |
} |
} |
# -------------------------------------------------------------------- Body tag |
# -------------------------------------------------------------------- Body tag |
$script = '<script type="text/javascript">'."\n" |
$script = '<script type="text/javascript">'."\n" |
Line 2940 ERFORM
|
Line 3528 ERFORM
|
|
|
|
|
if ($allowed) { |
if ($allowed) { |
&update_paste_buffer($coursenum,$coursedom); |
my $folder = $env{'form.folder'}; |
|
if ($folder eq '') { |
|
$folder='default'; |
|
} |
|
&update_paste_buffer($coursenum,$coursedom,$folder); |
$r->print(<<HIDDENFORM); |
$r->print(<<HIDDENFORM); |
<form name="renameform" method="post" action="/adm/coursedocs"> |
<form name="renameform" method="post" action="/adm/coursedocs"> |
<input type="hidden" name="title" /> |
<input type="hidden" name="title" /> |
Line 3409 sub decompression_phase_one {
|
Line 4001 sub decompression_phase_one {
|
my ($dir,$file,$warning,$error,$output); |
my ($dir,$file,$warning,$error,$output); |
my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)= |
my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)= |
&decompression_info(); |
&decompression_info(); |
if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default|supplemental|\d+).*/([^/]+)$}) { |
if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/\E(?:docs|supplemental)/(?:default|\d+).*/([^/]+)$}) { |
$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); |
$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); |
} else { |
} else { |
my $file = $1; |
my $file = $1; |
Line 3464 sub remove_archive {
|
Line 4056 sub remove_archive {
|
my ($title,$url,@rrest) = |
my ($title,$url,@rrest) = |
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]); |
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]); |
if (&handle_edit_cmd($docuname,$docudom)) { |
if (&handle_edit_cmd($docuname,$docudom)) { |
($errtext,$fatal) = &storemap($docuname,$docudom,$map); |
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
if ($fatal) { |
if ($fatal) { |
if ($container eq 'page') { |
if ($container eq 'page') { |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
Line 4180 Return hash with valid author names
|
Line 4772 Return hash with valid author names
|
|
|
=item do_paste_from_buffer() |
=item do_paste_from_buffer() |
|
|
|
=item get_newmap_url() |
|
|
|
=item dbcopy() |
|
|
|
=item uniqueness_check() |
|
|
|
=item contained_map_check() |
|
|
|
=item reinit_role() |
|
|
|
=item url_paste_fixups() |
|
|
|
=item apply_fixups() |
|
|
|
=item copy_dependencies() |
|
|
=item update_parameter() |
=item update_parameter() |
|
|
=item handle_edit_cmd() |
=item handle_edit_cmd() |