--- loncom/interface/londocs.pm 2002/10/20 18:42:53 1.34 +++ loncom/interface/londocs.pm 2003/09/08 19:21:10 1.75 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.34 2002/10/20 18:42:53 www Exp $ +# $Id: londocs.pm,v 1.75 2003/09/08 19:21:10 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,8 @@ use Apache::loncommon; use Apache::lonratedt; use Apache::lonratsrv; use Apache::lonxml; +use Apache::loncreatecourse; +use HTML::Entities; use GDBM_File; my $iconpath; @@ -44,6 +46,12 @@ 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 @@ -59,11 +67,97 @@ sub mapread { sub storemap { my ($coursenum,$coursedom,$map)=@_; + $hadchanges=1; return &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); } +# ----------------------------------------- Return hash with valid author names + +sub authorhosts { + my %outhash=(); + my $home=0; + my $other=0; + foreach (keys %ENV) { + if ($_=~/^user\.role\.(au|ca)\.(.+)$/) { + my $role=$1; + my $realm=$2; + my ($start,$end)=split(/\./,$ENV{$_}); + if (($start) && ($start>time)) { next; } + if (($end) && (time>$end)) { next; } + my $ca; my $cd; + if ($1 eq 'au') { + $ca=$ENV{'user.name'}; + $cd=$ENV{'user.domain'}; + } else { + ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/); + } + if (&Apache::lonnet::homeserver($ca,$cd) eq + $Apache::lonnet::perlvar{'lonHostID'}) { + $home++; + $outhash{'home_'.$ca.'@'.$cd}=1; + } else { + $outhash{'otherhome_'.$ca.'@'.$cd}= + &Apache::lonnet::homeserver($ca,$cd); + $other++; + } + } + } + return ($home,$other,%outhash); +} +# ------------------------------------------------------ Generate "dump" button + +sub dumpbutton { + my ($home,$other,%outhash)=&authorhosts(); + if ($home+$other==0) { return ''; } + my $output=''; + if ($home) { + return ''. + ''; + } else { + return''. + 'Dump Course DOCS to Construction Space: available on other servers'; + } +} + +# -------------------------------------------------------- Actually dump course + +sub dumpcourse { + my $r=shift; + $r->print('Dump DOCS'. + &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space')); + my ($home,$other,%outhash)=&authorhosts(); + unless ($home) { return ''; } + if ($ENV{'form.authorspace'}) { + unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; } + my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'}); + } +} + +# Imports the given (name, url) resources into the course +# coursenum, coursedom, and folder must precede the list +sub group_import { + my $coursenum = shift; + my $coursedom = shift; + my $folder = shift; + while (@_) { + my $name = shift; + my $url = shift; + 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] = + join ':', ($name, $url, $ext, 'normal', 'res'); + } + } + &storemap($coursenum, $coursedom, $folder); +} + sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed)=@_; if ($ENV{'form.foldername'}) { @@ -118,41 +212,64 @@ sub editor { } $#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; - $Apache::lonratedt::resources[$idx]= - $name.':'.$url.':'.$ext.':normal:res'; - } - } - } + my @imports; + foreach (split(/\&/,$ENV{'form.importdetail'})) { + if (defined($_)) { + my ($name,$url)=split(/\=/,$_); + $name=&Apache::lonnet::unescape($name); + $url=&Apache::lonnet::unescape($url); + push @imports, $name, $url; + } + } # Store the changed version - &storemap($coursenum,$coursedom,$folder.'.sequence'); + group_import($coursenum, $coursedom, $folder, @imports); } +# 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 @@ -161,8 +278,8 @@ sub editor { 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)); + unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; } + $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); $idx++; } $r->print(''); @@ -172,18 +289,38 @@ sub editor { # --------------------------------------------------------------- An entry line sub entryline { - my ($index,$title,$url,$folder,$allowed)=@_; + 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
+ +Remove + +Rename END } # Figure out what kind of a resource this is @@ -205,18 +342,18 @@ END } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; -# Title - $title=&Apache::lonnet::unescape($title); - my $foldertitle=$title; - if ($title=~ - /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/ - ) { - $foldertitle=&Apache::lontexconvert::msgtexconverted($4); - $title=''.localtime($1).' '. - &Apache::loncommon::plainname($2,$3).':
'. - $foldertitle; - } - if ($isfolder) { $url.='&foldername='.$foldertitle; } + 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.=''. @@ -247,7 +384,7 @@ sub checkonthis { my ($r,$url,$level,$title)=@_; $alreadyseen{$url}=1; $r->rflush(); - if ($url) { + if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { $r->print('
'); for (my $i=0;$i<=$level*5;$i++) { $r->print(' '); @@ -265,18 +402,16 @@ sub checkonthis { if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { $r->print('
'); $r->rflush(); - my $default=''; - if ($1=~/(problem|exam|quiz|assess|survey|form|library)/) { - $default=&Apache::lonnet::getfile( - '/home/httpd/html/res/adm/includes/default_homework.lcpm'); - } 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)),$default); + &Apache::lonnet::filelocation('',$url))); + $ENV{'request.filename'}=$oldpath; if (($Apache::lonxml::errorcount) || ($Apache::lonxml::warningcount)) { if ($Apache::lonxml::errorcount) { @@ -310,16 +445,12 @@ sub checkonthis { } } -# ================================================================ Main Handler -sub handler { - my $r = shift; - $r->content_type('text/html'); - $r->send_http_header; - return OK if $r->header_only; - - if ($ENV{'form.verify'}) { - +# +# -------------------------------------------------------------- Verify Content +# +sub verifycontent { + my $r=shift; my $loaderror=&Apache::lonnet::overloaderror($r); if ($loaderror) { return $loaderror; } @@ -335,8 +466,14 @@ sub handler { } } &untiehash(); - } elsif ($ENV{'form.versions'}) { - $r->print('Check Versions'. + $r->print('

Done.

'); +} + +# -------------------------------------------------------------- Check Versions + +sub checkversions { + my $r=shift; + $r->print('Check Versions'. &Apache::loncommon::bodytag('Check Course Document Versions')); $hashtied=0; &tiehash(); @@ -369,7 +506,7 @@ sub handler { $seltext='since yesterday ('.localtime($starttime).')'; $daysel='selected'; } - + $r->print(< + + + +
+ + +
+ +
+ +$dumpbut +
ENDCOURSEVERIFY + $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', + 'Editing the Table of Contents for your Course')); } # --------------------------------------------------------- Standard documents - $r->print(''); + $r->print('
'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print(' +

Main Course Documents

'); + $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(<
@@ -555,75 +803,126 @@ ENDCOURSEVERIFY
Upload a new main course document Import a published document Special documents
File:
- +
-Title:
+Title:
+ + $help{'Uploading_From_Harddrive'} +
-
+ - + +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> + +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import"> +$help{'Importing_LON-CAPA_Resource'} + +

+

+
+ +$help{'Load_Map'} +
+ +value="New Folder" />$help{'Adding_Folders'} +
+ +value="External Resource" /> $help{'Adding_External_Resource'} +
- + + + $help{'Syllabus'} +
+ +$help{'Navigate_Content'} +
+ +onClick="javascript:makesmppage();" /> $help{'Simple Page'} + +
+
+ + + + +$help{'Simple Problem'} + +
+
+ + + + + +$help{'Score_Upload_Form'} +
+ +$help{'Bulletin Board'} +
+ +$help{'My Personal Info'} +
@@ -633,7 +932,8 @@ ENDFORM # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { $r->print( - '

Supplemental Course Documents

'); + '

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

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/supplemental/) { $folder='supplemental'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -643,62 +943,83 @@ ENDFORM '.sequence'; $r->print(< +
Upload a new supplemental course document Import a published document Special documents
- +
Comment:
+ + $help{'Uploading_From_Harddrive'} +
-
+ + +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'} +

+

+ + +
+ +value="New Folder" /> $help{'Adding_Folders'} +
+ +value="External Resource" /> $help{'Adding_External_Resource'} +
+ +$help{'Syllabus'} +
+ +$help{'My Personal Info'} +