--- loncom/interface/londocs.pm	2003/10/28 21:50:02	1.91
+++ loncom/interface/londocs.pm	2004/02/27 18:16:54	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.91 2003/10/28 21:50:02 www Exp $
+# $Id: londocs.pm,v 1.108 2004/02/27 18:16:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,10 +68,13 @@ sub mapread {
 
 sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
-    $hadchanges=1;
-    return
+    my ($outtext,$errtext)=
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);
+    if ($errtext) { return ($errtext,2); }
+    
+    $hadchanges=1;
+    return ($errtext,0);
 }
 
 # ----------------------------------------- Return hash with valid author names
@@ -94,13 +97,15 @@ sub authorhosts {
 	    } else {
 		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
 	    }
-	    if (&Apache::lonnet::homeserver($ca,$cd) eq 
-		$Apache::lonnet::perlvar{'lonHostID'}) {
+	    my $allowed=0;
+	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
+	    my @ids=&Apache::lonnet::current_machine_ids();
+	    foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } }
+	    if ($allowed) {
 		$home++;
 		$outhash{'home_'.$ca.'@'.$cd}=1;
 	    } else {
-		$outhash{'otherhome_'.$ca.'@'.$cd}=
-		    &Apache::lonnet::homeserver($ca,$cd);
+		$outhash{'otherhome_'.$ca.'@'.$cd}=$myhome;
 		$other++;
 	    }
 	}
@@ -250,7 +255,7 @@ sub group_import {
 		join ':', ($name, $url, $ext, 'normal', 'res');
 	}
     }
-    &storemap($coursenum, $coursedom, $folder.'.sequence');
+    return &storemap($coursenum, $coursedom, $folder.'.sequence');
 }
 
 sub editor {
@@ -295,7 +300,12 @@ sub editor {
                   $comment.':'.$url.':'.$ext.':normal:res';
               $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
                                                               $newidx;       
- 	      &storemap($coursenum,$coursedom,$folder.'.sequence');
+
+	      ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
+	      if ($fatal) {
+		  $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		  return;
+	      }
 	     }
             }
 	    if ($ENV{'form.cmd'}) {
@@ -335,7 +345,12 @@ sub editor {
                     
                 }
 # Store the changed version
-		&storemap($coursenum,$coursedom,$folder.'.sequence');
+		($errtext,$fatal)=&storemap($coursenum,$coursedom,
+					    $folder.'.sequence');
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
             }
 # Group import/search
 	    if ($ENV{'form.importdetail'}) {
@@ -349,21 +364,30 @@ sub editor {
 		    }
 		}
 # Store the changed version
-		group_import($coursenum, $coursedom, $folder, @imports);
+		($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
+					       @imports);
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
             }
 # Loading a complete map
 	   if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
-              foreach
-(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+	       foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
                    my $idx=$#Apache::lonratedt::resources;
                    $idx++;
                    $Apache::lonratedt::resources[$idx]=$_;
                    $Apache::lonratedt::order
-                            [$#Apache::lonratedt::order+1]=$idx;
-                }
+		       [$#Apache::lonratedt::order+1]=$idx;
+	       }
 
 # Store the changed version
-		&storemap($coursenum,$coursedom,$folder.'.sequence');
+	       ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+					   $folder.'.sequence');
+	       if ($fatal) {
+		   $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		   return;
+	       }
            }
        }
 # ---------------------------------------------------------------- End commands
@@ -373,7 +397,7 @@ sub editor {
         foreach (@Apache::lonratedt::order) {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-           unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }
+           unless ($name) { next; }
            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
            $idx++;
         }
@@ -425,14 +449,11 @@ END
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);
-    my $icon='unknown';
-    if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
-	$icon=$extension;
-    }
+    my $icon=&Apache::loncommon::icon($url);
     my $isfolder=0;
     if ($uploaded) {
        if ($extension eq 'sequence') {
-	  $icon='folder_closed';
+	  $icon=$iconpath.'/folder_closed.gif';
           $url=~/\/(\w+)\.sequence/;
           $url='/adm/coursedocs?folder='.$1;
           $isfolder=1;
@@ -454,8 +475,7 @@ END
     if ($isfolder) { $url.='&foldername='.
        &Apache::lonnet::escape($foldertitle); }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
-'"><img src="/adm/lonIcons/'.
-        $icon.'.gif" border="0"></a></td>'.
+	'"><img src="'.$icon.'" border="0"></a></td>'.
         "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";
     return $line;
 }
@@ -484,7 +504,7 @@ sub checkonthis {
     $alreadyseen{$url}=1;
     $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
-       $r->print('<br />');
+       $r->print("\n<br />");
        for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');
        }
@@ -510,11 +530,12 @@ sub checkonthis {
                  &Apache::lonxml::xmlparse($r,'web',
                    &Apache::lonnet::getfile(
                     &Apache::lonnet::filelocation('',$url)));
+		 undef($Apache::lonhomework::parsing_a_problem);
 		 $ENV{'request.filename'}=$oldpath;
                  if (($Apache::lonxml::errorcount) ||
                      ($Apache::lonxml::warningcount)) {
 		     if ($Apache::lonxml::errorcount) {
-                        $r->print('<font color="red"><b>'.
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
 			  $Apache::lonxml::errorcount.' '.
 				  &mt('error(s)').'</b></font> ');
                      }
@@ -538,7 +559,11 @@ sub checkonthis {
           } elsif ($result==HTTP_SERVICE_UNAVAILABLE) {
              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
           } elsif ($result==HTTP_NOT_FOUND) {
-             $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+	      unless ($url=~/\$/) {
+		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+	      } else {
+		  $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+	      }
           } else {
              $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
           }
@@ -567,7 +592,8 @@ sub verifycontent {
        }
    }
    &untiehash();
-   $r->print('<h1>'.&mt('Done').'.</h1>');
+   $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
+	     &mt('Return to DOCS').'</a>');
 }
 
 # -------------------------------------------------------------- Check Versions
@@ -585,20 +611,52 @@ sub checkversions {
     my %changes=();
     my $starttime=0;
     my $haschanged=0;
+    my %setversions=&Apache::lonnet::dump('resourceversions',
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+    $hashtied=0;
+    &tiehash();
+    my %newsetversions=();
     if ($ENV{'form.setmostrecent'}) {
 	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		$newsetversions{$1}='mostrecent';
+	    }
+	}
     } elsif ($ENV{'form.setcurrent'}) {
 	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		my $getvers=&Apache::lonnet::getversion($1);
+		if ($getvers>0) {
+		    $newsetversions{$1}=$getvers;
+		}
+	    }
+	}
     } elsif ($ENV{'form.setversions'}) {
 	$haschanged=1;
+	foreach (keys %ENV) {
+	    if ($_=~/^form\.set_version_(.+)$/) {
+		my $src=$1;
+		&Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});
+		if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
+		    $newsetversions{$src}=$ENV{$_};
+		}
+	    }
+	}
     }
     if ($haschanged) {
-	$r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+        if (&Apache::lonnet::put('resourceversions',\%newsetversions,
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') {		
+	    $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+	} else {
+	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
+	}
 	&changewarning($r,'');
-	return;
     }
-    $hashtied=0;
-    &tiehash();
     if ($ENV{'form.timerange'} eq 'all') {
 # show all documents
 	$header=&mt('All Documents in Course');
@@ -642,6 +700,9 @@ sub checkversions {
 	    $header=&mt('No content modifications yet.');
 	}
     }
+    %setversions=&Apache::lonnet::dump('resourceversions',
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash
 	      ('st' => 'Version changes since start of Course',
 	       'lm' => 'Version changes since last Month',
@@ -671,42 +732,54 @@ sub checkversions {
 <option value="86400" $daysel>$lt{'sy'}</option>
 </select>
 <input type="submit" name="display" value="$lt{'sd'}" />
-</form>
 <h3>$header</h3>
 <input type="submit" name="setversions" value="$lt{'sv'}" />
-<table border="2">
-<tr>
-<th>$lt{'fi'}</th><th>$lt{'md'}</th><th>$lt{'mr'}</th>
-<th>$lt{'ve'}</th><th>$lt{'vu'}</th><th>$lt{'di'}</th></tr>
+<table border="0">
 ENDHEADERS
     foreach (sort keys %changes) {
 	if ($changes{$_}>$starttime) {
 	    my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
 	    my $currentversion=&Apache::lonnet::getversion($_);
+	    if ($currentversion<0) {
+		$currentversion=&mt('Could not be determined.');
+	    }
 	    my $linkurl=&Apache::lonnet::clutter($_);
 	    $r->print(
-		      '<tr><td><b>'.
+		      '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
 		      &Apache::lonnet::gettitle($linkurl).
-		   '</b><br /><a href="'.$linkurl.'" target="cat">'.$linkurl.
-		      '</a></td><td>'.
-		      &Apache::lonlocal::locallocaltime($changes{$_}).
-                      '</td><td><font size="+2">'.
-		      $currentversion.'</font></td><td><font size="+2">');
+                      '</b></font></td></tr>'.
+                      '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.
+                      '<td colspan="4">'.
+                      '<a href="'.$linkurl.'" target="cat">'.$linkurl.
+		      '</a></td></tr>'.
+                      '<tr><td></td>'.
+                      '<td title="'.$lt{'md'}.'">'.
+		      &Apache::lonlocal::locallocaltime(
+                           &Apache::lonnet::metadata($root.'.'.$extension,
+                                                     'lastrevisiondate')
+                                                        ).
+                      '</td>'.
+                      '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+                      '<font size="+1">'.$currentversion.'</font>'.
+                      '</nobr></td>'.
+                      '<td title="'.$lt{'ve'}.'"><nobr>In Course: '.
+                      '<font size="+1">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
-	    if ($usedversion) {
+	    if (($usedversion) && ($usedversion ne 'mostrecent')) {
 		$r->print($usedversion);
 	    } else {
 		$r->print($currentversion);
 	    }
-	    $r->print('</font></td><td>');
+	    $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
+                      '<nobr>Use: ');
 # Set version
-	    $r->print(&Apache::loncommon::select_form($usedversion,
+	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
 						      'set_version_'.$linkurl,
 						      ('' => '',
-						       'current' => 'most recent',
+						       'mostrecent' => 'most recent',
 						       map {$_,$_} (1..$currentversion))));
-	    $r->print('</td><td><font size="1"><ul>');
+	    $r->print('</nobr></td></tr><tr><td></td>');
 	    my $lastold=1;
 	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -715,11 +788,27 @@ ENDHEADERS
 		    $lastold=$prevvers;
 		}
 	    }
+            # 
+            # Code to figure out how many version entries should go in
+            # each of the four columns
+            my $entries_per_col = 0;
+            my $num_entries = ($currentversion-$lastold);
+            if ($num_entries % 4 == 0) {
+                $entries_per_col = $num_entries/4;
+            } else {
+                $entries_per_col = $num_entries/4 + 1;
+            }
+            my $entries_count = 0;
+            $r->print('<td valign="top"><font size="-2">'); 
+            my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
-		$r->print('<li><a href="'.&Apache::lonnet::clutter($url).
+		$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
 			  '">'.&mt('Version').' '.$prevvers.'</a> ('.
-			  &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($url,'lastrevisiondate')).
+			  &Apache::lonlocal::locallocaltime(
+                                &Apache::lonnet::metadata($url,
+                                                          'lastrevisiondate')
+                                                            ).
 			  ')');
 		if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
                     $r->print(' <a href="/adm/diff?filename='.
@@ -727,12 +816,22 @@ ENDHEADERS
 			      '&versionone='.$prevvers.
 			      '">'.&mt('Diffs').'</a>');
 		}
-		$r->print('</li>');
+		$r->print('</nobr><br />');
+                if (++$entries_count % $entries_per_col == 0) {
+                    $r->print('</font></td>');
+                    if ($cols_output != 4) {
+                        $r->print('<td valign="top"><font size="-2">');
+                        $cols_output++;
+                    }
+                }
 	    }
-	    $r->print('</ul></font></td></tr>');
+            while($cols_output++ < 4) {
+                $r->print('</font></td><td><font>')
+            }
+	    $r->print('</font></td></tr>'."\n");
 	}
     }
-    $r->print('</table>');
+    $r->print('</table></form>');
     $r->print('<h1>'.&mt('Done').'.</h1>');
 
     &untiehash();
@@ -758,7 +857,6 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    &Apache::lonlocal::clearreroutetrans();
 # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',
@@ -896,6 +994,21 @@ function makebulboard() {
    }
 }
 
+function makeabout() {
+   var user=prompt("Enter user\@domain for User's 'About Me' Page");
+   if (user) {
+       var comp=new Array();
+       comp=user.split('\@');
+       if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
+	   if ((comp[0]) && (comp[1])) {
+	       this.document.forms.newaboutsomeone.importdetail.value=
+		   'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+	       this.document.forms.newaboutsomeone.submit();
+	   }
+       }
+   }
+}
+
 function finishpick() {
     var title=this.document.forms.extimport.title.value;
     var url=this.document.forms.extimport.url.value;
@@ -916,7 +1029,7 @@ function changename(folder,index,oldtitl
 }
 
 function removeres(folder,index,oldtitle) {
-    if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) {
+    if (confirm('Remove "'+oldtitle+'"?')) {
 	this.document.forms.renameform.cmd.value='del_'+index;
 	this.document.forms.renameform.folder.value=folder;
         this.document.forms.renameform.submit();
@@ -929,7 +1042,9 @@ ENDNEWSCRIPT
 # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events,
-					'','',$showdoc));
+					'','',$showdoc).
+	    &Apache::loncommon::help_open_faq(273).
+	    &Apache::loncommon::help_open_bug('RAT'));
   unless ($showdoc) {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
@@ -950,7 +1065,11 @@ ENDNEWSCRIPT
                 'sipr' => 'Simple Problem',
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',
-                'mypi' => 'My Personal Info'
+                'mypi' => 'My Personal Info',
+		'abou' => 'About User',
+                'file' =>  'File',
+                'title' => 'Title',
+                'comment' => 'Comment' 
 					  );
 # -----------------------------------------------------------------------------
     if ($allowed) {
@@ -980,7 +1099,7 @@ $dumpbut
 </form>
 ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     'Editing the Table of Contents for your Course'));
+		     &mt('Editing the Table of Contents for your Course')));
     }
 # --------------------------------------------------------- Standard documents
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
@@ -1009,11 +1128,11 @@ ENDCOURSEVERIFY
 <th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
-File:<br />
+$lt{'file'}:<br />
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
 <br />
-Title:<br />
+$lt{'title'}:<br />
 <input type="text" size="50" name="comment">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
@@ -1132,6 +1251,15 @@ value="$plainname=/adm/$udom/$uname/abou
 $help{'My Personal Info'}
 </nobr>
 </form>
+<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
+onClick="javascript:makeabout();" />
+</nobr>
+</form>
 </td></tr>
 </table>
 ENDFORM
@@ -1153,13 +1281,12 @@ ENDFORM
           $r->print(<<ENDSUPFORM);
 <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'upls'}</th>
-<th bgcolor="#DDDDDD">$lt{'impp'}</th>
 <th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
-<br />Comment:<br />
+<br />$lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <input type="hidden" name="folder" value="$folder">
@@ -1172,23 +1299,6 @@ ENDFORM
 </form>
 </td>
 <td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
-<input type=hidden name="importdetail" value="">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}
-<p>
-<hr />
-<input type="text" size="20" name="importmap">
-<input type=button 
-onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
-value="$lt{'selm'}"><input type="submit" name="loadmap" value="$lt{'load'}">$help{'Load_Map'}
-</p>
-</form>
-</td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
@@ -1245,7 +1355,7 @@ ENDSUPFORM
          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
   }
  }
- $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>');
+ $r->print('</body></html>');
  return OK;
 }