--- loncom/interface/loncommon.pm	2012/03/04 15:42:52	1.1057
+++ loncom/interface/loncommon.pm	2012/03/17 20:11:26	1.1059
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1057 2012/03/04 15:42:52 foxr Exp $
+# $Id: loncommon.pm,v 1.1059 2012/03/17 20:11:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4017,18 +4017,25 @@ sub findallcourses {
             if ($tstart) {
                 next if ($tstart > $now);
             }
-            my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role,$realsec);
+            my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role);
             (undef,$cdom,$cnumpart,$secpart) = split(/\//,$entry);
+            my $value = $trole.'/'.$cdom.'/';
             if ($secpart eq '') {
                 ($cnum,$role) = split(/_/,$cnumpart); 
                 $sec = 'none';
-                $realsec = '';
+                $value .= $cnum.'/';
             } else {
                 $cnum = $cnumpart;
                 ($sec,$role) = split(/_/,$secpart);
-                $realsec = $sec;
+                $value .= $cnum.'/'.$sec;
+            }
+            if (ref($courses{$cdom.'_'.$cnum}{$sec}) eq 'ARRAY') {
+                unless (grep(/^\Q$value\E$/,@{$courses{$cdom.'_'.$cnum}{$sec}})) {
+                    push(@{$courses{$cdom.'_'.$cnum}{$sec}},$value);
+                }
+            } else {
+                @{$courses{$cdom.'_'.$cnum}{$sec}} = ($value);
             }
-            $courses{$cdom.'_'.$cnum}{$sec} = $trole.'/'.$cdom.'/'.$cnum.'/'.$realsec;
         }
     } else {
         foreach my $key (keys(%env)) {
@@ -4046,11 +4053,19 @@ sub findallcourses {
                     if ($now>$endtime) { $active=0; }
                 }
                 if ($active) {
+                    my $value = $role.'/'.$cdom.'/'.$cnum.'/';
                     if ($sec eq '') {
                         $sec = 'none';
+                    } else {
+                        $value .= $sec;
+                    }
+                    if (ref($courses{$cdom.'_'.$cnum}{$sec}) eq 'ARRAY') {
+                        unless (grep(/^\Q$value\E$/,@{$courses{$cdom.'_'.$cnum}{$sec}})) {
+                            push(@{$courses{$cdom.'_'.$cnum}{$sec}},$value);
+                        }
+                    } else {
+                        @{$courses{$cdom.'_'.$cnum}{$sec}} = ($value);
                     }
-                    $courses{$cdom.'_'.$cnum}{$sec} = 
-                                     $role.'/'.$cdom.'/'.$cnum.'/'.$sec;
                 }
             }
         }
@@ -4143,34 +4158,38 @@ sub blockcheck {
             if ($otheruser) {
                 # Resource belongs to user other than current user.
                 # Assemble privs for that user, and check for 'evb' priv.
-                my ($trole,$tdom,$tnum,$tsec);
-                my $entry = $live_courses{$course}{$sec};
-                if ($entry =~ /^cr/) {
-                    ($trole,$tdom,$tnum,$tsec) = 
-                      ($entry =~ m|^(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$|);
-                } else {
-                    ($trole,$tdom,$tnum,$tsec) = split(/\//,$entry);
-                }
-                my ($spec,$area,$trest,%allroles,%userroles);
-                $area = '/'.$tdom.'/'.$tnum;
-                $trest = $tnum;
-                if ($tsec ne '') {
-                    $area .= '/'.$tsec;
-                    $trest .= '/'.$tsec;
-                }
-                $spec = $trole.'.'.$area;
-                if ($trole =~ /^cr/) {
-                    &Apache::lonnet::custom_roleprivs(\%allroles,$trole,
-                                                      $tdom,$spec,$trest,$area);
-                } else {
-                    &Apache::lonnet::standard_roleprivs(\%allroles,$trole,
-                                                       $tdom,$spec,$trest,$area);
-                }
-                my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
-                if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
-                    if ($1) {
-                        $no_userblock = 1;
-                        last;
+                my (%allroles,%userroles);
+                if (ref($live_courses{$course}{$sec}) eq 'ARRAY') {
+                    foreach my $entry (@{$live_courses{$course}{$sec}}) { 
+                        my ($trole,$tdom,$tnum,$tsec);
+                        if ($entry =~ /^cr/) {
+                            ($trole,$tdom,$tnum,$tsec) = 
+                                ($entry =~ m|^(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$|);
+                        } else {
+                           ($trole,$tdom,$tnum,$tsec) = split(/\//,$entry);
+                        }
+                        my ($spec,$area,$trest);
+                        $area = '/'.$tdom.'/'.$tnum;
+                        $trest = $tnum;
+                        if ($tsec ne '') {
+                            $area .= '/'.$tsec;
+                            $trest .= '/'.$tsec;
+                        }
+                        $spec = $trole.'.'.$area;
+                        if ($trole =~ /^cr/) {
+                            &Apache::lonnet::custom_roleprivs(\%allroles,$trole,
+                                                              $tdom,$spec,$trest,$area);
+                        } else {
+                            &Apache::lonnet::standard_roleprivs(\%allroles,$trole,
+                                                                $tdom,$spec,$trest,$area);
+                        }
+                    }
+                    my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
+                    if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
+                        if ($1) {
+                            $no_userblock = 1;
+                            last;
+                        }
                     }
                 }
             } else {
@@ -9986,12 +10005,12 @@ sub archive_row {
     my ($is_dir,$item,$currdir,$depth,$count) = @_;
     my ($name) = ($item =~ m{([^/]+)$});
     my %choices = &Apache::lonlocal::texthash (
-                                       'display'    => 'Add as File',
+                                       'display'    => 'Add as file',
                                        'dependency' => 'Include as dependency',
                                        'discard'    => 'Discard',
                                       );
     if ($is_dir) {
-        $choices{'display'} = &mt('Add as Folder'); 
+        $choices{'display'} = &mt('Add as folder'); 
     }
     my $output = &start_data_table_row().'<td align="right">'.$count.'</td>'."\n";
     my $offset = 0;
@@ -10004,7 +10023,7 @@ sub archive_row {
         if ($is_dir) {
             $output .= ' onclick="javascript:propagateCheck(this.form,'."'$count'".');"';
             if ($action eq 'display') {
-                $text = &mt('Add as Folder');
+                $text = &mt('Add as folder');
             }
         } else {
             $output .= ' onclick="javascript:dependencyCheck(this.form,'."$count,$offset".');"';
@@ -10018,6 +10037,10 @@ sub archive_row {
                        '<option value=""></option>'."\n".
                        '</select>'."\n".
                        '</div>';
+        } elsif ($action eq 'display') {
+            $output .= '<div id="arc_title_'.$count.'" style="display:none;">'."\n".
+                       &mt('Title:').'&nbsp;<input type="text" name="archive_title_'.$count.'" id="archive_title_'.$count.'" />'."\n".
+                       '</div>';
         }
         $output .= '</td>';
     }
@@ -10046,9 +10069,9 @@ sub archive_options_form {
                     '</p>'.
                     '<div class="LC_columnSection"><fieldset>'.
                     '<legend>'.&mt('Content actions for all').'</legend>'.
-                    '<input type="button" value="'.&mt('Display in Contents').'" '.
+                    '<input type="button" value="'.&mt('Add as folder/file').'" '.
                     'onclick="javascript:checkAll(document.'.$form.",'display'".')" />'.
-                    '&nbsp;&nbsp;<input type="button" value="'.&mt('Include as dependency for a displayed item').'"'.
+                    '&nbsp;&nbsp;<input type="button" value="'.&mt('Include as dependency for a displayed file').'"'.
                     ' onclick="javascript:checkAll(document.'.$form.",'dependency'".')" />'.
                     '&nbsp;&nbsp;<input type="button" value="'.&mt('Discard').'"'.
                     ' onclick="javascript:checkAll(document.'.$form.",'discard'".')" />'.
@@ -10065,6 +10088,7 @@ sub archive_options_form {
 sub archive_javascript {
     my ($startcount,$numitems,$titles,$children) = @_;
     return unless ((ref($titles) eq 'HASH') && (ref($children) eq 'HASH'));
+    my $maintitle = $env{'form.comment'};
     my $scripttag = <<START;
 <script type="text/javascript">
 // <![CDATA[
@@ -10078,8 +10102,8 @@ function checkAll(form,prefix) {
                 if (form.elements[i].type == 'radio') {
                     form.elements[i].checked = true;
                     var nostart = i-$startcount;
-                    var offset = nostart%6;
-                    var count = (nostart-offset)/6;    
+                    var offset = nostart%7;
+                    var count = (nostart-offset)/7;    
                     dependencyCheck(form,count,offset);
                 }
             }
@@ -10089,9 +10113,9 @@ function checkAll(form,prefix) {
 
 function propagateCheck(form,count) {
     if (count > 0) {
-        var startelement = $startcount + ((count-1) * 6);
-        for (var j=1; j<5; j++) {
-            if (j != 3) {
+        var startelement = $startcount + ((count-1) * 7);
+        for (var j=1; j<6; j++) {
+            if ((j != 2) && (j != 4)) {
                 var item = startelement + j; 
                 if (form.elements[item].type == 'radio') {
                     if (form.elements[item].checked) {
@@ -10110,6 +10134,7 @@ var parents = new Array(numitems);
 for (var i=0; i<numitems; i++) {
     parents[i] = new Array;
 }
+var maintitle = '$maintitle';
 
 START
 
@@ -10129,7 +10154,7 @@ START
 function containerCheck(form,count,offset) {
     if (count > 0) {
         dependencyCheck(form,count,offset);
-        var item = (offset+$startcount)+6*(count-1);
+        var item = (offset+$startcount)+7*(count-1);
         form.elements[item].checked = true;
         if(Object.prototype.toString.call(parents[count]) === '[object Array]') {
             if (parents[count].length > 0) {
@@ -10143,17 +10168,17 @@ function containerCheck(form,count,offse
 
 function dependencyCheck(form,count,offset) {
     if (count > 0) {
-        var chosen = (offset+$startcount)+6*(count-1);
-        var depitem = $startcount + ((count-1) * 6) + 3;
+        var chosen = (offset+$startcount)+7*(count-1);
+        var depitem = $startcount + ((count-1) * 7) + 4;
         var currtype = form.elements[depitem].type;
         if (form.elements[chosen].value == 'dependency') {
             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++) {
-                var startelement = $startcount + (i-1) * 6;
-                for (var j=1; j<5; j++) {
-                    if (j != 3) {
+                var startelement = $startcount + (i-1) * 7;
+                for (var j=1; j<6; j++) {
+                    if ((j != 2) && (j!= 4)) {
                         var item = startelement + j;
                         if (form.elements[item].type == 'radio') {
                             if (form.elements[item].checked) {
@@ -10171,12 +10196,13 @@ function dependencyCheck(form,count,offs
             form.elements[depitem].options.length = 0;
             form.elements[depitem].options[0] = new Option('Select','',true,true);
         }
+        titleCheck(form,count,offset);
     }
 }
 
 function propagateSelect(form,count,offset) {
     if (count > 0) {
-        var item = (1+offset+$startcount)+6*(count-1);
+        var item = (2+offset+$startcount)+7*(count-1);
         var picked = form.elements[item].options[form.elements[item].selectedIndex].value; 
         if (Object.prototype.toString.call(parents[count]) === '[object Array]') {
             if (parents[count].length > 0) {
@@ -10190,7 +10216,7 @@ function propagateSelect(form,count,offs
 
 function containerSelect(form,count,offset,picked) {
     if (count > 0) {
-        var item = (offset+$startcount)+6*(count-1);
+        var item = (1+offset+$startcount)+7*(count-1);
         if (form.elements[item].type == 'radio') {
             if (form.elements[item].value == 'dependency') {
                 if (form.elements[item+1].type == 'select-one') {
@@ -10213,6 +10239,26 @@ function containerSelect(form,count,offs
     }
 }
 
+function titleCheck(form,count,offset) {
+    if (count > 0) {
+        var chosen = (offset+$startcount)+7*(count-1);
+        var depitem = $startcount + ((count-1) * 7) + 2;
+        var currtype = form.elements[depitem].type;
+        if (form.elements[chosen].value == 'display') {
+            document.getElementById('arc_title_'+count).style.display='block';
+            if ((count==1) && ((parents[count].length > 0) || (numitems == 1))) {
+                document.getElementById('archive_title_'+count).value=maintitle;
+            }
+        } else {
+            document.getElementById('arc_title_'+count).style.display='none';
+            if (currtype == 'text') { 
+                document.getElementById('archive_title_'+count).value='';
+            }
+        }
+    }
+    return;
+}
+
 // ]]>
 </script>
 END
@@ -10279,8 +10325,12 @@ sub process_extracted_files {
                         }
                     }
                 } elsif ($env{'form.archive_'.$i} eq 'display') {
-                    my ($title,$url,$outer);
+                    my ($docstitle,$title,$url,$outer);
                     ($title) = ($path =~ m{/([^/]+)$});
+                    $docstitle = $env{'form.archive_title_'.$i};
+                    if ($docstitle eq '') {
+                        $docstitle = $title;
+                    }
                     $outer = 0;
                     if (ref($dirorder{$i}) eq 'ARRAY') {
                         if (@{$dirorder{$i}} > 0) {
@@ -10306,7 +10356,7 @@ sub process_extracted_files {
                                       $folders{$i}.'.'.$containers{$i};
                             my $newidx = &LONCAPA::map::getresidx();
                             $LONCAPA::map::resources[$newidx]=
-                                $title.':'.$url.':false:normal:res';
+                                $docstitle.':'.$url.':false:normal:res';
                             push(@LONCAPA::map::order,$newidx);
                             my ($outtext,$errtext) =
                                 &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
@@ -10331,7 +10381,7 @@ sub process_extracted_files {
                                 $newdest{$i} = "$prefix$dir/$docstype/$mapinner{$outer}/$newidx";
                             }
                             $LONCAPA::map::resources[$newidx]=
-                                $title.':'.$url.':false:normal:res';
+                                $docstitle.':'.$url.':false:normal:res';
                             push(@LONCAPA::map::order, $newidx);
                             my ($outtext,$errtext)=
                                 &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.