--- loncom/interface/londocs.pm	2002/08/20 13:02:41	1.8
+++ loncom/interface/londocs.pm	2002/09/10 19:01:09	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.8 2002/08/20 13:02:41 www Exp $
+# $Id: londocs.pm,v 1.22 2002/09/10 19:01:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,11 +34,12 @@ use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonratedt;
 use Apache::lonratsrv;
+use Apache::lonxml;
 
 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
 #
@@ -54,23 +55,111 @@ sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
     return
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-                                $map);
+                                $map,1);
 }
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
-    my ($errtext,$fatal)=
+    if ($ENV{'form.foldername'}) {
+	$r->print('<h3>Folder: '.$ENV{'form.foldername'}.'</h3>');
+    }
+    my $errtext='';
+    my $fatal=0;
+    ($errtext,$fatal)=
           &mapread($coursenum,$coursedom,$folder.'.sequence');
+    if ($#Apache::lonratedt::order<1) {
+       	$Apache::lonratedt::order[0]=1;
+        $Apache::lonratedt::resources[1]='';
+    }
     if ($fatal) {
 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {
 # ------------------------------------------------------------ Process commands
-	if ($allowed) {
+# ---------------- if they are for this folder and user allowed to make changes
+	if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
+# 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;
+              if ($folder=~/^supplemental/) {
+		  $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
+		      $ENV{'user.domain'}.'___&&&___'.$comment;
+              }
+              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');
             }
-	}
+# Group import/search
+	    if ($ENV{'form.importdetail'}) {
+               foreach (split(/\&/,$ENV{'form.importdetail'})) {
+                  if (defined($_)) {
+	             my ($name,$url)=split(/\=/,$_);
+                     $name=&Apache::lonnet::unescape($name);
+                     $url=&Apache::lonnet::unescape($url);
+                     if ($url) {
+	                my $idx=$#Apache::lonratedt::resources+1;
+                        $Apache::lonratedt::order
+                           [$#Apache::lonratedt::order+1]=$idx;
+                        my $ext='false';
+                        if ($url=~/^http\:\/\//) { $ext='true'; }
+                        $url=~s/\:/\&colon;/g;
+                        $Apache::lonratedt::resources[$idx]=
+                           $name.':'.$url.':'.$ext.':normal:res';
+	             }
+                 }
+	      }
+# Store the changed version
+		&storemap($coursenum,$coursedom,$folder.'.sequence');
+            }
+       }
+# ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- 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>');
     }
 }
 
@@ -91,17 +180,40 @@ sub entryline {
 <a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>Remove</td>
 END
     }
-# URL
-    $line.='<td><a href="'.$url.'">View</a></td>';
+# 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 $isfolder=0;
+    if ($uploaded) {
+       if ($extension eq 'sequence') {
+	  $icon='folder_closed';
+          $url=~/\/(\w+)\.sequence/;
+          $url='/adm/coursedocs?folder='.$1;
+          $isfolder=1;
+       } else {
+	  $url=&Apache::lonnet::tokenwrapper($url);
+       } 
+    }
+    $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
 # Title
     $title=&Apache::lonnet::unescape($title);
+    my $foldertitle=$title;
     if ($title=~
  /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/
-	) { $title='<i>'.localtime($1).'</i> '.$2.' at '.$3.': <br>'.
-		&Apache::lontexconvert::msgtexconverted($4);
+	) { 
+            $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+            $title='<i>'.localtime($1).'</i> '.
+                &Apache::loncommon::plainname($2,$3).': <br>'.
+		$foldertitle;
 	}
-    $line.='<td>$title</td>';
-    $line.='</tr>';
+    if ($isfolder) { $url.='&foldername='.$foldertitle; }
+    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="/adm/lonIcons/'.
+        $icon.'.gif" border="0"></a></td>'.
+        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";
     return $line;
 }
 
@@ -114,63 +226,195 @@ sub handler {
 
 # is this a standard course?
 
-    &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 $forcestandard;
+    my $forcesupplement;
+    my $script='';
+    my $allowed;
+    my $events='';
+    my $showdoc=0;
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+       ['folder','foldername']);
+    if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
+       $showdoc=$1;
+    }
+    unless ($showdoc) { # got called from remote
+       $forcestandard=($ENV{'form.folder'}=~/^default_/);
+       $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
 # does this user have privileges to post, etc?
-    my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
-    my $script='';
-    if ($allowed) { 
-       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
-       $script=&Apache::lonratedt::editscript('docs'); 
+       $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+       if ($allowed) { 
+         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
+         $script=&Apache::lonratedt::editscript('simple'); 
+       }
+    } else { # got called in sequence from course
+       $allowed=0;
+       $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>';
+       $events='onLoad="'.&Apache::lonxml::loadevents.
+           '" onUnload="'.&Apache::lonxml::unloadevents.'"';
     }
 
 # get course data
     my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
     my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
 
+# get personal data
+ 
+    my $uname=$ENV{'user.name'};
+    my $udom=$ENV{'user.domain'};
+    my $plainname=&Apache::lonnet::escape(
+                     &Apache::loncommon::plainname($uname,$udom));
+
 # graphics settings
 
     $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;        
-    }
+    my $now=time;
 
 # print screen
     $r->print(<<ENDDOCUMENT);
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
-<script>$script</script>
-</head>
-<body bgcolor="#FFFFFF">
-<h1>Course Documents</h1>
+<script>
+$script
+</script>
 ENDDOCUMENT
-# --------------------------------------------------0------ Standard documents
+   if ($allowed) {
+    $r->print(<<ENDNEWSCRIPT);
+<script>
+function makenewfolder(targetform,folderseq) {
+    var foldername=prompt('Name of New Folder','New Folder');
+    if (foldername) {
+	targetform.importdetail.value=foldername+"="+folderseq;
+        targetform.submit();
+    }
+}
+
+function makenewext(targetname) {
+    this.document.forms.extimport.useform.value=targetname;
+    window.open('/adm/rat/extpickframe.html');
+}
+
+function makesmppage() {
+    var title=prompt('Listed Title for the Page');
+    this.document.forms.newsmppg.importdetail.value=
+	title+'=/adm/$udom/$uname/$now/smppg';
+    this.document.forms.newsmppg.submit();
+}
+
+function makebulboard() {
+    var title=prompt('Listed Title for the Bulletin Board');
+    this.document.forms.newbul.importdetail.value=
+	title+'=/adm/$udom/$uname/$now/bulletinboard';
+    this.document.forms.newbul.submit();
+}
+
+function finishpick() {
+    var title=this.document.forms.extimport.title.value;
+    var url=this.document.forms.extimport.url.value;
+    var form=this.document.forms.extimport.useform.value;
+    eval
+     ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
+    '";this.document.forms.'+form+'.submit();');
+}
+</script>
+ENDNEWSCRIPT
+  }
+# -------------------------------------------------------------------- Body tag
+  $r->print('</head>'.
+            &Apache::loncommon::bodytag('Course Documents','',$events));
+  unless ($showdoc) {
+# --------------------------------------------------------- Standard documents
     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);
+       my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+                     '.sequence';
        $r->print(<<ENDFORM);
-<h3>Post a new main course document</h3>
-<form method="post" enctype="multipart/form-data">
+<table cellspacing=2><tr>
+<th bgcolor="#DDDDDD">Upload a new main course document</th>
+<th bgcolor="#DDDDDD">Import a published document</th>
+<th bgcolor="#DDDDDD">Special documents</th>
+</tr>
+<tr><td bgcolor="#DDDDDD">
+File:<br />
+<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">
+Title:<br /> 
+<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="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">
 </form>
+</td>
+<td bgcolor="#DDDDDD">
+<form action="/adm/coursedocs" method="post" name="simpleedit">
+<input type="hidden" name="folder" value="$folder">
+<input type=hidden name="importdetail" value="">
+<input type=button onClick=
+"javascript:groupsearch()" value="Search">
+<input type=button onClick=
+"javascript:groupimport();" value="Import">
+</form>
+</td><td bgcolor="#DDDDDD">
+<form action="/adm/coursedocs" method="post" name="newfolder">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" value="">
+<input name="newfolder" type="button"
+onClick="javascript:makenewfolder(this.form,'$folderseq');"
+value="New Folder" />
+</form>
+<form action="/adm/coursedocs" method="post" name="newext">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" value="">
+<input name="newext" type="button" onClick="javascript:makenewext('newext');"
+value="External Resource" />
+</form>
+<form action="/adm/coursedocs" method="post" name="newsyl">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" 
+value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<input name="newsyl" type="submit" value="Syllabus" />
+</form>
+<form action="/adm/coursedocs" method="post" name="newnav">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" 
+value="Navigate Content=/adm/navmaps">
+<input name="newnav" type="submit" value="Navigate Content" />
+</form>
+<form action="/adm/coursedocs" method="post" name="newsmppg">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" value="">
+<input name="newsmppg" type="button" value="Simple Page"
+onClick="javascript:makesmppage();" />
+</form>
+<form action="/adm/coursedocs" method="post" name="newbul">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" value="">
+<input name="newbulletin" type="button" value="Bulletin Board"
+onClick="javascript:makebulboard();" />
+</form>
+<form action="/adm/coursedocs" method="post" name="newaboutme">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" 
+value="$plainname=/adm/$udom/$uname/aboutme">
+<input name="newaboutme" type="submit" value="My Personal Info" />
+</form>
+</td></tr>
+</table>
 ENDFORM
        $r->print('<hr />');
     }
@@ -178,26 +422,86 @@ 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) {
+       my $folderseq=
+                  '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+                     '.sequence';
+
           $r->print(<<ENDSUPFORM);
-<h3>Post a new supplemental course document</h3>
-<form method="post" enctype="multipart/form-data">
+<table cellspacing=2><tr>
+<th bgcolor="#DDDDDD">Upload a new supplemental course document</th>
+<th bgcolor="#DDDDDD">Import a published document</th>
+<th bgcolor="#DDDDDD">Special documents</th>
+</tr>
+<tr><td bgcolor="#DDDDDD">
+<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="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="cmd" value="upload_supplemental">
 <input type="submit" value="Upload Document">
 </form>
+</td>
+<td bgcolor="#DDDDDD">
+<form action="/adm/coursedocs" method="post" name="simpleedit">
+<input type="hidden" name="folder" value="$folder">
+<input type=hidden name="importdetail" value="">
+<input type=button onClick=
+"javascript:groupsearch()" value="Search">
+<input type=button onClick=
+"javascript:groupimport();" value="Import">
+</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'}">
+<input type=hidden name="importdetail" value="">
+<input name="newfolder" type="button"
+onClick="javascript:makenewfolder(this.form,'$folderseq');"
+value="New Folder" />
+</form>
+<form action="/adm/coursedocs" method="post" name="supnewext">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" value="">
+<input name="newext" type="button" 
+onClick="javascript:makenewext('supnewext');"
+value="External Resource" />
+</form>
+<form action="/adm/coursedocs" method="post" name="supnewsyl">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" 
+value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<input name="newsyl" type="submit" value="Syllabus" />
+</form>
+<form action="/adm/coursedocs" method="post" name="subnewaboutme">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type=hidden name="importdetail" 
+value="$plainname=/adm/$udom/$uname/aboutme">
+<input name="newaboutme" type="submit" value="My Personal Info" />
+</form>
+</td></tr>
+</table>
 ENDSUPFORM
        }
     }
-
-    $r->print('</body></html>');
-    return OK;
+    if ($allowed) {
+	$r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>');
+    }
+  } else {
+# -------------------------------------------------------- This is showdoc mode
+      $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".
+         &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>');
+  }
+  $r->print('</body></html>');
+  return OK;
 } 
 
 1;