version 1.520, 2012/12/04 00:39:48
|
version 1.531, 2013/01/10 17:10:30
|
Line 40 use Apache::lonxml;
|
Line 40 use Apache::lonxml;
|
use Apache::lonclonecourse; |
use Apache::lonclonecourse; |
use Apache::lonnavmaps; |
use Apache::lonnavmaps; |
use Apache::lonnavdisplay(); |
use Apache::lonnavdisplay(); |
use Apache::lonuserstate(); |
|
use Apache::lonextresedit(); |
use Apache::lonextresedit(); |
use HTML::Entities; |
use HTML::Entities; |
use HTML::TokeParser; |
use HTML::TokeParser; |
Line 153 sub dumpcourse {
|
Line 152 sub dumpcourse {
|
$r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
return ''; |
return ''; |
} |
} |
my ($ca,$cd)=split(/\@/,$env{'form.authorspace'}); |
my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); |
$r->print('<h3>'.&mt('Copying Files').'</h3>'); |
$r->print('<h3>'.&mt('Copying Files').'</h3>'); |
my $title=$env{'form.authorfolder'}; |
my $title=$env{'form.authorfolder'}; |
$title=&clean($title); |
$title=&clean($title); |
Line 271 sub dumpcourse {
|
Line 270 sub dumpcourse {
|
|
|
sub group_import { |
sub group_import { |
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; |
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; |
|
my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, |
|
%removeparam,$importuploaded,$fixuperrors); |
|
$allmaps = {}; |
while (@files) { |
while (@files) { |
my ($name, $url, $residx) = @{ shift(@files) }; |
my ($name, $url, $residx) = @{ shift(@files) }; |
if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) |
if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) |
Line 297 sub group_import {
|
Line 298 sub group_import {
|
} |
} |
} |
} |
if ($url) { |
if ($url) { |
|
if (($caller eq 'londocs') && |
|
($folder =~ /^default/)) { |
|
unless ($donechk) { |
|
my $chome = &Apache::lonnet::homeserver($coursenum,$coursedom); |
|
my $cid = $coursedom.'_'.$coursenum; |
|
$allmaps = |
|
&Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
|
$chome,$cid); |
|
$donechk = 1; |
|
} |
|
if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) { |
|
&contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
|
\%addedmaps,\%hierarchy,\%titles,$allmaps); |
|
$importuploaded = 1; |
|
} elsif ($url =~ m{^/res/.+\.(page|sequence)$}) { |
|
next if ($allmaps->{$url}); |
|
} |
|
} |
if (!$residx |
if (!$residx |
|| defined($LONCAPA::map::zombies[$residx])) { |
|| defined($LONCAPA::map::zombies[$residx])) { |
$residx = &LONCAPA::map::getresidx($url,$residx); |
$residx = &LONCAPA::map::getresidx($url,$residx); |
Line 310 sub group_import {
|
Line 329 sub group_import {
|
join(':', ($name, $url, $ext, 'normal', 'res')); |
join(':', ($name, $url, $ext, 'normal', 'res')); |
} |
} |
} |
} |
return &storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
if ($importuploaded) { |
|
my %import_errors; |
|
my %updated = ( |
|
removefrommap => \%removefrommap, |
|
removeparam => \%removeparam, |
|
); |
|
&apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated); |
|
if (keys(%import_errors) > 0) { |
|
$fixuperrors = |
|
'<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 for which errors occurred during import:')."\n". |
|
'<ul>'."\n"; |
|
foreach my $key (sort(keys(%import_errors))) { |
|
$fixuperrors .= '<li>'.$key.'</li>'."\n"; |
|
} |
|
$fixuperrors .= '</ul></p>'."\n"; |
|
} |
|
} |
|
my ($errtext,$fatal) = |
|
&storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
|
return ($errtext,$fatal,$fixuperrors); |
} |
} |
|
|
sub log_docs { |
sub log_docs { |
Line 651 sub print_paste_buffer {
|
Line 690 sub print_paste_buffer {
|
$is_external = 1; |
$is_external = 1; |
} |
} |
|
|
my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map); |
my ($canpaste,$nopaste,$othercrs,$areachange); |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
$canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); |
$canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); |
unless ($canpaste) { |
unless ($canpaste) { |
Line 895 sub do_paste_from_buffer {
|
Line 934 sub do_paste_from_buffer {
|
%dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls); |
%dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls); |
$oldurl = $url; |
$oldurl = $url; |
if ($is_map) { |
if ($is_map) { |
if ($folder =~ /^default/) { |
|
my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum); |
|
if ($lastchange > $env{'request.course.tied'}) { |
|
&reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"}); |
|
} |
|
} |
|
# If pasting a map, check if map contains other maps |
# If pasting a map, check if map contains other maps |
my (%allmaps,%hierarchy,%titles); |
my ($allmaps,%hierarchy,%titles); |
|
$allmaps = {}; |
if ($folder =~ /^default/) { |
if ($folder =~ /^default/) { |
my $navmap = Apache::lonnavmaps::navmap->new(); |
$allmaps = |
if (defined($navmap)) { |
&Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { |
$env{"course.$env{'request.course.id'}.home"}, |
$allmaps{$res->src()} = 1; |
$env{'request.course.id'}); |
} |
|
} |
|
} |
} |
&contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
&contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
\%addedmaps,\%hierarchy,\%titles,\%allmaps); |
\%addedmaps,\%hierarchy,\%titles,$allmaps); |
if ($url=~ m{^/uploaded/}) { |
if ($url=~ m{^/uploaded/}) { |
my $newurl; |
my $newurl; |
unless ($env{'form.docs.markedcopy_options'} eq 'move') { |
unless ($env{'form.docs.markedcopy_options'} eq 'move') { |
($newurl,my $error) = |
($newurl,my $error) = |
&get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum, |
&get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum, |
$srcdom,$srcnum,\$title,\%allmaps,\%newurls); |
$srcdom,$srcnum,\$title,$allmaps,\%newurls); |
if ($error) { |
if ($error) { |
return ($error); |
return ($error); |
} |
} |
Line 934 sub do_paste_from_buffer {
|
Line 966 sub do_paste_from_buffer {
|
if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) || |
if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) || |
(($newurl ne '') && ($newurl ne $url))) { |
(($newurl ne '') && ($newurl ne $url))) { |
unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum, |
unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum, |
\%allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies, |
$allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies, |
\%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove, |
\%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove, |
\%newsubdir,\%newurls)) { |
\%newsubdir,\%newurls)) { |
$mapmoves{$url} = 1; |
$mapmoves{$url} = 1; |
} |
} |
$url = $newurl; |
$url = $newurl; |
} elsif ($env{'docs.markedcopy_nested'}) { |
} elsif ($env{'docs.markedcopy_nested'}) { |
&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites, |
&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,$allmaps,\%rewrites, |
\%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves, |
\%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves, |
\%mapchanges,\%tomove,\%newsubdir,\%newurls); |
\%mapchanges,\%tomove,\%newsubdir,\%newurls); |
} |
} |
Line 950 sub do_paste_from_buffer {
|
Line 982 sub do_paste_from_buffer {
|
&Apache::lonnet::delenv('docs.markedcopy'); |
&Apache::lonnet::delenv('docs.markedcopy'); |
# if pasting published map (main content are only) check map is not already in course |
# if pasting published map (main content are only) check map is not already in course |
if ($folder =~ /^default/) { |
if ($folder =~ /^default/) { |
if ($allmaps{$url}) { |
if ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) { |
return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.')); |
return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.')); |
} |
} |
} |
} |
Line 1016 sub do_paste_from_buffer {
|
Line 1048 sub do_paste_from_buffer {
|
} |
} |
# Apply any changes to maps, or copy dependencies for uploaded HTML pages |
# Apply any changes to maps, or copy dependencies for uploaded HTML pages |
my ($result,$save_err); |
my ($result,$save_err); |
|
my %updated = ( |
|
rewrites => \%rewrites, |
|
zombies => \%zombies, |
|
removefrommap => \%removefrommap, |
|
removeparam => \%removeparam, |
|
dbcopies => \%dbcopies, |
|
retitles => \%retitles, |
|
); |
|
my %info = ( |
|
newsubdir => \%newsubdir, |
|
params => \%params, |
|
before => \%before, |
|
after => \%after, |
|
); |
|
my %moves = ( |
|
copies => \%copies, |
|
docmoves => \%docmoves, |
|
mapmoves => \%mapmoves, |
|
); |
$result = |
$result = |
&apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl, |
&apply_fixups($folder,$is_map,$coursedom,$coursenum,$errors, |
$url,\%removefrommap,\%removeparam,\%rewrites,\%retitles, |
\%updated,\%info,\%moves,$prefixchg,$oldurl,$url,'paste'); |
\%copies,\%dbcopies,\%zombies,\%params,\%docmoves, |
|
\%mapmoves,\%newsubdir,$errors,\%before,\%after); |
|
if ($result eq 'ok') { |
if ($result eq 'ok') { |
if ($is_map) { |
if ($is_map) { |
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
Line 1180 sub contained_map_check {
|
Line 1229 sub contained_map_check {
|
$titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'}; |
$titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'}; |
} else { |
} else { |
if ($allmaps->{$ressrc}) { |
if ($allmaps->{$ressrc}) { |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
} elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') { |
} elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') { |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
} else { |
} else { |
Line 1204 sub contained_map_check {
|
Line 1253 sub contained_map_check {
|
return; |
return; |
} |
} |
|
|
sub reinit_role { |
|
my ($cdom,$cnum,$chome) = @_; |
|
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); |
|
unless ($ferr) { |
|
&Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum); |
|
} |
|
return; |
|
} |
|
|
|
sub url_paste_fixups { |
sub url_paste_fixups { |
my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies, |
my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies, |
$dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_; |
$dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_; |
Line 1331 sub url_paste_fixups {
|
Line 1371 sub url_paste_fixups {
|
} |
} |
|
|
sub apply_fixups { |
sub apply_fixups { |
my ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap, |
my ($folder,$is_map,$cdom,$cnum,$errors,$updated,$info,$moves,$prefixchg, |
$removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params, |
$oldurl,$url,$caller) = @_; |
$docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_; |
my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, |
foreach my $key (keys(%{$copies}),keys(%{$docmoves})) { |
%params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves); |
|
if (ref($updated) eq 'HASH') { |
|
if (ref($updated->{'rewrites'}) eq 'HASH') { |
|
%rewrites = %{$updated->{'rewrites'}}; |
|
} |
|
if (ref($updated->{'zombies'}) eq 'HASH') { |
|
%zombies = %{$updated->{'zombies'}}; |
|
} |
|
if (ref($updated->{'removefrommap'}) eq 'HASH') { |
|
%removefrommap = %{$updated->{'removefrommap'}}; |
|
} |
|
if (ref($updated->{'removeparam'}) eq 'HASH') { |
|
%removeparam = %{$updated->{'removeparam'}}; |
|
} |
|
if (ref($updated->{'dbcopies'}) eq 'HASH') { |
|
%dbcopies = %{$updated->{'dbcopies'}}; |
|
} |
|
if (ref($updated->{'retitles'}) eq 'HASH') { |
|
%retitles = %{$updated->{'retitles'}}; |
|
} |
|
} |
|
if (ref($info) eq 'HASH') { |
|
if (ref($info->{'newsubdir'}) eq 'HASH') { |
|
%newsubdir = %{$info->{'newsubdir'}}; |
|
} |
|
if (ref($info->{'params'}) eq 'HASH') { |
|
%params = %{$info->{'params'}}; |
|
} |
|
if (ref($info->{'before'}) eq 'HASH') { |
|
%before = %{$info->{'before'}}; |
|
} |
|
if (ref($info->{'after'}) eq 'HASH') { |
|
%after = %{$info->{'after'}}; |
|
} |
|
} |
|
if (ref($moves) eq 'HASH') { |
|
if (ref($moves->{'copies'}) eq 'HASH') { |
|
%copies = %{$moves->{'copies'}}; |
|
} |
|
if (ref($moves->{'docmoves'}) eq 'HASH') { |
|
%docmoves = %{$moves->{'docmoves'}}; |
|
} |
|
if (ref($moves->{'mapmoves'}) eq 'HASH') { |
|
%mapmoves = %{$moves->{'mapmoves'}}; |
|
} |
|
} |
|
foreach my $key (keys(%copies),keys(%docmoves)) { |
my @allcopies; |
my @allcopies; |
if (ref($copies->{$key}) eq 'HASH') { |
if (exists($copies{$key})) { |
my %added; |
if (ref($copies{$key}) eq 'HASH') { |
foreach my $innerkey (keys(%{$copies->{$key}})) { |
my %added; |
if (($innerkey ne '') && (!$added{$innerkey})) { |
foreach my $innerkey (keys(%{$copies{$key}})) { |
push(@allcopies,$innerkey); |
if (($innerkey ne '') && (!$added{$innerkey})) { |
$added{$innerkey} = 1; |
push(@allcopies,$innerkey); |
|
$added{$innerkey} = 1; |
|
} |
} |
} |
|
undef(%added); |
} |
} |
undef(%added); |
|
} |
} |
if ($key eq $oldurl) { |
if ($key eq $oldurl) { |
if ((exists($docmoves->{$key}))) { |
if ((exists($docmoves{$key}))) { |
unless (grep(/^\Q$oldurl\E/,@allcopies)) { |
unless (grep(/^\Q$oldurl\E/,@allcopies)) { |
push(@allcopies,$oldurl); |
push(@allcopies,$oldurl); |
} |
} |
Line 1361 sub apply_fixups {
|
Line 1449 sub apply_fixups {
|
my $content = &Apache::lonnet::getfile($item); |
my $content = &Apache::lonnet::getfile($item); |
unless ($content eq '-1') { |
unless ($content eq '-1') { |
my $storefn; |
my $storefn; |
if (($key eq $oldurl) && (ref($docmoves) eq 'HASH') && (exists($docmoves->{$key}))) { |
if (($key eq $oldurl) && (exists($docmoves{$key}))) { |
$storefn = $docmoves->{$key}; |
$storefn = $docmoves{$key}; |
} else { |
} else { |
$storefn = $relpath; |
$storefn = $relpath; |
$storefn =~s{^/uploaded/$match_domain/$match_courseid/}{}; |
$storefn =~s{^/uploaded/$match_domain/$match_courseid/}{}; |
if ($prefixchg) { |
if ($prefixchg && $before{'doc'} && $after{'doc'}) { |
$storefn =~ s/^\Q$before->{'doc'}\E/$after->{'doc'}/; |
$storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/; |
} |
} |
if ($newsubdir->{$key}) { |
if ($newsubdir{$key}) { |
$storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir->{$key}#; |
$storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}#; |
} |
} |
} |
} |
©_dependencies($item,$storefn,$relpath,$errors,\$content); |
©_dependencies($item,$storefn,$relpath,$errors,\$content); |
Line 1378 sub apply_fixups {
|
Line 1466 sub apply_fixups {
|
&Apache::lonclonecourse::writefile($env{'request.course.id'}, |
&Apache::lonclonecourse::writefile($env{'request.course.id'}, |
$storefn.$fname,$content); |
$storefn.$fname,$content); |
if ($copyurl eq '/adm/notfound.html') { |
if ($copyurl eq '/adm/notfound.html') { |
if ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) { |
if (exists($docmoves{$oldurl})) { |
return &mt('Paste failed: an error occurred copying the file.'); |
return &mt('Paste failed: an error occurred copying the file.'); |
} elsif (ref($errors) eq 'HASH') { |
} elsif (ref($errors) eq 'HASH') { |
$errors->{$item} = 1; |
$errors->{$item} = 1; |
Line 1389 sub apply_fixups {
|
Line 1477 sub apply_fixups {
|
} |
} |
} |
} |
} |
} |
foreach my $key (keys(%{$mapmoves})) { |
foreach my $key (keys(%mapmoves)) { |
my $storefn=$key; |
my $storefn=$key; |
$storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
$storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
if ($prefixchg) { |
if ($prefixchg && $before{'map'} && $after{'map'}) { |
$storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/; |
$storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/; |
} |
} |
if ($newsubdir->{$key}) { |
if ($newsubdir{$key}) { |
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/; |
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
} |
} |
my $mapcontent = &Apache::lonnet::getfile($key); |
my $mapcontent = &Apache::lonnet::getfile($key); |
if ($mapcontent eq '-1') { |
if ($mapcontent eq '-1') { |
Line 1416 sub apply_fixups {
|
Line 1504 sub apply_fixups {
|
} |
} |
my %updates; |
my %updates; |
if ($is_map) { |
if ($is_map) { |
foreach my $key (keys(%{$rewrites})) { |
if (ref($updated) eq 'HASH') { |
$updates{$key} = 1; |
foreach my $type (keys(%{$updated})) { |
} |
if (ref($updated->{$type}) eq 'HASH') { |
foreach my $key (keys(%{$zombies})) { |
foreach my $key (keys(%{$updated->{$type}})) { |
$updates{$key} = 1; |
$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)) { |
foreach my $key (keys(%updates)) { |
my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
if (ref($rewrites->{$key}) eq 'HASH') { |
if (ref($rewrites{$key}) eq 'HASH') { |
%torewrite = %{$rewrites->{$key}}; |
%torewrite = %{$rewrites{$key}}; |
} |
} |
if (ref($retitles->{$key}) eq 'HASH') { |
if (ref($retitles{$key}) eq 'HASH') { |
%toretitle = %{$retitles->{$key}}; |
%toretitle = %{$retitles{$key}}; |
} |
} |
if (ref($removefrommap->{$key}) eq 'HASH') { |
if (ref($removefrommap{$key}) eq 'HASH') { |
%toremove = %{$removefrommap->{$key}}; |
%toremove = %{$removefrommap{$key}}; |
} |
} |
if (ref($removeparam->{$key}) eq 'HASH') { |
if (ref($removeparam{$key}) eq 'HASH') { |
%remparam = %{$removeparam->{$key}}; |
%remparam = %{$removeparam{$key}}; |
} |
} |
if (ref($zombies->{$key}) eq 'HASH') { |
if (ref($zombies{$key}) eq 'HASH') { |
%zombie = %{$zombies->{$key}}; |
%zombie = %{$zombies{$key}}; |
} |
} |
if (ref($dbcopies->{$key}) eq 'HASH') { |
if (ref($dbcopies{$key}) eq 'HASH') { |
foreach my $item (keys(%{$dbcopies->{$key}})) { |
foreach my $item (keys(%{$dbcopies{$key}})) { |
$newdb{$item} = &dbcopy($item); |
$newdb{$item} = &dbcopy($item); |
} |
} |
} |
} |
if (ref($params->{$key}) eq 'HASH') { |
if (ref($params{$key}) eq 'HASH') { |
%currparam = %{$params->{$key}}; |
%currparam = %{$params{$key}}; |
} |
} |
my ($errtext,$fatal) = &LONCAPA::map::mapread($key); |
my ($errtext,$fatal) = &LONCAPA::map::mapread($key); |
if ($fatal) { |
if ($fatal) { |
Line 1471 sub apply_fixups {
|
Line 1550 sub apply_fixups {
|
} |
} |
} |
} |
} |
} |
for (my $i=0; $i<@LONCAPA::map::resources; $i++) { |
for (my $i=0; $i<@LONCAPA::map::order; $i++) { |
if (defined($LONCAPA::map::resources[$i])) { |
my $idx = $LONCAPA::map::order[$i]; |
|
if (defined($LONCAPA::map::resources[$idx])) { |
my $changed; |
my $changed; |
my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]); |
my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]); |
if ($toremove{$src} eq $i) { |
if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) { |
splice(@LONCAPA::map::order,$i,1); |
splice(@LONCAPA::map::order,$i,1); |
if (ref($currparam{$i}) eq 'ARRAY') { |
if (ref($currparam{$idx}) eq 'ARRAY') { |
foreach my $name (@{$currparam{$i}}) { |
foreach my $name (@{$currparam{$idx}}) { |
&LONCAPA::map::delparameter($i,'parameter_'.$name); |
&LONCAPA::map::delparameter($idx,'parameter_'.$name); |
} |
} |
} |
} |
next; |
next; |
} |
} |
my $origsrc = $src; |
my $origsrc = $src; |
if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) { |
if ((exists($toretitle{$src})) && ($toretitle{$src} eq $idx)) { |
if ($title =~ m{^\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) { |
if ($title =~ m{^\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) { |
$changed = 1; |
$changed = 1; |
} |
} |
} |
} |
if ((exists($torewrite{$src})) && ($torewrite{$src} eq $i)) { |
if ((exists($torewrite{$src})) && ($torewrite{$src} eq $idx)) { |
$src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/}; |
$src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/}; |
if ($origsrc =~ m{^/uploaded/}) { |
if ($origsrc =~ m{^/uploaded/}) { |
if ($prefixchg) { |
if ($prefixchg && $before{'map'} && $after{'map'}) { |
if ($src =~ /\.(page|sequence)$/) { |
if ($src =~ /\.(page|sequence)$/) { |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'map'}\E#$1$after->{'map'}#; |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'map'}\E#$1$after{'map'}#; |
} else { |
} else { |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'doc'}\E#$1$after->{'doc'}#; |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'doc'}\E#$1$after{'doc'}#; |
} |
} |
} |
} |
if ($newsubdir->{$origsrc}) { |
if ($newsubdir{$origsrc}) { |
if ($src =~ /\.(page|sequence)$/) { |
if ($src =~ /\.(page|sequence)$/) { |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir->{$origsrc}#; |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir{$origsrc}#; |
} else { |
} else { |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir->{$origsrc}#; |
$src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$origsrc}#; |
} |
} |
} |
} |
} |
} |
Line 1514 sub apply_fixups {
|
Line 1594 sub apply_fixups {
|
$changed = 1; |
$changed = 1; |
} |
} |
if ($changed) { |
if ($changed) { |
$LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type)); |
$LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type)); |
} |
} |
} |
} |
} |
} |
Line 1532 sub apply_fixups {
|
Line 1612 sub apply_fixups {
|
} else { |
} else { |
$storefn = $key; |
$storefn = $key; |
$storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
$storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
if ($prefixchg) { |
if ($prefixchg && $before{'map'} && $after{'map'}) { |
$storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/; |
$storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/; |
} |
} |
if ($newsubdir->{$key}) { |
if ($newsubdir{$key}) { |
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/; |
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
} |
} |
} |
} |
my $report; |
my $report; |
if ($folder !~ /^supplemental/) { |
if ($folder !~ /^supplemental/) { |
$report = 1; |
$report = 1; |
} |
} |
my ($outtext,$errtext) = |
(my $outtext,$errtext) = |
&LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report); |
&LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report); |
if ($errtext) { |
if ($errtext) { |
return &mt('Paste failed: an error occurred saving the folder or page.'); |
if ($caller eq 'paste') { |
|
return &mt('Paste failed: an error occurred saving the folder or page.'); |
|
} |
} |
} |
} |
} |
} |
} |
Line 1694 sub editor {
|
Line 1776 sub editor {
|
$container = 'sequence'; |
$container = 'sequence'; |
} |
} |
|
|
my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container"; |
my $jumpto; |
|
|
|
unless ($supplementalflag) { |
|
$jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'"; |
|
} |
|
|
unless ($allowed) { |
unless ($allowed) { |
$randompick = -1; |
$randompick = -1; |
Line 1786 sub editor {
|
Line 1872 sub editor {
|
push(@imports, [$name, $url, $residx]); |
push(@imports, [$name, $url, $residx]); |
} |
} |
} |
} |
($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, |
($errtext,$fatal,my $fixuperrors) = |
$container,'londocs',@imports); |
&group_import($coursenum, $coursedom, $folder,$container, |
|
'londocs',@imports); |
return $errtext if ($fatal); |
return $errtext if ($fatal); |
|
if ($fixuperrors) { |
|
$r->print($fixuperrors); |
|
} |
} |
} |
# Loading a complete map |
# Loading a complete map |
if ($env{'form.loadmap'}) { |
if ($env{'form.loadmap'}) { |
Line 1867 sub editor {
|
Line 1957 sub editor {
|
'Navigation_Screen',undef,'RAT') |
'Navigation_Screen',undef,'RAT') |
.'</td><td class="LC_middle">'.&mt('Tools:').'</td>' |
.'</td><td class="LC_middle">'.&mt('Tools:').'</td>' |
.'<td align="left"><ul id="LC_toolbar">' |
.'<td align="left"><ul id="LC_toolbar">' |
.'<li><a href="/adm/coursedocs?forcesupplement=1" ' |
.'<li><a href="/adm/coursedocs?forcesupplement=1&command=editsupp" ' |
.'id="LC_content_toolbar_edittoplevel" ' |
.'id="LC_content_toolbar_edittoplevel" ' |
.'class="LC_toolbarItem" ' |
.'class="LC_toolbarItem" ' |
.'title="'.&mt('Supplemental Content Editor').'">' |
.'title="'.&mt('Supplemental Content Editor').'">' |
Line 2443 $form_common.'
|
Line 2533 $form_common.'
|
$forceedit, |
$forceedit, |
undef,$symb, |
undef,$symb, |
&escape($env{'form.folderpath'}), |
&escape($env{'form.folderpath'}), |
$renametitle); |
$renametitle,'','',1); |
if ($jscall) { |
if ($jscall) { |
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'. |
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'. |
$jscall.'" >'.&mt('Edit').'</a> '."\n"; |
$jscall.'" >'.&mt('Edit').'</a> '."\n"; |
Line 2627 sub checkonthis {
|
Line 2717 sub checkonthis {
|
$r->print('<span class="LC_error">'.&mt('connection down').'</span>'); |
$r->print('<span class="LC_error">'.&mt('connection down').'</span>'); |
} elsif ($result eq 'not_found') { |
} elsif ($result eq 'not_found') { |
unless ($url=~/\$/) { |
unless ($url=~/\$/) { |
$r->print('<span class="LC_error">'.&mt('not found').'</b></span>'); |
$r->print('<span class="LC_error">'.&mt('not found').'</span>'); |
} else { |
} else { |
$r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>'); |
$r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>'); |
} |
} |
Line 2673 sub list_symbs {
|
Line 2763 sub list_symbs {
|
$r->print(&Apache::loncommon::start_data_table_row(). |
$r->print(&Apache::loncommon::start_data_table_row(). |
'<td>'.$res->compTitle().'</td>'. |
'<td>'.$res->compTitle().'</td>'. |
'<td>'.$res->symb().'</td>'. |
'<td>'.$res->symb().'</td>'. |
&Apache::loncommon::start_data_table_row()); |
&Apache::loncommon::end_data_table_row()); |
$count ++; |
$count ++; |
} |
} |
if (!$count) { |
if (!$count) { |
Line 2683 sub list_symbs {
|
Line 2773 sub list_symbs {
|
} |
} |
$r->print(&Apache::loncommon::end_data_table()); |
$r->print(&Apache::loncommon::end_data_table()); |
} |
} |
|
$r->print(&endContentScreen()); |
} |
} |
|
|
|
|
Line 2713 sub verifycontent {
|
Line 2804 sub verifycontent {
|
} |
} |
&untiehash(); |
&untiehash(); |
$r->print('<p class="LC_success">'.&mt('Done').'</p>'); |
$r->print('<p class="LC_success">'.&mt('Done').'</p>'); |
|
$r->print(&endContentScreen()); |
} |
} |
|
|
|
|
Line 2792 sub checkversions {
|
Line 2884 sub checkversions {
|
if ($env{'form.timerange'} eq 'all') { |
if ($env{'form.timerange'} eq 'all') { |
# show all documents |
# show all documents |
$header=&mt('All Documents in '.$crstype); |
$header=&mt('All Documents in '.$crstype); |
$allsel=1; |
$allsel=' selected="selected"'; |
foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
if ($key=~/^ids\_(\/res\/.+)$/) { |
if ($key=~/^ids\_(\/res\/.+)$/) { |
my $src=$1; |
my $src=$1; |
Line 2813 sub checkversions {
|
Line 2905 sub checkversions {
|
.&mt('seconds'); |
.&mt('seconds'); |
if ($env{'form.timerange'}==-1) { |
if ($env{'form.timerange'}==-1) { |
$seltext='since start of course'; |
$seltext='since start of course'; |
$startsel='selected'; |
$startsel=' selected="selected"'; |
$env{'form.timerange'}=time; |
$env{'form.timerange'}=time; |
} |
} |
$starttime=time-$env{'form.timerange'}; |
$starttime=time-$env{'form.timerange'}; |
if ($env{'form.timerange'}==2592000) { |
if ($env{'form.timerange'}==2592000) { |
$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$monthsel='selected'; |
$monthsel=' selected="selected"'; |
} elsif ($env{'form.timerange'}==604800) { |
} elsif ($env{'form.timerange'}==604800) { |
$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$weeksel='selected'; |
$weeksel=' selected="selected"'; |
} elsif ($env{'form.timerange'}==86400) { |
} elsif ($env{'form.timerange'}==86400) { |
$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$daysel='selected'; |
$daysel=' selected="selected"'; |
} |
} |
$header=&mt('Content changed').' '.$seltext; |
$header=&mt('Content changed').' '.$seltext; |
} else { |
} else { |
Line 2863 sub checkversions {
|
Line 2955 sub checkversions {
|
<fieldset> |
<fieldset> |
<legend>$lt{'cd'}</legend> |
<legend>$lt{'cd'}</legend> |
<select name="timerange"> |
<select name="timerange"> |
<option value='all' $allsel>$lt{'al'}</option> |
<option value='all'$allsel>$lt{'al'}</option> |
<option value="-1" $startsel>$lt{'st'}</option> |
<option value="-1"$startsel>$lt{'st'}</option> |
<option value="2592000" $monthsel>$lt{'lm'}</option> |
<option value="2592000"$monthsel>$lt{'lm'}</option> |
<option value="604800" $weeksel>$lt{'lw'}</option> |
<option value="604800"$weeksel>$lt{'lw'}</option> |
<option value="86400" $daysel>$lt{'sy'}</option> |
<option value="86400"$daysel>$lt{'sy'}</option> |
</select> |
</select> |
<input type="submit" name="display" value="$lt{'sd'}" /> |
<input type="submit" name="display" value="$lt{'sd'}" /> |
</fieldset> |
</fieldset> |
Line 2883 $lt{'sc'}: <input type="submit" name="se
|
Line 2975 $lt{'sc'}: <input type="submit" name="se
|
<hr /> |
<hr /> |
<h4>$lt{'vers'}</h4> |
<h4>$lt{'vers'}</h4> |
<input type="submit" name="setversions" value="$lt{'save'}" /> |
<input type="submit" name="setversions" value="$lt{'save'}" /> |
<table border="0"> |
|
ENDHEADERS |
ENDHEADERS |
#number of columns for version history |
#number of columns for version history |
my $num_ver_col = 1; |
|
$r->print( |
$r->print( |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Resources').'</th>'. |
'<th>'.&mt('Resources').'</th>'. |
"<th>$lt{'mr'}</th>". |
"<th>$lt{'mr'}</th>". |
"<th>$lt{'ve'}</th>". |
"<th>$lt{'ve'}</th>". |
"<th>$lt{'vu'}</th>". |
"<th>$lt{'vu'}</th>". |
'<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'. |
'<th>'.&mt('History').'</th>'. |
'</b>'); |
&Apache::loncommon::end_data_table_header_row() |
|
); |
foreach my $key (sort(keys(%changes))) { |
foreach my $key (sort(keys(%changes))) { |
#excludes not versionable problems from resource version history: |
#excludes not versionable problems from resource version history: |
if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) { |
next unless ($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) { |
$currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
$currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
} |
} |
my $linkurl=&Apache::lonnet::clutter($key); |
my $linkurl=&Apache::lonnet::clutter($key); |
$r->print( |
$r->print( |
&Apache::loncommon::end_data_table_header_row(). |
|
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br>'. |
'<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
'<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br>('. |
'<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('. |
&Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'. |
&Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'. |
'<td align="right">'); |
'<td align="right">' |
# Used in course |
); |
my $usedversion=$hash{'version_'.$linkurl}; |
# Used in course |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
my $usedversion=$hash{'version_'.$linkurl}; |
if($usedversion != $currentversion){ |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
|
if ($usedversion != $currentversion) { |
$r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
$r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
}else{ |
} else { |
$r->print($usedversion); |
$r->print($usedversion); |
} |
} |
} else { |
|
$r->print($currentversion); |
|
} |
|
$r->print('</td><td title="'.$lt{'vu'}.'">'); |
|
# Set version |
|
$r->print(&Apache::loncommon::select_form($setversions{$linkurl}, |
|
'set_version_'.$linkurl, |
|
{'select_form_order' => |
|
['',1..$currentversion,'mostrecent'], |
|
'' => '', |
|
'mostrecent' => &mt('most recent'), |
|
map {$_,$_} (1..$currentversion)})); |
|
my $lastold=1; |
|
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
|
my $url=$root.'.'.$prevvers.'.'.$extension; |
|
if (&Apache::lonnet::metadata($url,'lastrevisiondate')< |
|
$starttime) { |
|
$lastold=$prevvers; |
|
} |
|
} |
|
# |
|
# Code to figure out how many version entries should go in |
|
# each of the four columns |
|
my $entries_per_col = 0; |
|
my $num_entries = ($currentversion-$lastold); |
|
if ($num_entries % $num_ver_col == 0) { |
|
$entries_per_col = $num_entries/$num_ver_col; |
|
} else { |
} else { |
$entries_per_col = $num_entries/$num_ver_col + 1; |
$r->print($currentversion); |
} |
} |
my $entries_count = 0; |
$r->print('</td><td title="'.$lt{'vu'}.'">'); |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
# Set version |
my $cols_output = 1; |
$r->print(&Apache::loncommon::select_form( |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
$setversions{$linkurl}, |
my $url=$root.'.'.$prevvers.'.'.$extension; |
'set_version_'.$linkurl, |
$r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url). |
{'select_form_order' => ['',1..$currentversion,'mostrecent'], |
'">'.&mt('Version').' '.$prevvers.'</a> ('. |
'' => '', |
&Apache::lonlocal::locallocaltime( |
'mostrecent' => &mt('most recent'), |
&Apache::lonnet::metadata($url, |
map {$_,$_} (1..$currentversion)})); |
'lastrevisiondate') |
my $lastold=1; |
). |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
')'); |
my $url=$root.'.'.$prevvers.'.'.$extension; |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { |
$r->print(' <a href="/adm/diff?filename='. |
$lastold=$prevvers; |
&Apache::lonnet::clutter($root.'.'.$extension). |
} |
'&versionone='.$prevvers. |
} |
'" target="diffs">'.&mt('Diffs').'</a>'); |
$r->print('</td>'); |
} |
# List all available versions |
$r->print('</span><br />'); |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
if (++$entries_count % $entries_per_col == 0) { |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
$r->print('</span></td>'); |
my $url=$root.'.'.$prevvers.'.'.$extension; |
if ($cols_output != $num_ver_col) { |
$r->print( |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
'<span class="LC_nobreak">' |
$cols_output++; |
.'<a href="'.&Apache::lonnet::clutter($url).'">' |
} |
.&mt('Version [_1]',$prevvers).'</a>' |
} |
.' ('.&Apache::lonlocal::locallocaltime( |
} |
&Apache::lonnet::metadata($url,'lastrevisiondate')) |
while($cols_output++ < $num_ver_col) { |
.')'); |
$r->print('</span></td><td>'); |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
|
$r->print( |
|
' <a href="/adm/diff?filename='. |
|
&Apache::lonnet::clutter($root.'.'.$extension). |
|
&HTML::Entities::encode('&versionone='.$prevvers,'"<>&'). |
|
'" target="diffs">'.&mt('Diffs').'</a>'); |
} |
} |
} |
$r->print('</span><br />'); |
|
} |
|
$r->print('</span></td>'.&Apache::loncommon::end_data_table_row()); |
} |
} |
$r->print('</td>'.&Apache::loncommon::end_data_table_row(). |
$r->print( |
&Apache::loncommon::end_data_table(). |
&Apache::loncommon::end_data_table(). |
'<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'); |
'<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'. |
|
'</form>' |
|
); |
|
|
&untiehash(); |
&untiehash(); |
|
$r->print(&endContentScreen()); |
} |
} |
|
|
sub mark_hash_old { |
sub mark_hash_old { |
Line 3227 sub handler {
|
Line 3301 sub handler {
|
|
|
# Do we directly jump somewhere? |
# Do we directly jump somewhere? |
|
|
if ($env{'form.command'} eq 'direct') { |
if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) { |
my ($mapurl,$id,$resurl); |
|
if ($env{'form.symb'} ne '') { |
if ($env{'form.symb'} ne '') { |
($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
$env{'form.folderpath'}= |
if ($resurl=~/\.(sequence|page)$/) { |
&Apache::loncommon::symb_to_docspath($env{'form.symb'}); |
$mapurl=$resurl; |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
} elsif ($resurl eq 'adm/navmaps') { |
$env{'form.command'}.'_'.$env{'form.symb'}}); |
$mapurl=$env{'course.'.$env{'request.course.id'}.'.url'}; |
|
} |
|
my $mapresobj; |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (ref($navmap)) { |
|
$mapresobj = $navmap->getResourceByUrl($mapurl); |
|
} |
|
$mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1}; |
|
my $type=$2; |
|
my $path; |
|
if (ref($mapresobj)) { |
|
my $pcslist = $mapresobj->map_hierarchy(); |
|
if ($pcslist ne '') { |
|
foreach my $pc (split(/,/,$pcslist)) { |
|
next if ($pc <= 1); |
|
my $res = $navmap->getByMapPc($pc); |
|
if (ref($res)) { |
|
my $thisurl = $res->src(); |
|
$thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; |
|
my $thistitle = $res->title(); |
|
$path .= '&'. |
|
&Apache::lonhtmlcommon::entity_encode($thisurl).'&'. |
|
&Apache::lonhtmlcommon::entity_encode($thistitle). |
|
':'.$res->randompick(). |
|
':'.$res->randomout(). |
|
':'.$res->encrypted(). |
|
':'.$res->randomorder(). |
|
':'.$res->is_page(); |
|
} |
|
} |
|
} |
|
$path =~ s/^\&//; |
|
my $maptitle = $mapresobj->title(); |
|
if ($mapurl eq 'default') { |
|
$maptitle = 'Main Course Documents'; |
|
} |
|
$path .= (($path ne '')? '&' : ''). |
|
&Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
|
&Apache::lonhtmlcommon::entity_encode($maptitle). |
|
':'.$mapresobj->randompick(). |
|
':'.$mapresobj->randomout(). |
|
':'.$mapresobj->encrypted(). |
|
':'.$mapresobj->randomorder(). |
|
':'.$mapresobj->is_page(); |
|
} else { |
|
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
|
my $ispage = (($type eq 'page')? 1 : ''); |
|
if ($mapurl eq 'default') { |
|
$maptitle = 'Main Course Documents'; |
|
} |
|
$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
|
&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage; |
|
} |
|
unless ($mapurl eq 'default') { |
|
$path = 'default&'. |
|
&Apache::lonhtmlcommon::entity_encode('Main Course Documents'). |
|
':::::&'.$path; |
|
} |
|
$env{'form.folderpath'}=$path; |
|
} elsif ($env{'form.supppath'} ne '') { |
} elsif ($env{'form.supppath'} ne '') { |
$env{'form.folderpath'}=$env{'form.supppath'}; |
$env{'form.folderpath'}=$env{'form.supppath'}; |
|
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
|
$env{'form.command'}.'_'.$env{'form.supppath'}}); |
} |
} |
} elsif ($env{'form.command'} eq 'editdocs') { |
} elsif ($env{'form.command'} eq 'editdocs') { |
$env{'form.folderpath'} = 'default&'. |
$env{'form.folderpath'} = 'default&'. |
&Apache::lonhtmlcommon::entity_encode('Main Course Content'). |
&Apache::lonhtmlcommon::entity_encode('Main Course Content'). |
':::::'; |
':::::'; |
|
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}}); |
} elsif ($env{'form.command'} eq 'editsupp') { |
} elsif ($env{'form.command'} eq 'editsupp') { |
$env{'form.folderpath'} = 'default&'. |
$env{'form.folderpath'} = 'supplemental&'. |
&Apache::lonhtmlcommon::entity_encode('Supplemental Content'); |
&Apache::lonhtmlcommon::entity_encode('Supplemental Content'); |
|
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'}); |
|
} elsif ($env{'form.command'} eq 'contents') { |
|
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'}); |
|
} elsif ($env{'form.command'} eq 'home') { |
|
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/menu'}); |
} |
} |
|
|
|
|
# Where do we store these for when we come back? |
# Where do we store these for when we come back? |
my $stored_folderpath='docs_folderpath'; |
my $stored_folderpath='docs_folderpath'; |
if ($supplementalflag) { |
if ($supplementalflag) { |
Line 3315 sub handler {
|
Line 3338 sub handler {
|
if ((!$env{'form.folderpath'}) && $allowed) { |
if ((!$env{'form.folderpath'}) && $allowed) { |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
{'folderpath' => 'scalar'}); |
{'folderpath' => 'scalar'}); |
|
unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) { |
|
undef($env{'form.folderpath'}); |
|
} |
} |
} |
|
|
# If we are not allowed to make changes, all we can see are supplemental docs |
# If we are not allowed to make changes, all we can see are supplemental docs |
Line 3517 sub handler {
|
Line 3543 sub handler {
|
} elsif ((!$showdoc) && (!$uploadphase)) { |
} elsif ((!$showdoc) && (!$uploadphase)) { |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'uplm' => 'Upload a new main '.lc($crstype).' document', |
|
'upls' => 'Upload a new supplemental '.lc($crstype).' document', |
|
'impp' => 'Import a document', |
|
'copm' => 'All documents out of a published map into this folder', |
'copm' => 'All documents out of a published map into this folder', |
'upfi' => 'Upload File', |
'upfi' => 'Upload File', |
'upld' => 'Import Content', |
'upld' => 'Import Content', |
Line 3529 sub handler {
|
Line 3552 sub handler {
|
'impm' => 'Import from Assembled Map', |
'impm' => 'Import from Assembled Map', |
'selm' => 'Select Map', |
'selm' => 'Select Map', |
'load' => 'Load Map', |
'load' => 'Load Map', |
'reco' => 'Recover Deleted Documents', |
|
'newf' => 'New Folder', |
'newf' => 'New Folder', |
'newp' => 'New Composite Page', |
'newp' => 'New Composite Page', |
'extr' => 'External Resource', |
|
'syll' => 'Syllabus', |
'syll' => 'Syllabus', |
'navc' => 'Table of Contents', |
'navc' => 'Table of Contents', |
'sipa' => 'Simple Course Page', |
'sipa' => 'Simple Course Page', |
Line 3543 sub handler {
|
Line 3564 sub handler {
|
'mypi' => 'My Personal Information Page', |
'mypi' => 'My Personal Information Page', |
'grpo' => 'Group Portfolio', |
'grpo' => 'Group Portfolio', |
'rost' => 'Course Roster', |
'rost' => 'Course Roster', |
'abou' => 'Personal Information Page for a User', |
'abou' => 'Personal Information Page for a User', |
'imsf' => 'IMS Import', |
'imsf' => 'IMS Import', |
'imsl' => 'Import IMS package', |
'imsl' => 'Import IMS package', |
'cms' => 'Origin of IMS package', |
'cms' => 'Origin of IMS package', |
Line 3551 sub handler {
|
Line 3572 sub handler {
|
'file' => 'File', |
'file' => 'File', |
'title' => 'Title', |
'title' => 'Title', |
'comment' => 'Comment', |
'comment' => 'Comment', |
'url' => 'URL', |
|
'prev' => 'Preview', |
|
'lnk' => 'Add Link', |
|
'parse' => 'Upload embedded images/multimedia files if HTML file', |
'parse' => 'Upload embedded images/multimedia files if HTML file', |
); |
); |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
Line 4294 sub generate_edit_table {
|
Line 4312 sub generate_edit_table {
|
my $form; |
my $form; |
my $activetab; |
my $activetab; |
my $active; |
my $active; |
if($env{'form.active'} ne ''){ |
if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) { |
$activetab = $env{'form.active'}; |
$activetab = $env{'form.active'}; |
} |
} |
my $backicon = $iconpath.'clickhere.gif'; |
my $backicon = $iconpath.'clickhere.gif'; |
my $backtext = &mt('Exit'); |
my $backtext = &mt('Exit Editor'); |
$form = '<div class="LC_Box" style="margin:0;">'. |
$form = '<div class="LC_Box" style="margin:0;">'. |
'<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n". |
'<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n". |
'<li class="goback">'. |
'<li class="goback">'. |
'<a href="javascript:toContents('."'$jumpto'".');">'. |
'<a href="javascript:toContents('.$jumpto.');">'. |
'<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'. |
'<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'. |
' alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n". |
' alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n". |
'<li>'. |
'<li>'. |
Line 4398 sub editing_js {
|
Line 4416 sub editing_js {
|
my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A'; |
my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A'; |
my $toplevelsupp = &supplemental_base(); |
my $toplevelsupp = &supplemental_base(); |
|
|
my $backtourl = '/adm/navmaps'; |
my $backtourl; |
if ($supplementalflag) { |
if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { |
|
my $caller = $1; |
|
if ($caller =~ /^supplemental/) { |
|
$backtourl = '/adm/supplemental?folderpath='.&escape($caller); |
|
} else { |
|
my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller); |
|
$res = &Apache::lonnet::clutter($res); |
|
if (&Apache::lonnet::is_on_map($res)) { |
|
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='. |
|
&HTML::Entities::encode($caller,'<>&"'); |
|
} |
|
} |
|
} elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { |
|
$backtourl = '/adm/menu'; |
|
} elsif ($supplementalflag) { |
$backtourl = '/adm/supplemental'; |
$backtourl = '/adm/supplemental'; |
|
} else { |
|
$backtourl = '/adm/navmaps'; |
} |
} |
|
|
my $fieldsets = "'ext','doc'"; |
my $fieldsets = "'ext','doc'"; |
Line 4702 function showPage(current, pageId, nav,
|
Line 4736 function showPage(current, pageId, nav,
|
|
|
function toContents(jumpto) { |
function toContents(jumpto) { |
var newurl = '$backtourl'; |
var newurl = '$backtourl'; |
if (jumpto != '') { |
if ((newurl == '/adm/navmaps') && (jumpto != '')) { |
newurl = newurl+'?postdata='+jumpto; |
newurl = newurl+'?postdata='+jumpto; |
; |
|
} |
} |
location.href=newurl; |
location.href=newurl; |
} |
} |
Line 4896 Return hash with valid author names
|
Line 4929 Return hash with valid author names
|
|
|
=item contained_map_check() |
=item contained_map_check() |
|
|
=item reinit_role() |
|
|
|
=item url_paste_fixups() |
=item url_paste_fixups() |
|
|
=item apply_fixups() |
=item apply_fixups() |