--- loncom/interface/loncommon.pm	2012/05/18 16:07:54	1.1075.2.2
+++ loncom/interface/loncommon.pm	2012/07/07 21:58:14	1.1086
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.2 2012/05/18 16:07:54 raeburn Exp $
+# $Id: loncommon.pm,v 1.1086 2012/07/07 21:58:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5060,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;
         }
 
@@ -5165,7 +5163,10 @@ i.e., $env{'internal.head.redirect'} exi
 
 sub endbodytag {
     my ($args) = @_;
-    my $endbodytag='</body>';
+    my $endbodytag;
+    unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) {
+        $endbodytag='</body>';
+    }
     $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
     if ( exists( $env{'internal.head.redirect'} ) ) {
         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
@@ -6482,16 +6483,19 @@ 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 {
@@ -6502,6 +6506,7 @@ 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 {
@@ -6895,6 +6900,7 @@ ul#LC_toolbar {
   list-style:none;
   position:relative;
   background-color:white;
+  overflow: auto;
 }
 
 ul#LC_toolbar li {
@@ -6904,6 +6910,7 @@ ul#LC_toolbar li {
   float: left;
   display:inline;
   vertical-align:middle;
+  white-space: nowrap;
 }
 
 
@@ -7355,7 +7362,9 @@ sub end_page {
     } else {
 	$result .= &endbodytag($args);
     }
-    $result .= "\n</html>";
+    unless ($args->{'notbody'}) {
+        $result .= "\n</html>";
+    }
 
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);
@@ -9307,7 +9316,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);
+        %currsubfile,%unused,$rem);
     my $counter = 0;
     my $numnew = 0;
     my $numremref = 0;
@@ -9320,6 +9329,10 @@ 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'}) {
@@ -9349,8 +9362,15 @@ 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') {
+    } elsif ($actionurl eq '/adm/dependencies')  {
         if ($env{'request.course.id'} ne '') {
             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
             $cnum =  $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -9358,6 +9378,7 @@ 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);
@@ -9420,7 +9441,9 @@ sub ask_for_embedded_content {
                 my @subdir_list = grep(!/^\./,readdir($dir));
                 map {$currsubfile{$path}{$_} = 1;} @subdir_list;
             }
-        } elsif ($actionurl eq '/adm/dependencies') {
+        } elsif (($actionurl eq '/adm/dependencies') ||
+                 (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
+                  ($args->{'context'} eq 'paste'))) {
             if ($env{'request.course.id'} ne '') {
                 my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
                 if ($dir ne '') {
@@ -9456,6 +9479,12 @@ 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; 
                          }
                     }
@@ -9478,7 +9507,9 @@ sub ask_for_embedded_content {
             my @dir_list = grep(!/^\./,readdir($dir));
             map {$currfile{$_} = 1;} @dir_list;
         }
-    } elsif ($actionurl eq '/adm/dependencies') {
+    } elsif (($actionurl eq '/adm/dependencies') ||
+             (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
+              ($args->{'context'} eq 'paste'))) {
         if ($env{'request.course.id'} ne '') {
             my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
             if ($dir ne '') {
@@ -9512,9 +9543,23 @@ 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+://});
@@ -9531,7 +9576,6 @@ 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 {
@@ -11019,7 +11063,10 @@ 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<count; i++) {
+            for (var i=1; i<=numitems; i++) {
+                if (i == count) {
+                    continue;
+                }
                 var startelement = $startcount + (i-1) * 7;
                 for (var j=1; j<6; j++) {
                     if ((j != 2) && (j!= 4)) {
@@ -11160,6 +11207,7 @@ 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') {
@@ -11251,84 +11299,90 @@ sub process_extracted_files {
                             }
                         }
                     }
-                } 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);
+                }
+            } 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];
                             for (my $j=0; $j<@{$dirorder{$i}}; $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 ($dirorder{$i}->[$j] eq $container) {
+                                    $itemidx = $j;
                                 }
                             }
-                            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;
-                                            }
-                                        }
-                                    }
-                                } 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);
-                                                }
+                        }
+                        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);
                                             }
-                                        } 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";
-                                        } 
-                                        $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 ($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;
                                 }
                             }
                         }
-                    } 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 />';
+                        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;
+                            }
+                        }
                     }
+                } 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 />'; 
@@ -13711,7 +13765,7 @@ sub init_user_environment {
             %domdef = &Apache::lonnet::get_domain_defaults($domain);
         }
 
-        foreach my $tool ('aboutme','blog','portfolio') {
+        foreach my $tool ('aboutme','blog','webdav','portfolio') {
             $userenv{'availabletools.'.$tool} = 
                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
                                                   undef,\%userenv,\%domdef,\%is_adv);
@@ -13838,6 +13892,66 @@ 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