--- loncom/interface/loncommon.pm	2012/08/07 13:15:28	1.1075.2.13
+++ loncom/interface/loncommon.pm	2012/05/18 14:27:11	1.1076
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.13 2012/08/07 13:15:28 raeburn Exp $
+# $Id: loncommon.pm,v 1.1076 2012/05/18 14:27:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4954,9 +4954,6 @@ Inputs:
 
 =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
 
-=item * $no_inline_link, if true and in remote mode, don't show the
-         'Switch To Inline Menu' link
-
 =item * $args, optional argument valid values are
             no_auto_mt_title -> prevents &mt()ing the title arg
             inherit_jsmath -> when creating popup window in a page,
@@ -4974,7 +4971,7 @@ other decorations will be returned.
 
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
-        $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
+        $no_nav_bar,$bgcolor,$args)=@_;
 
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -5016,8 +5013,6 @@ sub bodytag {
     }
 
     if (!$realm) { $realm=' '; }
-# Set messages
-    my $messages=&domainlogo($domain);
 
     my $extra_body_attr = &make_attr_string($forcereg,\%design);
 
@@ -5052,13 +5047,11 @@ sub bodytag {
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
-    if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
-        return $bodytag; 
-    }
-
-    if ($env{'request.state'} eq 'construct') { $forcereg=1; }
+        if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
+            return $bodytag; 
+        } 
 
-    unless ($env{'environment.remote'} eq 'on') {
+        if ($env{'request.state'} eq 'construct') { $forcereg=1; }
 
         #    if ($env{'request.state'} eq 'construct') {
         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
@@ -5067,13 +5060,11 @@ sub bodytag {
 
 
         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
-            unless ($env{'request.noversionuri'} =~ m{/res/adm/pages/bookmarkmenu/}) {
-                if ($dc_info) {
-                     $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
-                }
-                $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
-                               <em>$realm</em> $dc_info</div>|;
-            }
+             if ($dc_info) {
+                 $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
+             }
+             $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+                <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
 
@@ -5110,55 +5101,6 @@ sub bodytag {
         }
 
         return $bodytag;
-    }
-
-#
-# Top frame rendering, Remote is up
-#
-
-    my $imgsrc = $img;
-    if ($img =~ /^\/adm/) {
-        $imgsrc = &lonhttpdurl($img);
-    }
-    my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
-
-    # Explicit link to get inline menu
-    my $menu= ($no_inline_link?''
-               :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
-
-    if ($dc_info) {
-        $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|;
-    }
-
-    unless ($env{'form.inhibitmenu'}) {
-        $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
-                       <ol class="LC_primary_menu LC_right">
-                       <li>$menu</li>
-                       </ol><div id="LC_realm"> $realm $dc_info</div>|;
-    }
-    my $funclist;
-    if ($env{'request.state'} eq 'construct') {
-        if (!$public){
-            if ($env{'request.state'} eq 'construct') {
-                $funclist = &Apache::lonhtmlcommon::scripttag(
-                                &Apache::lonmenu::utilityfunctions(), 'start').
-                            &Apache::lonhtmlcommon::scripttag('','end').
-                            &Apache::lonmenu::innerregister($forcereg,
-                                                            $args->{'bread_crumbs'});
-            }
-        }
-    }
-    return(<<ENDBODY);
-$bodytag
-<table id="LC_title_bar" class="LC_with_remote">
-<tr><td>$upperleft</td>
-    <td>$messages&nbsp;</td>
-</tr>
-<tr><td>$titleinfo $dc_info $menu</td>
-</tr>
-</table>
-$funclist
-ENDBODY
 }
 
 sub dc_courseid_toggle {
@@ -5190,15 +5132,8 @@ sub make_attr_string {
 		delete($attr_ref->{$key});
 	    }
 	}
-        if ($env{'environment.remote'} eq 'on') {
-            $attr_ref->{'onload'}  =
-                &Apache::lonmenu::loadevents().  $on_load;
-            $attr_ref->{'onunload'}=
-                &Apache::lonmenu::unloadevents().$on_unload;
-        } else {  
-	    $attr_ref->{'onload'}  = $on_load;
-	    $attr_ref->{'onunload'}= $on_unload;
-        }
+	$attr_ref->{'onload'}  = $on_load;
+	$attr_ref->{'onunload'}= $on_unload;
     }
 
     my $attr_string;
@@ -5228,10 +5163,7 @@ i.e., $env{'internal.head.redirect'} exi
 
 sub endbodytag {
     my ($args) = @_;
-    my $endbodytag;
-    unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) {
-        $endbodytag='</body>';
-    }
+    my $endbodytag='</body>';
     $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
     if ( exists( $env{'internal.head.redirect'} ) ) {
         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
@@ -6548,19 +6480,16 @@ ol.LC_primary_menu li:hover ul, ol.LC_pr
   position: absolute;
   margin: 0;
   padding: 0;
-  z-index: 2;
 }
 
 ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li {
   font-size: 90%;
   vertical-align: top;
   float: none;
-  border-left: 1px solid black;
-  border-right: 1px solid black;
 }
 
 ol.LC_primary_menu li:hover li a, ol.LC_primary_menu li.hover li a {
-  background-color:$data_table_light;
+  background-color:$data_table_light
 }
 
 ol.LC_primary_menu li li a:hover {
@@ -6571,7 +6500,6 @@ ol.LC_primary_menu li li a:hover {
 ol.LC_primary_menu li img {
   vertical-align: bottom;
   height: 1.1em;
-  margin: 0.2em 0 0 0;
 }
 
 ol.LC_primary_menu a {
@@ -6617,53 +6545,15 @@ ul#LC_secondary_menu {
   margin: 0;
   width: 100%;
   text-align: left;
-  float: left;
 }
 
 ul#LC_secondary_menu li {
   font-weight: bold;
   line-height: 1.8em;
-  border-right: 1px solid black;
-  vertical-align: middle;
-  float: left;
-}
-
-ul#LC_secondary_menu li.LC_hoverable:hover, ul#LC_secondary_menu li.hover {
-  background-color: $data_table_light;
-}
-
-ul#LC_secondary_menu li a {
   padding: 0 0.8em;
-}
-
-ul#LC_secondary_menu li ul {
-  display: none;
-}
-
-ul#LC_secondary_menu li:hover ul, ul#LC_secondary_menu li.hover ul {
-  display: block;
-  position: absolute;
-  margin: 0;
-  padding: 0;
-  list-style:none;
-  float: none;
-  background-color: $data_table_light;
-  z-index: 2;
-  margin-left: -1px;
-}
-
-ul#LC_secondary_menu li ul li {
-  font-size: 90%;
-  vertical-align: top;
-  border-left: 1px solid black;
   border-right: 1px solid black;
-  background-color: $data_table_light
-  list-style:none;
-  float: none;
-}
-
-ul#LC_secondary_menu li ul li:hover, ul#LC_secondary_menu li ul li.hover {
-  background-color: $data_table_dark;
+  display: inline;
+  vertical-align: middle;
 }
 
 ul.LC_TabContent {
@@ -7003,7 +6893,6 @@ ul#LC_toolbar {
   list-style:none;
   position:relative;
   background-color:white;
-  overflow: auto;
 }
 
 ul#LC_toolbar li {
@@ -7013,7 +6902,6 @@ ul#LC_toolbar li {
   float: left;
   display:inline;
   vertical-align:middle;
-  white-space: nowrap;
 }
 
 
@@ -7163,8 +7051,8 @@ sub headtag {
     if (!$args->{'frameset'}) {
 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
     }
-    if ($args->{'force_register'}) {
-        $result .= &Apache::lonmenu::registerurl(1);
+    if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
+        $result .= Apache::lonxml::display_title();
     }
     if (!$args->{'no_nav_bar'} 
 	&& !$args->{'only_body'}
@@ -7373,8 +7261,6 @@ $args - additional optional args support
              skip_phases    -> hash ref of 
                                     head -> skip the <html><head> generation
                                     body -> skip all <body> generation
-             no_inline_link -> if true and in remote mode, don't show the
-                                    'Switch To Inline Menu' link
              no_auto_mt_title -> prevent &mt()ing the title arg
              inherit_jsmath -> when creating popup window in a page,
                                     should it have jsmath forced on by the
@@ -7410,8 +7296,7 @@ sub start_page {
                          $args->{'function'},       $args->{'add_entries'},
                          $args->{'only_body'},      $args->{'domain'},
                          $args->{'force_register'}, $args->{'no_nav_bar'},
-                         $args->{'bgcolor'},        $args->{'no_inline_link'},
-                         $args);
+                         $args->{'bgcolor'},        $args);
         }
     }
 
@@ -7468,9 +7353,7 @@ sub end_page {
     } else {
 	$result .= &endbodytag($args);
     }
-    unless ($args->{'notbody'}) {
-        $result .= "\n</html>";
-    }
+    $result .= "\n</html>";
 
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);
@@ -9422,7 +9305,7 @@ sub get_env_multiple {
 sub ask_for_embedded_content {
     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
     my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges,
-        %currsubfile,%unused,$rem);
+        %currsubfile,%unused);
     my $counter = 0;
     my $numnew = 0;
     my $numremref = 0;
@@ -9435,10 +9318,6 @@ sub ask_for_embedded_content {
     my $heading = &mt('Upload embedded files');
     my $buttontext = &mt('Upload');
 
-    my $navmap;
-    if ($env{'request.course.id'}) {
-        $navmap = Apache::lonnavmaps::navmap->new();
-    }
     if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
         my $current_path='/';
         if ($env{'form.currentpath'}) {
@@ -9468,13 +9347,6 @@ sub ask_for_embedded_content {
         if (ref($args) eq 'HASH') {
             $url = $args->{'docs_url'};
             $toplevel = $url;
-            if ($args->{'context'} eq 'paste') {
-                ($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/});
-                ($path) =
-                    ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
-                $fileloc = &Apache::lonnet::filelocation('',$toplevel);
-                $fileloc =~ s{^/}{};
-            }
         }
     } elsif ($actionurl eq '/adm/dependencies') {
         if ($env{'request.course.id'} ne '') {
@@ -9484,7 +9356,6 @@ sub ask_for_embedded_content {
                 $url = $args->{'docs_url'};
                 $title = $args->{'docs_title'};
                 $toplevel = "/$url";
-                ($rem) = ($toplevel =~ m{^(.+/)[^/]+$});
                 ($path) =  
                     ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
                 $fileloc = &Apache::lonnet::filelocation('',$toplevel);
@@ -9547,9 +9418,7 @@ sub ask_for_embedded_content {
                 my @subdir_list = grep(!/^\./,readdir($dir));
                 map {$currsubfile{$path}{$_} = 1;} @subdir_list;
             }
-        } elsif (($actionurl eq '/adm/dependencies') ||
-                 (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
-                  ($args->{'context'} eq 'paste'))) {
+        } elsif ($actionurl eq '/adm/dependencies') {
             if ($env{'request.course.id'} ne '') {
                 my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
                 if ($dir ne '') {
@@ -9585,12 +9454,6 @@ sub ask_for_embedded_content {
                 if (ref($currsubfile{$path}) eq 'HASH') {
                     foreach my $file (keys(%{$currsubfile{$path}})) {
                          unless ($subdependencies{$path}{$file}) {
-                             next if (($rem ne '') &&
-                                      (($env{"httpref.$rem"."$path/$file"} ne '') ||
-                                       (ref($navmap) &&
-                                       (($navmap->getResourceByUrl($rem."$path/$file") ne '') ||
-                                        (($file =~ /^(.*\.s?html?)\.bak$/i) &&
-                                         ($navmap->getResourceByUrl($rem."$path/$1")))))));
                              $unused{$path.'/'.$file} = 1; 
                          }
                     }
@@ -9613,9 +9476,7 @@ sub ask_for_embedded_content {
             my @dir_list = grep(!/^\./,readdir($dir));
             map {$currfile{$_} = 1;} @dir_list;
         }
-    } elsif (($actionurl eq '/adm/dependencies') ||
-             (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
-              ($args->{'context'} eq 'paste'))) {
+    } elsif ($actionurl eq '/adm/dependencies') {
         if ($env{'request.course.id'} ne '') {
             my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
             if ($dir ne '') {
@@ -9649,23 +9510,9 @@ sub ask_for_embedded_content {
         unless (($file eq $filename) ||
                 ($file eq $filename.'.bak') ||
                 ($dependencies{$file})) {
-            if ($actionurl eq '/adm/dependencies') {
-                next if (($rem ne '') &&
-                         (($env{"httpref.$rem".$file} ne '') ||
-                          (ref($navmap) &&
-                          (($navmap->getResourceByUrl($rem.$file) ne '') ||
-                           (($file =~ /^(.*\.s?html?)\.bak$/i) &&
-                            ($navmap->getResourceByUrl($rem.$1)))))));
-            }
             $unused{$file} = 1;
         }
     }
-    if (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
-        ($args->{'context'} eq 'paste')) {
-        $counter = scalar(keys(%existing));
-        $numpathchg = scalar(keys(%pathchanges));
-        return ($output,$counter,$numpathchg,\%existing);
-    }
     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
         if ($actionurl eq '/adm/dependencies') {
             next if ($embed_file =~ m{^\w+://});
@@ -9682,6 +9529,7 @@ sub ask_for_embedded_content {
             $numremref++;
         } elsif ($args->{'error_on_invalid_names'}
             && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
+
             $upload_output.='<span class="LC_warning">'.&mt('Invalid characters').'</span>';
             $numinvalid++;
         } else {
@@ -11169,10 +11017,7 @@ function dependencyCheck(form,count,offs
             document.getElementById('arc_depon_'+count).style.display='block'; 
             form.elements[depitem].options.length = 0;
             form.elements[depitem].options[0] = new Option('Select','',true,true);
-            for (var i=1; i<=numitems; i++) {
-                if (i == count) {
-                    continue;
-                }
+            for (var i=1; i<count; i++) {
                 var startelement = $startcount + (i-1) * 7;
                 for (var j=1; j<6; j++) {
                     if ((j != 2) && (j!= 4)) {
@@ -11313,7 +11158,6 @@ sub process_extracted_files {
     my (%referrer,%orphaned,%todelete,%todeletedir,%newdest,%newseqid);
     if ($numitems) {
         for (my $i=1; $i<=$numitems; $i++) {
-            next if ($env{'form.archive_'.$i} eq 'dependency');
             my $path = $env{'form.archive_content_'.$i};
             if ($path =~ /^\Q$pathtocheck\E/) {
                 if ($env{'form.archive_'.$i} eq 'discard') {
@@ -11364,7 +11208,7 @@ sub process_extracted_files {
                             my ($outtext,$errtext) =
                                 &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
                                                         $docuname.'/'.$folders{$outer}.
-                                                        '.'.$containers{$outer},1,1);
+                                                        '.'.$containers{$outer},1);
                             $newseqid{$i} = $newidx;
                             unless ($errtext) {
                                 $result .=  '<li>'.&mt('Folder: [_1] added to course',$docstitle).'</li>'."\n";
@@ -11397,7 +11241,7 @@ sub process_extracted_files {
                             my ($outtext,$errtext)=
                                 &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
                                                         $docuname.'/'.$folders{$outer}.
-                                                        '.'.$containers{$outer},1,1);
+                                                        '.'.$containers{$outer},1);
                             unless ($errtext) {
                                 if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") {
                                     $result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n";
@@ -11405,93 +11249,87 @@ sub process_extracted_files {
                             }
                         }
                     }
-                }
-            } else {
-                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
-            }
-        }
-        for (my $i=1; $i<=$numitems; $i++) {
-            next unless ($env{'form.archive_'.$i} eq 'dependency');
-            my $path = $env{'form.archive_content_'.$i};
-            if ($path =~ /^\Q$pathtocheck\E/) {
-                my ($title) = ($path =~ m{/([^/]+)$});
-                $referrer{$i} = $env{'form.archive_dependent_on_'.$i};
-                if ($env{'form.archive_'.$referrer{$i}} eq 'display') {
-                    if (ref($dirorder{$i}) eq 'ARRAY') {
-                        my ($itemidx,$fullpath,$relpath);
-                        if (ref($dirorder{$referrer{$i}}) eq 'ARRAY') {
-                            my $container = $dirorder{$referrer{$i}}->[-1];
+                } elsif ($env{'form.archive_'.$i} eq 'dependency') {
+                    my ($title) = ($path =~ m{/([^/]+)$});
+                    $referrer{$i} = $env{'form.archive_dependent_on_'.$i};
+                    if ($env{'form.archive_'.$referrer{$i}} eq 'display') {
+                        if (ref($dirorder{$i}) eq 'ARRAY') {
+                            my ($itemidx,$fullpath,$relpath);
                             for (my $j=0; $j<@{$dirorder{$i}}; $j++) {
-                                if ($dirorder{$i}->[$j] eq $container) {
-                                    $itemidx = $j;
+                                if (ref($dirorder{$referrer{$i}}) eq 'ARRAY') {
+                                    my $container = $dirorder{$referrer{$i}}->[-1];
+                                    for (my $j=0; $j<@{$dirorder{$i}}; $j++) {
+                                        if ($dirorder{$i}->[$j] eq $container) {
+                                            $itemidx = $j;
+                                        }
+                                    }
                                 }
                             }
-                        }
-                        if ($itemidx eq '') {
-                            $itemidx =  0;
-                        }
-                        if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) {
-                            if ($mapinner{$referrer{$i}}) {
-                                $fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}";
-                                for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
-                                    if (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) {
-                                        unless (defined($newseqid{$dirorder{$i}->[$j]})) {
-                                            $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                            $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                            if (!-e $fullpath) {
-                                                mkdir($fullpath,0755);
+                            if ($itemidx ne '') {
+                                if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) {
+                                    if ($mapinner{$referrer{$i}}) {
+                                        $fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}";
+                                        for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
+                                            if (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) {
+                                                unless (defined($newseqid{$dirorder{$i}->[$j]})) {
+                                                    $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                                    $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                                    if (!-e $fullpath) {
+                                                        mkdir($fullpath,0755);
+                                                    }
+                                                }
+                                            } else {
+                                                last;
                                             }
                                         }
-                                    } else {
-                                        last;
                                     }
-                                }
-                            }
-                        } elsif ($newdest{$referrer{$i}}) {
-                            $fullpath = $newdest{$referrer{$i}};
-                            for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
-                                if ($env{'form.archive_'.$dirorder{$i}->[$j]} eq 'discard') {
-                                    $orphaned{$i} = $env{'form.archive_'.$dirorder{$i}->[$j]};
-                                    last;
-                                } elsif (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) {
-                                    unless (defined($newseqid{$dirorder{$i}->[$j]})) {
-                                        $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                        $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                        if (!-e $fullpath) {
-                                            mkdir($fullpath,0755);
+                                } elsif ($newdest{$referrer{$i}}) {
+                                    $fullpath = $newdest{$referrer{$i}};
+                                    for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
+                                        if ($env{'form.archive_'.$dirorder{$i}->[$j]} eq 'discard') {
+                                            $orphaned{$i} = $env{'form.archive_'.$dirorder{$i}->[$j]};
+                                            last;
+                                        } elsif (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) {
+                                            unless (defined($newseqid{$dirorder{$i}->[$j]})) {
+                                                $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                                $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                                if (!-e $fullpath) {
+                                                    mkdir($fullpath,0755);
+                                                }
+                                            }
+                                        } else {
+                                            last;
                                         }
                                     }
-                                } else {
-                                    last;
                                 }
-                            }
-                        }
-                        if ($fullpath ne '') {
-                            if (-e "$prefix$path") {
-                                system("mv $prefix$path $fullpath/$title");
-                            }
-                            if (-e "$fullpath/$title") {
-                                my $showpath;
-                                if ($relpath ne '') {
-                                    $showpath = "$relpath/$title";
-                                } else {
-                                    $showpath = "/$title";
+                                if ($fullpath ne '') {
+                                    if (-e "$prefix$path") {
+                                        system("mv $prefix$path $fullpath/$title");
+                                    }
+                                    if (-e "$fullpath/$title") {
+                                        my $showpath;
+                                        if ($relpath ne '') {
+                                            $showpath = "$relpath/$title";
+                                        } else {
+                                            $showpath = "/$title";
+                                        } 
+                                        $result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";
+                                    } 
+                                    unless ($ishome) {
+                                        my $fetch = "$fullpath/$title";
+                                        $fetch =~ s/^\Q$prefix$dir\E//; 
+                                        $prompttofetch{$fetch} = 1;
+                                    }
                                 }
-                                $result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";
-                            }
-                            unless ($ishome) {
-                                my $fetch = "$fullpath/$title";
-                                $fetch =~ s/^\Q$prefix$dir\E//;
-                                $prompttofetch{$fetch} = 1;
                             }
                         }
+                    } elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') {
+                        $warning .= &mt('[_1] is a dependency of [_2], which was discarded.',
+                                        $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';
                     }
-                } elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') {
-                    $warning .= &mt('[_1] is a dependency of [_2], which was discarded.',
-                                    $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';
                 }
             } else {
-                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
+                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; 
             }
         }
         if (keys(%todelete)) {
@@ -13871,7 +13709,7 @@ sub init_user_environment {
             %domdef = &Apache::lonnet::get_domain_defaults($domain);
         }
 
-        foreach my $tool ('aboutme','blog','webdav','portfolio') {
+        foreach my $tool ('aboutme','blog','portfolio') {
             $userenv{'availabletools.'.$tool} = 
                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
                                                   undef,\%userenv,\%domdef,\%is_adv);
@@ -13998,66 +13836,6 @@ sub build_release_hashes {
     return;
 }
 
-sub update_content_constraints {
-    my ($cdom,$cnum,$chome,$cid) = @_;
-    my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
-    my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'});
-    my %checkresponsetypes;
-    foreach my $key (keys(%Apache::lonnet::needsrelease)) {
-        my ($item,$name,$value) = split(/:/,$key);
-        if ($item eq 'resourcetag') {
-            if ($name eq 'responsetype') {
-                $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}
-            }
-        }
-    }
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    if (defined($navmap)) {
-        my %allresponses;
-        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
-            my %responses = $res->responseTypes();
-            foreach my $key (keys(%responses)) {
-                next unless(exists($checkresponsetypes{$key}));
-                $allresponses{$key} += $responses{$key};
-            }
-        }
-        foreach my $key (keys(%allresponses)) {
-            my ($major,$minor) = split(/\./,$checkresponsetypes{$key});
-            if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) {
-                ($reqdmajor,$reqdminor) = ($major,$minor);
-            }
-        }
-        undef($navmap);
-    }
-    unless (($reqdmajor eq '') && ($reqdminor eq '')) {
-        &Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid);
-    }
-    return;
-}
-
-sub parse_supplemental_title {
-    my ($title) = @_;
-
-    my ($foldertitle,$renametitle);
-    if ($title =~ /&amp;&amp;&amp;/) {
-        $title = &HTML::Entites::decode($title);
-    }
-    if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
-        $renametitle=$4;
-        my ($time,$uname,$udom) = ($1,$2,$3);
-        $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-        my $name =  &plainname($uname,$udom);
-        $name = &HTML::Entities::encode($name,'"<>&\'');
-        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
-        $title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
-            $name.': <br />'.$foldertitle;
-    }
-    if (wantarray) {
-        return ($title,$foldertitle,$renametitle);
-    }
-    return $title;
-}
-
 =pod
 
 =back