--- loncom/interface/londocs.pm	2006/11/13 17:20:29	1.251
+++ loncom/interface/londocs.pm	2006/11/22 14:07:13	1.256
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.251 2006/11/13 17:20:29 www Exp $
+# $Id: londocs.pm,v 1.256 2006/11/22 14:07:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1027,7 +1027,6 @@ sub log_docs {
         my ($plain)=@_;
         my %storehash=('folder' => $plain);
         if ($parmidx) {
-           $storehash{'parameter_idx'}=$parmidx;
            $storehash{'parameter_res'}=$oldresources[$parmidx];
            foreach my $parm (keys %parmaction) {
               $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
@@ -1045,10 +1044,8 @@ sub log_docs {
               $changedflag=1;
            }
            if ($LONCAPA::map::order[$idx] ne $oldorder[$idx]) {
-              $storehash{'before_order_'.$idx}=$oldorder[$idx];
-              $storehash{'after_order_'.$idx}=$LONCAPA::map::order[$idx];
-              $storehash{'before_order_res_'.$idx}=$oldresources[$idx];
-              $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$idx];
+              $storehash{'before_order_res_'.$idx}=$oldresources[$oldorder[$idx]];
+              $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
               $changedflag=1;
            }
         }
@@ -1065,27 +1062,32 @@ sub docs_change_log {
     my ($r)=@_;
     $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
-                                                                                                                            
+
     my %docslog=&Apache::lonnet::dump('nohist_docslog',
                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                                       $env{'course.'.$env{'request.course.id'}.'.num'});
-                                                                                                                            
+
     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
-                                                                                                                            
+
     $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
               '<input type="hidden" name="docslog" value="1" />');
-                                                                                                                            
+
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('docs_log',
                                               \%saveable_parameters);
     &Apache::loncommon::restore_course_settings('docs_log',
                                                 \%saveable_parameters);
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
-                                                                                                                            
+    my %lt=('hiddenresource' => 'Resources hidden',
+	    'encrypturl'     => 'URL hidden',
+	    'randompick'     => 'Randomly pick',
+	    'set'            => 'set to',
+	    'del'            => 'deleted');
+
     my $countselect =
         &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
                                     (&mt('all'),10,20,50,100,1000,10000));
-                                                                                                                            
+
     $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
               '<input type="submit" value="'.&mt('Display').'" /></form>');
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
@@ -1125,9 +1127,16 @@ sub docs_change_log {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtunescape($oldname));
+		$r->print(&LONCAPA::map::qtescape($oldname));
 	    }
 	}
+	$r->print('<ul>');
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+            if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
+		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+	    }
+	}
+	$r->print('</ul>');
 # After
         $r->print('</td><td>');
 
@@ -1135,9 +1144,28 @@ sub docs_change_log {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtunescape($newname));
+		$r->print(&LONCAPA::map::qtescape($newname));
 	    }
 	}        
+	$r->print('<ul>');
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+            if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
+		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+	    }
+	}
+	$r->print('</ul>');
+	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
+	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
+	    foreach my $parameter ('randompick','hiddenresource','encrypturl') {
+		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+		    $r->print('<li>'.
+			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
+				  $docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
+			      .'</li>');
+		}
+	    }
+	    $r->print('</ul>');
+	}
 # End
         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
         $shown++;
@@ -2331,6 +2359,7 @@ sub handler {
 		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
+    $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
 
 # does this user have privileges to modify docs
@@ -2525,6 +2554,7 @@ sub handler {
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',
+                'grpo' => 'Group Files',
 		'abou' => 'About User',
                 'imsf' => 'Import IMS package',
                 'file' =>  'File',
@@ -2564,7 +2594,7 @@ sub handler {
 $containertag
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 $uploadtag
 </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">
@@ -2678,7 +2708,7 @@ ENDFORM
 <hr />
 <form action="/adm/coursedocs" method="post" name="newext">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
@@ -2696,7 +2726,7 @@ ENDFORM
            $r->print(<<ENDFORM);
 <br /><form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
@@ -2705,7 +2735,7 @@ value="$lt{'newf'}" />$help{'Adding_Fold
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newpage">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newpage" type="button"
 onClick="javascript:makenewpage(this.form,'$pageseq');"
@@ -2714,8 +2744,8 @@ value="$lt{'newp'}" />$help{'Adding_Page
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag
-<input type=hidden name="importdetail" 
-value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<input type="hidden" name="importdetail" 
+value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
 <nobr>
 <input name="newsyl" type="submit" value="$lt{'syll'}" /> 
  $help{'Syllabus'}
@@ -2723,8 +2753,8 @@ value="Syllabus=/public/$coursedom/$cour
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newnav">
 $uploadtag
-<input type=hidden name="importdetail" 
-value="Navigate Content=/adm/navmaps">
+<input type="hidden" name="importdetail" 
+value="Navigate Content=/adm/navmaps" />
 <nobr>
 <input name="newnav" type="submit" value="$lt{'navc'}" />
 $help{'Navigate_Content'}
@@ -2732,7 +2762,7 @@ $help{'Navigate_Content'}
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newsmppg">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newsmppg" type="button" value="$lt{'sipa'}"
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}
@@ -2740,7 +2770,7 @@ onClick="javascript:makesmppage();" /> $
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
@@ -2748,7 +2778,7 @@ onClick="javascript:makesmpproblem();" /
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newdropbox">
 $uploadtag      
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>          
 <input name="newdropbox" type="button" value="$lt{'drbx'}"
 onClick="javascript:makedropbox();" />
@@ -2756,7 +2786,7 @@ onClick="javascript:makedropbox();" />
 </form> 
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
 onClick="javascript:makeexamupload();" />
@@ -2765,7 +2795,7 @@ $help{'Score_Upload_Form'}
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newbul">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newbulletin" type="button" value="$lt{'bull'}"
 onClick="javascript:makebulboard();" />
@@ -2774,8 +2804,8 @@ $help{'Bulletin Board'}
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newaboutme">
 $uploadtag
-<input type=hidden name="importdetail" 
-value="$plainname=/adm/$udom/$uname/aboutme">
+<input type="hidden" name="importdetail" 
+value="$plainname=/adm/$udom/$uname/aboutme" />
 <nobr>
 <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}
@@ -2783,19 +2813,28 @@ $help{'My Personal Info'}
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
 onClick="javascript:makeabout();" />
 </nobr>
 </form>
+<br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
+$uploadtag
+<input type="hidden" name="importdetail"
+value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
+<nobr>
+<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
+$help{'Group Files'}
+</nobr>
+</form>
 ENDFORM
        }
        if ($env{'form.pagepath'}) {
            $r->print(<<ENDBLOCK);
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
@@ -2803,7 +2842,7 @@ onClick="javascript:makesmpproblem();" /
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
 onClick="javascript:makeexamupload();" />
@@ -2867,7 +2906,7 @@ $lt{'comment'}:<br />
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
@@ -2876,7 +2915,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type=hidden name="importdetail" value="">
+<input type="hidden" name="importdetail" value="" />
 <nobr>
 <input name="newext" type="button" 
 onClick="javascript:makenewext('supnewext');"
@@ -2885,8 +2924,8 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type=hidden name="importdetail" 
-value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<input type="hidden" name="importdetail" 
+value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
 <nobr>
 <input name="newsyl" type="submit" value="$lt{'syll'}" />
 $help{'Syllabus'}
@@ -2894,8 +2933,8 @@ $help{'Syllabus'}
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type=hidden name="importdetail" 
-value="$plainname=/adm/$udom/$uname/aboutme">
+<input type="hidden" name="importdetail" 
+value="$plainname=/adm/$udom/$uname/aboutme" />
 <nobr>
 <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}