--- loncom/interface/londocs.pm	2013/01/09 17:23:58	1.484.2.23
+++ loncom/interface/londocs.pm	2012/12/07 16:48:19	1.522
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.23 2013/01/09 17:23:58 raeburn Exp $
+# $Id: londocs.pm,v 1.522 2012/12/07 16:48:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::lonxml;
 use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
+use Apache::lonuserstate();
 use Apache::lonextresedit();
 use HTML::Entities;
 use HTML::TokeParser;
@@ -270,9 +271,7 @@ sub dumpcourse {
 
 sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
-    my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
-        %removeparam,$importuploaded,$fixuperrors);
-    $allmaps = {};
+
     while (@files) {
 	my ($name, $url, $residx) = @{ shift(@files) };
         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
@@ -298,24 +297,6 @@ sub group_import {
             }
         }
 	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
 		|| defined($LONCAPA::map::zombies[$residx])) {
 		$residx = &LONCAPA::map::getresidx($url,$residx);
@@ -329,27 +310,7 @@ sub group_import {
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
-    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);
+    return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
 }
 
 sub log_docs {
@@ -690,7 +651,7 @@ sub print_paste_buffer {
         $is_external = 1;
     }
 
-    my ($canpaste,$nopaste,$othercrs,$areachange);
+    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
     if ($folder =~ /^supplemental/) {
         $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
         unless ($canpaste) {
@@ -934,23 +895,30 @@ sub do_paste_from_buffer {
         %dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls);
     $oldurl = $url;
     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
-        my ($allmaps,%hierarchy,%titles);
-        $allmaps = {};
+        my (%allmaps,%hierarchy,%titles);
         if ($folder =~ /^default/) {
-            $allmaps =
-                &Apache::loncommon::allmaps_incourse($coursedom,$coursenum,
-                                                     $env{"course.$env{'request.course.id'}.home"},
-                                                     $env{'request.course.id'});
+            my $navmap = Apache::lonnavmaps::navmap->new();
+            if (defined($navmap)) {
+                foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
+                    $allmaps{$res->src()} = 1;
+                }
+            }
         }
         &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
-                             \%addedmaps,\%hierarchy,\%titles,$allmaps);
+                             \%addedmaps,\%hierarchy,\%titles,\%allmaps);
         if ($url=~ m{^/uploaded/}) {
             my $newurl;
             unless ($env{'form.docs.markedcopy_options'} eq 'move') {
                 ($newurl,my $error) = 
                     &get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum,
-                                    $srcdom,$srcnum,\$title,$allmaps,\%newurls);
+                                    $srcdom,$srcnum,\$title,\%allmaps,\%newurls);
                 if ($error) {
                     return ($error);
                 }
@@ -966,14 +934,14 @@ sub do_paste_from_buffer {
             if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) ||
                 (($newurl ne '') && ($newurl ne $url))) {
                 unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,
-                                          $allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
+                                          \%allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
                                           \%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove,
                                           \%newsubdir,\%newurls)) {
                     $mapmoves{$url} = 1;
                 }
                 $url = $newurl;
             } 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,
                                   \%mapchanges,\%tomove,\%newsubdir,\%newurls); 
             }
@@ -982,7 +950,7 @@ sub do_paste_from_buffer {
             &Apache::lonnet::delenv('docs.markedcopy');
 # if pasting published map (main content are only) check map is not already in course
             if ($folder =~ /^default/) {
-                if ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) {
+                if ($allmaps{$url}) {
                     return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.'));
                 }
             }
@@ -1048,28 +1016,11 @@ sub do_paste_from_buffer {
     }
 # Apply any changes to maps, or copy dependencies for uploaded HTML pages 
     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 =
-        &apply_fixups($folder,$is_map,$coursedom,$coursenum,$errors,
-                      \%updated,\%info,\%moves,$prefixchg,$oldurl,$url,'paste');
+        &apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl,
+                      $url,\%removefrommap,\%removeparam,\%rewrites,\%retitles,
+                      \%copies,\%dbcopies,\%zombies,\%params,\%docmoves,
+                      \%mapmoves,\%newsubdir,$errors,\%before,\%after);
     if ($result eq 'ok') {
         if ($is_map) { 
             my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
@@ -1229,7 +1180,7 @@ sub contained_map_check {
                         $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
                     } else {
                         if ($allmaps->{$ressrc}) {
-                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; 
                         } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
                             $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         } else {
@@ -1253,6 +1204,15 @@ sub contained_map_check {
     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 {
     my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies,
         $dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_;
@@ -1371,71 +1331,23 @@ sub url_paste_fixups {
 }
 
 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);
-    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 ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap,
+        $removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,
+        $docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_;
+    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;
-                    }
+        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);
             }
+            undef(%added);
         }
         if ($key eq $oldurl) {
-            if ((exists($docmoves{$key}))) {
+            if ((exists($docmoves->{$key}))) {
                 unless (grep(/^\Q$oldurl\E/,@allcopies)) {
                     push(@allcopies,$oldurl);
                 }
@@ -1449,16 +1361,16 @@ sub apply_fixups {
                     my $content = &Apache::lonnet::getfile($item);
                     unless ($content eq '-1') {
                         my $storefn;
-                        if (($key eq $oldurl) && (exists($docmoves{$key}))) {
-                            $storefn = $docmoves{$key};
+                        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 && $before{'doc'} && $after{'doc'}) {
-                                $storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/;
+                            if ($prefixchg) {
+                                $storefn =~ s/^\Q$before->{'doc'}\E/$after->{'doc'}/;
                             }
-                            if ($newsubdir{$key}) {
-                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}#;
+                            if ($newsubdir->{$key}) {
+                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir->{$key}#;
                             }
                         }
                         &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
@@ -1466,7 +1378,7 @@ sub apply_fixups {
                             &Apache::lonclonecourse::writefile($env{'request.course.id'},
                                                                $storefn.$fname,$content);
                         if ($copyurl eq '/adm/notfound.html') {
-                            if (exists($docmoves{$oldurl})) {
+                            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;
@@ -1477,14 +1389,14 @@ sub apply_fixups {
             }
         }
     }
-    foreach my $key (keys(%mapmoves)) {
+    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 ($prefixchg) {
+            $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/;
         }
-        if ($newsubdir{$key}) {
-            $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
+        if ($newsubdir->{$key}) {
+            $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/;
         }
         my $mapcontent = &Apache::lonnet::getfile($key);
         if ($mapcontent eq '-1') {
@@ -1504,39 +1416,48 @@ sub apply_fixups {
     }
     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(%{$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($rewrites->{$key}) eq 'HASH') {
+                %torewrite = %{$rewrites->{$key}};
             }
-            if (ref($retitles{$key}) eq 'HASH') {
-                %toretitle = %{$retitles{$key}};
+            if (ref($retitles->{$key}) eq 'HASH') {
+                %toretitle = %{$retitles->{$key}};
             }
-            if (ref($removefrommap{$key}) eq 'HASH') {
-                %toremove = %{$removefrommap{$key}};
+            if (ref($removefrommap->{$key}) eq 'HASH') {
+                %toremove = %{$removefrommap->{$key}};
             }
-            if (ref($removeparam{$key}) eq 'HASH') {
-                %remparam = %{$removeparam{$key}};
+            if (ref($removeparam->{$key}) eq 'HASH') {
+                %remparam = %{$removeparam->{$key}};
             }
-            if (ref($zombies{$key}) eq 'HASH') {
-                %zombie = %{$zombies{$key}};
+            if (ref($zombies->{$key}) eq 'HASH') {
+                %zombie = %{$zombies->{$key}};
             }
-            if (ref($dbcopies{$key}) eq 'HASH') {
-                foreach my $item (keys(%{$dbcopies{$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}};
+            if (ref($params->{$key}) eq 'HASH') {
+                %currparam = %{$params->{$key}};
             }
             my ($errtext,$fatal) = &LONCAPA::map::mapread($key);
             if ($fatal) {
@@ -1550,41 +1471,40 @@ sub apply_fixups {
                     }
                 }
             }
-            for (my $i=0; $i<@LONCAPA::map::order; $i++) {
-                my $idx = $LONCAPA::map::order[$i];
-                if (defined($LONCAPA::map::resources[$idx])) {
+            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[$idx]);
-                    if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) {
+                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]);
+                    if ($toremove{$src} eq $i) {
                         splice(@LONCAPA::map::order,$i,1);
-                        if (ref($currparam{$idx}) eq 'ARRAY') {
-                            foreach my $name (@{$currparam{$idx}}) {
-                                &LONCAPA::map::delparameter($idx,'parameter_'.$name);
+                        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 $idx)) {
+                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) {
                         if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
                             $changed = 1;
                         }
                     }
-                    if ((exists($torewrite{$src})) && ($torewrite{$src} eq $idx)) {
+                    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 && $before{'map'} && $after{'map'}) {
+                            if ($prefixchg) {
                                 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 {
-                                    $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)$/) {
-                                    $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 {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$origsrc}#;
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir->{$origsrc}#;
                                 }
                             }
                         }
@@ -1594,7 +1514,7 @@ sub apply_fixups {
                         $changed = 1;
                     }
                     if ($changed) {
-                        $LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type));
+                        $LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type));
                     }
                 }
             }
@@ -1612,23 +1532,21 @@ sub apply_fixups {
             } 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 ($prefixchg) {
+                    $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/;
                 }
-                if ($newsubdir{$key}) {
-                    $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
+                if ($newsubdir->{$key}) {
+                    $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/;
                 }
             }
             my $report;
             if ($folder !~ /^supplemental/) {
                 $report = 1;
             }
-            (my $outtext,$errtext) =
+            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 &mt('Paste failed: an error occurred saving the folder or page.');
             }
         }
     }
@@ -1776,11 +1694,7 @@ sub editor {
         $container = 'sequence';
     }
 
-    my $jumpto;
-
-    unless ($supplementalflag) {
-        $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
-    }
+    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
 
     unless ($allowed) {
         $randompick = -1;
@@ -1872,13 +1786,9 @@ sub editor {
 		    push(@imports, [$name, $url, $residx]);
 		}
 	    }
-            ($errtext,$fatal,my $fixuperrors) =
-                &group_import($coursenum, $coursedom, $folder,$container,
-                              'londocs',@imports);
+	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
+					    $container,'londocs',@imports);
 	    return $errtext if ($fatal);
-            if ($fixuperrors) {
-                $r->print($fixuperrors);
-            }
 	}
 # Loading a complete map
 	if ($env{'form.loadmap'}) {
@@ -1957,7 +1867,7 @@ sub editor {
                                                            'Navigation_Screen',undef,'RAT')
                        .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
                        .'<td align="left"><ul id="LC_toolbar">'
-                       .'<li><a href="/adm/coursedocs?forcesupplement=1&amp;command=editsupp" '
+                       .'<li><a href="/adm/coursedocs?forcesupplement=1" '
                        .'id="LC_content_toolbar_edittoplevel" '
                        .'class="LC_toolbarItem" '
                        .'title="'.&mt('Supplemental Content Editor').'">'
@@ -2533,7 +2443,7 @@ $form_common.'
                                                             $forceedit,
                                                             undef,$symb,
                                                             &escape($env{'form.folderpath'}),
-                                                            $renametitle,'','',1);
+                                                            $renametitle);
                 if ($jscall) {
                     $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
@@ -3158,6 +3068,7 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
     } else {
         $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
@@ -3300,33 +3211,23 @@ sub handler {
 
 # Do we directly jump somewhere?
 
-   if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) {
+   if ($env{'form.command'} eq 'direct') {
+       my ($mapurl,$id,$resurl);
        if ($env{'form.symb'} ne '') {
            $env{'form.folderpath'}=
                &Apache::loncommon::symb_to_docspath($env{'form.symb'});
-           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
-               $env{'form.command'}.'_'.$env{'form.symb'}});
        } elsif ($env{'form.supppath'} ne '') {
            $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') {
-       $env{'form.folderpath'} = 'default&'.
-                                 &Apache::lonhtmlcommon::entity_encode('Main Course Content').
-                                 ':::::';
-       &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
+        $env{'form.folderpath'} = 'default&'.
+                                  &Apache::lonhtmlcommon::entity_encode('Main Course Content').
+                                  ':::::';
    } elsif ($env{'form.command'} eq 'editsupp') {
-       $env{'form.folderpath'} = 'supplemental&'.
+        $env{'form.folderpath'} = 'default&'.
                                   &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?
     my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {
@@ -3337,9 +3238,6 @@ sub handler {
     if ((!$env{'form.folderpath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
                                           {'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
@@ -3542,6 +3440,9 @@ sub handler {
   } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
        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',
                 'upfi' => 'Upload File',
                 'upld' => 'Import Content',
@@ -3551,8 +3452,10 @@ sub handler {
                 'impm' => 'Import from Assembled Map',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
+                'reco' => 'Recover Deleted Documents',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
+                'extr' => 'External Resource',
                 'syll' => 'Syllabus',
                 'navc' => 'Table of Contents',
                 'sipa' => 'Simple Course Page',
@@ -3563,7 +3466,7 @@ sub handler {
                 'mypi' => 'My Personal Information Page',
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
-                'abou' => 'Personal Information Page for a User',
+				'abou' => 'Personal Information Page for a User',
                 'imsf' => 'IMS Import',
                 'imsl' => 'Import IMS package',
                 'cms'  => 'Origin of IMS package',
@@ -3571,6 +3474,9 @@ sub handler {
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
+                'url'  => 'URL',
+                'prev' => 'Preview',
+                'lnk'  => 'Add Link', 
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
 					  );
 # -----------------------------------------------------------------------------
@@ -4311,15 +4217,15 @@ sub generate_edit_table {
     my $form;
     my $activetab;
     my $active;
-    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
+    if($env{'form.active'} ne ''){
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';
-    my $backtext = &mt('Exit Editor');
+    my $backtext = &mt('Exit');
     $form = '<div class="LC_Box" style="margin:0;">'.
             '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
             '<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;"'.
             '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
             '<li>'.
@@ -4415,25 +4321,9 @@ sub editing_js {
     my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A';
     my $toplevelsupp = &supplemental_base();
 
-    my $backtourl;
-    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) {
+    my $backtourl = '/adm/navmaps';
+    if ($supplementalflag) {
         $backtourl = '/adm/supplemental';
-    } else {
-        $backtourl = '/adm/navmaps';
     }
 
     my $fieldsets = "'ext','doc'";
@@ -4735,8 +4625,9 @@ function showPage(current, pageId, nav,
 
 function toContents(jumpto) {
     var newurl = '$backtourl';
-    if ((newurl == '/adm/navmaps') && (jumpto != '')) {
+    if (jumpto != '') {
         newurl = newurl+'?postdata='+jumpto;
+;
     }
     location.href=newurl;
 }
@@ -4928,6 +4819,8 @@ Return hash with valid author names
 
 =item contained_map_check()
 
+=item reinit_role()
+
 =item url_paste_fixups()
 
 =item apply_fixups()