--- loncom/interface/londocs.pm	2025/01/17 14:10:05	1.484.2.93.2.18
+++ loncom/interface/londocs.pm	2024/07/03 15:15:00	1.484.2.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.93.2.18 2025/01/17 14:10:05 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.95 2024/07/03 15:15:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,14 +43,12 @@ use Apache::lonnavdisplay();
 use Apache::lonextresedit();
 use Apache::lontemplate();
 use Apache::lonsimplepage();
-use Apache::loncourserespicker();
 use HTML::Entities;
 use HTML::TokeParser;
 use GDBM_File;
 use File::MMagic;
 use Apache::lonlocal;
 use Cwd;
-use UUID::Tiny ':std';
 use LONCAPA qw(:DEFAULT :match);
 
 my $iconpath;
@@ -87,7 +85,7 @@ sub storemap {
 
     if ($map =~ /^default/) {
         $hadchanges=1;
-    } elsif ($contentchg) {
+    } else {
         $suppchanges=1;
     }
     return ($errtext,0);
@@ -179,62 +177,43 @@ sub default_folderpath {
     }
 }
 
-sub validate_supppath {
-    my ($coursenum,$coursedom) = @_;
-    my $backto;
+sub validate_folderpath {
+    my ($supplementalflag) = @_;
+    if ($env{'form.folderpath'} ne '') {
+        my @items = split(/\&/,$env{'form.folderpath'});
+        my $badpath;
+        for (my $i=0; $i<@items; $i++) {
+            my $odd = $i%2;
+            if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) {
+                $badpath = 1;
+            } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) {
+                $badpath = 1;
+            }
+            last if ($badpath);
+        }
+        if ($badpath) {
+            delete($env{'form.folderpath'});
+        }
+    }
+    return;
+}
+
+sub validate_suppath {
     if ($env{'form.supppath'} ne '') {
         my @items = split(/\&/,$env{'form.supppath'});
-        my ($badpath,$got_supp,$supppath,%supphidden,%suppids);
+        my $badpath;
         for (my $i=0; $i<@items; $i++) {
             my $odd = $i%2;
             if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) {
                 $badpath = 1;
-                last;
-            } elsif ($odd) {
-                my $suffix;
-                my $idx = $i-1;
-                if ($items[$i] =~ /^([^:]*)::(|1):::$/) {
-                    $backto .= '&'.$1;
-                } elsif ($items[$idx] eq 'supplemental') {
-                    $backto .= '&'.$items[$i];
-                } else {
-                    $backto .= '&'.$items[$i];
-                    my $is_hidden;
-                    unless ($got_supp) {
-                        my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom);
-                        if (ref($supplemental) eq 'HASH') {
-                            if (ref($supplemental->{'hidden'}) eq 'HASH') {
-                                %supphidden = %{$supplemental->{'hidden'}};
-                            }
-                            if (ref($supplemental->{'ids'}) eq 'HASH') {
-                                %suppids = %{$supplemental->{'ids'}};
-                            }
-                        }
-                        $got_supp = 1;
-                    }
-                    if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') {
-                        my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0];
-                        if ($supphidden{$mapid}) {
-                            $is_hidden = 1;
-                        }
-                    }
-                    $suffix = '::'.$is_hidden.':::';
-                }
-                $supppath .= '&'.$items[$i].$suffix;
-            } else {
-                $supppath .= '&'.$items[$i];
-                $backto .= '&'.$items[$i];
             }
+            last if ($badpath);
         }
         if ($badpath) {
             delete($env{'form.supppath'});
-        } else {
-            $supppath =~ s/^\&//;
-            $backto =~ s/^\&//;
-            $env{'form.supppath'} = $supppath;
         }
     }
-    return $backto;
+    return;
 }
 
 sub dumpcourse {
@@ -682,7 +661,7 @@ sub recurse_html {
 }
 
 sub group_import {
-    my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_;
+    my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
     my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
         %removeparam,$importuploaded,$fixuperrors);
     $allmaps = {};
@@ -711,166 +690,6 @@ sub group_import {
             }
         }
 	if ($url) {
-            if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/ext\.tool)\:?(.*)$}) {
-                $url = $1;
-                my $marker = $2;
-                my $info = $3;
-                my ($toolid,$toolprefix,$tooltype,%toolhash,%toolsettings);
-                my @extras = ('linktext','explanation','crslabel','crstitle','crsappend');
-                my @toolinfo = split(/:/,$info);
-                if ($residx) {
-                    %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
-                    $toolid = $toolsettings{'id'};
-                } else {
-                    $toolid = shift(@toolinfo);
-                }
-                if ($toolid =~ /^c/) {
-                    $tooltype = 'crs';
-                    $toolprefix = 'c';
-                } else {
-                    $tooltype = 'dom';
-                }
-                $toolid =~ s/\D//g;
-                ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},
-                 $toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'},
-                 $toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'}) = @toolinfo;
-                foreach my $item (@extras) {
-                    $toolhash{$item} = &unescape($toolhash{$item});
-                }
-                if ($folder =~ /^supplemental/) {
-                    delete($toolhash{'gradable'});
-                } else {
-                    $toolhash{'gradable'} =~ s/\D+//g;
-                }
-                if (ref($ltitoolsref) eq 'HASH') {
-                    if (ref($ltitoolsref->{$tooltype}) eq 'HASH') {
-                        if (ref($ltitoolsref->{$tooltype}->{$toolid}) eq 'HASH') {
-                            my %tools = %{$ltitoolsref->{$tooltype}->{$toolid}};
-                            my @deleted;
-                            $toolhash{'id'} = $toolprefix.$toolid;
-                            if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') ||
-                                ($toolhash{'target'} eq 'window')) {
-                                if ($toolhash{'target'} eq 'window') {
-                                    foreach my $item ('width','height') {
-                                        $toolhash{$item} =~ s/^\s+//;
-                                        $toolhash{$item} =~ s/\s+$//;
-                                        if ($toolhash{$item} =~ /\D/) {
-                                            delete($toolhash{$item});
-                                            if ($residx) {
-                                                if ($toolsettings{$item}) {
-                                                    push(@deleted,$item);
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            } elsif ($residx) {
-                                $toolhash{'target'} = $toolsettings{'target'};
-                                if ($toolhash{'target'} eq 'window') {
-                                    foreach my $item ('width','height') {
-                                        $toolhash{$item} = $toolsettings{$item};
-                                    }
-                                }
-                            } elsif (ref($tools{'display'}) eq 'HASH') {
-                                $toolhash{'target'} = $tools{'display'}{'target'};
-                                if ($toolhash{'target'} eq 'window') {
-                                    $toolhash{'width'} = $tools{'display'}{'width'};
-                                    $toolhash{'height'} = $tools{'display'}{'height'};
-                                }
-                            }
-                            if ($toolhash{'target'} eq 'iframe') {
-                                foreach my $item ('width','height','linktext','explanation') {
-                                    delete($toolhash{$item});
-                                    if ($residx) {
-                                        if ($toolsettings{$item}) {
-                                            push(@deleted,$item);
-                                        }
-                                    }
-                                }
-                            } elsif ($toolhash{'target'} eq 'tab') {
-                                foreach my $item ('width','height') {
-                                    delete($toolhash{$item});
-                                    if ($residx) {
-                                        if ($toolsettings{$item}) {
-                                            push(@deleted,$item);
-                                        }
-                                    }
-                                }
-                            }
-                            if (ref($tools{'crsconf'}) eq 'HASH') {
-                                foreach my $item ('label','title','linktext','explanation') {
-                                    my $crsitem;
-                                    if (($item eq 'label') || ($item eq 'title')) {
-                                        $crsitem = 'crs'.$item;
-                                    } else {
-                                        $crsitem = $item;
-                                    }
-                                    if ($tools{'crsconf'}{$item}) {
-                                        $toolhash{$crsitem} =~ s/^\s+//;
-                                        $toolhash{$crsitem} =~ s/\s+$//;
-                                        if ($toolhash{$crsitem} eq '') {
-                                            delete($toolhash{$crsitem});
-                                        }
-                                    } else {
-                                        delete($toolhash{$crsitem});
-                                    }
-                                    if (($residx) && (exists($toolsettings{$crsitem}))) {
-                                        unless (exists($toolhash{$crsitem})) {
-                                            push(@deleted,$crsitem);
-                                        }
-                                    }
-                                }
-                            }
-                            if ($toolhash{'passback'}) {
-                                my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
-                                $toolhash{'gradesecret'} = $gradesecret;
-                                $toolhash{'gradesecretdate'} = time;
-                            }
-                            if ($toolhash{'roster'}) {
-                                my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
-                                $toolhash{'rostersecret'} = $rostersecret;
-                                $toolhash{'rostersecretdate'} = time;
-                            }
-                            my $changegradable;
-                            if (($residx) && ($folder =~ /^default/)) {
-                                if ($toolsettings{'gradable'}) {
-                                    unless (($toolhash{'gradable'}) || (defined($LONCAPA::map::zombies[$residx]))) {
-                                        push(@deleted,'gradable');
-                                        $changegradable = 1;
-                                    }
-                                } elsif ($toolhash{'gradable'}) {
-                                    $changegradable = 1;
-                                }
-                                if (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) {
-                                    $changegradable = 1;
-                                    if ($toolsettings{'gradable'}) {
-                                        $toolhash{'gradable'} = 1;
-                                    }
-                                }
-                            }
-                            my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum);
-                            if ($putres eq 'ok') {
-                                if (@deleted) {
-                                    &Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum);
-                                }
-                                if (($changegradable) && ($folder =~ /^default/)) {
-                                    my $val;
-                                    if ($toolhash{'gradable'}) {
-                                        $val = 'yes';
-                                    } else {
-                                        $val = 'no';
-                                    }
-                                    &LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$val,
-                                                                  'string_yesno');
-                                    &remember_parms($residx,'gradable','set',$val);
-                                }
-                            } else {
-                                return (&mt('Failed to save update to external tool.'),1);
-                            }
-                        }
-                    }
-                }
-            }
             if (($caller eq 'londocs') &&
                 ($folder =~ /^default/)) {
                 if (($url =~ /\.(page|sequence)$/) && (!$donechk)) {
@@ -882,8 +701,8 @@ sub group_import {
                     $donechk = 1;
                 }
                 if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) {
-                    &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
-                                         \%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps);
+                    &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
+                                         \%addedmaps,\%hierarchy,\%titles,$allmaps);
                     $importuploaded = 1;
                 } elsif ($url =~ m{^/res/.+\.(page|sequence)$}) {
                     next if ($allmaps->{$url});
@@ -979,6 +798,7 @@ END
         &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
     unless ($fatal) {
         if ($folder =~ /^supplemental/) {
+            &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
             my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
                                             $folder.'.'.$container);
         }
@@ -1055,7 +875,7 @@ sub docs_change_log {
              '// <![CDATA['."\n".
              &Apache::loncommon::display_filter_js('docslog')."\n".
              &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag,
-                         $coursedom,$coursenum,'','',$canedit,'',\$navmap)."\n".
+                         $coursedom,$coursenum,$canedit,'',\$navmap)."\n".
              &history_tab_js()."\n".
              &Apache::lonratedt::editscript('simple')."\n".
              '// ]]>'."\n".
@@ -1105,7 +925,6 @@ sub docs_change_log {
 	    'encrypturl'     => 'URL hidden',
 	    'randompick'     => 'Randomly pick',
 	    'randomorder'    => 'Randomly ordered',
-            'gradable'       => 'Grade can be assigned to External Tool',
 	    'set'            => 'set to',
 	    'del'            => 'deleted');
     my $filter = &Apache::loncommon::display_filter('docslog')."\n".
@@ -1215,11 +1034,9 @@ sub docs_change_log {
             my ($title,$url) = split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'},3);
             if ($title eq '') {
                 ($title) = ($url =~ m{/([^/]+)$});
-            } elsif ($is_supp) {
-                $title = &Apache::loncommon::parse_supplemental_title($title);
             }
             $r->print(&LONCAPA::map::qtescape($title).':<ul>');
-	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder','gradable') {
+	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
 # FIXME: internationalization seems wrong here
 		    $r->print('<li>'.
@@ -1354,8 +1171,8 @@ sub update_paste_buffer {
                 $subdir = $prefix;
             }
             my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);
-            &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
-                                 \%removeparam,\%addedmaps,\%hierarchy,\%titles,\%allmaps);
+            &contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps,
+                                 \%hierarchy,\%titles,\%allmaps);
             if (ref($hierarchy{$url}) eq 'HASH') {
                 my ($nested,$nestednames);
                 &recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);
@@ -1416,7 +1233,7 @@ sub print_paste_buffer {
     }
 
     my @currpaste = split(/,/,$env{'docs.markedcopies'});
-    my ($pasteitems,@pasteable,$same_institution,$checkedsameinst);
+    my ($pasteitems,@pasteable);
     my $clipboardcount = 0;
 
 # Construct identifiers for current contents of user's paste buffer
@@ -1429,14 +1246,10 @@ sub print_paste_buffer {
             ($url ne '')) {
             $clipboardcount ++;
             my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
-                $canpaste,$nopaste,$othercrs,$areachange,$is_exttool,$toolcdom,
-                $toolcnum,$marker);
+                $canpaste,$nopaste,$othercrs,$areachange);
             my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
             if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
                 $is_external = 1;
-            } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
-                ($toolcdom,$toolcnum,$marker) = ($1,$2,$3);
-                $is_exttool = 1;
             }
             if ($folder =~ /^supplemental/) {
                 $canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix});
@@ -1469,47 +1282,11 @@ sub print_paste_buffer {
                         $is_uploaded_map = 1;
                     }
                 } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||
-                         ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg|ext\.tool)$})) {
+                         ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg)$})) {
                     if ($cid ne $env{'request.course.id'}) {
                         my ($srcdom,$srcnum) = split(/_/,$cid);
                         if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                            if ($is_exttool) {
-                                if ($toolcdom ne $coursedom) {
-                                    $canpaste = 0;
-                                    $nopaste = &mt('Paste from another domain unavailable.');
-                                } elsif ($toolcnum ne $coursenum) {
-                                    my %toolsettings =
-                                        &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum);
-                                    my %tooltypes = &Apache::loncommon::usable_exttools();
-                                    if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
-                                        (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
-                                        $canpaste = 0;
-                                        $nopaste = &mt('Paste from another course unavailable.');
-                                    } elsif ($toolsettings{'id'} =~ /^c\d+$/) {
-                                        unless ($checkedsameinst) {
-                                            my $primary_id = &Apache::lonnet::domain($coursedom,'primary');
-                                            my $intdom = &Apache::lonnet::internet_dom($primary_id);
-                                            if ($intdom ne '') {
-                                                my $internet_names =
-                                                    &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
-                                                if (ref($internet_names) eq 'ARRAY') {
-                                                    if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
-                                                        $same_institution = 1;
-                                                    }
-                                                }
-                                            }
-                                            $checkedsameinst = 1;
-                                        }
-                                        if ($same_institution) {
-                                            $othercrs = '<br />'.&mt('(from another course)');
-                                        } else {
-                                            $nopaste = &mt('Paste from another course unavailable.');
-                                        }
-                                    } else {
-                                        $othercrs = '<br />'.&mt('(from another course)');
-                                    }
-                                }
-                            }
+                            $othercrs = '<br />'.&mt('(from another course)');
                         } else {
                             $canpaste = 0;
                             $nopaste = &mt('Paste from another course unavailable.');
@@ -1525,9 +1302,6 @@ sub print_paste_buffer {
                 $buffer = &mt('External Resource').': '.
                     &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('.
                     &LONCAPA::map::qtescape($url).')';
-            } elsif ($is_exttool) {
-                $buffer = &mt('External Tool').': '.
-                    &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
             } else {
                 my $icon = &Apache::loncommon::icon($extension);
                 if ($extension eq 'sequence' &&
@@ -1583,7 +1357,7 @@ sub print_paste_buffer {
             }
             $buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.('&nbsp;'x2);
         }
-        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.('&nbsp;'x2);
+        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'.('&nbsp;'x2);
         if ($clipboardcount > 1) {
             $buttons .=
                 '<span style="text-decoration:line-through">'.('&nbsp;'x20).'</span>'.('&nbsp;'x2).
@@ -1684,8 +1458,7 @@ sub supp_pasteable {
         (($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) ||
         ($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) ||
         ($url =~ m{^/adm/$match_domain/$match_username/aboutme}) ||
-        ($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) ||
-        ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
+        ($url =~ m{^/public/$match_domain/$match_courseid/syllabus})) {
         return 1;
     }
     return;
@@ -1807,12 +1580,9 @@ sub do_paste_from_buffer {
         return();
     }
 
-    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,
-        %othcrstool,%duplicate,%prefixchg,%srcdom,%srcnum,%srcmapidx,
-        %marktomove,$save_err,$lockerrors,$allresult,%currcrsltitools,
-        %currltititles,$currltimax,$gotcrsltitools);
-    $currltimax = 0;
-    $gotcrsltitools = 0;
+    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate,
+        %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult);
+
     foreach my $suffix (@topaste) {
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
         my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
@@ -1839,8 +1609,7 @@ sub do_paste_from_buffer {
             $srcdom{$suffix} = $srcd;
             $srcnum{$suffix} = $srcn;
         } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) ||
-                 ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$}) ||
-                 ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
+                 ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$})) {
             my ($srcd,$srcn) = split(/_/,$cid);
 # When paste buffer was populated using an active role in a different course
 # check for mdc privilege in the course from which the resource was pasted
@@ -1850,42 +1619,6 @@ sub do_paste_from_buffer {
                     next;
                 }
             }
-# When buffer was populated using an active role in a different course
-# disallow pasting of External Tool if course is in a different domain,
-# or if External Tool use is not permitted in this course.
-            if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
-                my ($toolcdom,$toolcnum,$marker) = ($1,$2,$3);
-                if ($toolcdom ne $coursedom) {
-                    $notindom{$suffix} = 1;
-                    next;
-                } elsif ($toolcnum ne $coursenum) {
-                    my %toolsettings =
-                        &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum);
-                    my %tooltypes = &Apache::loncommon::usable_exttools();
-                    if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
-                        (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
-                        $othcrstool{$suffix} = 1;
-                        next;
-                    }
-                    if ($toolsettings{'id'} =~ /^c\d+$/) {
-                        unless ($gotcrsltitools) {
-                            %currcrsltitools =
-                                &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer');
-                            foreach my $item (sort(keys(%currcrsltitools))) {
-                                if (ref($currcrsltitools{$item}) eq 'HASH') {
-                                    $currltimax ++;
-                                    if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') {
-                                        push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item);
-                                    } else {
-                                        $currltititles{$currcrsltitools{$item}{'title'}} = [$item];
-                                    }
-                                }
-                            }
-                            $gotcrsltitools = 1;
-                        }
-                    }
-                }
-            }
             $srcdom{$suffix} = $srcd;
             $srcnum{$suffix} = $srcn;
         }
@@ -1894,6 +1627,7 @@ sub do_paste_from_buffer {
         if ($url=~/\.(page|sequence)$/) {
             $is_map{$suffix} = 1; 
         }
+
         if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) {
             my $oldprefix = $1;
 # When pasting content from Main Content to Supplemental Content and vice versa 
@@ -1938,8 +1672,6 @@ sub do_paste_from_buffer {
     %msgs = &Apache::lonlocal::texthash (
                 notinsupp => 'Paste failed: content type is not supported within Supplemental Content',
                 notincrs  => 'Paste failed: Item is from a different course which you do not have rights to edit.',
-                notindom  => 'Paste failed: Item is an external tool from a course in a different domain.',
-                othcrstool => 'Paste failed: Item is an external tool from a different course, for which use is not allowed in this course.',
                 duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.',
             );
 
@@ -1968,9 +1700,7 @@ sub do_paste_from_buffer {
 # Retrieve information about all course maps in main content area 
 
     my $allmaps = {};
-    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk,
-        @updatetoolsenc,$updatetoolscache,$checkedsameinst,
-        $same_institution);
+    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk);
 
 # Loop over the items to paste
     foreach my $suffix (@dopaste) {
@@ -1995,9 +1725,8 @@ sub do_paste_from_buffer {
                                                          $env{'request.course.id'});
                 $donechk = 1; 
             }
-            &contained_map_check($url,$folder,$coursenum,$coursedom,
-                                 \%removefrommap,\%removeparam,\%addedmaps,
-                                 \%hierarchy,\%titles,$allmaps);
+            &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
+                                 \%addedmaps,\%hierarchy,\%titles,$allmaps);
             if ($url=~ m{^/uploaded/}) {
                 my $newurl;
                 unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
@@ -2050,7 +1779,7 @@ sub do_paste_from_buffer {
                 }
             }
         }
-        if ($url=~ m{/(bulletinboard|smppg|ext\.tool)$}) {
+        if ($url=~ m{/(bulletinboard|smppg)$}) {
             my $prefix = $1;
             my $fromothercrs;
             #need to copy the db contents to a new one, unless this is a move.
@@ -2059,37 +1788,17 @@ sub do_paste_from_buffer {
                          cdom => $coursedom,
                          cnum => $coursenum,
                        );
-            if ($prefix eq 'ext.tool') {
-                if ($prefixchg{$suffix} eq 'docstosupp') {
-                    $info{'delgradable'} = 1;
-                }
-            }
             if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) {
                 unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) {
                     $fromothercrs = 1;
                     $info{'cdom'} = $srcdom{$suffix};
                     $info{'cnum'} = $srcnum{$suffix};
-                    unless ($checkedsameinst) {
-                        my $primary_id = &Apache::lonnet::domain($coursedom,'primary');
-                        my $intdom = &Apache::lonnet::internet_dom($primary_id);
-                        if ($intdom ne '') {
-                            my $internet_names =
-                                &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
-                            if (ref($internet_names) eq 'ARRAY') {
-                                if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
-                                    $same_institution = 1;
-                                }
-                            }
-                        }
-                        $checkedsameinst = 1;
-                    }
                 }
             }
             unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) {
                 my (%lockerr,$msg); 
                 my ($newurl,$result,$errtext) =
-                    &dbcopy(\%info,$coursedom,$coursenum,\%lockerr,\%currltititles,
-                            \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution);
+                    &dbcopy(\%info,$coursedom,$coursenum,\%lockerr);
                 if ($result eq 'ok') {
                     $url = $newurl;
                     $title=&mt('Copy of').' '.$title;
@@ -2098,8 +1807,6 @@ sub do_paste_from_buffer {
                         $msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;
                     } elsif ($prefix eq 'bulletinboard') {
                         $msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;
-                    } elsif ($prefix eq 'ext.tool') {
-                        $msg = &mt('Paste failed: An error occurred when copying the external tool.').' '.$errtext;
                     }
                     $results{$suffix} = $result;
                     $msgerrs{$suffix} = $msg;
@@ -2170,18 +1877,6 @@ sub do_paste_from_buffer {
                     &copy_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix},
                                           $coursedom,$coursenum,$template,$newidx,"$folder.$container");
                 }
-            } elsif ($url =~ /ext\.tool$/) {
-                if (($newidx) && ($folder=~/^default/)) {
-                    my $marker = (split(m{/},$url))[4];
-                    my %toolsettings = &Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
-                    my $val = 'no';
-                    if ($toolsettings{'gradable'}) {
-                        $val = 'yes';
-                    }
-                    &LONCAPA::map::storeparameter($newidx,'parameter_0_gradable',$val,
-                                                  'string_yesno');
-                    &remember_parms($newidx,'gradable','set',$val);
-                }
             }
             $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
                                               ':'.$ext.':normal:res';
@@ -2258,10 +1953,6 @@ sub do_paste_from_buffer {
             }
         }
     }
-    if (($updatetoolscache) || (@updatetoolsenc)) {
-        &update_ltitools_caches($coursedom,$coursenum,$updatetoolscache,
-                                \@updatetoolsenc);
-    }
     &clear_from_buffer(\@toclear,\@currpaste);
     my $msgsarray;
     foreach my $suffix (keys(%msgs)) {
@@ -2310,30 +2001,6 @@ sub clear_from_buffer {
     return $numdel;
 }
 
-sub update_ltitools_caches {
-    my ($coursedom,$coursenum,$updatetoolscache,$updatetoolsenc) = @_;
-    my $hashid=$coursedom.'_'.$coursenum;
-    if ($updatetoolscache) {
-        &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid);
-    }
-    if ((ref($updatetoolsenc) eq 'ARRAY') &&
-        (@{$updatetoolsenc})) {
-        my @ids=&Apache::lonnet::current_machine_ids();
-        my $updatedone;
-        foreach my $lonhost (@{$updatetoolsenc}) {
-            if (grep(/^\Q$lonhost\E$/,@ids)) {
-                unless ($updatedone) {
-                    &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid);
-                }
-                $updatedone = 1;
-            } else {
-                &Apache::lonnet::remote_devalidate_cache($lonhost,["crsltitoolsenc:$hashid"]);
-            }
-        }
-    }
-    return;
-}
-
 sub get_newmap_url {
     my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum,
         $titleref,$allmaps,$newurls) = @_;
@@ -2395,16 +2062,12 @@ sub get_newmap_url {
 }
 
 sub dbcopy {
-    my ($dbref,$coursedom,$coursenum,$lockerrorsref,$currltititles,
-        $currltimax,$updatetoolsenc,$updatetoolscache,$same_institution) = @_;
+    my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
     my ($url,$result,$errtext);
     if (ref($dbref) eq 'HASH') {
         $url = $dbref->{'src'};
-        if ($url =~ m{/(smppg|bulletinboard|ext\.tool)$}) {
+        if ($url =~ m{/(smppg|bulletinboard)$}) {
             my $prefix = $1;
-            if ($prefix eq 'ext.tool') {
-                $prefix = 'exttool';
-            }
             if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
                 ($dbref->{'cnum'} =~ /^$match_courseid$/)) {
                 my $db_name;
@@ -2415,8 +2078,6 @@ sub dbcopy {
                         &Apache::lonsimplepage::get_db_name($url,$marker,
                                                             $dbref->{'cdom'},
                                                             $dbref->{'cnum'});
-                } elsif ($dbref->{'src'} =~ m{/ext\.tool$}) {
-                    $db_name = 'exttool_'.$marker;
                 } else {
                     $db_name = 'bulletinpage_'.$marker;
                 }
@@ -2427,8 +2088,6 @@ sub dbcopy {
                 if (!$suffix) {
                     if ($prefix eq 'smppg') {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
-                    } elsif ($prefix eq 'exttool') {
-                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying an external tool [_1].',$url);
                     } else {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
                     }
@@ -2440,117 +2099,6 @@ sub dbcopy {
                     my %contents=&Apache::lonnet::dump($db_name,
                                                        $dbref->{'cdom'},
                                                        $dbref->{'cnum'});
-                    my ($toolcopyerror,$toolpassback,$toolroster,%toolinfo,$oldtoolid,$defincrs);
-                    if ($url eq '/adm/'.$dbref->{'cdom'}.'/'.$dbref->{'cnum'}."/$marker/ext.tool") {
-                        if ($contents{'id'} =~ /^(|c)(\d+)$/) {
-                            $oldtoolid = $2;
-                            if ($1 eq 'c') {
-                                $defincrs = 1;
-                                %toolinfo =
-                                    &Apache::lonnet::get('ltitools',[$oldtoolid],$dbref->{'cdom'},$dbref->{'cnum'});
-                            } else {
-                                %toolinfo= &Apache::lonnet::get_domain_lti($dbref->{'cdom'},'consumer');
-                            }
-                            if (ref($toolinfo{$oldtoolid}) eq 'HASH') {
-                                if ($toolinfo{$oldtoolid}{'passback'}) {
-                                    $toolpassback = 1;
-                                }
-                                if ($toolinfo{$oldtoolid}{'roster'}) {
-                                    $toolroster = 1;
-                                }
-                            } else {
-                                $toolcopyerror = 1;
-                                $errtext = &mt('Could not retrieve original settings for pasted external tool.');
-                            }
-                        }
-                        unless (($dbref->{'cnum'} eq $coursenum) && ($dbref->{'cdom'} eq $coursedom)) {
-                            $url = "/adm/$coursedom/$coursenum/$marker/ext.tool";
-                            if ($contents{'crstitle'} ne '') {
-                                $contents{'crstitle'} = $env{'course.'.$coursedom.'_'.$coursenum.'.description'};
-                            }
-                            if (($defincrs) && (!$toolcopyerror)) {
-                                my %newtool;
-                                my $oldcdom = $dbref->{'cdom'};
-                                my $oldcnum = $dbref->{'cnum'};
-                                my $title = $toolinfo{$oldtoolid}{'title'};
-                                if (ref($currltititles) eq 'HASH') {
-                                    if (exists($currltititles->{$title})) {
-                                        $title .= ' (copied from another course)';
-                                    }
-                                }
-                                my ($newid,$iderror) =
-                                    &Apache::lonnet::get_ltitools_id('course',$coursedom,$coursenum,$title);
-                                if ($newid =~ /^\d+$/) {
-                                    %{$newtool{$newid}} = %{$toolinfo{$oldtoolid}};
-                                    $newtool{$newid}{'title'} = $title;
-                                    if (ref($currltimax)) {
-                                        $newtool{$newid}{'order'} = $$currltimax;
-                                    }
-                                    if ($newtool{$newid}{'image'} =~ m{^\Q/uploaded/$oldcdom/$oldcnum/toollogo/$oldtoolid/\E([^/]+)$}) {
-                                        my $fname = $1;
-                                        my $content = &Apache::lonnet::getfile($newtool{$newid}{'image'});
-                                        if ($content eq '-1') {
-                                            delete($newtool{$newid}{'image'});
-                                        } else {
-                                            $env{'form.'.$suffix.'.image'} = $content;
-                                            my $newlogo =
-                                                &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.image',"toollogo/$newid/$fname");
-                                            delete($env{'form.'.$suffix.'.image'});
-                                            if ($newlogo =~ m{^/uploaded/}) {
-                                                $newtool{$newid}{'image'} = $newlogo;
-                                            } else {
-                                                delete($newtool{$newid}{'image'});
-                                            }
-                                        }
-                                    }
-                                    my $newusable;
-                                    if ($same_institution) {
-                                        my %oldtoolsenc = &Apache::lonnet::eget('nohist_toolsenc',[$oldtoolid],$oldcdom,$oldcnum);
-                                        if (ref($oldtoolsenc{$oldtoolid}) eq 'HASH') {
-                                            my %newtoolsenc;
-                                            %{$newtoolsenc{$newid}} = %{$oldtoolsenc{$oldtoolid}};
-                                            my $putres = &Apache::lonnet::put('nohist_toolsenc',\%newtoolsenc,$coursedom,$coursenum,1);
-                                            if ($putres eq 'ok') {
-                                                if (ref($updatetoolsenc) eq 'ARRAY') {
-                                                    my $newhome = &Apache::lonnet::homeserver($coursenum,$coursedom);
-                                                    unless (grep(/^\Q$newhome\E$/,@{$updatetoolsenc})) {
-                                                        push(@{$updatetoolsenc},$newhome);
-                                                    }
-                                                }
-                                                $newusable = 1;
-                                            }
-                                        }
-                                    }
-                                    if ($newtool{$newid}{'usable'}) {
-                                        unless ($newusable) {
-                                            delete($newtool{$newid}{'usable'});
-                                        }
-                                    }
-                                    my $putres = &Apache::lonnet::put('ltitools',\%newtool,$coursedom,$coursenum);
-                                    if ($putres eq 'ok') {
-                                        $contents{'id'} = "c$newid";
-                                        if (ref($updatetoolscache)) {
-                                            $$updatetoolscache ++;
-                                        }
-                                        if (ref($currltititles->{$title}) eq 'ARRAY') {
-                                            push(@{$currltititles->{$title}},$newid);
-                                        } else {
-                                            $currltititles->{$title} = [$newid];
-                                        }
-                                        if (ref($currltimax)) {
-                                            $$currltimax ++;
-                                        }
-                                    } else {
-                                        $toolcopyerror = 1;
-                                        $errtext = &mt('Unable to save external tool definition in Course Settings.');
-                                    }
-                                } else {
-                                    $toolcopyerror = 1;
-                                    $errtext = &mt('Unable to retrieve new tool ID when adding external tool definition to Course Settings.');
-                                }
-                            }
-                        }
-                    }
                     if (exists($contents{'uploaded.photourl'})) {
                         my $photo = $contents{'uploaded.photourl'};
                         my ($subdir,$fname) =
@@ -2570,40 +2118,10 @@ sub dbcopy {
                         }
                     }
                     $db_name =~ s{_\d*$ }{_$suffix}x;
-                    if ($prefix eq 'exttool') {
-                        unless ($toolcopyerror) {
-                            foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') {
-                                if (exists($contents{$key})) {
-                                    delete($contents{$key});
-                                }
-                            }
-                            if ($dbref->{'delgradable'}) {
-                                if (exists($contents{'gradable'})) {
-                                    delete($contents{'gradable'});
-                                }
-                            }
-                            if ($toolpassback) {
-                                if ($contents{'gradable'}) {
-                                    my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
-                                    $contents{'gradesecret'} = $gradesecret;
-                                    $contents{'gradesecretdate'} = time;
-                                }
-                            }
-                            if ($toolroster) {
-                                my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
-                                $contents{'rostersecret'} = $rostersecret;
-                                $contents{'rostersecretdate'} = time;
-                            }
-                        }
-                    }
-                    if (($prefix eq 'exttool') && ($toolcopyerror)) {
-                        $result = 'error';
-                    } else {
-                        $result=&Apache::lonnet::put($db_name,\%contents,
-                                                     $coursedom,$coursenum);
-                        if ($result eq 'ok') {
-                            $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}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')) {
@@ -2613,9 +2131,6 @@ sub dbcopy {
                     if ($prefix eq 'smppg') {
                         $lockerrorsref->{$prefix} .=
                             ' '.&mt('This will prevent creation of additional simple pages in this course.');
-                    } elsif ($prefix eq 'exttool') {
-                        $lockerrorsref->{$prefix} .=
-                            ' '.&mt('This will prevent addition of more external tools to this course.');
                     } else {
                         $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
                     }
@@ -2747,8 +2262,8 @@ sub uniqueness_check {
 }
 
 sub contained_map_check {
-    my ($url,$folder,$coursenum,$coursedom,$removefrommap,$removeparam,$addedmaps,
-        $hierarchy,$titles,$allmaps) = @_;
+    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);
@@ -2758,23 +2273,7 @@ sub contained_map_check {
             if ($token->[1] eq 'resource') {
                 next if ($token->[2]->{'type'} eq 'zombie');
                 my $ressrc = $token->[2]->{'src'};
-                if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
-                    my ($srcdom,$srcnum,$marker) = ($1,$2,$3);
-                    unless ($srcdom eq $coursedom) {
-                        $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
-                        next;
-                    }
-                    unless ($srcnum eq $coursenum) {
-                        my %toolsettings =
-                            &Apache::lonnet::dump('exttool_'.$marker,$srcdom,$srcnum);
-                        my %tooltypes = &Apache::loncommon::usable_exttools();
-                        if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
-                            (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
-                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
-                            next;
-                        }
-                    }
-                } elsif ($folder =~ /^supplemental/) {
+                if ($folder =~ /^supplemental/) {
                     unless (&supp_pasteable($ressrc)) {
                         $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         next;
@@ -2793,8 +2292,7 @@ sub contained_map_check {
                             $addedmaps->{$ressrc} = [$url];
                         }
                     }
-                    &contained_map_check($ressrc,$folder,$coursenum,$coursedom,
-                                         $removefrommap,$removeparam,
+                    &contained_map_check($ressrc,$folder,$removefrommap,$removeparam,
                                          $addedmaps,$hierarchy,$titles,$allmaps);
                 }
             } elsif ($token->[1] eq 'param') {
@@ -2897,38 +2395,16 @@ sub url_paste_fixups {
                         $changed = 1;
                     }
                 }
-            } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
+            } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) {
                 next if ($skip);
                 my $srcdom = $1;
                 my $srcnum = $2;
-                my $rem = $3;
-                my ($is_exttool,$exttoolchg);
-                if ($rem =~ m{\d+/ext\.tool$}) {
-                    $is_exttool = 1;
-                }
                 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;
-                    if ($is_exttool) {
-                        $exttoolchg = 1;
-                    }
-                } elsif (($is_exttool) &&
-                         ($env{'form.docs.markedcopy_options'} ne 'move')) {
-                    $dbcopies->{$oldurl}{$id}{'src'} = $ressrc;
-                    $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom;
-                    $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum;
-                    $changed = 1;
-                    $exttoolchg = 1;
-                }
-                if (($is_exttool) && ($prefixchg)) {
-                    if ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/default}) {
-                        if ($exttoolchg) {
-                            $dbcopies->{$oldurl}{$id}{'delgradable'} = 1;
-                        }
-                    }
                 }
             } elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) {
                 if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) ||
@@ -2975,9 +2451,7 @@ sub apply_fixups {
         $oldurl,$url,$caller) = @_;
     my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
         %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,
-        %resdatacopy,%lockerrors,$lockmsg,%currcrsltitools,$gotcrsltitools,
-        %currltititles,$currltimax);
-    $currltimax = 0;
+        %resdatacopy,%lockerrors,$lockmsg);
     if (ref($updated) eq 'HASH') {
         if (ref($updated->{'rewrites'}) eq 'HASH') {
             %rewrites = %{$updated->{'rewrites'}};
@@ -3128,7 +2602,6 @@ sub apply_fixups {
                 }
             }
         }
-        my ($updatetoolscache,@updatetoolsenc,$same_institution,$checkedsameinst);
         foreach my $key (keys(%updates)) {
             my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb);
             if (ref($rewrites{$key}) eq 'HASH') {
@@ -3149,63 +2622,10 @@ sub apply_fixups {
             if (ref($dbcopies{$key}) eq 'HASH') {
                 foreach my $idx (keys(%{$dbcopies{$key}})) {
                     if (ref($dbcopies{$key}{$idx}) eq 'HASH') {
-                        my $oldurl = $dbcopies{$key}{$idx}{'src'};
-                        my $oldcdom = $dbcopies{$key}{$idx}{'cdom'};
-                        my $oldcnum = $dbcopies{$key}{$idx}{'cnum'};
-                        my $oldmarker;
-                        if ($oldurl =~ m{^\Q/adm/$oldcdom/$oldcnum/\E(\d+)/ext\.tool$}) {
-                            $oldmarker = $1;
-                            unless (($gotcrsltitools) ||
-                                    (($oldcnum eq $cnum) && ($oldcdom eq $cdom))) {
-                                my %oldtoolsettings=&Apache::lonnet::dump('exttool_'.$oldmarker,$oldcdom,$oldcnum);
-                                if ($oldtoolsettings{'id'} =~ /^c\d+$/) {
-                                    unless ($gotcrsltitools) {
-                                        %currcrsltitools =
-                                            &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
-                                        foreach my $item (sort(keys(%currcrsltitools))) {
-                                            if (ref($currcrsltitools{$item}) eq 'HASH') {
-                                                $currltimax ++;
-                                                if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') {
-                                                    push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item);
-                                                } else {
-                                                    $currltititles{$currcrsltitools{$item}{'title'}} = [$item];
-                                                }
-                                            }
-                                        }
-                                        $gotcrsltitools = 1;
-                                    }
-                                    unless ($checkedsameinst) {
-                                        my $primary_id = &Apache::lonnet::domain($cdom,'primary');
-                                        my $intdom = &Apache::lonnet::internet_dom($primary_id);
-                                        if ($intdom ne '') {
-                                            my $internet_names =
-                                                &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
-                                            if (ref($internet_names) eq 'ARRAY') {
-                                                if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
-                                                    $same_institution = 1;
-                                                }
-                                            }
-                                        }
-                                        $checkedsameinst = 1;
-                                    }
-                                }
-                            }
-                        }
                         my ($newurl,$result,$errtext) =
-                            &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors,\%currltititles,
-                                    \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution);
+                            &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors);
                         if ($result eq 'ok') {
                             $newdb{$idx} = $newurl;
-                            if ($newurl =~ /ext\.tool$/) {
-                                if ($torewrite{$idx} eq "/adm/$oldcdom/$oldcnum/$oldmarker/ext.tool") {
-                                    if ($newurl =~ m{^\Q/adm/$cdom/$cnum/\E(\d+)/ext.tool$}) {
-                                        my $newmarker = $1;
-                                        unless ($oldmarker eq $newmarker) {
-                                            $torewrite{$idx} = "/adm/$oldcdom/$oldcnum/$newmarker/ext.tool";
-                                        }
-                                    }
-                                }
-                            }
                         } elsif (ref($errors) eq 'HASH') {
                             $errors->{$key} = 1;
                         }
@@ -3344,10 +2764,6 @@ sub apply_fixups {
                 }
             }
         }
-        if (($updatetoolscache) || (@updatetoolsenc)) {
-            &update_ltitools_caches($cdom,$cnum,$updatetoolscache,
-                                    \@updatetoolsenc);
-        }
     }
     return ('ok',\@msgs,$lockmsg);
 }
@@ -3442,7 +2858,7 @@ sub update_parameter {
             my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
             $name=&LONCAPA::map::qtescape($name);
             $url=&LONCAPA::map::qtescape($url);
-            next unless $url;
+            next unless ($url);
             my $is_map;
             if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
                 $is_map = 1;
@@ -3527,9 +2943,8 @@ sub update_parameter {
 
 sub handle_edit_cmd {
     my ($coursenum,$coursedom) =@_;
-    my $haschanges = 0;
     if ($env{'form.cmd'} eq '') {
-        return $haschanges;
+        return 0;
     }
     my ($cmd,$idx)=split('_',$env{'form.cmd'});
 
@@ -3544,19 +2959,19 @@ sub handle_edit_cmd {
 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
 	}
 	splice(@LONCAPA::map::order, $idx, 1);
-        $haschanges = 1;
+
     } elsif ($cmd eq 'cut') {
 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
 	splice(@LONCAPA::map::order, $idx, 1);
-        $haschanges = 1;
+
     } elsif ($cmd eq 'up'
 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
-        $haschanges = 1;
+
     } elsif ($cmd eq 'down'
 	     && defined($LONCAPA::map::order[$idx+1])) {
 	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
-        $haschanges = 1;
+
     } elsif ($cmd eq 'rename') {
 	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
 	if ($comment=~/\S/) {
@@ -3566,15 +2981,17 @@ sub handle_edit_cmd {
 # Devalidate title cache
 	my $renamed_url=&LONCAPA::map::qtescape($url);
 	&Apache::lonnet::devalidate_title_cache($renamed_url);
-        $haschanges = 1;
+
+    } else {
+	return 0;
     }
-    return $haschanges;
+    return 1;
 }
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref,
-        $canedit,$hostname,$navmapref,$hiddentop)=@_;
+        $supplementalflag,$orderhash,$iconpath,$pathitem,$canedit,
+        $hostname,$navmapref,$hiddentop)=@_;
     my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
     if ($allowed) {
         (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
@@ -3785,17 +3202,6 @@ sub editor {
                         } else {
                             return $errortxt;
                         }
-                    } elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/ext\.tool}) {
-                        my ($suffix,$errortxt,$locknotfreed) =
-                            &new_timebased_suffix($coursedom,$coursenum,'exttool');
-                        if ($locknotfreed) {
-                            $r->print($locknotfreed);
-                        }
-                        if ($suffix) {
-                            $url =~ s{^(/adm/$coursedom/$coursenum)/new}{$1/$suffix};
-                        } else {
-                            return $errortxt;
-                        }
                     } elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) {
                         if ($supplementalflag) {
                             next unless ($1 eq 'supplemental');
@@ -3818,7 +3224,7 @@ sub editor {
 	    }
             ($errtext,$fatal,my $fixuperrors) =
                 &group_import($coursenum, $coursedom, $folder,$container,
-                              'londocs',$ltitoolsref,@imports);
+                              'londocs',@imports);
 	    return $errtext if ($fatal);
             if ($fixuperrors) {
                 $r->print($fixuperrors);
@@ -3878,21 +3284,6 @@ sub editor {
         $r->print('</div>');
     }
 
-    if ((!$allowed) && ($folder =~ /^supplemental_\d+$/)) {
-        my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom);
-        if (ref($supplemental) eq 'HASH') {
-            if ((ref($supplemental->{'hidden'}) eq 'HASH') &&
-                (ref($supplemental->{'ids'}) eq 'HASH')) {
-                if (ref($supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}) eq 'ARRAY') {
-                    my $mapnum = $supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}->[0];
-                    if ($supplemental->{'hidden'}->{$mapnum}) {
-                        $ishidden = 1;
-                    }
-                }
-            }
-        }
-    }
-
     my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups);
     %filters =  (
                   canremove      => [],
@@ -3916,17 +3307,11 @@ sub editor {
             push(@allmapidx,$res);
         }
 
-        if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) {
-            if (($ishidden) || ((&LONCAPA::map::getparameter($res,'parameter_hiddenresource'))[0]=~/^yes$/i)) {
-                $idx++;
-                next;
-            }
-        }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,
                               $pathitem,$supplementalflag,$container,
-                              \%filters,\%curr_groups,$ltitoolsref,$canedit,
-                              $isencrypted,$ishidden,$navmapref,$hostname);
+                              \%filters,\%curr_groups,$canedit,
+                              $isencrypted,$navmapref,$hostname);
         $idx++;
         $shown++;
     }
@@ -3935,14 +3320,10 @@ sub editor {
     my $need_save;
     if ($allowed || ($supplementalflag && $folder eq 'supplemental')) {
         my $toolslink;
-        if ($allowed || $canedit) {
-            my $helpitem = 'Navigation_Screen';
-            if (!$allowed) {
-                $helpitem = 'Supplemental_Navigation';
-            }
+        if ($allowed) {
             $toolslink = '<table><tr><td>'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
-                                                           $helpitem,undef,'RAT')
+                                                           '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" '
@@ -3958,9 +3339,11 @@ sub editor {
                           .&Apache::loncommon::start_data_table_header_row()
                           .'<th colspan="2">'.&mt('Move').'</th>'
                           .'<th colspan="2">'.&mt('Actions').'</th>'
-                          .'<th>'.&mt('Document').'</th>'
-                          .'<th colspan="2">'.&mt('Settings').'</th>'
-                          .&Apache::loncommon::end_data_table_header_row();
+                          .'<th>'.&mt('Document').'</th>';
+                if ($folder !~ /^supplemental/) {
+                    $to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
+                }
+                $to_show .= &Apache::loncommon::end_data_table_header_row();
                 if ($folder !~ /^supplemental/) {
                     $lists{'canhide'} = join(',',@allidx);
                     $lists{'canrandomlyorder'} = join(',',@allmapidx);
@@ -3988,7 +3371,7 @@ sub editor {
                                 '</td>'.
                                 '<td>&nbsp;</td>'.
                                 '<td>&nbsp;</td>'.
-                                '<td colspan="2">'.
+                                '<td colspan="4">'.
                                 &multiple_check_form('settings',\%lists,$canedit).
                                 '</td>'.
                                 &Apache::loncommon::end_data_table_row();
@@ -4307,14 +3690,12 @@ sub is_supplemental_title {
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
         $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,
-        $ltitoolsref,$canedit,$isencrypted,$ishidden,$navmapref,$hostname)=@_;
-    my ($foldertitle,$renametitle,$oldtitle,$encodedtitle);
+        $canedit,$isencrypted,$navmapref,$hostname)=@_;
+    my ($foldertitle,$renametitle,$oldtitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
-        $encodedtitle=$title;
     } else {
 	$title=&HTML::Entities::encode($title,'"<>&\'');
-        $encodedtitle=$title;
 	$renametitle=$title;
 	$foldertitle=$title;
     }
@@ -4406,7 +3787,6 @@ END
 		'rn' => 'Rename',
 		'cp' => 'Copy',
                 'ex' => 'External Resource',
-                'et' => 'External Tool',
                 'ed' => 'Edit',
                 'pr' => 'Preview',
                 'sv' => 'Save',
@@ -4426,7 +3806,6 @@ END
 			    |/aboutme$
 			    |/navmaps$
 			    |/bulletinboard$
-                            |/ext\.tool$
 			    |\.html$)}x)
              || $isexternal) {
 	    $skip_confirm = 1;
@@ -4536,7 +3915,6 @@ END
     my $ispage;
     my $containerarg;
     my $folderurl;
-    my $plainurl;
     if ($uploaded) {
         if (($extension eq 'sequence') || ($extension eq 'page')) {
             $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
@@ -4555,7 +3933,7 @@ END
                 $url='/adm/supplemental?';
             }
 	} else {
-            $plainurl = $url;
+	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
 	}
     }
 
@@ -4594,8 +3972,6 @@ END
                 if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
                     $nomodal = 1;
                 }
-            } elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
-                $url='/adm/wrapper'.$url;
             } elsif ($url eq "/public/$coursedom/$coursenum/syllabus") {
                 if (($ENV{'SERVER_PORT'} == 443) &&
                     ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
@@ -4605,10 +3981,30 @@ END
                     $nomodal = 1;
                 }
 	    }
-            my $checkencrypt;
-            if (!$env{'request.role.adv'}) {
+            if (&Apache::lonnet::symbverify($symb,$url)) {
+                $shownsymb = $symb;
+                if ($isexternal) {
+                    $url =~ s/\#[^#]+$//;
+                    if ($container eq 'page') {
+                        $url = &Apache::lonnet::clutter($url);
+                    }
+                }
+                unless ($env{'request.role.adv'}) {
+                    if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+                        $url = '';
+                    }
+                    if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) {
+                        $url = '';
+                        $hiddenres = 1;
+                    }
+                }
+                if ($url ne '') {
+                    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb);
+                }
+            } elsif (!$env{'request.role.adv'}) {
+                my $checkencrypt;
                 if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) ||
-                    ($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {
+                      $isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {
                     $checkencrypt = 1;
                 } elsif (ref($navmapref)) {
                     unless (ref($$navmapref)) {
@@ -4620,40 +4016,22 @@ END
                         }
                     }
                 }
-            }
-            if ($checkencrypt) {
-                my $currenc = $env{'request.enc'};
-                $env{'request.enc'} = 1;
-                $shownsymb = &Apache::lonenc::encrypted($symb);
-                my $shownurl = &Apache::lonenc::encrypted($url);
-                if (&Apache::lonnet::symbverify($symb,$url)) {
-                    $url = $shownurl;
-                } else {
-                    $url = '';
-                }
-                $env{'request.enc'} = $currenc;
-            } elsif (&Apache::lonnet::symbverify($symb,$url)) {
-                $shownsymb = $symb;
-                if ($isexternal) {
-                    $url =~ s/\#[^#]+$//;
-                    if ($container eq 'page') {
-                        $url = &Apache::lonnet::clutter($url);
+                if ($checkencrypt) {
+                    $shownsymb = &Apache::lonenc::encrypted($symb);
+                    my $shownurl = &Apache::lonenc::encrypted($url);
+                    if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) {
+                        $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb);
+                        if ($env{'request.enc'} ne '') {
+                            delete($env{'request.enc'});
+                        }
+                    } else {
+                        $url='';
                     }
+                } else {
+                    $url='';
                 }
             } else {
-                $url = '';
-            }
-            unless ($env{'request.role.adv'}) {
-                if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
-                    $url = '';
-                }
-                if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) {
-                    $url = '';
-                    $hiddenres = 1;
-                }
-            }
-            if (($url ne '') && ($shownsymb ne '')) {
-                $url .= (($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb);
+                $url='';
             }
 	}
     } elsif ($supplementalflag) {
@@ -4682,22 +4060,6 @@ END
                 }
                 $nomodal = 1;
             }
-        } elsif (($uploaded) && ($url ne '/adm/supplemental?') && ($url ne '/adm/coursedocs?')) {
-            my $embstyle=&Apache::loncommon::fileembstyle($extension);
-            unless ($embstyle eq 'ssi') {
-                if (($embstyle eq 'img')
-                 || ($embstyle eq 'emb')
-                 || ($embstyle eq 'wrp')) {
-                    $url='/adm/wrapper'.$url;
-                } elsif ($url !~ /\.(sequence|page)$/) {
-                    $url='/adm/coursedocs/showdoc'.$url;
-                }
-            }
-        }
-        unless ($allowed && $env{'request.role.adv'}) {
-            if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
-                $hiddenres = 1;
-            }
         }
     }
     my ($rand_pick_text,$rand_order_text,$hiddenfolder);
@@ -4709,9 +4071,6 @@ END
         if (!$allowed && $supplementalflag) {
             $folderpath.=$containerarg.'&'.$foldername;
             $url.='folderpath='.&escape($folderpath);
-            if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
-                $hiddenfolder = 1;
-            }
         } else {
             my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
                                                         'parameter_randompick'))[0];
@@ -4788,18 +4147,13 @@ $form_common."\n".
 '<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'.
 $form_end;
         }
-    } elsif ($supplementalflag) {
-        my $isexttool;
-        if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
-            $url='/adm/wrapper'.$url;
-            $isexttool = 1;
-        }
+    } elsif ($supplementalflag && !$allowed) {
         $url .= ($url =~ /\?/) ? '&amp;':'?';
         $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
         if ($title) {
-            $url .= '&amp;title='.$encodedtitle;
+            $url .= '&amp;title='.&HTML::Entities::encode($renametitle,'<>&"');
         }
-        if ((($isexternal) || ($isexttool)) && $orderidx) {
+        if ($isexternal && $orderidx) {
             $url .= '&amp;idx='.$orderidx;
         }
         if ($anchor ne '') {
@@ -4813,13 +4167,7 @@ $form_end;
         if ($isexternal) {
             ($editlink,$extresform) = 
                 &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
-                                                     undef,undef,undef,undef,undef,undef,
-                                                     undef,$disabled);
-        } elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
-            ($editlink,$extresform) =
-                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
-                                                     undef,undef,undef,'tool',$coursedom,
-                                                     $coursenum,$ltitoolsref,$disabled);
+                                                     undef,undef,undef,$disabled);
         } elsif (!$isfolder && !$ispage) {
             my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
                 &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
@@ -4852,18 +4200,9 @@ $form_end;
         $reinit = &mt('(re-initialize course to access)');
     }
     $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;
-    my ($link,$nolink);
+    my $link;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
-        if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) {
-            if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
-                $nolink = 1;
-            }
-        }
-        if ($nolink) {
-            $line .= '<img src="'.$icon.'" alt="" class="LC_icon" /></a>';
-        } else {
-            $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
-        }
+       $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
        if ($anchor ne '') {
            if ($supplementalflag) {
@@ -4872,28 +4211,14 @@ $form_end;
                $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
            }
        }
-       if (($nomodal) && ($hostname ne '')) {
+
+       if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) {
            $link = 'http://'.$hostname.$url;
        } else {
            $link = $url;
        }
-       my $inhibitmenu;
-       if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) ||
-           (($allowed) && (($url =~ m{^/adm/(viewclasslist|$match_domain/$match_username/aboutme)(\?|$)}) ||
-                           ($url =~ m{^/public/$match_domain/$match_courseid/syllabus(\?|$)})))) {
-           $inhibitmenu = 'only_body=1';
-       } else {
-           $inhibitmenu = 'inhibitmenu=yes';
-       }
-       $link = &js_escape($link.(($url=~/\?/)?'&amp;':'?').$inhibitmenu.$anchor);
-       if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) {
-           if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
-               $nolink = 1;
-           }
-       }
-       if ($nolink) {
-           $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
-       } elsif ($nomodal) {
+       $link = &js_escape($link.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes'.$anchor);
+       if ($nomodal) {
            $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
                   '<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>';
        } else {
@@ -4905,26 +4230,9 @@ $form_end;
     }
     $line.='</span></td><td'.$tdwidth.'>';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
-       if ($nolink) {
-           $line.=$title;
-       } else {
-           $line.='<a href="'.$url.'">'.$title.'</a>';
-       }
-       if (!$allowed && $supplementalflag && $canedit && $isfolder) {
-           my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
-           my $editurl = $url;
-           $editurl =~ s{^\Q/adm/supplemental?\E}{/adm/coursedocs?command=direct&amp;forcesupplement=1&amp;};
-           $line .= '&nbsp;'.'<a href="'.$editurl.'">'.
-                    '<img src="'.$editicon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
-                    '</a>';
-       }
-       if ((($hiddenfolder) || ($hiddenres)) && (!$allowed) && ($supplementalflag))  {
-           $line.= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
-       }
+       $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
-       if ($nolink) {
-           $line.=$title;
-       } elsif ($nomodal) {
+       if ($nomodal) {
            $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
                   $title.'</a>';
        } else {
@@ -4938,42 +4246,32 @@ $form_end;
     $line.="$extresform</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
-    if ($uploaded && $url && !$isfolder && !$ispage) {
-        if (($plainurl ne '') && ($env{'request.role.adv'} || $allowed || !$hiddenres)) {
-            &Apache::lonnet::allowuploaded('/adm/coursedoc',$plainurl);
+    if (($allowed) && ($folder!~/^supplemental/)) {
+ 	my %lt=&Apache::lonlocal::texthash(
+ 			      'hd' => 'Hidden',
+ 			      'ec' => 'URL hidden');
+        my ($enctext,$hidtext);
+        if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) {
+            $enctext = ' checked="checked"';
+            if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) {
+                push(@{$filtersref->{'encrypturl'}},$orderidx);
+            }
         }
-    }
-    if ($allowed) {
-        my %lt=&Apache::lonlocal::texthash(
-                              'hd' => 'Hidden',
-                              'ec' => 'URL hidden');
-        my ($enctext,$hidtext,$formhidden,$formurlhidden);
         if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
             $hidtext = ' checked="checked"';
             if (($ishash) && (ref($filtersref->{'hiddenresource'}) eq 'ARRAY')) {
                 push(@{$filtersref->{'hiddenresource'}},$orderidx);
             }
         }
-        $formhidden = 'edit_hiddenresource_'.$orderidx;
-        $line.=(<<ENDPARMS);
+        my $formhidden = 'edit_hiddenresource_'.$orderidx;
+        my $formurlhidden = 'edit_encrypturl_'.$orderidx;
+	$line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">
     <form action="/adm/coursedocs" method="post" name="$formhidden">
     $form_param
     $form_common
     <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label>
     $form_end
-ENDPARMS
-        if ($folder =~/^supplemental/) {
-            $line.= "\n    <td>";
-        } else {
-            if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) {
-                $enctext = ' checked="checked"';
-                if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) {
-                    push(@{$filtersref->{'encrypturl'}},$orderidx);
-                }
-            }
-            $formurlhidden = 'edit_encrypturl_'.$orderidx;
-	    $line.=(<<ENDPARMS);
     <br />
     <form action="/adm/coursedocs" method="post" name="$formurlhidden">
     $form_param
@@ -4984,7 +4282,6 @@ ENDPARMS
   <td class="LC_docs_entry_parameter">$rand_pick_text<br />
                                       $rand_order_text</td>
 ENDPARMS
-        }
     }
     $line.=&Apache::loncommon::end_data_table_row();
     return $line;
@@ -5081,8 +4378,6 @@ sub new_timebased_suffix {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
         } elsif ($type eq 'smppg') {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
-        } elsif ($type eq 'exttool') {
-            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new external tool.');
         } else {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');
         }
@@ -5111,9 +4406,6 @@ sub new_timebased_suffix {
         } elsif ($type eq 'smppg') {
             $locknotfreed .=
                 &mt('This will prevent creation of additional simple pages in this course.');
-        } elsif ($type eq 'exttool') {
-            $locknotfreed .=
-                &mt('This will prevent creation of additional external tools in this course.');
         } else {
             $locknotfreed .=
                 &mt('This will prevent creation of additional discussion boards in this course.');
@@ -5297,48 +4589,6 @@ sub list_symbs {
     $r->print(&endContentScreen());
 }
 
-sub short_urls {
-    my ($r,$canedit) = @_;
-    my $crstype = &Apache::loncommon::course_type();
-    my $formname = 'shortenurl';
-    $r->print(&Apache::loncommon::start_page('Display/Set Shortened URLs'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Shortened URLs'));
-    $r->print(&startContentScreen('tools'));
-    my ($navmap,$errormsg) =
-        &Apache::loncourserespicker::get_navmap_object($crstype,'shorturls');
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my (%maps,%resources,%titles);
-    if (!ref($navmap)) {
-        $r->print($errormsg.
-                  &endContentScreen());
-        return '';
-    } else {
-        $r->print('<h4 class="LC_info">'.&mt('Tiny URLs for deep-linking into course').'</h4>'."\n");
-        $r->rflush();
-        my $readonly;
-        if ($canedit) {
-            my ($numnew,$errors) = &Apache::loncommon::get_requested_shorturls($cdom,$cnum,$navmap);
-            if ($numnew) {
-                $r->print('<p class="LC_info">'.&mt('Created [quant,_1,URL]',$numnew).'</p>');
-            }
-            if ((ref($errors) eq 'ARRAY') && (@{$errors} > 0)) {
-                $r->print(&mt('The following errors occurred when processing your request to create shortened URLs:').'<br /><ul>');
-                foreach my $error (@{$errors}) {
-                    $r->print('<li>'.$error.'</li>');
-                }
-                $r->print('</ul><br />');
-            }
-        } else {
-            $readonly = 1;
-        }
-        my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum);
-        $r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef,
-                                                             undef,undef,undef,undef,undef,\%currtiny,undef,$readonly));
-    }
-    $r->print(&endContentScreen());
-}
-
 sub contentverifyform {
     my ($r) = @_;
     my $crstype = &Apache::loncommon::course_type();
@@ -5710,17 +4960,13 @@ sub changewarning {
     if (!defined($message)) {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
-    my $windowname = 'loncapaclient';
-    if ($env{'request.lti.login'}) {
-        $windowname .= 'lti';
-    }
     $r->print("\n\n".
 '<script type="text/javascript">'."\n".
 '// <![CDATA['."\n".
 'function reinit(tf) { tf.submit();'.$postexec.' }'."\n".
 '// ]]>'."\n".
 '</script>'."\n".
-'<form name="reinitform" method="post" action="/adm/roles" target="'.$windowname.'">'.
+'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.
 '" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'.
 &mt($message,' <input type="hidden" name="'.
@@ -5816,12 +5062,12 @@ sub handler {
 #
 # --------------------------------------------- Initialize help topics for this
     foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
-	               'Adding_External_Resource','Adding_External_Tool',
-                       'Navigate_Content','Adding_Folders','Docs_Overview',
-	               'Load_Map','Supplemental','Score_Upload_Form', 
-	               'Adding_Pages','Importing_LON-CAPA_Resource',
-	               'Importing_IMS_Course','Uploading_From_Harddrive',
-                       'Course_Roster','Web_Page','Dropbox','Simple_Problem') {
+	               'Adding_External_Resource','Navigate_Content',
+	               'Adding_Folders','Docs_Overview', 'Load_Map',
+	               'Supplemental','Score_Upload_Form','Adding_Pages',
+	               'Importing_LON-CAPA_Resource','Importing_IMS_Course',
+                       'Uploading_From_Harddrive','Course_Roster','Web_Page',
+                       'Dropbox','Simple_Problem') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -5837,20 +5083,17 @@ sub handler {
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
  
     my ($allowed,$canedit,$canview,$disabled);
-# does this user have privileges to modify content.
-    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
 # URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
-        unless ($r->uri eq '/adm/supplemental') {
+    unless ($r->uri eq '/adm/supplemental') {
+        # does this user have privileges to modify content.  
+        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
             $allowed = 1;
-        }
-        $canedit = 1;
-        $canview = 1;
-    } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) {
-# URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
-        unless ($r->uri eq '/adm/supplemental') {
+            $canedit = 1;
+            $canview = 1;
+        } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) {
             $allowed = 1;
+            $canview = 1;
         }
-        $canview = 1;
     }
     unless ($canedit) {
         $disabled = ' disabled="disabled"';
@@ -5878,9 +5121,6 @@ sub handler {
   } elsif ($allowed && $env{'form.listsymbs'}) {
       &init_breadcrumbs('listsymbs','List Content IDs');
       &list_symbs($r);
-  } elsif ($allowed && $env{'form.shorturls'}) {
-      &init_breadcrumbs('shorturls','Set/Display Shortened URLs','Docs_Short_URLs');
-      &short_urls($r,$canedit);
   } elsif ($allowed && $env{'form.docslog'}) {
       &init_breadcrumbs('docslog','Show Log');
       my $folder = $env{'form.folder'};
@@ -5904,7 +5144,7 @@ sub handler {
 # Get the parameters that may be needed
 #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['folderpath','title',
+                                            ['folderpath',
                                              'forcesupplement','forcestandard',
                                              'tools','symb','command','supppath']);
 
@@ -5945,23 +5185,17 @@ sub handler {
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
     if ($env{'form.forcestandard'})   { $supplementalflag=0; }
-    unless (($supplementalflag) ||
-            ($r->uri =~ m{^/adm/coursedocs/showdoc/uploaded/\Q$coursedom\E/\Q$coursenum\E/docs/})) {
-        unless ($allowed) { $supplementalflag=1; }
-        unless ($standard) { $supplementalflag=1; }
-    }
+    unless ($allowed) { $supplementalflag=1; }
+    unless ($standard) { $supplementalflag=1; }
     my $toolsflag=0;
     if ($env{'form.tools'}) { $toolsflag=1; }
 
     if ($env{'form.folderpath'} ne '') {
-        &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom);
+        &validate_folderpath($supplementalflag);
     }
 
-    my $backto_supppath;
     if ($env{'form.supppath'} ne '') {
-        if ($supplementalflag && $allowed) {
-            $backto_supppath = &validate_supppath($coursenum,$coursedom);
-        }
+        &validate_suppath();
     }
 
     my $script='';
@@ -5970,8 +5204,6 @@ sub handler {
     my $container;
     my $containertag;
     my $pathitem;
-    my %ltitools;
-    my $posslti;
     my $hiddentop;
     my $navmap;
     my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
@@ -5983,10 +5215,10 @@ sub handler {
                &Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap);
            &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
                $env{'form.command'}.'_'.$env{'form.symb'}});
-       } elsif (($env{'form.supppath'} ne '') && $supplementalflag && $allowed) {
+       } elsif ($env{'form.supppath'} ne '') {
            $env{'form.folderpath'}=$env{'form.supppath'};
            &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
-               $env{'form.command'}.'_'.$backto_supppath});
+               $env{'form.command'}.'_'.$env{'form.supppath'}});
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
        $env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap);
@@ -6022,12 +5254,12 @@ sub handler {
             undef($env{'form.folderpath'});
         }
         if ($env{'form.folderpath'} ne '') {
-            &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom);
+            &validate_folderpath($supplementalflag);
         }
     }
-
-# If we are not allowed to make changes and this is supplemental content set folderpath
-    if ((!$allowed) && ($supplementalflag)) {
+   
+# If we are not allowed to make changes, all we can see are supplemental docs
+    if (!$allowed) {
         unless ($env{'form.folderpath'} =~ /^supplemental/) {
             $env{'form.folderpath'} = &supplemental_base();
         }
@@ -6039,9 +5271,9 @@ sub handler {
                                   $env{'form.folderpath'};
     }
 # If allowed and user's role is not advanced check folderpath is not hidden
-    my $hidden_and_empty;
-    if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) {
-        my ($folderurl,$foldername,$hiddenfolder);
+    if (($allowed) && (!$env{'request.role.adv'}) &&
+        ($env{'form.folderpath'} ne '') && (!$supplementalflag)) {
+        my $folderurl;
         my @pathitems = split(/\&/,$env{'form.folderpath'});
         my $folder = $pathitems[-2];
         if ($folder eq '') {
@@ -6053,74 +5285,21 @@ sub handler {
             } else {
                 $folderurl .= '.sequence';
             }
-            if ($supplementalflag) {
-                ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*)::(|1):::$/);
-                $foldername = &HTML::Entities::decode(&unescape($foldername));
-                my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom);
-                if (ref($supplemental) eq 'HASH') {
-                    my ($suppmap,$suppmapnum);
-                    if ($folder eq 'supplemental') {
-                        $suppmap = 'default';
-                        $suppmapnum = 0;
-                    } elsif ($folder =~ /^supplemental_(\d+)$/) {
-                        $suppmap = $1;
-                        $suppmapnum = $suppmap;
-                    }
-                    if ($hiddenfolder) {
-                        my $hascontent;
-                        foreach my $key (reverse(sort(keys(%{$supplemental->{'ids'}})))) {
-                            if ($key =~ m{^\Q/uploaded/$coursedom/$coursenum/supplemental/$suppmap/\E}) {
-                                $hascontent = 1;
-                            } elsif (ref($supplemental->{'ids'}->{$key}) eq 'ARRAY') {
-                                foreach my $id (@{$supplemental->{'ids'}->{$key}}) {
-                                    if ($id =~ /^$suppmapnum\:/) {
-                                        $hascontent = 1;
-                                        last;
-                                    }
-                                }
-                            }
-                            last if ($hascontent);
-                        }
-                        unless ($hascontent) {
-                            if ($foldername ne '') {
-                                $hidden_and_empty = $foldername;
-                            } else {
-                                $hidden_and_empty = $folder;
-                            }
-                        }
-                    }
-                }
-            } else {
-                unless (ref($navmap)) {
-                    $navmap = Apache::lonnavmaps::navmap->new();
-                }
-                ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*):|\d+:|1:(|1):|1:|1$/);
-                $foldername = &HTML::Entities::decode(&unescape($foldername));
-                if (ref($navmap)) {
-                    if ($hiddenfolder ||
-                        (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes')) {
-                        my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1);
-                        unless (@resources) {
-                            if ($foldername ne '') {
-                                $hidden_and_empty = $foldername;
-                            } else {
-                                $hidden_and_empty = $folder;
-                            }
-                        }
-                    }
-                }
+            unless (ref($navmap)) {
+                $navmap = Apache::lonnavmaps::navmap->new();
             }
-            if ($hidden_and_empty ne '') {
-                splice(@pathitems,-2);
-                if (@pathitems) {
-                    $env{'form.folderpath'} = join('&',@pathitems);
-                } else {
-                    undef($env{'form.folderpath'});
+            if (ref($navmap)) {
+                if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {
+                    my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1);
+                    unless (@resources) {
+                        undef($env{'form.folderpath'});
+                    }
                 }
             }
         }
     }
 
+
 # If after all of this, we still don't have any paths, make them
     unless ($env{'form.folderpath'}) {
        if ($supplementalflag) {
@@ -6205,34 +5384,15 @@ sub handler {
                 }
             }
             my $tabidstr = join("','",@tabids);
-            my (%domtools,%crstools);
-            my %tooltypes = &Apache::loncommon::usable_exttools();
-            if ($tooltypes{'dom'}) {
-                %domtools = &Apache::lonnet::get_domain_lti($coursedom,'consumer');
-            }
-            if ($tooltypes{'crs'}) {
-                %crstools = &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer');
-            }
-            %ltitools = (
-                          dom => \%domtools,
-                          crs => \%crstools,
-                        );
-            $posslti = scalar(keys(%domtools)) + scalar(keys(%crstools));
             my $hostname = $r->hostname();
-            $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
+	    $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,
                                    $canedit,$hostname,\$navmap).
                        &history_tab_js().
                        &inject_data_js().
                        &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
-                       &Apache::lonextresedit::extedit_javascript(\%ltitools);
-            my $onload = "javascript:resize_scrollbox('contentscroll','1','1');";
-            if ($hidden_and_empty ne '') {
-                my $alert = &mt("Additional privileges required to edit empty and hidden folder: '[_1]'",
-                                $hidden_and_empty);
-                $onload .= "javascript:alert('".&js_escape($alert)."');";
-            }
+                       &Apache::lonextresedit::extedit_javascript();
             $addentries = {
-                            onload => $onload,
+                            onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
                           };
         }
         $script .= &paste_popup_js(); 
@@ -6253,16 +5413,8 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
     if ($showdoc) {
-        my $args;
-        if ($supplementalflag) {
-            my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&');
-            my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
-            $args = {'bread_crumbs' => $brcrum,
-                     'bread_crumbs_nomenu' => 1};
-        } else {
-            $args = {'force_register' => $showdoc};
-        }
-        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,$args));
+        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
+                                                {'force_register' => $showdoc,}));
     } elsif ($toolsflag) {
         my ($breadtext,$breadtitle);
         $breadtext = "$crstype Editor";
@@ -6280,20 +5432,9 @@ sub handler {
                      $breadtitle)
                  );
     } elsif ($r->uri eq '/adm/supplemental') {
-        unless ($env{'request.role.adv'}) {
-            unless (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom)) {
-                $r->internal_redirect('/adm/navmaps');
-                return OK;
-            }
-        }
         my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
-        my $args = {'bread_crumbs' => $brcrum};
-        unless (($env{'form.folderpath'} eq '') ||
-                ($env{'form.folder'} eq 'supplemental')) {
-            $args->{'bread_crumbs_nomenu'} = 1;
-        }
         $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
-                                                $args));
+                                                {'bread_crumbs' => $brcrum,}));
     } else {
         my ($breadtext,$breadtitle,$helpitem);
         $breadtext = "$crstype Editor";
@@ -6321,7 +5462,6 @@ sub handler {
   my %codebase = ();
   my ($upload_result,$upload_output,$uploadphase);
   if ($canedit) {
-      undef($suppchanges);
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
           my $context = $1; 
@@ -6333,10 +5473,6 @@ sub handler {
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
-          if ($suppchanges) {
-              &Apache::lonnet::update_supp_caches($coursedom,$coursenum);
-              undef($suppchanges);
-          }
           $r->print($upload_output);
       } elsif ($env{'form.phase'} eq 'upload_embedded') {
           # Process file upload - phase two - upload embedded objects 
@@ -6390,8 +5526,6 @@ sub handler {
                 'impo' => 'Import',
 		'lnks' => 'Import from Stored Links',
                 'impm' => 'Import from Assembled Map',
-                'extr' => 'External Resource',
-                'extt' => 'External Tool',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'newf' => 'New Folder',
@@ -6564,12 +5698,7 @@ SEDFFORM
         my $extresourcesform =
             &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
                                                  $help{'Adding_External_Resource'},
-                                                 undef,undef,undef,undef,undef,undef,$disabled);
-        my $exttoolform =
-            &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Tool'},undef,
-                                                 undef,'tool',$coursedom,$coursenum,
-                                                 \%ltitools,$disabled);
+                                                 undef,undef,$disabled);
     if ($allowed) {
         my $folder = $env{'form.folder'};
         if ($folder eq '') {
@@ -6626,13 +5755,9 @@ HIDDENFORM
        }
        my $postexec='';
        if ($folder eq 'default') {
-           my $windowname = 'loncapaclient';
-           if ($env{'request.lti.login'}) {
-               $windowname .= 'lti';
-           }
            $r->print('<script type="text/javascript">'."\n"
                     .'// <![CDATA['."\n"
-                    .'this.window.name="$windowname";'."\n"
+                    .'this.window.name="loncapaclient";'."\n"
                     .'// ]]>'."\n"
                     .'</script>'."\n"
        );
@@ -6828,11 +5953,6 @@ NGFFORM
         my @importdoc = (
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform}
         );
-        if ($posslti) {
-            push(@importdoc,
-                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform},
-        );
-        }
         unless ($container eq 'page') {
             push(@importdoc,
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform}
@@ -6875,7 +5995,7 @@ unless ($container eq 'page') {
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
                               $supplementalflag,\%orderhash,$iconpath,$pathitem,
-                              \%ltitools,$canedit,$hostname,\$navmap,$hiddentop);
+                              $canedit,$hostname,\$navmap,$hiddentop);
           undef($navmap);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
@@ -6896,7 +6016,7 @@ unless ($container eq 'page') {
        unless ($supplementalflag) {
 	   $folder='supplemental';
        }
-       if (($folder eq 'supplemental') &&
+       if ($folder =~ /^supplemental$/ &&
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = &supplemental_base();
        } elsif ($allowed) {
@@ -6948,11 +6068,6 @@ SNFFORM
             &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
                                                  $help{'Adding_External_Resource'},
                                                  undef,undef,$disabled);
-        my $supexttoolform =
-            &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Tool'},
-                                                 undef,undef,'tool',$coursedom,
-                                                 $coursenum,\%ltitools,$disabled);
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
@@ -7007,16 +6122,10 @@ my @specialdocs = (
 		);
 my @supimportdoc = (
 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
-            =>$supextform});
-        if (keys(%ltitools)) {
-            push(@supimportdoc,
-                {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />'
-            =>$supexttoolform});
-        }
-        push(@supimportdoc,
+            =>$supextform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
             =>$supupdocform},
-        );
+                   );
 
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc));
 my %suporderhash = (
@@ -7025,22 +6134,29 @@ my %suporderhash = (
                 'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
-            $suppchanges = 0;
-            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                                $supplementalflag,\%suporderhash,$iconpath,$pathitem,
-                                \%ltitools,$canedit,$hostname);
-            if ($error) {
-                $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-            }
-            if ($suppchanges) {
-                &Apache::lonnet::update_supp_caches($coursedom,$coursenum);
-                undef($suppchanges);
-            }
+           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
+                               $supplementalflag,\%suporderhash,$iconpath,$pathitem,
+                               $canedit,$hostname);
+           if ($error) {
+              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+           } else {
+               if ($suppchanges) {
+                   my %servers = &Apache::lonnet::internet_dom_servers($coursedom);
+                   my @ids=&Apache::lonnet::current_machine_ids();
+                   foreach my $server (keys(%servers)) {
+                       next if (grep(/^\Q$server\E$/,@ids));
+                       my $hashid=$coursenum.':'.$coursedom;
+                       my $cachekey = &escape('suppcount').':'.&escape($hashid);
+                       &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
+                   }
+                   &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
+                   undef($suppchanges);
+               }
+           }
         }
     } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                            $supplementalflag,'',$iconpath,$pathitem,'',$canedit,
-                            $hostname);
+                            $supplementalflag,'',$iconpath,$pathitem,'',$hostname);
         if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
@@ -7202,10 +6318,6 @@ sub remove_archive {
             if ($url eq $env{'form.archiveurl'}) {
                 if (&handle_edit_cmd($docuname,$docudom)) {
                     ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
-                    if ($suppchanges) {
-                        &Apache::lonnet::update_supp_caches($docudom,$docuname);
-                        undef($suppchanges);
-                    }
                     if ($fatal) {
                         if ($container eq 'page') {
                             $delwarning = &mt('An error occurred updating the contents of the current page.');
@@ -7244,7 +6356,6 @@ sub generate_admin_menu {
                                          'vc'   => 'Verify Content',
                                          'cv'   => 'Check/Set Resource Versions',
                                          'ls'   => 'List Resource Identifiers',
-                                         'ct'   => 'Display/Set Shortened URLs for Deep-linking',
                                          'imse' => 'Export contents to IMS Archive',
                                          'dcd'  => "Copy $crstype Content to Authoring Space",
             );
@@ -7295,13 +6406,6 @@ sub generate_admin_menu {
                     icon       => 'symbs.png',
                     linktitle  => "List the unique identifier used for each resource instance in your $lc_crstype"
                 },
-                {   linktext   => $lt{'ct'},
-                    url        => "javascript:injectData(document.courseverify,'dummy','shorturls','$lt{'ct'}')",
-                    permission => 'F',
-                    help       => 'Docs_Short_URLs',
-                    icon       => 'shorturls.png',
-                    linktitle  => "Set shortened URLs for a resource or folder in your $lc_crstype for use in deep-linking"
-                },
                 ]
         });
     if ($canedit) {
@@ -7432,7 +6536,7 @@ END
 }
 
 sub editing_js {
-    my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
+    my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,
         $canedit,$hostname,$navmapref) = @_;
     my %js_lt = &Apache::lonlocal::texthash(
                                           p_mnf => 'Name of New Folder',
@@ -7543,28 +6647,17 @@ sub editing_js {
     } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') {
         $backtourl = '/adm/menu';
     } elsif ($supplementalflag) {
-        if (($env{'request.role.adv'}) ||
-            (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom))) {
-            $backtourl = '/adm/supplemental';
-        } else {
-            $backtourl = '/adm/navmaps';
-        }
+        $backtourl = '/adm/supplemental';
     } else {
         $backtourl = '/adm/navmaps';
     }
 
     my $fieldsets = "'ext','doc'";
-    if ($posslti) {
-        $fieldsets .= ",'tool'";
-    }
     unless ($main_container_page) {
         $fieldsets .=",'ims'";
     }
     if ($supplementalflag) {
         $fieldsets = "'suppext','suppdoc'";
-        if ($posslti) {
-            $fieldsets .= ",'supptool'";
-        }
     }
 
     my $jsmakefunctions;
@@ -7761,19 +6854,6 @@ function toggleUpload(caller) {
             }
         }
         document.getElementById('upload'+blocks[i]+'form').style.display=disp;
-        if ((caller == 'tool') || (caller == 'supptool')) {
-            if (disp == 'block') {
-                if (document.getElementById('LC_exttoolid')) {
-                    var toolselector = document.getElementById('LC_exttoolid');
-                    var suppflag = 0;
-                    if (caller == 'supptool') {
-                        suppflag = 1;
-                    }
-                    currForm = document.getElementById('new'+caller);
-                    updateExttool(toolselector,currForm,suppflag);
-                }
-            }
-        }
     }
     resize_scrollbox('contentscroll','1','1');
     return;