--- loncom/interface/londocs.pm 2002/08/27 13:01:26 1.12 +++ loncom/interface/londocs.pm 2002/09/04 20:33:38 1.19 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.12 2002/08/27 13:01:26 www Exp $ +# $Id: londocs.pm,v 1.19 2002/09/04 20:33:38 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,7 @@ use Apache::lonnet; use Apache::loncommon; use Apache::lonratedt; use Apache::lonratsrv; +use Apache::lonxml; my $iconpath; @@ -54,20 +55,28 @@ sub storemap { my ($coursenum,$coursedom,$map)=@_; return &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. - $map); + $map,1); } sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed)=@_; + if ($ENV{'form.foldername'}) { + $r->print('

Folder: '.$ENV{'form.foldername'}.'

'); + } 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('

'.$errtext.'

'); } 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+)/)) { @@ -82,6 +91,10 @@ sub editor { $comment=~s/\/\>\;/g; $comment=~s/\:/\:/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'; @@ -134,7 +147,8 @@ sub editor { # Store the changed version &storemap($coursenum,$coursedom,$folder.'.sequence'); } - } + } +# ---------------------------------------------------------------- End commands # ---------------------------------------------------------------- Print screen my $idx=0; $r->print(''); @@ -166,20 +180,40 @@ sub entryline { Remove END } -# URL - if ($url=~/^\/*uploaded\//) { - $url=&Apache::lonnet::tokenwrapper($url); +# 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); + } } - $line.=''; + $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; # Title $title=&Apache::lonnet::unescape($title); + my $foldertitle=$title; if ($title=~ /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/ - ) { $title=''.localtime($1).' '.$2.' at '.$3.':
'. - &Apache::lontexconvert::msgtexconverted($4); + ) { + $foldertitle=&Apache::lontexconvert::msgtexconverted($4); + $title=''.localtime($1).' '. + &Apache::loncommon::plainname($2,$3).':
'. + $foldertitle; } - $line.=""; - $line.=''; + if ($isfolder) { $url.='&foldername='.$foldertitle; } + $line.=''. + ""; return $line; } @@ -192,23 +226,44 @@ 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'}=~/^supplemental_/); + my $forcestandard; + my $forcesupplement; + my $script=''; + my $allowed; + my $events=''; + my $showdoc=0; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['folder','foldername','showdoc']); + unless ($ENV{'form.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('simple'); + $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; + $showdoc=1; + $script=&Apache::lonxml::registerurl(1,undef); + $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') . "/"; @@ -218,23 +273,55 @@ sub handler { The LearningOnline Network with CAPA - + +ENDNEWSCRIPT + } +# -------------------------------------------------------------------- Body tag + $r->print(&Apache::loncommon::bodytag('Course Documents','',$events)); + unless ($showdoc) { +# --------------------------------------------------------- Standard documents if (($standard) && ($allowed) && (!$forcesupplement)) { $r->print('

Main Course Documents

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/^default/) { $folder='default'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); + my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. + '.sequence'; $r->print(< - - - +
View$title
$title
Upload a new main course documentImport a published documentSpecial documents
+ + + - -
Upload a new main course documentImport a published documentSpecial documents
+
File:
@@ -242,34 +329,54 @@ File:
Title:
+
+
+ +"javascript:groupsearch()" value="Search"> +"javascript:groupimport();" value="Import">
-		 +
- + + +
- + + +
- + + + + +
+
+ +
- + + + +
@@ -283,23 +390,83 @@ ENDFORM unless ($folder=~/supplemental/) { $folder='supplemental'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); if ($allowed) { + my $folderseq= + '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. + '.sequence'; + $r->print(<Post a new supplemental course document + + + + + + + +
Upload a new supplemental course documentImport a published documentSpecial documents

Comment:
+
+		 +
+ + + + +
+		 +
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
ENDSUPFORM } } - - $r->print(''); - return OK; + if ($allowed) { + $r->print('
'); + } + } else { +# -------------------------------------------------------- This is showdoc mode + $r->print("

Uploaded Document

It is recommended that you use an up-to-date virus scanner before handling this file.

". + &entryline(0,"Click to download or use your browser's Save Link function",$ENV{'form.showdoc'}).'

'); + } + $r->print(''); + return OK; } 1;