'."\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". - '
- '."\n";
- foreach my $key (sort(keys(%import_errors))) {
- $fixuperrors .= '
- '.$key.' '."\n"; - } - $fixuperrors .= '
'.
- join('
',@{$msgsarray}).
- '
'. - $lockerror. - '
'; + return &storemap($coursenum, $coursedom, $folder.'.'.$container); +} + +sub breadcrumbs { + my ($allowed,$crstype)=@_; + &Apache::lonhtmlcommon::clear_breadcrumbs(); + my (@folders); + if ($env{'form.pagepath'}) { + @folders = split('&',$env{'form.pagepath'}); + } else { + @folders=split('&',$env{'form.folderpath'}); + } + my $folderpath; + my $cpinfo=''; + my $plain=''; + my $randompick=-1; + my $isencrypted=0; + my $ishidden=0; + my $is_random_order=0; + while (@folders) { + my $folder=shift(@folders); + my $foldername=shift(@folders); + if ($folderpath) {$folderpath.='&';} + $folderpath.=$folder.'&'.$foldername; + my $url; + if ($allowed) { + $url = '/adm/coursedocs?folderpath='; + } else { + $url = '/adm/supplemental?folderpath='; } - } - my ($errtext,$fatal) = - &storemap($coursenum, $coursedom, $folder.'.'.$container,1); - return ($errtext,$fatal,$fixuperrors); + $url .= &escape($folderpath); + my $name=&unescape($foldername); +# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername + $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//; + if ($1 ne '') { + $randompick=$1; + } else { + $randompick=-1; + } + if ($2) { $ishidden=1; } + if ($3) { $isencrypted=1; } + if ($4 ne '') { $is_random_order = 1; } + if ($folder eq 'supplemental') { + $name = &mt('Supplemental '.$crstype.' Content'); + } + &Apache::lonhtmlcommon::add_breadcrumb( + {'href'=>$url.$cpinfo, + 'title'=>$name, + 'text'=>$name, + 'no_mt'=>1, + }); + $plain.=$name.' > '; + } + $plain=~s/\>\;\s*$//; + return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', + undef, undef, 1 ),$randompick,$ishidden, + $isencrypted,$plain,$is_random_order); } sub log_docs { - return &Apache::lonnet::write_log('course','docslog',@_); + return &Apache::lonnet::instructor_log('docslog',@_); } { @@ -481,28 +436,26 @@ sub docs_change_log { ''."\n"; $r->print(&Apache::loncommon::start_page('Content Change Log',$js)); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log')); - $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs'))); + $r->print(&startContentScreen('docs')); my %orderhash; my $container='sequence'; my $pathitem; - if ($env{'form.folderpath'} =~ /\:1$/) { + if ($env{'form.pagepath'}) { $container='page'; + $pathitem = ''; + } else { + my $folderpath=$env{'form.folderpath'}; + if ($folderpath eq '') { + $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents')); + } + $pathitem = ''; } - my $folderpath=$env{'form.folderpath'}; - if ($folderpath eq '') { - $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents').':::::'); - } - $pathitem = ''; my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; my $jumpto = $readfile; $jumpto =~ s{^/}{}; my $tid = 1; - if ($supplementalflag) { - $tid = 2; - } - my ($breadcrumbtrail) = - &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); + my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype); $r->print($breadcrumbtrail. &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto, $readfile)); @@ -576,30 +529,18 @@ sub docs_change_log { ':'.$docslog{$id}{'exe_udom'}.''. $send_msg_link.'- ');
for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
- my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]);
- if ($is_supp) {
- $shown = &Apache::loncommon::parse_supplemental_title($shown);
- }
- $r->print('
- '.$shown.' '); + $r->print('
- '.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).' '); } } $r->print('
- ');
for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
- my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]);
- if ($is_supp) {
- $shown = &Apache::loncommon::parse_supplemental_title($shown);
- }
- $r->print('
- '.$shown.' '); + $r->print('
- '.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).' '); } } $r->print('
'.$error; - } - } else { - #need to copy the db contents to a new one. - my %contents=&Apache::lonnet::dump($db_name, - $dbref->{'cdom'}, - $dbref->{'cnum'}); - if (exists($contents{'uploaded.photourl'})) { - my $photo = $contents{'uploaded.photourl'}; - my ($subdir,$fname) = - ($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin|simplepage)/(?:|\d+/)([^/]+)$}); - my $newphoto; - if ($fname ne '') { - my $content = &Apache::lonnet::getfile($photo); - unless ($content eq '-1') { - $env{'form.'.$suffix.'.photourl'} = $content; - $newphoto = - &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname"); - delete($env{'form.'.$suffix.'.photourl'}); - } - } - if ($newphoto =~ m{^/uploaded/}) { - $contents{'uploaded.photourl'} = $newphoto; - } - } - $db_name =~ s{_\d*$ }{_$suffix}x; - $result=&Apache::lonnet::put($db_name,\%contents, - $coursedom,$coursenum); - if ($result eq 'ok') { - $url =~ s{/(\d*)/(smppg|bulletinboard)$}{/$suffix/$2}x; - } - } - if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { - $lockerrorsref->{$prefix} = - '
'.
- &mt('There was a problem removing a lockfile.');
- if ($prefix eq 'smppg') {
- $lockerrorsref->{$prefix} .=
- &mt('This will prevent creation of additional simple pages in this course.');
- } else {
- $lockerrorsref->{$prefix} .= &mt('This will prevent creation of additional bulletin boards in this course.');
- }
- $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').'
';
- }
- }
- } elsif ($url =~ m{/syllabus$}) {
- if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
- ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
- if (($dbref->{'cdom'} ne $coursedom) ||
- ($dbref->{'cnum'} ne $coursenum)) {
- my %contents=&Apache::lonnet::dump('syllabus',
- $dbref->{'cdom'},
- $dbref->{'cnum'});
- $result=&Apache::lonnet::put('syllabus',\%contents,
- $coursedom,$coursenum);
- }
- }
- }
- }
- return ($url,$result,$errtext);
+ $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';
+ push(@LONCAPA::map::order, $newidx);
+ return 'ok';
+# Store the result
}
sub uniqueness_check {
@@ -1370,518 +764,6 @@ sub uniqueness_check {
return $unique;
}
-sub contained_map_check {
- my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles,
- $allmaps) = @_;
- my $content = &Apache::lonnet::getfile($url);
- unless ($content eq '-1') {
- my $parser = HTML::TokeParser->new(\$content);
- $parser->attr_encoded(1);
- while (my $token = $parser->get_token) {
- next if ($token->[0] ne 'S');
- if ($token->[1] eq 'resource') {
- next if ($token->[2]->{'type'} eq 'zombie');
- my $ressrc = $token->[2]->{'src'};
- if ($folder =~ /^supplemental/) {
- unless (&supp_pasteable($ressrc)) {
- $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
- next;
- }
- }
- if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) {
- if ($1 eq 'uploaded') {
- $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc;
- $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
- } else {
- 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,$removeparam,
- $addedmaps,$hierarchy,$titles,$allmaps);
- }
- } elsif ($token->[1] eq 'param') {
- if ($folder =~ /^supplemental/) {
- 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'}];
- }
- }
- }
- }
- }
- return;
-}
-
-sub url_paste_fixups {
- my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps,
- $rewrites,$retitles,$copies,$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');
- my $parser = HTML::TokeParser->new(\$file);
- $parser->attr_encoded(1);
- my $changed = 0;
- while (my $token = $parser->get_token) {
- next if ($token->[0] ne 'S');
- if ($token->[1] eq 'resource') {
- my $ressrc = $token->[2]->{'src'};
- next if ($ressrc eq '');
- 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}{$id} = $ressrc;
- }
- }
- next if ($token->[2]->{'type'} eq 'external');
- if ($token->[2]->{'type'} eq 'zombie') {
- next if ($skip);
- $zombies->{$oldurl}{$id} = $ressrc;
- $changed = 1;
- } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
- my $srcdom = $1;
- my $srcnum = $2;
- my $rem = $3;
- 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,
- $srcdom,$srcnum,$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)$/) {
- $rewrites->{$oldurl}{$id} = $ressrc;
- $mapchanges->{$ressrc} = 1;
- unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,
- $cnum,$srcdom,$srcnum,$allmaps,
- $rewrites,$retitles,$copies,$dbcopies,
- $zombies,$params,$mapmoves,$mapchanges,
- $tomove,$newsubdir,$newurls)) {
- $mapmoves->{$ressrc} = 1;
- }
- $changed = 1;
- } else {
- $rewrites->{$oldurl}{$id} = $ressrc;
- $copies->{$oldurl}{$ressrc} = $id;
- $changed = 1;
- }
- }
- } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) {
- next if ($skip);
- my $srcdom = $1;
- my $srcnum = $2;
- if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
- $rewrites->{$oldurl}{$id} = $ressrc;
- $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
- $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
- $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
- $changed = 1;
- }
- } elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) {
- if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) ||
- ($env{'form.docs.markedcopy_options'} ne 'move')) {
- $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
- $dbcopies->{$oldurl}{$id}{'cdom'} = $fromcdom;
- $dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum;
- $changed = 1;
- }
- } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
- next if ($skip);
- my $srcdom = $1;
- my $srcnum = $2;
- if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
- $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
- $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
- $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
- $changed = 1;
- }
- }
- } elsif ($token->[1] eq 'param') {
- next if ($skip);
- my $to = $token->[2]->{'to'};
- if ($to ne '') {
- if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {
- push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
- } else {
- @{$params->{$oldurl}{$to}} = ($token->[2]->{'name'});
- }
- }
- }
- }
- return $changed;
-}
-
-sub apply_fixups {
- my ($folder,$is_map,$cdom,$cnum,$errors,$updated,$info,$moves,$prefixchg,
- $oldurl,$url,$caller) = @_;
- my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
- %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,
- %lockerrors,$lockmsg);
- 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;
- if (exists($copies{$key})) {
- if (ref($copies{$key}) eq 'HASH') {
- my %added;
- foreach my $innerkey (keys(%{$copies{$key}})) {
- if (($innerkey ne '') && (!$added{$innerkey})) {
- push(@allcopies,$innerkey);
- $added{$innerkey} = 1;
- }
- }
- undef(%added);
- }
- }
- if ($key eq $oldurl) {
- if ((exists($docmoves{$key}))) {
- unless (grep(/^\Q$oldurl\E$/,@allcopies)) {
- push(@allcopies,$oldurl);
- }
- }
- }
- if (@allcopies > 0) {
- 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) && (exists($docmoves{$key}))) {
- $storefn = $docmoves{$key};
- } else {
- $storefn = $relpath;
- $storefn =~s{^/uploaded/$match_domain/$match_courseid/}{};
- if ($prefixchg && $before{'doc'} && $after{'doc'}) {
- $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 (exists($docmoves{$oldurl})) {
- return &mt('Paste failed: an error occurred copying the file.');
- } elsif (ref($errors) eq 'HASH') {
- $errors->{$item} = 1;
- }
- }
- }
- }
- }
- }
- }
- foreach my $key (keys(%mapmoves)) {
- my $storefn=$key;
- $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
- if ($prefixchg && $before{'map'} && $after{'map'}) {
- $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/;
- }
- if ($newsubdir{$key}) {
- $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
- }
- my $mapcontent = &Apache::lonnet::getfile($key);
- if ($mapcontent eq '-1') {
- if (ref($errors) eq 'HASH') {
- $errors->{$key} = 1;
- }
- } else {
- my $newmap =
- &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
- $mapcontent);
- if ($newmap eq '/adm/notfound.html') {
- if (ref($errors) eq 'HASH') {
- $errors->{$key} = 1;
- }
- }
- }
- }
- my %updates;
- if ($is_map) {
- if (ref($updated) eq 'HASH') {
- foreach my $type (keys(%{$updated})) {
- if (ref($updated->{$type}) eq 'HASH') {
- foreach my $key (keys(%{$updated->{$type}})) {
- $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 $idx (keys(%{$dbcopies{$key}})) {
- if (ref($dbcopies{$key}{$idx}) eq 'HASH') {
- my ($newurl,$result,$errtext) =
- &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors);
- if ($result eq 'ok') {
- $newdb{$idx} = $newurl;
- } elsif (ref($errors) eq 'HASH') {
- $errors->{$key} = 1;
- }
- push(@msgs,$errtext);
- }
- }
- }
- 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{$i} eq $src) {
- undef($LONCAPA::map::zombies[$i]);
- }
- }
- }
- for (my $i=0; $i<@LONCAPA::map::order; $i++) {
- my $idx = $LONCAPA::map::order[$i];
- if (defined($LONCAPA::map::resources[$idx])) {
- my $changed;
- my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]);
- if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) {
- splice(@LONCAPA::map::order,$i,1);
- if (ref($currparam{$idx}) eq 'ARRAY') {
- foreach my $name (@{$currparam{$idx}}) {
- &LONCAPA::map::delparameter($idx,'parameter_'.$name);
- }
- }
- next;
- }
- my $origsrc = $src;
- if ((exists($toretitle{$idx})) && ($toretitle{$idx} eq $src)) {
- if ($title =~ m{^\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) {
- $changed = 1;
- }
- }
- if ((exists($torewrite{$idx})) && ($torewrite{$idx} eq $src)) {
- $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
- if ($origsrc =~ m{^/uploaded/}) {
- if ($prefixchg && $before{'map'} && $after{'map'}) {
- 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'}#;
- }
- }
- if ($origsrc =~ /\.(page|sequence)$/) {
- if ($newsubdir{$origsrc}) {
- $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir{$origsrc}#;
- }
- } elsif ($newsubdir{$key}) {
- $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$key}#;
- }
- }
- $changed = 1;
- } elsif ($newdb{$idx} ne '') {
- $src = $newdb{$idx};
- $changed = 1;
- }
- if ($changed) {
- $LONCAPA::map::resources[$idx] = 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);
- }
- }
- }
- if (values(%lockerrors) > 0) {
- $lockmsg = join('',values(%lockerrors)); - } - 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 && $before{'map'} && $after{'map'}) { - $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) { - if ($caller eq 'paste') { - return (&mt('Paste failed: an error occurred saving the folder or page.')); - } - } - } - } - return ('ok',\@msgs,$lockmsg); -} - -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); - } - } - } - } - } - } - } - } - return; -} - my %parameter_type = ( 'randompick' => 'int_pos', 'hiddenresource' => 'string_yesno', 'encrypturl' => 'string_yesno', @@ -1889,93 +771,23 @@ my %parameter_type = ( 'randompick' my $valid_parameters_re = join('|',keys(%parameter_type)); # set parameters sub update_parameter { - if ($env{'form.changeparms'} eq 'all') { - my (@allidx,@allmapidx,%allchecked,%currchecked); - %allchecked = ( - 'hiddenresource' => {}, - 'encrypturl' => {}, - 'randompick' => {}, - 'randomorder' => {}, - ); - foreach my $which (keys(%allchecked)) { - $env{'form.all'.$which} =~ s/,$//; - if ($which eq 'randompick') { - foreach my $item (split(/,/,$env{'form.all'.$which})) { - my ($res,$value) = split(/:/,$item); - if ($value =~ /^\d+$/) { - $allchecked{$which}{$res} = $value; - } - } - } else { - map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.all'.$which}); - } - } - my $haschanges = 0; - foreach my $res (@LONCAPA::map::order) { - my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); - $name=&LONCAPA::map::qtescape($name); - $url=&LONCAPA::map::qtescape($url); - next unless ($name && $url); - my $is_map; - if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { - $is_map = 1; - } - foreach my $which (keys(%allchecked)) { - if (($which eq 'randompick' || $which eq 'randomorder')) { - next if (!$is_map); - } - my $oldvalue = 0; - my $newvalue = 0; - if ($allchecked{$which}{$res}) { - $newvalue = $allchecked{$which}{$res}; - } - my $current = (&LONCAPA::map::getparameter($res,'parameter_'.$which))[0]; - if ($which eq 'randompick') { - if ($current =~ /^(\d+)$/) { - $oldvalue = $1; - } - } else { - if ($current =~ /^yes$/i) { - $oldvalue = 1; - } - } - if ($oldvalue ne $newvalue) { - $haschanges = 1; - if ($newvalue) { - my $storeval = 'yes'; - if ($which eq 'randompick') { - $storeval = $newvalue; - } - &LONCAPA::map::storeparameter($res,'parameter_'.$which, - $storeval, - $parameter_type{$which}); - &remember_parms($res,$which,'set',$storeval); - } elsif ($oldvalue) { - &LONCAPA::map::delparameter($res,'parameter_'.$which); - &remember_parms($res,$which,'del'); - } - } - } - } - return $haschanges; - } else { - return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); - my $which = $env{'form.changeparms'}; - my $idx = $env{'form.setparms'}; - if ($env{'form.'.$which.'_'.$idx}) { - my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} - : 'yes'; - &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value, - $parameter_type{$which}); - &remember_parms($idx,$which,'set',$value); - } else { - &LONCAPA::map::delparameter($idx,'parameter_'.$which); + return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); - &remember_parms($idx,$which,'del'); - } - return 1; + my $which = $env{'form.changeparms'}; + my $idx = $env{'form.setparms'}; + if ($env{'form.'.$which.'_'.$idx}) { + my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx} + : 'yes'; + &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value, + $parameter_type{$which}); + &remember_parms($idx,$which,'set',$value); + } else { + &LONCAPA::map::delparameter($idx,'parameter_'.$which); + + &remember_parms($idx,$which,'del'); } + return 1; } @@ -2025,24 +837,15 @@ sub handle_edit_cmd { sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, - $supplementalflag,$orderhash,$iconpath,$pathitem)=@_; - my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); - if ($allowed) { - (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, - $is_random_order,$container) = - &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); - $r->print($breadcrumbtrail); - } elsif ($env{'form.folderpath'} =~ /\:1$/) { - $container = 'page'; - } else { - $container = 'sequence'; - } - - my $jumpto; + $supplementalflag,$orderhash,$iconpath)=@_; + my $container= ($env{'form.pagepath'}) ? 'page' + : 'sequence'; + + my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) = + &breadcrumbs($allowed,$crstype); + $r->print($breadcrumbtrail); - unless ($supplementalflag) { - $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'"; - } + my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container"; unless ($allowed) { $randompick = -1; @@ -2081,48 +884,20 @@ sub editor { } if ($env{'form.pastemarked'}) { - my %paste_errors; - my ($paste_res,$save_error,$pastemsgarray,$lockerror) = - &do_paste_from_buffer($coursenum,$coursedom,$folder,$container, - \%paste_errors); - if (ref($pastemsgarray) eq 'ARRAY') { - if (@{$pastemsgarray} > 0) { - - $r->print('
'.
- join('
',@{$pastemsgarray}).
- '
'. - $lockerror. - '
'); - } - if ($save_error ne '') { - return $save_error; - } - if ($paste_res ne 'ok') { + my $paste_res = + &do_paste_from_buffer($coursenum,$coursedom,$folder); + if ($paste_res eq 'ok') { + ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); + return $errtext if ($fatal); + } elsif ($paste_res ne '') { $r->print(''.$paste_res.'
'); } - if (keys(%paste_errors) > 0) { - $r->print(''."\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". - '
- '."\n");
- foreach my $key (sort(keys(%paste_errors))) {
- $r->print('
- '.$key.' '."\n"); - } - $r->print('
'.&mt('No map selected.').'
'); @@ -2237,7 +968,7 @@ sub editor { $r->print(''); } - my ($to_show,$output,@allidx,@allmapidx); + my ($to_show,$output); &Apache::loncommon::start_data_table_count(); #setup a row counter foreach my $res (@LONCAPA::map::order) { @@ -2246,113 +977,36 @@ sub editor { $url=&LONCAPA::map::qtescape($url); unless ($name) { $name=(split(/\//,$url))[-1]; } unless ($name) { $idx++; next; } - push(@allidx,$res); - if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { - push(@allmapidx,$res); - } $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, - $coursenum,$coursedom,$crstype, - $pathitem,$supplementalflag,$container); + $coursenum,$crstype); $idx++; $shown++; } &Apache::loncommon::end_data_table_count(); - - if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) { - my $toolslink = '| ' - .&Apache::loncommon::help_open_menu('Navigation Screen', - 'Navigation_Screen',undef,'RAT') - .' | '.&mt('Tools:').' | ' - .'
|
'; - if ($shown) { - if ($allowed) { - $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll') - .&Apache::loncommon::start_data_table(undef,'contentlist') - .&Apache::loncommon::start_data_table_header_row() - .'
' - .&Apache::loncommon::end_scrollbox(); - } else { - $to_show .= $toolslink - .&Apache::loncommon::start_data_table('LC_tableOfContent') - .$output.' ' - .&Apache::loncommon::end_data_table(); - } - } else { - if (!$allowed) { - $to_show .= $toolslink; + + if ($shown) { + $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll') + .&Apache::loncommon::start_data_table(undef,'contentlist'); + if ($allowed) { + $to_show .= &Apache::loncommon::start_data_table_header_row() + .'
'
- .&mt('Currently no documents.')
- .'
'
- .&Apache::loncommon::end_scrollbox();
- }
- } else {
- if ($shown) {
- $to_show = ''
- .&Apache::loncommon::start_data_table('LC_tableOfContent')
- .$output
- .&Apache::loncommon::end_data_table()
- .'
';
- } else {
- $to_show = ''
- .&mt('Currently no documents.')
- .'
'
+ $to_show .= &Apache::loncommon::end_data_table_header_row();
}
+ $to_show .= $output.' '
+ .&Apache::loncommon::end_data_table()
+ .'' + .&Apache::loncommon::end_scrollbox(); + } else { + $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll') + .'
'
+ .&mt('Currently no documents.')
+ .'
'
+ .&Apache::loncommon::end_scrollbox();
}
my $tid = 1;
if ($supplementalflag) {
@@ -2362,8 +1016,21 @@ sub editor {
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
$r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto,
$readfile));
- &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
+ &print_paste_buffer($r,$container);
} else {
+ if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ #Function Box for Supplemental Content for users with mdc priv.
+ my $funcname = &mt('Folder Editor');
+ $r->print(
+ &Apache::loncommon::head_subbox(
+ &Apache::lonhtmlcommon::start_funclist().
+ &Apache::lonhtmlcommon::add_item_funclist(
+ ''.
+ '
'.
+ '').
+ &Apache::lonhtmlcommon::end_funclist()));
+ }
$r->print($to_show);
}
return;
@@ -2384,15 +1051,19 @@ sub process_file_upload {
my $errtext='';
my $fatal=0;
my $container='sequence';
- if ($env{'form.folderpath'} =~ /:1$/) {
+ if ($env{'form.pagepath'}) {
$container='page';
}
($errtext,$fatal)=
- &mapread($coursenum,$coursedom,$folder.'.'.$container);
+ &mapread($coursenum,$coursedom,$folder.'.'.$container);
if ($#LONCAPA::map::order<1) {
$LONCAPA::map::order[0]=1;
$LONCAPA::map::resources[1]='';
}
+ if ($fatal) {
+ $$upload_output = ''.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'
';
+ return;
+ }
my $destination = 'docs/';
if ($folder =~ /^supplemental/) {
$destination = 'supplemental/';
@@ -2402,10 +1073,6 @@ sub process_file_upload {
} elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
$destination .= $2.'/';
}
- if ($fatal) {
- $$upload_output = ''.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'
';
- return;
- }
# this is for a course, not a user, so set context to coursedoc.
my $newidx=&LONCAPA::map::getresidx();
$destination .= $newidx;
@@ -2437,7 +1104,7 @@ sub process_file_upload {
$comment.':'.$url.':'.$ext.':normal:res';
$LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx;
($errtext,$fatal)=&storemap($coursenum,$coursedom,
- $folder.'.'.$container,1);
+ $folder.'.'.$container);
if ($fatal) {
$$upload_output = ''.$errtext.'
';
return;
@@ -2474,6 +1141,7 @@ sub process_file_upload {
my $archiveurl = &HTML::Entities::encode($url,'<>&"');
my %archiveitems = (
folderpath => $env{'form.folderpath'},
+ pagepath => $env{'form.pagepath'},
cmd => $nextphase,
newidx => $newidx,
position => $position,
@@ -2524,51 +1192,68 @@ sub is_supplemental_title {
return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
}
+sub parse_supplemental_title {
+ my ($title) = @_;
+
+ my ($foldertitle,$renametitle);
+ if ($title =~ /&&&/) {
+ $title = &HTML::Entites::decode($title);
+ }
+ if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
+ $renametitle=$4;
+ my ($time,$uname,$udom) = ($1,$2,$3);
+ $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ my $name = &Apache::loncommon::plainname($uname,$udom);
+ $name = &HTML::Entities::encode($name,'"<>&\'');
+ $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
+ $title=''.&Apache::lonlocal::locallocaltime($time).' '.
+ $name.': '.$foldertitle; + } + if (wantarray) { + return ($title,$foldertitle,$renametitle); + } + return $title; +} + # --------------------------------------------------------------- An entry line sub entryline { - my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, - $crstype,$pathitem,$supplementalflag,$container)=@_; - my ($foldertitle,$renametitle); + my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_; + my ($foldertitle,$pagetitle,$renametitle); if (&is_supplemental_title($title)) { - ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); + ($title,$foldertitle,$renametitle) = &parse_supplemental_title($title); + $pagetitle = $foldertitle; } else { $title=&HTML::Entities::encode($title,'"<>&\''); $renametitle=$title; $foldertitle=$title; + $pagetitle=$title; } my $orderidx=$LONCAPA::map::order[$index]; + $renametitle=~s/\\/\\\\/g; $renametitle=~s/\"\;/\\\"/g; $renametitle=~s/ /%20/g; my $line=&Apache::loncommon::start_data_table_row(); my ($form_start,$form_end,$form_common); # Edit commands - my ($esc_path, $path, $symb); + my ($container, $type, $esc_path, $path, $symb); if ($env{'form.folderpath'}) { + $type = 'folder'; + $container = 'sequence'; $esc_path=&escape($env{'form.folderpath'}); $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); # $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); } - my $isexternal; - if ($residx) { - my $currurl = $url; - $currurl =~ s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; - if ($currurl =~ m{^/adm/wrapper/ext/}) { - $isexternal = 1; - } - if (!$supplementalflag) { - my $path = 'uploaded/'. - $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. - $env{'course.'.$env{'request.course.id'}.'.num'}.'/'; - $symb = &Apache::lonnet::encode_symb($path.$folder.".$container", - $residx, - &Apache::lonnet::declutter($currurl)); - } + if ($env{'form.pagepath'}) { + $type = $container = 'page'; + $esc_path=&escape($env{'form.pagepath'}); + $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"'); + $symb=&escape($env{'form.pagesymb'}); } - my ($renamelink,%lt); + my $cpinfo=''; if ($allowed) { my $incindex=$index+1; my $selectbox=''; @@ -2591,81 +1276,36 @@ sub entryline { } $selectbox.=''; } - %lt=&Apache::lonlocal::texthash( + my %lt=&Apache::lonlocal::texthash( 'up' => 'Move Up', 'dw' => 'Move Down', 'rm' => 'Remove', 'ct' => 'Cut', 'rn' => 'Rename', - 'cp' => 'Copy', - 'ex' => 'External Resource', - 'ed' => 'Edit', - 'pr' => 'Preview', - 'sv' => 'Save', - 'ul' => 'URL', - 'ti' => 'Title', - ); + 'cp' => 'Copy'); my $nocopy=0; my $nocut=0; - my $noremove=0; - if ($url=~ m{^/res/.+\.(page|sequence)$}) { - # no copy for published maps - $nocopy=1; + if ($url=~/\.(page|sequence)$/) { + if ($url =~ m{/res/}) { + # no copy for published maps + $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\//) { $nocopy=1; $nocut=1; } - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - if ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") { - if ($env{'form.folderpath'} =~ /^default&[^\&]+$/) { - my %curr_groups = &Apache::longroup::coursegroups(); - if (keys(%curr_groups) > 0) { - $noremove=1; - } - $nocut=1; - $nocopy=1; - } - } elsif ($url =~ m{^\Q/uploaded/$cdom/$cnum/group_folder_\E(\w+)\.sequence$}) { - my $group = $1; - if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+$/) { - my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); - if (keys(%curr_group) > 0) { - $noremove=1; - } - } - $nocut=1; - $nocopy=1; - } elsif ($url =~ m{^\Q/adm/$cdom/$cnum/\E(\w+)/smppg$}) { - my $group = $1; - if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&\Qgroup_folder_$group\E\&[^\&]+$/) { - my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); - my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group}); - if (keys(%groupsettings) > 0) { - $noremove=1; - } - $nocut=1; - $nocopy=1; - } - } elsif ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&group_folder_(\w+)\&/) { - my $group = $1; - my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); - if ($url =~ /group_boards_\Q$group\E/) { - my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); - my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group}); - if (keys(%groupsettings) > 0) { - if (ref($groupsettings{'functions'}) eq 'HASH') { - if ($groupsettings{'functions'}{'discussion'} eq 'on') { - $noremove=1; - } - } - } - $nocut=1; - $nocopy=1; - } - } - my ($copylink,$cutlink,$removelink); + my $copylink=' '; + my $cutlink=' '; + my $skip_confirm = 0; if ( $folder =~ /^supplemental/ || ($url =~ m{( /smppg$ @@ -2673,49 +1313,27 @@ sub entryline { |/aboutme$ |/navmaps$ |/bulletinboard$ - |\.html$)}x) - || $isexternal) { + |\.html$ + |^/adm/wrapper/ext)}x)) { $skip_confirm = 1; } - if ($nocopy) { - $copylink=(<