--- loncom/interface/londocs.pm 2002/07/31 15:23:55 1.5 +++ loncom/interface/londocs.pm 2003/09/02 18:31:08 1.69.2.1.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.5 2002/07/31 15:23:55 www Exp $ +# $Id: londocs.pm,v 1.69.2.1.2.3 2003/09/02 18:31:08 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,95 +29,906 @@ package Apache::londocs; use strict; -use Apache::Constants qw(:common); +use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; +use Apache::lonratedt; +use Apache::lonratsrv; +use Apache::lonxml; +use HTML::Entities; +use GDBM_File; +my $iconpath; + +my %hash; + +my $hashtied; +my %alreadyseen=(); + +my $hadchanges; + +# Available help topics + +my %help=(); + +# Mapread read maps into lonratedt::global arrays +# @order and @resources, determines status +# sets @order - pointer to resources in right order +# sets @resources - array with the resources with correct idx +# + +sub mapread { + my ($coursenum,$coursedom,$map)=@_; + return + &Apache::lonratedt::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'. + $map); +} + +sub storemap { + my ($coursenum,$coursedom,$map)=@_; + $hadchanges=1; + return + &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. + $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 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/\:/\:/g; + my $comment=$ENV{'form.comment'}; + $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'; + $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') { + if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) { + 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') { + if (defined($Apache::lonratedt::order[$idx+1])) { + my $i=$Apache::lonratedt::order[$idx+1]; + $Apache::lonratedt::order[$idx+1]= + $Apache::lonratedt::order[$idx]; + $Apache::lonratedt::order[$idx]=$i; + } + } elsif ($cmd eq 'rename') { + my ($rtitle,@rrest)=split(/\:/, + $Apache::lonratedt::resources[ + $Apache::lonratedt::order[$idx]]); + my $comment= + &HTML::Entities::decode($ENV{'form.title'}); + $comment=~s/\/\>\;/g; + $comment=~s/\:/\:/g; + $Apache::lonratedt::resources[ + $Apache::lonratedt::order[$idx]]= + $comment.':'.join(':',@rrest); + + } +# 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/\:/\:/g; + $name=~s/\:/\:/g; + $Apache::lonratedt::resources[$idx]= + $name.':'.$url.':'.$ext.':normal:res'; + } + } + } +# Store the changed version + &storemap($coursenum,$coursedom,$folder.'.sequence'); + } +# Loading a complete map + if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { + 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; + } + +# Store the changed version + &storemap($coursenum,$coursedom,$folder.'.sequence'); + } + } +# ---------------------------------------------------------------- End commands +# ---------------------------------------------------------------- Print screen + my $idx=0; + $r->print(''); + 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'; } + $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); + $idx++; + } + $r->print('
'); + } +} + +# --------------------------------------------------------------- An entry line + +sub entryline { + my ($index,$title,$url,$folder,$allowed,$residx)=@_; + $title=~s/\&colon\;/\:/g; + $title=&HTML::Entities::encode(&HTML::Entities::decode( + &Apache::lonnet::unescape($title)),'\"\<\>\&\''); + my $renametitle=$title; + my $foldertitle=$title; + if ($title=~ + /^(\d+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(.*)$/ + ) { + $foldertitle=&Apache::lontexconvert::msgtexconverted($4); + $renametitle=$4; + $title=''.localtime($1).' '. + &Apache::loncommon::plainname($2,$3).':
'. + $foldertitle; + } + $renametitle=~s/\"\;/\\\"/g; + my $line=''; +# Edit commands + if ($allowed) { + $line.=(< + + +
+ +UP
+ +DOWN
+ +Remove + +Rename +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 $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\//; + if (($residx) && ($folder!~/supplemental/)) { + $url.=(($url=~/\?/)?'&':'?').'symb='. + &Apache::lonnet::escape(&Apache::lonnet::symbclean( + &Apache::lonnet::declutter('uploaded/'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder. + '.sequence'). + '___'.$residx.'___'. + &Apache::lonnet::declutter($url))); + } + if ($isfolder) { $url.='&foldername='. + &Apache::lonnet::escape($foldertitle); } + $line.=''. + "$title"; + return $line; +} + +# ---------------------------------------------------------------- tie the hash + +sub tiehash { + $hashtied=0; + if ($ENV{'request.course.fn'}) { + if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", + &GDBM_READER(),0640)) { + $hashtied=1; + } + } +} + +sub untiehash { + if ($hashtied) { untie %hash; } + $hashtied=0; +} + +# --------------------------------------------------------------- check on this + +sub checkonthis { + my ($r,$url,$level,$title)=@_; + $alreadyseen{$url}=1; + $r->rflush(); + if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { + $r->print('
'); + for (my $i=0;$i<=$level*5;$i++) { + $r->print(' '); + } + $r->print(''. + ($title?$title:$url).' '); + if ($url=~/^\/res\//) { + my $result=&Apache::lonnet::repcopy( + &Apache::lonnet::filelocation('',$url)); + if ($result==OK) { + $r->print('ok'); + $r->rflush(); + &Apache::lonnet::countacc($url); + $url=~/\.(\w+)$/; + if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { + $r->print('
'); + $r->rflush(); + for (my $i=0;$i<=$level*5;$i++) { + $r->print(' '); + } + $r->print('- Rendering: '); + my $oldpath=$ENV{'request.filename'}; + $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url); + &Apache::lonxml::xmlparse($r,'web', + &Apache::lonnet::getfile( + &Apache::lonnet::filelocation('',$url))); + $ENV{'request.filename'}=$oldpath; + if (($Apache::lonxml::errorcount) || + ($Apache::lonxml::warningcount)) { + if ($Apache::lonxml::errorcount) { + $r->print(''. + $Apache::lonxml::errorcount.' error(s) '); + } + if ($Apache::lonxml::warningcount) { + $r->print(''. + $Apache::lonxml::warningcount.' warning(s)'); + } + } else { + $r->print('ok'); + } + $r->rflush(); + } + my $dependencies= + &Apache::lonnet::metadata($url,'dependencies'); + foreach (split(/\,/,$dependencies)) { + if (($_=~/^\/res\//) && (!$alreadyseen{$_})) { + &checkonthis($r,$_,$level+1); + } + } + } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { + $r->print('connection down'); + } elsif ($result==HTTP_NOT_FOUND) { + $r->print('not found'); + } else { + $r->print('access denied'); + } + } + } +} + +# ================================================================ Main Handler sub handler { my $r = shift; $r->content_type('text/html'); $r->send_http_header; return OK if $r->header_only; -# does this user have privileges to post, etc? - my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); +# --------------------------------------------- Initialize help topics for this + foreach ('Adding_Course_Doc','Main_Course_Documents', + 'Adding_External_Resource','Navigate_Content', + 'Adding_Folders','Docs_Overview', 'Load_Map', + 'Supplemental', 'Score_Upload_Form', + 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') { + $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_); + } + # Composite help files + $help{'Syllabus'} = &Apache::loncommon::help_open_topic( + 'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); + $help{'Simple Page'} = &Apache::loncommon::help_open_topic( + 'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); + $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( + '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{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); + + if ($ENV{'form.verify'}) { + + my $loaderror=&Apache::lonnet::overloaderror($r); + if ($loaderror) { return $loaderror; } + + $r->print('Verify Content'. + &Apache::loncommon::bodytag('Verify Course Documents')); + $hashtied=0; + undef %alreadyseen; + %alreadyseen=(); + &tiehash(); + foreach (keys %hash) { + if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { + &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); + } + } + &untiehash(); + $r->print('

Done.

'); + } elsif ($ENV{'form.versions'}) { + $r->print('Check Versions'. + &Apache::loncommon::bodytag('Check Course Document Versions')); + $hashtied=0; + &tiehash(); + my %changes=&Apache::lonnet::dump + ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $firstkey=(keys %changes)[0]; + unless ($firstkey=~/^error\:/) { + unless ($ENV{'form.timerange'}) { + $ENV{'form.timerange'}=604800; + } + my $seltext='during the last '.$ENV{'form.timerange'}.' seconds'; + my $startsel=''; + my $monthsel=''; + my $weeksel=''; + my $daysel=''; + if ($ENV{'form.timerange'}==-1) { + $seltext='since start of course'; + $startsel='selected'; + $ENV{'form.timerange'}=time; + } + my $starttime=time-$ENV{'form.timerange'}; + if ($ENV{'form.timerange'}==2592000) { + $seltext='during the last month ('.localtime($starttime).')'; + $monthsel='selected'; + } elsif ($ENV{'form.timerange'}==604800) { + $seltext='during the last week ('.localtime($starttime).')'; + $weeksel='selected'; + } elsif ($ENV{'form.timerange'}==86400) { + $seltext='since yesterday ('.localtime($starttime).')'; + $daysel='selected'; + } + + $r->print(< + + + +

Content changed $seltext

+ + + + +ENDHEADERS + foreach (keys %changes) { + if ($changes{$_}>$starttime) { + my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($_); + my $linkurl=&Apache::lonnet::clutter($_); + $r->print( + ''. + ''); + } + } + $r->print('
FileModification DateVersionDifferences
'.$linkurl. + ''. + localtime($changes{$_}).''.$currentversion.''); + my $lastold=1; + for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + if (&Apache::lonnet::metadata($url,'lastrevisiondate')< + $starttime) { + $lastold=$prevvers; + } + } + for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + $r->print('Version '.$prevvers.' ('. + localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')). + ')'); + if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + $r->print(' Diffs'); + } + $r->print('
'); + } + $r->print('
'); + $r->print('

Done.

'); + } else { + $r->print('

No content modifications yet.

'); + } + &untiehash(); + } else { +# is this a standard course? + + my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//); + 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_/); - if ($allowed) { - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['remove']) +# does this user have privileges to post, etc? + $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=''.&Apache::lonmenu::registerurl(1,undef).' ENDDOCUMENT -# ------------------------------------------------------- Print headers to docs - my %currentdocs=&Apache::lonnet::dump('coursedocs',$coursedom,$coursenum); - foreach (sort keys (%currentdocs)) { - if ($_=~/(\d+)\_(\w+)\_(\w+)\.url/) { - $r->print('
'.localtime($1).' '.$2.' '.$3.'
'. - &Apache::lontexconvert::msgtexconverted( - $currentdocs{$1.'_'.$2.'_'.$3.'.comment'} - ). - '
View'); - if (($2 eq $ENV{'user.name'}) && ($3 eq $ENV{'user.domain'}) - && ($allowed)) { - $r->print(' Remove'); - } - } - } -# ----------------------------------------------------------------- Upload form if ($allowed) { + $r->print(< +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 makeexamupload() { + var title=prompt('Listed Title for the Uploaded Score'); + if (title) { + this.document.forms.newexamupload.importdetail.value= + title+'=/res/lib/templates/examupload.problem'; + this.document.forms.newexamupload.submit(); + } +} + +function makesmppage() { + var title=prompt('Listed Title for the Page'); + if (title) { + this.document.forms.newsmppg.importdetail.value= + title+'=/adm/$udom/$uname/$now/smppg'; + this.document.forms.newsmppg.submit(); + } +} + +function makesmpproblem() { + var title=prompt('Listed Title for the Problem'); + if (title) { + this.document.forms.newsmpproblem.importdetail.value= + title+'=/res/lib/templates/simpleproblem.problem'; + this.document.forms.newsmpproblem.submit(); + } +} + +function makebulboard() { + var title=prompt('Listed Title for the Bulletin Board'); + if (title) { + 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();'); +} + +function changename(folder,index,oldtitle) { + var title=prompt('New Title',oldtitle); + if (title) { + this.document.forms.renameform.title.value=title; + this.document.forms.renameform.cmd.value='rename_'+index; + this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.submit(); + } +} + +function removeres(folder,index,oldtitle) { + if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) { + this.document.forms.renameform.cmd.value='del_'+index; + this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.submit(); + } +} + + +ENDNEWSCRIPT + } +# -------------------------------------------------------------------- Body tag + $r->print(''. + &Apache::loncommon::bodytag('Course Documents','',$events, + '','',$showdoc)); + unless ($showdoc) { + if ($allowed) { + $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', + 'Editing the Table of Contents for your Course')); + $r->print(< + + + + +
+ + +
+
+ + +
+ENDCOURSEVERIFY + } +# --------------------------------------------------------- Standard documents + $r->print(''); + if (($standard) && ($allowed) && (!$forcesupplement)) { + $r->print(' + + + + + + +

Main Course Documents'. + ($allowed?' '.$help{'Main_Course_Documents'}:'').'

'); + my $folder=$ENV{'form.folder'}; + unless ($folder=~/^default/) { $folder='default'; } + my $postexec=''; + if ($folder eq 'default') { + $r->print(''); + } else { + $postexec='self.close();'; + } + $hadchanges=0; + &editor($r,$coursenum,$coursedom,$folder,$allowed); + if ($hadchanges) { + $r->print( +''. +'
'. +'

Changes will become active for your current session after , or the next time you log in.'. +$help{'Caching'}.'

'); + } + my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. + '.sequence'; + $r->print(<
Upload a new main course documentImport a published documentSpecial documents
+File:
+
+ +
+Title:
+ + + + + + + $help{'Uploading_From_Harddrive'} + +
+		 +
+ + + + + +$help{'Importing_LON-CAPA_Resource'} + +

-

Post a new course document

- - +
+ +$help{'Load_Map'} +

+
+		 +
+ + + + +$help{'Adding_Folders'} + +
+
+ + + + + $help{'Adding_External_Resource'} + +
+
+ + + + + + $help{'Syllabus'} + +
+
+ + + + + +$help{'Navigate_Content'} + +
+
+ + + + + $help{'Simple Page'} + +
+
+ + + + + +$help{'Score_Upload_Form'} + +
+
+ + + + + +$help{'Bulletin Board'} + +
+
+ + + + + +$help{'My Personal Info'} + +
+
+ENDFORM + $r->print(''); + } +# ----------------------------------------------------- Supplemental documents + if (!$forcestandard) { + $r->print( + '

Supplemental Course Documents'. + ($allowed?' '.$help{'Supplemental'}:'').'

'); + my $folder=$ENV{'form.folder'}; + unless ($folder=~/supplemental/) { $folder='supplemental'; } + &editor($r,$coursenum,$coursedom,$folder,$allowed); + if ($allowed) { + my $folderseq= + '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. + '.sequence'; + + $r->print(< +Upload a new supplemental course document +Import a published document +Special documents + + +
+
Comment:
+ + + + + $help{'Uploading_From_Harddrive'} +
-ENDFORM + + +
+ + + + +$help{'Importing_LON-CAPA_Resource'} +

+

+ + +

+
+ +
+ + + + + $help{'Adding_Folders'} + +
+
+ + + + + $help{'Adding_External_Resource'} + +
+
+ + + + + +$help{'Syllabus'} + +
+
+ + + + + +$help{'My Personal Info'} + +
+ + +ENDSUPFORM + } + } + if ($allowed) { + $r->print('
'); } - $r->print(''); - return OK; + $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",$showdoc).'

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