--- loncom/interface/londocs.pm 2004/02/19 21:51:11 1.107 +++ loncom/interface/londocs.pm 2004/12/14 21:10:58 1.156 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.107 2004/02/19 21:51:11 albertel Exp $ +# $Id: londocs.pm,v 1.156 2004/12/14 21:10:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,9 +36,11 @@ use Apache::lonratedt; use Apache::lonratsrv; use Apache::lonxml; use Apache::loncreatecourse; +use Apache::lonnavmaps; use HTML::Entities; use GDBM_File; use Apache::lonlocal; +use Cwd; my $iconpath; @@ -121,7 +123,8 @@ sub dumpbutton { if ($home) { return '</td><td bgcolor="#DDDDCC">'. '<input type="submit" name="dumpcourse" value="'. - &mt('Dump Course DOCS to Construction Space').'" />'; + &mt('Dump Course DOCS to Construction Space').'" />'. + &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'); } else { return'</td><td bgcolor="#DDDDCC">'. &mt('Dump Course DOCS to Construction Space: available on other servers'); @@ -156,7 +159,7 @@ sub dumpcourse { $crs=~s/\_/\//g; foreach (keys %replacehash) { my $newfilename=$title.'/'.$replacehash{$_}; - $newfilename=~s/[^\w\/\.]+/\_/g; + $newfilename=~s/[^\w\/\.\/]+/\_/g; my @dirs=split(/\//,$newfilename); my $path='/home/'.$ca.'/public_html'; my $makepath=$path; @@ -200,7 +203,8 @@ sub dumpcourse { $r->print( '<input type="hidden" name="authorspace" value="'.$1.'" />'); } else { - $r->print('<option value="'.$1.'">'.$_.'</option>'); + $r->print('<option value="'.$1.'">'.$1.' - '. + &Apache::loncommon::plainname(split(/\@/,$1)).'</option>'); } } } @@ -223,7 +227,7 @@ sub dumpcourse { $title=$_; } $title=~s/\.(\w+)$//; - $title=~s/\W+/\_/gs; + $title=~s/[^\w\/]+/\_/gs; $title.='.'.$ext; $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n"); } @@ -234,6 +238,472 @@ sub dumpcourse { } } +# ------------------------------------------------------ Generate "export" button + +sub exportbutton { + return '</td><td bgcolor="#DDDDCC">'. + '<input type="submit" name="exportcourse" value="'. + &mt('Export Course to IMS').'" />'. + &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs'); +} + +sub exportcourse { + my $r=shift; + my %discussiontime = &Apache::lonnet::dump('discussiontimes', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $numdisc = keys %discussiontime; + my $navmap = Apache::lonnavmaps::navmap->new(); + my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef); + my $curRes; + my $outcome; + + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['finishexport']); + if ($ENV{'form.finishexport'}) { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['archive','discussion']); + + my @exportitems = (); + if (defined($ENV{'form.archive'})) { + if (ref($ENV{'form.archive'}) eq 'ARRAY') { + @exportitems = @{$ENV{'form.archive'}}; + } else { + $exportitems[0] = $ENV{'form.archive'}; + } + } + my @discussions = (); + if (defined($ENV{'form.discussion'})) { + if (ref($ENV{'form.discussion'}) eq 'ARRAY') { + @discussions = $ENV{'form.discussion'}; + } else { + $discussions[0] = $ENV{'form.discussion'}; + } + } + if (@exportitems == 0 && @discussions == 0) { + $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created. Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export'; + } else { + my $now = time; + my $count = 0; + my %symbs; + my $manifestok = 0; + my $imsresources; + my $tempexport; + my $copyresult; + my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport); + if ($manifestok) { + &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,\$tempexport,\$copyresult,$ims_manifest); + close($ims_manifest); + +#Create zip file in prtspool + my $imszipfile = '/prtspool/'. + $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. + time.'_'.rand(1000000000).'.zip'; +# zip can cause an sh launch which can pass along all of %ENV +# which can be too large for /bin/sh to handle + my %oldENV=%ENV; + undef(%ENV); + my $cwd = &Cwd::getcwd(); + my $imszip = '/home/httpd/'.$imszipfile; + chdir $tempexport; + open(OUTPUT, "zip -r $imszip * 2> /dev/null |"); + close(OUTPUT); + chdir $cwd; + %ENV=%oldENV; + undef(%oldENV); + $outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />'; + if ($copyresult) { + $outcome .= 'The following errors occurred during export - '.$copyresult; + } + } else { + $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />'; + } + } + + $r->print('<html><head><title>Export Course</title></head>'. + &Apache::loncommon::bodytag('Export course to IMS or SCORM content package')); + $r->print($outcome); + $r->print('</body></html>'); + } else { + my $display; + $display = '<form name="exportdoc" method="post">'."\n"; + $display .= 'Choose which items you wish to export from your course.<br /><br />'; + $display .= '<table border="0" cellspacing="0" cellpadding="3">'. + '<tr><td><fieldset><legend> <b>Content items</b></legend>'. + '<input type="button" value="check all" '. + 'onclick="javascript:checkAll(document.exportdoc.archive)" />'. + ' <input type="button" value="uncheck all"'. + ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'. + '<td> </td><td> </td>'. + '<td align="right"><fieldset><legend> <b>Discussion posts'. + '</b></legend><input type="button" value="check all"'. + ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'. + ' <input type="button" value="uncheck all"'. + ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'. + '</tr></table>'; + my $curRes; + my $depth = 0; + my $count = 0; + my $boards = 0; + my $startcount = 5; + my %parent = (); + my %children = (); + my $lastcontainer = $startcount; + my @bgcolors = ('#F6F6F6','#FFFFFF'); + $display .= '<table cellspacing="0"><tr>'. + '<td><b>Export content item?<br /></b></td><td> </td><td align="right">'."\n"; + if ($numdisc > 0) { + $display.='<b>Export discussion posts?</b>'."\n"; + } + $display.=' </td></tr>'; + while ($curRes = $it->next()) { + if (ref($curRes)) { + $count ++; + } + if ($curRes == $it->BEGIN_MAP()) { + $depth++; + $parent{$depth} = $lastcontainer; + } + if ($curRes == $it->END_MAP()) { + $depth--; + $lastcontainer = $parent{$depth}; + } + if (ref($curRes)) { + my $symb = $curRes->symb(); + my $color = $count%2; + $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n". + '<input type="checkbox" name="archive" value="'.$count.'" '; + if (($curRes->is_sequence()) || ($curRes->is_page())) { + my $checkitem = $count + $boards + $startcount; + $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"'; + } + $display .= ' />'."\n"; + for (my $i=0; $i<$depth; $i++) { + $display .= '<img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\n"; + } + if ($curRes->is_sequence()) { + $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif"> '."\n"; + $lastcontainer = $count + $startcount + $boards; + } elsif ($curRes->is_page()) { + $display .= '<img src="/adm/lonIcons/navmap.page.open.gif"> '."\n"; + $lastcontainer = $count + $startcount + $boards; + } + my $currelem = $count+$boards+$startcount; + $children{$parent{$depth}} .= $currelem.':'; + $display .= ' '.$curRes->title().'</td>'; + if ($discussiontime{$symb} > 0) { + $boards ++; + $currelem = $count+$boards+$startcount; + $display .= '<td> </td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" /> </td>'."\n"; + } else { + $display .= '<td colspan="2"> </td>'."\n"; + } + } + } + my $scripttag = qq| +<script> + +function checkAll(field) { + for (i = 0; i < field.length; i++) + field[i].checked = true ; +} + +function uncheckAll(field) { + for (i = 0; i < field.length; i++) + field[i].checked = false ; +} + +function propagateCheck(item) { + if (document.exportdoc.elements[item].checked == true) { + containerCheck(item) + } +} + +function containerCheck(item) { + document.exportdoc.elements[item].checked = true + var numitems = $count + $boards + $startcount + var parents = new Array(numitems) + for (var i=$startcount; i<numitems; i++) { + parents[i] = new Array + } + |; + + foreach my $container (sort { $a <=> $b } keys %children) { + my @contents = split/:/,$children{$container}; + for (my $i=0; $i<@contents; $i ++) { + $scripttag .= ' parents['.$container.']['.$i.'] = '.$contents[$i]."\n"; + } + } + + $scripttag .= qq| + if (parents[item].length > 0) { + for (var j=0; j<parents[item].length; j++) { + containerCheck(parents[item][j]) + } + } +} + +</script> + |; + $r->print('<html><head><title>Export Course</title>'.$scripttag.'</head>'. + &Apache::loncommon::bodytag('Export course to IMS or SCORM content package' +)); + + $r->print($display.'</table>'. + '<p><input type="hidden" name="finishexport" value="1">'. + '<input type="submit" name="exportcourse" value="'. + &mt('Export Course DOCS').'" /></p></form></body></html>'); + } +} + +sub create_ims_store { + my ($now,$manifestok,$outcome,$tempexport) = @_; + $$tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports'; + my $ims_manifest; + if (!-e $$tempexport) { + mkdir($$tempexport,0700); + } + $$tempexport .= '/'.$now; + if (!-e $$tempexport) { + mkdir($$tempexport,0700); + } + $$tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'}; + if (!-e $$tempexport) { + mkdir($$tempexport,0700); + } +# open manifest file + my $manifest = '/imsmanifest.xml'; + my $manifestfilename = $$tempexport.$manifest; + if ($ims_manifest = Apache::File->new('>'.$manifestfilename)) { + $$manifestok=1; + print $ims_manifest +'<?xml version="1.0" encoding="UTF-8"?>'."\n". +'<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1"'. +' xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"'. +' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'. +' identifier="MANIFEST-'.$ENV{'request.course.id'}.'-'.$now.'"'. +' xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1imscp_v1p1.xsd'. +' http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">'."\n". +' <organizations default="ORG-."'.$ENV{'request,course.id'}.'-'.$now.'">'."\n". +' <organization identifier="ORG-'.$ENV{'request.course.id'}.'-'.$now.'"'. +' structure="hierarchical">'."\n". +' <title>'.$ENV{'request.'.$ENV{'request.course.id'}.'.description'}.'</title>' + } else { + $$outcome .= 'An error occurred opening the IMS manifest file.<br />' +; + } + return $ims_manifest; +} + +sub build_package { + my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,$ims_manifest) = @_; +# first iterator to look for dependencies + my $it = $navmap->getIterator(undef,undef,undef,1,undef,undef); + my $curRes; + my $count = 0; + my $depth = 0; + my $lastcontainer = 0; + my %parent = (); + my @dependencies = (); + my $cnum = $ENV{'request.'.$ENV{'request.course.id'}.'.num'}; + my $cdom = $ENV{'request.'.$ENV{'request.course.id'}.'.domain'}; + while ($curRes = $it->next()) { + if (ref($curRes)) { + $count ++; + } + if ($curRes == $it->BEGIN_MAP()) { + $depth++; + $parent{$depth} = $lastcontainer; + } + if ($curRes == $it->END_MAP()) { + $depth--; + $lastcontainer = $parent{$depth}; + } + if (ref($curRes)) { + if ($curRes->is_sequence() || $curRes->is_page()) { + $lastcontainer = $count; + } + if (grep/^$count$/,@$exportitems) { + &get_dependencies($exportitems,\%parent,$depth,\@dependencies); + } + } + } +# second iterator to build manifest and store resources + $it = $navmap->getIterator(undef,undef,undef,1,undef,undef); + $depth = 0; + my $prevdepth; + $count = 0; + my $imsresources; + my $pkgdepth; + if ($curRes == $it->BEGIN_MAP()) { + $prevdepth = $depth; + $depth++; + } + if ($curRes == $it->END_MAP()) { + $prevdepth = $depth; + $depth--; + } + + if (ref($curRes)) { + if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) { + my $symb = $curRes->symb(); + my $isvisible = 'true'; + my $resourceref; + if ($curRes->randomout()) { + $isvisible = 'false'; + } + unless ($curRes->is_sequence()) { + $resourceref = 'identifierref="RES-'.$ENV{'request.course.id'}.'-'.$count.'"'; + } + if (($depth <= $prevdepth) && ($count > 1)) { + print $ims_manifest ' </item>'."\n"; + } + $prevdepth = $depth; + + my $itementry = + '<item identifier="ITEM-'.$ENV{'request.course.id'}.'-'.$count. + '" isvisible="'.$isvisible.'" '.$resourceref.'>'. + '<title>'.$curRes->title().'</title>'; + print $ims_manifest "\n".$itementry; + + unless ($curRes->is_sequence()) { + my $content_file; + my @hrefs = (); + &process_content($count,$curRes,$cdom,$cnum,$symb,$content_file,\@hrefs,$copyresult,$tempexport); + if ($content_file) { + $imsresources .= "\n". + ' <resource identifier="RES-'.$ENV{'request.course.id'}.'-'.$count. + '" type="webcontent" href="'.$content_file.'">'."\n". + ' <file href="'.$content_file.'" />'."\n"; + foreach (@hrefs) { + $imsresources .= + ' <file href="'.$_.'" />'."\n"; + } + $imsresources .= ' </resource>'."\n"; + } + } + $pkgdepth = $depth; + } + } + while ($pkgdepth > -1) { + print $ims_manifest " </item>\n"; + $pkgdepth --; + } + my $resource_text = qq| + </organization> + </organizations> + <resources> + $imsresources + </resources> +</manifest> + |; + print $ims_manifest $resource_text; +} + +sub get_dependencies { + my ($exportitems,$parent,$depth,$dependencies) = @_; + if ($depth > 1) { + unless (grep/^$$parent{$depth}$/,@$exportitems || grep/^$$parent{$depth}$/,@$dependencies) { + push @$dependencies, $$parent{$depth}; + if ($depth > 2) { + &get_dependencies($exportitems,$parent,$depth-1,$dependencies); + } + } + } +} + +sub process_content { + my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_; + my $content_type; + my $message; +# find where user is author or co-author + my %roleshash = &Appache::lonnet::get_my_roles(); + if ($curRes->is_page()) { + $content_type = 'page'; + } elsif ($symb =~ m-public/$cdom/$cnum/syllabus$-) { + $content_type = 'syllabus'; + } elsif ($symb =~ m-\.sequence____\d+____ext-) { + $content_type = 'external'; + } elsif ($symb =~ m-adm/navmaps$-) { + $content_type = 'navmap'; + } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/smppg$-) { + $content_type = 'simplepage'; + } elsif ($symb =~ m-$-) { + $content_type = 'simpleproblem'; + } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/bulletinboard$-) { + $content_type = 'bulletinboard'; + } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/aboutme$-) { + $content_type = 'aboutme'; + } elsif ($symb =~ m-uploaded/$cdom/$cnum-) { + &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'uploaded'); + } elsif ($symb =~ m-\.sequence____\d+____([^/])/([^/])-) { + my $coauth = $2.':'.$1.':ca'; + my $canedit = 0; + if ($1 eq $ENV{'user.domain'} && $2 eq $ENV{'user.name'}) { + $canedit= 1; + } elsif (defined($roleshash{$coauth})) { + if ($roleshash{$coauth} =~ /(\d+):(\d+)/) { + if (($1 < time || $1 == 0) && ($2 == 0 || $2 >= time)) { + $canedit = 1; + } + } elsif ($roleshash{$coauth} eq ':') { + $canedit = 1; + } + } + if ($canedit) { + &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'resource'); + } else { + &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'noedit'); + } + } + $$copyresult .= $message."\n"; +} + +sub replicate_content { + my ($cdom,$cnum,$tempexport,$symb,$count,$message,$caller) = @_; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + my $feedurl = &Apache::lonnet::clutter($url); + + my $content; + my $filename; + my $repstatus; + if ($url =~ m-[^/]/(.+)$-) { + $filename = $1; + if (!-e $tempexport.'/resources') { + mkdir($tempexport.'/resources',0700); + } + if (!-e $tempexport.'/resources') { + mkdir($tempexport.'/resources/'.$count,0700); + } + my $destination = $$tempexport.'/resources/'.$count.'/'.$filename; + my $copiedfile; + if ($copiedfile = Apache::File->new('>'.$destination)) { + my $content; + if ($caller eq 'uploaded' || $caller eq 'resource') { + $content = &Apache::lonnet::getfile($url); + if ($content eq -1) { + $$message = 'Could not copy file '.$filename; + } else { + $repstatus = 'ok'; + } + } elsif ($caller eq 'noedit') { + my $rtncode; + $repstatus = &getuploaded('GET',$url,$cdom,$cnum,$content,$rtncode); + unless ($repstatus eq 'ok') { + $$message = 'Could not render '.$url.' server message - '.$rtncode; + } + } + if ($repstatus eq 'ok') { + print $copiedfile $content; + } + close($copiedfile); + } else { + $$message = 'Could not open destination file for '.$filename."\n"; + } + } else { + $$message = 'Could not determine name of file for '; + } + return $repstatus; +} # Imports the given (name, url) resources into the course # coursenum, coursedom, and folder must precede the list @@ -241,9 +711,31 @@ sub group_import { my $coursenum = shift; my $coursedom = shift; my $folder = shift; + my $container = shift; + my $caller = shift; while (@_) { my $name = shift; my $url = shift; + if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) { + my $errtext = ''; + my $fatal = 0; + my $newmapstr = '<map>'."\n". + '<resource id="1" src="" type="start"></resource>'."\n". + '<link from="1" to="2" index="1"></link>'."\n". + '<resource id="2" src="" type="finish"></resource>'."\n". + '</map>'; + $ENV{'form.output'}=$newmapstr; + my $home=&Apache::lonnet::homeserver($coursenum,$coursedom); + my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$home, + 'output',$1.$2); + if ($result != m|^/uploaded/|) { + $errtext.='Map not saved: A network error occured when trying to save the new map. '; + $fatal = 2; + } + if ($fatal) { + return ($errtext,$fatal); + } + } if ($url) { my $idx = $#Apache::lonratedt::resources + 1; $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx; @@ -255,18 +747,51 @@ sub group_import { join ':', ($name, $url, $ext, 'normal', 'res'); } } - return &storemap($coursenum, $coursedom, $folder.'.sequence'); + return &storemap($coursenum, $coursedom, $folder.'.'.$container); +} + +sub breadcrumbs { + my ($where)=@_; + &Apache::lonhtmlcommon::clear_breadcrumbs(); + my (@folders); + if ($ENV{'form.pagepath'}) { + @folders = split('&',$ENV{'form.pagepath'}); + } else { + @folders=split('&',$ENV{'form.folderpath'}); + } + my $folderpath; + while (@folders) { + my $folder=shift(@folders); + my $foldername=shift(@folders); + if ($folderpath) {$folderpath.='&';} + $folderpath.=$folder.'&'.$foldername; + my $url='/adm/coursedocs?folderpath='. + &Apache::lonnet::escape($folderpath); + &Apache::lonhtmlcommon::add_breadcrumb( + {'href'=>$url, + 'title'=>&Apache::lonnet::unescape($foldername), + 'text'=>'<font size="+1">'. + &Apache::lonnet::unescape($foldername).'</font>' + }); + + + } + return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef, + 0,'nohelp'); } sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed)=@_; - if ($ENV{'form.foldername'}) { - $r->print('<h3>Folder: '.$ENV{'form.foldername'}.'</h3>'); - } + + $r->print(&breadcrumbs($folder)); my $errtext=''; my $fatal=0; + my $container='sequence'; + if ($ENV{'form.pagepath'}) { + $container='page'; + } ($errtext,$fatal)= - &mapread($coursenum,$coursedom,$folder.'.sequence'); + &mapread($coursenum,$coursedom,$folder.'.'.$container); if ($#Apache::lonratedt::order<1) { $Apache::lonratedt::order[0]=1; $Apache::lonratedt::resources[1]=''; @@ -275,15 +800,80 @@ sub editor { $r->print('<p><font color="red">'.$errtext.'</font></p>'); } else { # ------------------------------------------------------------ Process commands + # ---------------- if they are for this folder and user allowed to make changes if (($allowed) && ($ENV{'form.folder'} eq $folder)) { +# set parameters and change order + if (defined($ENV{'form.setparms'})) { + my $idx=$ENV{'form.setparms'}; +# set parameters + if ($ENV{'form.randpick_'.$idx}) { + &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos'); + } else { + &Apache::lonratedt::delparameter($idx,'parameter_randompick'); + } + if ($ENV{'form.hidprs_'.$idx}) { + &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno'); + } else { + &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource'); + } + if ($ENV{'form.encprs_'.$idx}) { + &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno'); + } else { + &Apache::lonratedt::delparameter($idx,'parameter_encrypturl'); + } + + if ($ENV{'form.newpos'}) { +# change order + + my $newpos=$ENV{'form.newpos'}-1; + my $currentpos=$ENV{'form.currentpos'}-1; + my $i; + my @neworder=(); + if ($newpos>$currentpos) { +# moving stuff up + for ($i=0;$i<$currentpos;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + for ($i=$currentpos;$i<$newpos;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i+1]; + } + $neworder[$newpos]=$Apache::lonratedt::order[$currentpos]; + for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + } else { +# moving stuff down + for ($i=0;$i<$newpos;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + $neworder[$newpos]=$Apache::lonratedt::order[$currentpos]; + for ($i=$newpos+1;$i<$currentpos+1;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i-1]; + } + for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + } + @Apache::lonratedt::order=@neworder; + } +# store the changed version + + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); + if ($fatal) { + $r->print('<p><font color="red">'.$errtext.'</font></p>'); + return; + } + + } + # upload a file, if present if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.cmd'}=~/^upload_(\w+)/)) { - if ($folder=~/^$1/) { + if ( ($folder=~/^$1/) || ($1 eq 'default') ) { # 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 $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs'); my $ext='false'; if ($url=~/^http\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; @@ -301,7 +891,7 @@ sub editor { $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $newidx; - ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence'); + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); if ($fatal) { $r->print('<p><font color="red">'.$errtext.'</font></p>'); return; @@ -311,6 +901,10 @@ sub editor { if ($ENV{'form.cmd'}) { my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'}); if ($cmd eq 'del') { + my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]); + if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) { + &Apache::lonnet::removeuploadedurl($url); + } for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { $Apache::lonratedt::order[$i]= $Apache::lonratedt::order[$i+1]; @@ -331,6 +925,7 @@ sub editor { $Apache::lonratedt::order[$idx]=$i; } } elsif ($cmd eq 'rename') { + my $ratstr = $Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]; my ($rtitle,@rrest)=split(/\:/, $Apache::lonratedt::resources[ $Apache::lonratedt::order[$idx]]); @@ -339,14 +934,15 @@ sub editor { $comment=~s/\</\<\;/g; $comment=~s/\>/\>\;/g; $comment=~s/\:/\:/g; - $Apache::lonratedt::resources[ + if ($comment=~/\S/) { + $Apache::lonratedt::resources[ $Apache::lonratedt::order[$idx]]= - $comment.':'.join(':',@rrest); - + $comment.':'.join(':',@rrest); + } } # Store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom, - $folder.'.sequence'); + $folder.'.'.$container); if ($fatal) { $r->print('<p><font color="red">'.$errtext.'</font></p>'); return; @@ -365,7 +961,7 @@ sub editor { } # Store the changed version ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder, - @imports); + $container,'londocs',@imports); if ($fatal) { $r->print('<p><font color="red">'.$errtext.'</font></p>'); return; @@ -383,7 +979,7 @@ sub editor { # Store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom, - $folder.'.sequence'); + $folder.'.'.$container); if ($fatal) { $r->print('<p><font color="red">'.$errtext.'</font></p>'); return; @@ -393,14 +989,19 @@ sub editor { # ---------------------------------------------------------------- End commands # ---------------------------------------------------------------- Print screen my $idx=0; + my $shown=0; $r->print('<table>'); foreach (@Apache::lonratedt::order) { my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); unless ($name) { $name=(split(/\//,$url))[-1]; } - unless ($name) { next; } - $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); + unless ($name) { $idx++; next; } + $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum)); $idx++; + $shown++; } + unless ($shown) { + $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); + } $r->print('</table>'); } } @@ -408,87 +1009,235 @@ sub editor { # --------------------------------------------------------------- An entry line sub entryline { - my ($index,$title,$url,$folder,$allowed,$residx)=@_; + my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_; $title=~s/\&colon\;/\:/g; $title=&HTML::Entities::encode(&HTML::Entities::decode( - &Apache::lonnet::unescape($title)),'\"\<\>\&\''); + &Apache::lonnet::unescape($title)),'"<>&\''); my $renametitle=$title; my $foldertitle=$title; - if ($title=~ - /^(\d+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(.*)$/ - ) { - $foldertitle=&Apache::lontexconvert::msgtexconverted($4); - $renametitle=$4; - $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '. - &Apache::loncommon::plainname($2,$3).': <br />'. - $foldertitle; - } + my $pagetitle=$title; + my $orderidx=$Apache::lonratedt::order[$index]; + if ($title=~ /^(\d+)___&&&___(\w+)___&&&___(\w+)___&&&___(.*)$/ ) { + $foldertitle=&Apache::lontexconvert::msgtexconverted($4); + $renametitle=$4; + $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '. + &Apache::loncommon::plainname($2,$3).': <br />'. + $foldertitle; + } $renametitle=~s/\"\;/\\\"/g; my $line='<tr>'; # Edit commands - if ($allowed) { - my %lt=('up' => 'Move Up', - 'dw' => 'Move Down', - 'rm' => 'Remove', - 'rn' => 'Rename'); - $line.=(<<END); + my $container; + my $folderpath; + if ($ENV{'form.folderpath'}) { + $container = 'sequence'; + $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'}); + # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); + } + my ($pagepath,$pagesymb); + if ($ENV{'form.pagepath'}) { + $container = 'page'; + $pagepath=&Apache::lonnet::escape($ENV{'form.pagepath'}); + $pagesymb=&Apache::lonnet::escape($ENV{'form.pagesymb'}); + } + if ($allowed) { + my $incindex=$index+1; + my $selectbox=''; + if ($folder!~/^supplemental/) { + $selectbox= + '<input type="hidden" name="currentpos" value="'.$incindex.'" />'. + '<select name="newpos" onChange="this.form.submit()">'; + for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) { + if ($i==$incindex) { + $selectbox.='<option value="" selected="1">('.$i.')</option>'; + } else { + $selectbox.='<option value="'.$i.'">'.$i.'</option>'; + } + } + $selectbox.='</select>'; + } + my %lt=&Apache::lonlocal::texthash( + 'up' => 'Move Up', + 'dw' => 'Move Down', + 'rm' => 'Remove', + 'rn' => 'Rename'); + if ($ENV{'form.pagepath'}) { + $line.=(<<END); +<form name="entry_$index" action="/adm/coursedocs" method="post"> +<input type="hidden" name="pagepath" value="$ENV{'form.pagepath'}" /> +<input type="hidden" name="pagesymb" value="$ENV{'form.pagesymb'}" /> +<input type="hidden" name="setparms" value="$orderidx" /> +<td><table border='0' cellspacing='2' cellpadding='0'> +<tr><td bgcolor="#DDDDDD"> +<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb'> +<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr> +<tr><td bgcolor="#DDDDDD"> +<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb'> +<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr> +</table></td> +<td>$selectbox +</td><td bgcolor="#DDDDDD"> +<a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'> +<font size="-2" color="#990000">$lt{'rm'}</font></a> +<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'> +<font size="-2" color="#009900">$lt{'rn'}</font></a></td> +END + } else { + $line.=(<<END); +<form name="entry_$index" action="/adm/coursedocs" method="post"> +<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="setparms" value="$orderidx" /> <td><table border='0' cellspacing='2' cellpadding='0'> <tr><td bgcolor="#DDDDDD"> -<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'> +<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'> <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr> <tr><td bgcolor="#DDDDDD"> -<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'> +<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'> <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr> -</table></td><td bgcolor="#DDDDDD"> -<a href='javascript:removeres("$folder","$index","$renametitle");'> +</table></td> +<td>$selectbox +</td><td bgcolor="#DDDDDD"> +<a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'> <font size="-2" color="#990000">$lt{'rm'}</font></a> -<a href='javascript:changename("$folder","$index","$renametitle");'> +<a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'> <font size="-2" color="#009900">$lt{'rn'}</font></a></td> END + } } # Figure out what kind of a resource this is my ($extension)=($url=~/\.(\w+)$/); my $uploaded=($url=~/^\/*uploaded\//); my $icon=&Apache::loncommon::icon($url); my $isfolder=0; + my $ispage=0; + my $folderarg; + my $pagearg; + my $pagefile; if ($uploaded) { - if ($extension eq 'sequence') { - $icon=$iconpath.'/folder_closed.gif'; - $url=~/\/(\w+)\.sequence/; - $url='/adm/coursedocs?folder='.$1; - $isfolder=1; - } else { - $url=&Apache::lonnet::tokenwrapper($url); - } + if ($extension eq 'sequence') { + $icon=$iconpath.'/folder_closed.gif'; + $url=~/$coursenum\/([\/\w]+)\.sequence$/; + $url='/adm/coursedocs?'; + $folderarg=$1; + $isfolder=1; + } elsif ($extension eq 'page') { + $icon=$iconpath.'/page.gif'; + $url=~/$coursenum\/([\/\w]+)\.page$/; + $pagearg=$1; + $url='/adm/coursedocs?'; + $ispage=1; + } else { + &Apache::lonnet::allowuploaded('/adm/coursedoc',$url); + } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; - if (($residx) && ($folder!~/supplemental/)) { - $url.=(($url=~/\?/)?'&':'?').'symb='. - &Apache::lonnet::escape(&Apache::lonnet::symbclean( + if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { + my $symb=&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))); + &Apache::lonnet::declutter($url)); + (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); + $url=&Apache::lonnet::clutter($url); + if ($url=~/^\/*uploaded\//) { + $url=~/\.(\w+)$/; + my $embstyle=&Apache::loncommon::fileembstyle($1); + if (($embstyle eq 'img') || ($embstyle eq 'emb')) { + $url='/adm/wrapper'.$url; + } elsif ($embstyle eq 'ssi') { + #do nothing with these + } elsif ($url!~/\.(sequence|page)$/) { + $url='/adm/coursedocs/showdoc'.$url; + } + } elsif ($url=~m|^/ext/|) { + $url='/adm/wrapper'.$url; + } + $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); + if ($container eq 'page') { + my $symb=$ENV{'form.pagesymb'}; + + $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]); + $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); + } + } + my $parameterset=' '; + if ($isfolder) { + my $foldername=&Apache::lonnet::escape($foldertitle); + my $folderpath=$ENV{'form.folderpath'}; + if ($folderpath) { $folderpath.='&' }; + $folderpath.=$folderarg.'&'.$foldername; + $url.='folderpath='.&Apache::lonnet::escape($folderpath); + $parameterset='<label>'.&mt('Randomly Pick: '). + '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'. + (&Apache::lonratedt::getparameter($orderidx, + 'parameter_randompick'))[0]. + '" />'.'</label>'; + + } + if ($ispage) { + my $pagename=&Apache::lonnet::escape($pagetitle); + my $pagepath; + my $folderpath=$ENV{'form.folderpath'}; + if ($folderpath) { $pagepath = $folderpath.'&' }; + $pagepath.=$pagearg.'&'.$pagename; + my $symb=$ENV{'form.pagesymb'}; + if (!$symb) { + my $path='uploaded/'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'; + $symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence', + $residx, + $path.$pagearg.'.page'); + } + $url.='pagepath='.&Apache::lonnet::escape($pagepath). + '&pagesymb='.&Apache::lonnet::escape($symb); + } + $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon. + '" border="0"></a></td>'. + "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>"; + if (($allowed) && ($folder!~/^supplemental/)) { + my %lt=&Apache::lonlocal::texthash( + 'hd' => 'Hidden', + 'ec' => 'URL hidden', + 'sp' => 'Store Parameters'); + my $enctext= + ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':''); + my $hidtext= + ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); + $line.=(<<ENDPARMS); +<td bgcolor="#BBBBFF"><font size='-2'> +<nobr><label><input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</label></nobr></td> +<td bgcolor="#BBBBFF"><font size='-2'> +<nobr><label><input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</label></nobr></td> +<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td> +<td bgcolor="#BBBBFF"><font size='-2'> +<input type="submit" value="$lt{'sp'}" /> +</font></td> +ENDPARMS } - if ($isfolder) { $url.='&foldername='. - &Apache::lonnet::escape($foldertitle); } - $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder. - '"><img src="'.$icon.'" border="0"></a></td>'. - "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>"; + $line.="</form></tr>"; return $line; } # ---------------------------------------------------------------- tie the hash sub tiehash { + my ($mode)=@_; $hashtied=0; if ($ENV{'request.course.fn'}) { - if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", - &GDBM_READER(),0640)) { + if ($mode eq 'write') { + if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", + &GDBM_WRCREAT(),0640)) { + $hashtied=2; + } + } else { + if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", + &GDBM_READER(),0640)) { $hashtied=1; - } + } + } } } @@ -501,10 +1250,11 @@ sub untiehash { sub checkonthis { my ($r,$url,$level,$title)=@_; + $url=&Apache::lonnet::unescape($url); $alreadyseen{$url}=1; $r->rflush(); if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { - $r->print('<br />'); + $r->print("\n<br />"); for (my $i=0;$i<=$level*5;$i++) { $r->print(' '); } @@ -587,12 +1337,21 @@ sub verifycontent { %alreadyseen=(); &tiehash(); foreach (keys %hash) { - if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { + if ($hash{$_}=~/\.(page|sequence)$/) { + if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) { + $r->print('<hr /><font color="red">'. + &mt('The following sequence or page is included more than once in your course: '). + &Apache::lonnet::unescape($hash{$_}).'</font><br />'. + &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />')); + } + } + if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::unescape($hash{$_})})) { &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); } } &untiehash(); - $r->print('<h1>'.&mt('Done').'.</h1>'); + $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'. + &mt('Return to DOCS').'</a>'); } # -------------------------------------------------------------- Check Versions @@ -639,7 +1398,6 @@ sub checkversions { foreach (keys %ENV) { if ($_=~/^form\.set_version_(.+)$/) { my $src=$1; - &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_}); if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) { $newsetversions{$src}=$ENV{$_}; } @@ -654,8 +1412,9 @@ sub checkversions { } else { $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>'); } - &changewarning($r,''); + &mark_hash_old(); } + &changewarning($r,''); if ($ENV{'form.timerange'} eq 'all') { # show all documents $header=&mt('All Documents in Course'); @@ -775,7 +1534,9 @@ ENDHEADERS # Set version $r->print(&Apache::loncommon::select_form($setversions{$linkurl}, 'set_version_'.$linkurl, - ('' => '', + ('select_form_order' => + ['',1..$currentversion,'mostrecent'], + '' => '', 'mostrecent' => 'most recent', map {$_,$_} (1..$currentversion)))); $r->print('</nobr></td></tr><tr><td></td>'); @@ -836,12 +1597,45 @@ ENDHEADERS &untiehash(); } +sub mark_hash_old { + my $retie_hash=0; + if ($hashtied) { + $retie_hash=1; + &untiehash(); + } + &tiehash('write'); + $hash{'old'}=1; + &untiehash(); + if ($retie_hash) { &tiehash(); } +} + +sub is_hash_old { + my $untie_hash=0; + if (!$hashtied) { + $untie_hash=1; + &tiehash(); + } + my $return=$hash{'old'}; + if ($untie_hash) { &untiehash(); } + return $return; +} + sub changewarning { my ($r,$postexec)=@_; + if (!&is_hash_old()) { return; } + my $pathvar='folderpath'; + my $path=&Apache::lonnet::escape($ENV{'form.folderpath'}); + if (defined($ENV{'form.pagepath'})) { + $pathvar='pagepath'; + $path=&Apache::lonnet::escape($ENV{'form.pagepath'}); + $path.='&symb='.&Apache::lonnet::escape($ENV{'form.pagesymb'}); + } $r->print( '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. '<form method="post" action="/adm/roles" target="loncapaclient">'. -'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. +'<input type="hidden" name="orgurl" value="/adm/coursedocs?'. +$pathvar.'='.$path. +'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. &mt('Changes will become active for your current session after'). ' <input type="hidden" name="'. $ENV{'request.role'}.'" value="1" /><input type="button" value="'. @@ -860,8 +1654,9 @@ sub handler { 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') { + 'Supplemental','Score_Upload_Form','Adding_Pages', + 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive', + 'Check_Resource_Versions','Verify_Content') { $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_); } # Composite help files @@ -876,30 +1671,51 @@ sub handler { $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'}) { &verifycontent($r); } elsif ($ENV{'form.versions'}) { &checkversions($r); } elsif ($ENV{'form.dumpcourse'}) { &dumpcourse($r); + } elsif ($ENV{'form.exportcourse'}) { + &exportcourse($r); } else { # is this a standard course? my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//); - my $forcestandard; + my $forcestandard = 0; my $forcesupplement; my $script=''; my $allowed; my $events=''; my $showdoc=0; + my $containertag; + my $uploadtag; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['folder','foldername']); + ['folderpath','pagepath','pagesymb']); + if ($ENV{'form.folderpath'}) { + my (@folderpath)=split('&',$ENV{'form.folderpath'}); + $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath)); + $ENV{'form.folder'}=pop(@folderpath); + } + if ($ENV{'form.pagepath'}) { + my (@pagepath)=split('&',$ENV{'form.pagepath'}); + $ENV{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath)); + $ENV{'form.folder'}=pop(@pagepath); + $containertag = '<input type="hidden" name="pagepath" value="" />'. + '<input type="hidden" name="pagesymb" value="" />'; + $uploadtag = '<input type="hidden" name="pagepath" value="'.$ENV{'form.pagepath'}.'" />'. + '<input type="hidden" name="pagesymb" value="'.$ENV{'form.pagesymb'}.'" />'; + } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { - $showdoc=$1; + $showdoc='/'.$1; } unless ($showdoc) { # got called from remote - $forcestandard=($ENV{'form.folder'}=~/^default_/); + if (($ENV{'form.folder'}=~/^default_/) || + ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) { + $forcestandard = 1; + } $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/); # does this user have privileges to post, etc? @@ -952,6 +1768,14 @@ function makenewfolder(targetform,folder } } +function makenewpage(targetform,folderseq) { + var pagename=prompt('Name of New Page','New Page'); + if (pagename) { + targetform.importdetail.value=pagename+"="+folderseq; + targetform.submit(); + } +} + function makenewext(targetname) { this.document.forms.extimport.useform.value=targetname; window.open('/adm/rat/extpickframe.html'); @@ -1008,6 +1832,14 @@ function makeabout() { } } +function makeims() { + var caller = document.forms.ims.folder.value + var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one" + newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes") + newWindow.location.href = newlocation +} + + function finishpick() { var title=this.document.forms.extimport.title.value; var url=this.document.forms.extimport.url.value; @@ -1017,23 +1849,36 @@ function finishpick() { '";this.document.forms.'+form+'.submit();'); } -function changename(folder,index,oldtitle) { +function changename(folderpath,index,oldtitle,container,pagesymb) { 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; + if (container == 'sequence') { + this.document.forms.renameform.folderpath.value=folderpath; + } + if (container == 'page') { + this.document.forms.renameform.pagepath.value=folderpath; + this.document.forms.renameform.pagesymb.value=pagesymb; + } this.document.forms.renameform.submit(); } } -function removeres(folder,index,oldtitle) { +function removeres(folderpath,index,oldtitle,container,pagesymb) { if (confirm('Remove "'+oldtitle+'"?')) { this.document.forms.renameform.cmd.value='del_'+index; - this.document.forms.renameform.folder.value=folder; + if (container == 'sequence') { + this.document.forms.renameform.folderpath.value=folderpath; + } + if (container == 'page') { + this.document.forms.renameform.pagepath.value=folderpath; + this.document.forms.renameform.pagesymb.value=pagesymb; + } this.document.forms.renameform.submit(); } } + </script> ENDNEWSCRIPT @@ -1042,8 +1887,7 @@ ENDNEWSCRIPT $r->print('</head>'. &Apache::loncommon::bodytag('Course Documents','',$events, '','',$showdoc). - &Apache::loncommon::help_open_faq(273). - &Apache::loncommon::help_open_bug('RAT')); + &Apache::loncommon::help_open_menu('','','','',273,'RAT')); unless ($showdoc) { # ----------------------------------------------------------------------------- my %lt=&Apache::lonlocal::texthash( @@ -1057,6 +1901,7 @@ ENDNEWSCRIPT 'selm' => 'Select Map', 'load' => 'Load Map', 'newf' => 'New Folder', + 'newp' => 'New Composite Page', 'extr' => 'External Resource', 'syll' => 'Syllabus', 'navc' => 'Navigate Contents', @@ -1066,6 +1911,7 @@ ENDNEWSCRIPT 'bull' => 'Bulletin Board', 'mypi' => 'My Personal Info', 'abou' => 'About User', + 'imsf' => 'Import IMS package', 'file' => 'File', 'title' => 'Title', 'comment' => 'Comment' @@ -1073,27 +1919,43 @@ ENDNEWSCRIPT # ----------------------------------------------------------------------------- if ($allowed) { my $dumpbut=&dumpbutton(); + my $exportbut=&exportbutton(); my %lt=&Apache::lonlocal::texthash( 'vc' => 'Verify Content', 'cv' => 'Check/Set Resource Versions', ); + + my $folderpath=$ENV{'form.folderpath'}; + if (!$folderpath) { + if ($ENV{'form.folder'} eq '' || + $ENV{'form.folder'} eq 'supplemental') { + $folderpath='default&'. + &Apache::lonnet::escape(&mt('Main Course Documents')); + } + } + unless ($ENV{'form.pagepath'}) { + $containertag = '<input type="hidden" name="folderpath" value="" />'; + $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />'; + } + $r->print(<<ENDCOURSEVERIFY); <form name="renameform" method="post" action="/adm/coursedocs"> <input type="hidden" name="title" /> <input type="hidden" name="cmd" /> -<input type="hidden" name="folder" /> +$containertag </form> <form name="simpleedit" method="post" action="/adm/coursedocs"> <input type=hidden name="importdetail" value=""> -<input type="hidden" name="folder" /> +$uploadtag </form> <form action="/adm/coursedocs" method="post" name="courseverify"> <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4"> <tr><td bgcolor="#DDDDCC"> -<input type="submit" name="verify" value="$lt{'vc'}" /> +<input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'} </td><td bgcolor="#DDDDCC"> -<input type="submit" name="versions" value="$lt{'cv'}" /> + <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'} $dumpbut +$exportbut </td></tr></table> </form> ENDCOURSEVERIFY @@ -1103,23 +1965,31 @@ ENDCOURSEVERIFY # --------------------------------------------------------- Standard documents $r->print('<table border=2 cellspacing=4 cellpadding=4>'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents'). - ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); + $r->print('<tr><td bgcolor="#BBBBBB">'); +# '<h2>'.&mt('Main Course Documents'). +# ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; - unless ($folder=~/^default/) { $folder='default'; } + if ($folder eq '' || $folder eq 'supplemental') { + $folder='default'; + $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); + } my $postexec=''; if ($folder eq 'default') { $r->print('<script>this.window.name="loncapaclient";</script>'); } else { - $postexec='self.close();'; + #$postexec='self.close();'; } $hadchanges=0; &editor($r,$coursenum,$coursedom,$folder,$allowed); if ($hadchanges) { - &changewarning($r,$postexec); + &mark_hash_old() } + &changewarning($r,$postexec); my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; + my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. + '.page'; + $r->print(<<ENDFORM); <table cellspacing=4 cellpadding=4><tr> <th bgcolor="#DDDDDD">$lt{'uplm'}</th> @@ -1133,24 +2003,20 @@ $lt{'file'}:<br /> <br /> $lt{'title'}:<br /> <input type="text" size="50" name="comment"> -<input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +$uploadtag <input type="hidden" name="cmd" value="upload_default"> -<input type="submit" value="$lt{'upld'}"> <nobr> +<input type="submit" value="$lt{'upld'}"> $help{'Uploading_From_Harddrive'} </nobr> </form> </td> <td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="simpleeditdefault"> -<input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> -<input type=button onClick= -"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}"> +$uploadtag +<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}"> <nobr> -<input type=button onClick= -"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}"> +<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}"> $help{'Importing_LON-CAPA_Resource'} </nobr> <p> @@ -1162,10 +2028,13 @@ value="$lt{'selm'}"> <input type="submit $help{'Load_Map'}</nobr> </p> </form> -</td><td bgcolor="#DDDDDD"> +</td> +<td bgcolor="#DDDDDD"> +ENDFORM + unless ($ENV{'form.pagepath'}) { + $r->print(<<ENDFORM); <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="folderpath" value="$ENV{'form.folderpath'}" /> <input type=hidden name="importdetail" value=""> <nobr> <input name="newfolder" type="button" @@ -1173,9 +2042,17 @@ onClick="javascript:makenewfolder(this.f value="$lt{'newf'}" />$help{'Adding_Folders'} </nobr> </form> +<form action="/adm/coursedocs" method="post" name="newpage"> +<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type=hidden name="importdetail" value=""> +<nobr> +<input name="newpage" type="button" +onClick="javascript:makenewpage(this.form,'$pageseq');" +value="$lt{'newp'}" />$help{'Adding_Pages'} +</nobr> +</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'}"> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newext" type="button" onClick="javascript:makenewext('newext');" @@ -1183,8 +2060,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext </nobr> </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'}"> +$uploadtag <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> <nobr> @@ -1193,8 +2069,7 @@ value="Syllabus=/public/$coursedom/$cour </nobr> </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'}"> +$uploadtag <input type=hidden name="importdetail" value="Navigate Content=/adm/navmaps"> <nobr> @@ -1203,8 +2078,7 @@ $help{'Navigate_Content'} </nobr> </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'}"> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newsmppg" type="button" value="$lt{'sipa'}" @@ -1212,8 +2086,7 @@ onClick="javascript:makesmppage();" /> $ </nobr> </form> <form action="/adm/coursedocs" method="post" name="newsmpproblem"> -<input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newsmpproblem" type="button" value="$lt{'sipr'}" @@ -1221,8 +2094,7 @@ onClick="javascript:makesmpproblem();" / </nobr> </form> <form action="/adm/coursedocs" method="post" name="newexamupload"> -<input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newexamupload" type="button" value="$lt{'scuf'}" @@ -1231,8 +2103,7 @@ $help{'Score_Upload_Form'} </nobr> </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'}"> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newbulletin" type="button" value="$lt{'bull'}" @@ -1241,8 +2112,7 @@ $help{'Bulletin Board'} </nobr> </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'}"> +$uploadtag <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> <nobr> @@ -1251,26 +2121,62 @@ $help{'My Personal Info'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newaboutsomeone"> -<input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newaboutsomeone" type="button" value="$lt{'abou'}" onClick="javascript:makeabout();" /> </nobr> +ENDFORM + } + if ($ENV{'form.pagepath'}) { + $r->print(<<ENDBLOCK); +<form action="/adm/coursedocs" method="post" name="newsmpproblem"> +$uploadtag +<input type=hidden name="importdetail" value=""> +<nobr> +<input name="newsmpproblem" type="button" value="$lt{'sipr'}" +onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} +</nobr> +</form> +<form action="/adm/coursedocs" method="post" name="newexamupload"> +$uploadtag +<input type=hidden name="importdetail" value=""> +<nobr> +<input name="newexamupload" type="button" value="$lt{'scuf'}" +onClick="javascript:makeexamupload();" /> +$help{'Score_Upload_Form'} +</nobr> +</form> +ENDBLOCK + } else { + $r->print(<<ENDFORM); +</form> +<form action="/adm/imsimportdocs" method="post" name="ims"> +<input type="hidden" name="folder" value="$folder" /> +<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" /> +</nobr> </form> -</td></tr> -</table> ENDFORM + } + $r->print('</td></tr>'."\n". +'</table>'); $r->print('</td></tr>'); } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print( - '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents'). - ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); + $r->print('<tr><td bgcolor="#BBBBBB">'); +# '<h2>'.&mt('Supplemental Course Documents'). +# ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; - unless ($folder=~/supplemental/) { $folder='supplemental'; } + unless ($folder=~/^supplemental/) { + $folder='supplemental'; + } + if ($folder =~ /^supplemental$/ && + $ENV{'form.folderpath'} =~ /^default\&/) { + $ENV{'form.folderpath'}='supplemental&'. + &Apache::lonnet::escape(&mt('Supplemental Course Documents')); + } &editor($r,$coursenum,$coursedom,$folder,$allowed); if ($allowed) { my $folderseq= @@ -1288,8 +2194,8 @@ ENDFORM <br />$lt{'comment'}:<br /> <textarea cols=50 rows=4 name='comment'> </textarea> -<input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<br /> +<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> <input type="hidden" name="cmd" value="upload_supplemental"> <nobr> <input type="submit" value="$lt{'upld'}"> @@ -1299,8 +2205,7 @@ ENDFORM </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="folderpath" value="$ENV{'form.folderpath'}" /> <input type=hidden name="importdetail" value=""> <nobr> <input name="newfolder" type="button" @@ -1309,8 +2214,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol </nobr> </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="folderpath" value="$ENV{'form.folderpath'}" /> <input type=hidden name="importdetail" value=""> <nobr> <input name="newext" type="button" @@ -1319,8 +2223,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext </nobr> </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="folderpath" value="$ENV{'form.folderpath'}" /> <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> <nobr> @@ -1329,8 +2232,7 @@ $help{'Syllabus'} </nobr> </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="folderpath" value="$ENV{'form.folderpath'}" /> <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> <nobr> @@ -1349,7 +2251,8 @@ ENDSUPFORM $r->print('</table>'); } else { # -------------------------------------------------------- This is showdoc mode - $r->print("<h1>".&mt('Uploaded Document').'</h1><p>'. + $r->print("<h1>".&mt('Uploaded Document').' - '. + &Apache::lonnet::gettitle($r->uri).'</h1><p>'. &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>". &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>'); }