--- loncom/interface/londocs.pm	2002/08/21 17:18:08	1.9
+++ loncom/interface/londocs.pm	2002/08/26 12:44:45	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.9 2002/08/21 17:18:08 www Exp $
+# $Id: londocs.pm,v 1.10 2002/08/26 12:44:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,7 @@ use Apache::lonratsrv;
 my $iconpath;
 
 # Mapread read maps into lonratedt::global arrays 
-# @links and @resources, determines status
+# @order and @resources, determines status
 # sets @order - pointer to resources in right order
 # sets @resources - array with the resources with correct idx
 #
@@ -59,18 +59,71 @@ sub storemap {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
-    my ($errtext,$fatal)=
+    my $errtext='';
+    my $fatal=0;
+    ($errtext,$fatal)=
           &mapread($coursenum,$coursedom,$folder.'.sequence');
     if ($fatal) {
 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {
 # ------------------------------------------------------------ Process commands
 	if ($allowed) {
+# upload a file, if present
+           if (($ENV{'form.uploaddoc.filename'}) &&
+               ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
+	    if ($folder=~/^$1/) {
+# this is for a course, not a user, so set coursedoc flag
+# probably the only place in the system where this should be "1"
+	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
+              my $ext='false';
+              if ($url=~/^http\:\/\//) { $ext='true'; }
+              $url=~s/\:/\&colon;/g;
+	      my $comment=$ENV{'form.comment'};
+              $comment=~s/\</\&lt\;/g;
+              $comment=~s/\>/\&gt\;/g;
+              $comment=~s/\:/\&colon;/g;
+              my $newidx=$#Apache::lonratedt::resources+1;
+              $Apache::lonratedt::resources[$newidx]=
+                  $comment.':'.$url.':'.$ext.':normal:res';
+              $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
+                                                              $newidx;       
+ 	      &storemap($coursenum,$coursedom,$folder.'.sequence');
+	     }
+            }
 	    if ($ENV{'form.cmd'}) {
-
+                my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
+                if ($cmd eq 'del') {
+		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
+                        $Apache::lonratedt::order[$i]=
+                          $Apache::lonratedt::order[$i+1];
+                    }
+                    $#Apache::lonratedt::order--;
+                } elsif ($cmd eq 'up') {
+                    my $i=$Apache::lonratedt::order[$idx-1];
+                    $Apache::lonratedt::order[$idx-1]=
+			$Apache::lonratedt::order[$idx];
+                    $Apache::lonratedt::order[$idx]=$i;
+                } elsif ($cmd eq 'down') {
+                    my $i=$Apache::lonratedt::order[$idx+1];
+                    $Apache::lonratedt::order[$idx+1]=
+			$Apache::lonratedt::order[$idx];
+                    $Apache::lonratedt::order[$idx]=$i;
+                }
+# Store the changed version
+		&storemap($coursenum,$coursedom,$folder.'.sequence');
             }
 	}
 # ---------------------------------------------------------------- Print screen
+        my $idx=0;
+        $r->print('<table>');
+        foreach (@Apache::lonratedt::order) {
+           my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
+           unless ($name) {  $name=(split(/\//,$url))[-1]; }
+           unless ($name) { $name='EMPTY'; }
+           $r->print(&entryline($idx,$name,$url,$folder,$allowed));
+           $idx++;
+        }
+        $r->print('</table>');
     }
 }
 
@@ -92,6 +145,9 @@ sub entryline {
 END
     }
 # URL
+    if ($url=~/^\/*uploaded\//) {
+	$url=&Apache::lonnet::tokenwrapper($url);
+    }
     $line.='<td><a href="'.$url.'">View</a></td>';
 # Title
     $title=&Apache::lonnet::unescape($title);
@@ -100,7 +156,7 @@ END
 	) { $title='<i>'.localtime($1).'</i> '.$2.' at '.$3.': <br>'.
 		&Apache::lontexconvert::msgtexconverted($4);
 	}
-    $line.='<td>$title</td>';
+    $line.="<td>$title</td>";
     $line.='</tr>';
     return $line;
 }
@@ -117,7 +173,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder']);
     my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
     my $forcestandard=($ENV{'form.folder'}=~/^default_/);
-    my $forcesupplement=($ENV{'form.folder'}=~/^supplement_/);
+    my $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
 # does this user have privileges to post, etc?
     my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
@@ -135,16 +191,6 @@ sub handler {
 
     $iconpath = $r->dir_config('lonIconsURL') . "/";
 
-# upload a file, if present
-    if (($ENV{'form.uploaddoc.filename'}) && ($allowed)) {
-# this is for a course, not a user, so set coursedoc flag
-# probably the only place in the system where this should be "1"
-	my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
-	my $comment=$ENV{'form.comment'};
-        $comment=~s/\</\&lt\;/g;
-        $comment=~s/\>/\&gt\;/g;        
-    }
-
 # print screen
     $r->print(<<ENDDOCUMENT);
 <html>
@@ -158,16 +204,16 @@ $r->print(&Apache::loncommon::bodytag('C
     if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<h2>Main Course Documents</h2>');
        my $folder=$ENV{'form.folder'};
-       unless ($folder) { $folder='default'; }
+       unless ($folder=~/^default/) { $folder='default'; }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        $r->print(<<ENDFORM);
 <h3>Post a new main course document</h3>
-<form method="post" enctype="multipart/form-data">
+<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="50">
 <br />
 Title: <input type="text" size="50" name="comment">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="cmd" value="upload_main">
+<input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">
 </form>
 ENDFORM
@@ -177,18 +223,18 @@ ENDFORM
     if (!$forcestandard) {
        $r->print('<h2>Supplemental Course Documents</h2>');
        my $folder=$ENV{'form.folder'};
-       unless ($folder) { $folder='supplemental'; }
+       unless ($folder=~/supplemental/) { $folder='supplemental'; }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {
           $r->print(<<ENDSUPFORM);
 <h3>Post a new supplemental course document</h3>
-<form method="post" enctype="multipart/form-data">
+<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="50">
 <br />Comment:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="cmd" value="upload_suppl">
+<input type="hidden" name="cmd" value="upload_supplemental">
 <input type="submit" value="Upload Document">
 </form>
 ENDSUPFORM