--- loncom/interface/londocs.pm 2004/08/22 18:15:54 1.138 +++ loncom/interface/londocs.pm 2005/06/11 13:38:47 1.188 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.138 2004/08/22 18:15:54 raeburn Exp $ +# $Id: londocs.pm,v 1.188 2005/06/11 13:38:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,6 +30,7 @@ package Apache::londocs; use strict; use Apache::Constants qw(:common :http); +use Apache::imsexport; use Apache::lonnet; use Apache::loncommon; use Apache::lonratedt; @@ -40,6 +41,7 @@ use Apache::lonnavmaps; use HTML::Entities; use GDBM_File; use Apache::lonlocal; +use Cwd; my $iconpath; @@ -84,17 +86,17 @@ sub authorhosts { my %outhash=(); my $home=0; my $other=0; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^user\.role\.(au|ca)\.(.+)$/) { my $role=$1; my $realm=$2; - my ($start,$end)=split(/\./,$ENV{$_}); + 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'}; + $ca=$env{'user.name'}; + $cd=$env{'user.domain'}; } else { ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/); } @@ -130,35 +132,41 @@ sub dumpbutton { } } +sub clean { + my ($title)=@_; + $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs; + return $title; +} # -------------------------------------------------------- Actually dump course sub dumpcourse { my $r=shift; - $r->print('<html><head><title>Dump DOCS</title></head>'. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head><title>Dump DOCS</title></head>'. &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space'). '<form name="dumpdoc" method="post">'); my ($home,$other,%outhash)=&authorhosts(); unless ($home) { return ''; } - my $origcrsid=$ENV{'request.course.id'}; + my $origcrsid=$env{'request.course.id'}; my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid); - if (($ENV{'form.authorspace'}) && ($ENV{'form.authorfolder'}=~/\w/)) { + if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { # Do the dumping - unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; } - my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'}); + unless ($outhash{'home_'.$env{'form.authorspace'}}) { return ''; } + my ($ca,$cd)=split(/\@/,$env{'form.authorspace'}); $r->print('<h3>'.&mt('Copying Files').'</h3>'); - my $title=$ENV{'form.authorfolder'}; - $title=~s/[^\w\/]+/\_/g; + my $title=$env{'form.authorfolder'}; + $title=&clean($title); my %replacehash=(); - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.namefor\_(.+)/) { - $replacehash{$1}=$ENV{$_}; + $replacehash{$1}=$env{$_}; } } - my $crs='/uploaded/'.$ENV{'request.course.id'}.'/'; + my $crs='/uploaded/'.$env{'request.course.id'}.'/'; $crs=~s/\_/\//g; foreach (keys %replacehash) { my $newfilename=$title.'/'.$replacehash{$_}; - $newfilename=~s/[^\w\/\.\/]+/\_/g; + $newfilename=&clean($newfilename); my @dirs=split(/\//,$newfilename); my $path='/home/'.$ca.'/public_html'; my $makepath=$path; @@ -173,12 +181,12 @@ sub dumpcourse { if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) { if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) { print $fh &Apache::loncreatecourse::rewritefile( - &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_), + &Apache::loncreatecourse::readfile($env{'request.course.id'},$_), (%replacehash,$crs => '') ); } else { print $fh - &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_); + &Apache::loncreatecourse::readfile($env{'request.course.id'},$_); } $fh->close(); } else { @@ -212,7 +220,7 @@ sub dumpcourse { } my $title=$origcrsdata{'description'}; $title=~s/\s+/\_/gs; - $title=~s/\W//gs; + $title=&clean($title); $r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />'); &tiehash(); $r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>'); @@ -221,12 +229,13 @@ sub dumpcourse { my ($ext)=($_=~/\.(\w+)$/); my $title=$hash{'title_'.$hash{ 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}}; + $title=~s/:/:/g; $r->print('<td>'.($title?$title:' ').'</td>'); unless ($title) { $title=$_; } $title=~s/\.(\w+)$//; - $title=~s/[^\w\/]+/\_/gs; + $title=&clean($title); $title.='.'.$ext; $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n"); } @@ -240,6 +249,7 @@ sub dumpcourse { # ------------------------------------------------------ Generate "export" button sub exportbutton { + return ''; return '</td><td bgcolor="#DDDDCC">'. '<input type="submit" name="exportcourse" value="'. &mt('Export Course to IMS').'" />'. @@ -249,57 +259,57 @@ sub exportbutton { 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'}); + $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'}) { + 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'}; - } - } - my $curRes; - my $count; - my %symbs; - my $display; - while ($curRes = $it->next()) { - if (ref($curRes)) { - $count ++; - $symbs{$count} = $curRes->symb(); - if (grep/^$count$/,@exportitems) { - $display.= 'Export content item '.$curRes->title()."<br />\n"; + my @exportitems = &Apache::loncommon::get_env_multiple('form.archive'); + my @discussions = &Apache::loncommon::get_env_multiple('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 %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'; + my $cwd = &Cwd::getcwd(); + my $imszip = '/home/httpd/'.$imszipfile; + chdir $tempexport; + open(OUTPUT, "zip -r $imszip * 2> /dev/null |"); + close(OUTPUT); + chdir $cwd; + $outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />'; + if ($copyresult) { + $outcome .= 'The following errors occurred during export - '.$copyresult; } - if (grep/^$count$/,@discussions) { - $display.= 'Export discussion posts '.$curRes->title()."<br />\n"; - } + } 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' -)); - - my $exportfile; - $r->print($display); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head><title>Export Course</title></head>'. + &Apache::loncommon::bodytag('Export course to IMS content package')); + $r->print($outcome); $r->print('</body></html>'); } else { my $display; @@ -347,6 +357,12 @@ sub exportcourse { } if (ref($curRes)) { my $symb = $curRes->symb(); + my $ressymb = $symb; + if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) { + unless ($ressymb =~ m|adm/wrapper/adm|) { + $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard'; + } + } my $color = $count%2; $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n". '<input type="checkbox" name="archive" value="'.$count.'" '; @@ -368,7 +384,7 @@ sub exportcourse { my $currelem = $count+$boards+$startcount; $children{$parent{$depth}} .= $currelem.':'; $display .= ' '.$curRes->title().'</td>'; - if ($discussiontime{$symb} > 0) { + if ($discussiontime{$ressymb} > 0) { $boards ++; $currelem = $count+$boards+$startcount; $display .= '<td> </td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" /> </td>'."\n"; @@ -381,13 +397,23 @@ sub exportcourse { <script> function checkAll(field) { - for (i = 0; i < field.length; i++) - field[i].checked = true ; + if (field.length > 0) { + for (i = 0; i < field.length; i++) { + field[i].checked = true ; + } + } else { + field.checked = true + } } - + function uncheckAll(field) { - for (i = 0; i < field.length; i++) - field[i].checked = false ; + if (field.length > 0) { + for (i = 0; i < field.length; i++) { + field[i].checked = false ; + } + } else { + field.checked = false ; + } } function propagateCheck(item) { @@ -422,8 +448,9 @@ function containerCheck(item) { </script> |; - $r->print('<html><head><title>Export Course</title>'.$scripttag.'</head>'. - &Apache::loncommon::bodytag('Export course to IMS or SCORM content package' + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head><title>Export Course</title>'.$scripttag.'</head>'. + &Apache::loncommon::bodytag('Export course to IMS content package' )); $r->print($display.'</table>'. @@ -433,6 +460,365 @@ function containerCheck(item) { } } +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); + } + if (!-e "$$tempexport/resources") { + mkdir("$$tempexport/resources",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{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$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; + my $included = 0; + while ($curRes = $it->next()) { + if ($curRes == $it->BEGIN_MAP()) { + $prevdepth = $depth; + $depth++; + } + if ($curRes == $it->END_MAP()) { + $prevdepth = $depth; + $depth--; + } + + if (ref($curRes)) { + $count ++; + 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) && ($included)) { + print $ims_manifest "\n".' </item>'."\n"; + } + $included = 1; + $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"; + } + if (grep/^$count$/,@$discussions) { + my $ressymb = $symb; + my $mode; + if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) { + unless ($ressymb =~ m|adm/wrapper/adm|) { + $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard'; + } + $mode = 'board'; + } + my %extras = ( + caller => 'imsexport', + tempexport => $tempexport.'/resources', + count => $count + ); + my $discresult = &Apache::lonfeedback::list_discussion($mode,undef,$ressymb,\%extras); + } + $imsresources .= ' </resource>'."\n"; + } + } + $pkgdepth = $depth; + } else { + $included = 0; + } + } + } + while ($pkgdepth > 0) { + 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) { + if ((!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 @uploads = (); + if ($curRes->is_sequence()) { + $content_type = 'sequence'; + } elsif ($curRes->is_page()) { + $content_type = 'page'; # need to handle individual items in pages. + } elsif ($symb =~ m-public/$cdom/$cnum/syllabus$-) { + $content_type = 'syllabus'; + my $contents = &Apache::imsexport::templatedpage($content_type); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-\.sequence___\d+___ext-) { + $content_type = 'external'; + my $title = $curRes->title; + my $contents = &Apache::imsexport::external($symb,$title); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-adm/navmaps$-) { + $content_type = 'navmap'; + } elsif ($symb =~ m-adm/[^/]+/[^/]+/(\d+)/smppg$-) { + $content_type = 'simplepage'; + my $contents = &Apache::imsexport::templatedpage($content_type,$1,$count,\@uploads); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-lib/templates/simpleproblem\.problem$-) { + $content_type = 'simpleproblem'; + my $contents = &Apache::imsexport::simpleproblem($symb); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-lib/templates/examupload\.problem$-) { + $content_type = 'examupload'; + } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) { + $content_type = 'bulletinboard'; + my $contents = &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-adm/([^/]+)/([^/]+)/aboutme$-) { + $content_type = 'aboutme'; + my $contents = &Apache::imsexport::templatedpage($content_type,undef,$count,\@uploads,$1,$2); + if ($contents) { + $$content_file = &store_template($contents,$tempexport,$count,$content_type); + } + } elsif ($symb =~ m-\.(sequence|page)___\d+___uploaded/$cdom/$cnum/-) { + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded'); + } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) { + my $canedit = 0; + if ($2 eq $env{'user.domain'} && $3 eq $env{'user.name'}) { + $canedit= 1; + } + if ($canedit) { + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource'); + } else { + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit'); + } + } elsif ($symb =~ m-uploaded/$cdom/$cnum-) { + $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded'); + } + if (@uploads > 0) { + foreach my $item (@uploads) { + my $uploadmsg = ''; + &replicate_content($cdom,$cnum,$tempexport,$item,$count,\$uploadmsg,$href,'templateupload'); + if ($uploadmsg) { + $$copyresult .= $uploadmsg."\n"; + } + } + } + if ($message) { + $$copyresult .= $message."\n"; + } +} + +sub replicate_content { + my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller) = @_; + my ($map,$ind,$url); + if ($caller eq 'templateupload') { + $url = $symb; + $url =~ s#//#/#g; + } else { + ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + } + my $content; + my $filename; + my $repstatus; + my $content_name; + if ($url =~ m-/([^/]+)$-) { + $filename = $1; + if (!-e $tempexport.'/resources') { + mkdir($tempexport.'/resources',0700); + } + if (!-e $tempexport.'/resources/'.$count) { + mkdir($tempexport.'/resources/'.$count,0700); + } + my $destination = $tempexport.'/resources/'.$count.'/'.$filename; + my $copiedfile; + if ($copiedfile = Apache::File->new('>'.$destination)) { + my $content; + if ($caller eq 'resource') { + $content = &Apache::lonnet::getfile('/home/httpd/html/res/'.$url); + if ($content eq -1) { + $$message = 'Could not copy file '.$filename; + } else { + &extract_media($content,$count,$tempexport,$href,'resource'); + $repstatus = 'ok'; + } + } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') { + my $rtncode; + $repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode); + if ($repstatus eq 'ok') { + if ($url =~ /\.html?$/i) { + &extract_media(\$content,$count,$tempexport,$href,'uploaded'); + } + } else { + $$message = 'Could not render '.$url.' server message - '.$rtncode; + } + } elsif ($caller eq 'noedit') { +# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this. + $repstatus = 'ok'; + $content = 'Not the owner of this resource'; + } + 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 '.$symb."\n"; + } + if ($repstatus eq 'ok') { + $content_name = $count.'/'.$filename; + } + return $content_name; +} + +sub extract_media { + my ($content,$count,$tempexport,$href,$caller) = @_; +# @$href will contain path to any embedded resources in the content. +# For LON-CAPA problems this would be images. applets etc. +# For uploaded HTML files this would be images etc. +# paths will be in the form $count/res/$file, and urls in the $content will be rewritten with the new paths. + return; +} + +sub store_template { + my ($contents,$tempexport,$count,$content_type) = @_; + if ($contents) { + if ($tempexport) { + if (!-e $tempexport.'/resources') { + mkdir($tempexport.'/resources',0700); + } + if (!-e $tempexport.'/resources/'.$count) { + mkdir($tempexport.'/resources/'.$count,0700); + } + my $destination = $tempexport.'/resources/'.$count.'/'.$content_type.'.xml'; + my $storetemplate; + if ($storetemplate = Apache::File->new('>'.$destination)) { + print $storetemplate $contents; + close($storetemplate); + } + if ($content_type eq 'external') { + return $count.'/'.$content_type.'.html'; + } else { + return $count.'/'.$content_type.'.xml'; + } + } + } +} # Imports the given (name, url) resources into the course # coursenum, coursedom, and folder must precede the list @@ -440,11 +826,33 @@ 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; + my $idx = &Apache::lonratedt::getresidx($url); $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx; my $ext = 'false'; if ($url=~/^http:\/\//) { $ext = 'true'; } @@ -454,14 +862,27 @@ 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)=split('&',$ENV{'form.folderpath'}); + my (@folders); + if ($env{'form.pagepath'}) { + @folders = split('&',$env{'form.pagepath'}); + } else { + @folders=split('&',$env{'form.folderpath'}); + } my $folderpath; + my $cpinfo=''; + if ($env{'form.markedcopy_url'}) { + &Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'}); + $cpinfo='&markedcopy_url='. + &Apache::lonnet::escape($env{'form.markedcopy_url'}). + '&markedcopy_title='. + &Apache::lonnet::escape($env{'form.markedcopy_title'}); + } while (@folders) { my $folder=shift(@folders); my $foldername=shift(@folders); @@ -470,7 +891,7 @@ sub breadcrumbs { my $url='/adm/coursedocs?folderpath='. &Apache::lonnet::escape($folderpath); &Apache::lonhtmlcommon::add_breadcrumb( - {'href'=>$url, + {'href'=>$url.$cpinfo, 'title'=>&Apache::lonnet::unescape($foldername), 'text'=>'<font size="+1">'. &Apache::lonnet::unescape($foldername).'</font>' @@ -483,49 +904,60 @@ sub breadcrumbs { } sub editor { - my ($r,$coursenum,$coursedom,$folder,$allowed)=@_; - - $r->print(&breadcrumbs($folder)); + my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_; 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]=''; + my $idx=&Apache::lonratedt::getresidx(); + if ($idx<=0) { $idx=1; } + $Apache::lonratedt::order[0]=$idx; + $Apache::lonratedt::resources[$idx]=''; + } + if (defined($env{'form.markcopy'})) { +# Mark for copying + my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$env{'form.markcopy'}]]); + $env{'form.markedcopy_title'}=$title; + $env{'form.markedcopy_url'}=$url; } + $r->print(&breadcrumbs($folder)); if ($fatal) { $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)) { + if (($allowed) && ($env{'form.folder'} eq $folder)) { # set parameters and change order - if (defined($ENV{'form.setparms'})) { - my $idx=$ENV{'form.setparms'}; + 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'); + 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}) { + 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}) { + 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'}) { + if ($env{'form.newpos'}) { # change order - my $newpos=$ENV{'form.newpos'}-1; - my $currentpos=$ENV{'form.currentpos'}-1; + my $newpos=$env{'form.newpos'}-1; + my $currentpos=$env{'form.currentpos'}-1; my $i; my @neworder=(); if ($newpos>$currentpos) { @@ -557,57 +989,73 @@ sub editor { } # store the changed version - ($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; } } + if ($env{'form.pastemarked'}) { +# paste resource to end of list + my $url=$env{'form.markedcopy_url'}; + my $title=$env{'form.markedcopy_title'}; +# Maps need to be copied first + if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { + $title=&mt('Copy of').' '.$title; + my $newid=$$.time; + $url=~/^(.+)\.(\w+)$/; + my $newurl=$1.$newid.'.'.$2; + my $storefn=$newurl; + $storefn=~s/^\/\w+\/\w+\/\w+\///; + &Apache::loncreatecourse::writefile + ($env{'request.course.id'},$storefn, + &Apache::lonnet::getfile($url)); + $url=$newurl; + } + $title=~s/\</\<\;/g; + $title=~s/\>/\>\;/g; + $title=~s/\:/\:/g; + my $ext='false'; + if ($url=~/^http\:\/\//) { $ext='true'; } + $url=~s/\:/\:/g; +# Now insert the URL at the bottom + my $newidx=&Apache::lonratedt::getresidx($url); + $Apache::lonratedt::resources[$newidx]= + $title.':'.$url.':'.$ext.':normal:res'; + $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx; +# Store the result + ($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/) || ($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,'docs'); - my $ext='false'; - if ($url=~/^http\:\/\//) { $ext='true'; } - $url=~s/\:/\:/g; - my $comment=$ENV{'form.comment'}; - $comment=~s/\</\<\;/g; - $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; - - ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence'); - if ($fatal) { - $r->print('<p><font color="red">'.$errtext.'</font></p>'); - return; - } - } - } - if ($ENV{'form.cmd'}) { - my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'}); + } + $r->print($upload_output); + 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/|) { + if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && + ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/)) { &Apache::lonnet::removeuploadedurl($url); + } else { + &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]); } for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { $Apache::lonratedt::order[$i]= $Apache::lonratedt::order[$i+1]; } $#Apache::lonratedt::order--; + } elsif ($cmd eq 'cut') { + my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]); + &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]); + 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]; @@ -623,31 +1071,33 @@ 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]]); my $comment= - &HTML::Entities::decode($ENV{'form.title'}); + &HTML::Entities::decode($env{'form.title'}); $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; } } # Group import/search - if ($ENV{'form.importdetail'}) { + if ($env{'form.importdetail'}) { my @imports; - foreach (split(/\&/,$ENV{'form.importdetail'})) { + foreach (split(/\&/,$env{'form.importdetail'})) { if (defined($_)) { my ($name,$url)=split(/\=/,$_); $name=&Apache::lonnet::unescape($name); @@ -657,17 +1107,17 @@ 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; } } # 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++; + if (($env{'form.importmap'}) && ($env{'form.loadmap'})) { + foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) { + my ($title,$url,$ext,$type)=split(/\:/,$_); + my $idx=&Apache::lonratedt::getresidx($url); $Apache::lonratedt::resources[$idx]=$_; $Apache::lonratedt::order [$#Apache::lonratedt::order+1]=$idx; @@ -675,7 +1125,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; @@ -685,21 +1135,167 @@ 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; } + unless ($name) { $idx++; next; } $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum)); $idx++; + $shown++; } - unless ($idx) { + unless ($shown) { $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); } - $r->print('</table>'); + $r->print("\n</table>\n"); + if ($env{'form.markedcopy_url'}) { + $r->print(<<ENDPASTE); +<p><form name="pasteform" action="/adm/coursedocs" method="post"> +<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" /> +<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" /> +ENDPASTE + $r->print( + '<input type="submit" name="pastemarked" value="'.&mt('Paste'). + '" /> '.&Apache::loncommon::filedescription( + (split(/\./,$env{'form.markedcopy_url'}))[-1]).': '. + $env{'form.markedcopy_title'}); + if ($container eq 'page') { + $r->print(<<PAGEINFO); +<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" /> +<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" /> +PAGEINFO + } else { + $r->print(<<FOLDERINFO); +<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> +FOLDERINFO + } + $r->print('</form></p>'); + } } } +sub process_file_upload { + my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase) = @_; +# upload a file, if present + my $parseaction; + if ($env{'form.parserflag'}) { + $parseaction = 'parse'; + } + my $phase_status; + my $folder=$env{'form.folder'}; + if ($folder eq '' || $folder eq 'supplemental') { + $folder='default'; + } + if ( ($folder=~/^$1/) || ($1 eq 'default') ) { + my $errtext=''; + my $fatal=0; + my $container='sequence'; + if ($env{'form.pagepath'}) { + $container='page'; + } + ($errtext,$fatal)= + &mapread($coursenum,$coursedom,$folder.'.'.$container); + if ($#Apache::lonratedt::order<1) { + $Apache::lonratedt::order[0]=1; + $Apache::lonratedt::resources[1]=''; + } + if ($fatal) { + return 'failed'; + } + my $destination = 'docs/'; + if ($folder eq 'default') { + $destination .= 'default/'; + } elsif ($folder =~ /^default_(\d+)$/) { + $destination .= $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 $newidx=&Apache::lonratedt::getresidx(); + $destination .= $newidx; + my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,$parseaction,$allfiles,$codebase); + my $ext='false'; + if ($url=~/^http\:\/\//) { $ext='true'; } + $url=~s/\:/\:/g; + my $comment=$env{'form.comment'}; + $comment=~s/\</\<\;/g; + $comment=~s/\>/\>\;/g; + $comment=~s/\:/\:/g; + if ($folder=~/^supplemental/) { + $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'. + $env{'user.domain'}.'___&&&___'.$comment; + } + + $Apache::lonratedt::resources[$newidx]= + $comment.':'.$url.':'.$ext.':normal:res'; + $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= + $newidx; + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); + if ($fatal) { + $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>'; + return 'failed'; + } else { + if ($parseaction eq 'parse') { + my $total_embedded = keys %{$allfiles}; + if ($total_embedded > 0) { + my $num = 0; + $$upload_output .= 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br /> + <form name="upload_embedded" action="/adm/coursedocs" + method="post" enctype="multipart/form-data"> + <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" /> <input type="hidden" name="cmd" value="upload_embedded" /> + <input type="hidden" name="newidx" value="'.$newidx.'" /> + <input type="hidden" name="primaryurl" value="'.&Apache::lonnet::escape($url).'" /> + <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />'; + $$upload_output .= '<b>Upload embedded files</b>:<br /> + <table>'; + foreach my $embed_file (keys %{$allfiles}) { + $$upload_output .= '<tr><td>'.$embed_file. + '<input name="embedded_item_'.$num.'" type="file"> + <input name="embedded_orig_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($embed_file).'"/>'; + my $attrib; + if (@{$$allfiles{$embed_file}} > 1) { + $attrib = join(':',@{$$allfiles{$embed_file}}); + } else { + $attrib = $$allfiles{$embed_file}[0]; + } + $$upload_output .= + '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />'; + if (exists($$codebase{$embed_file})) { + $$upload_output .= + '<input name="codebase_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($$codebase{$embed_file}).'" />'; + } + $$upload_output .= '</td></tr>'; + $num ++; + } + $phase_status = 'phasetwo'; + $$upload_output .= '</table><br /> + <input type ="submit" value="Complete upload" /> + </form>'; + } else { + $$upload_output .= 'No embedded items identified<br />'; + } + } + } + } + return $phase_status; +} + +sub process_secondary_uploads { + my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_; + my $folder=$env{'form.folder'}; + my $destination = 'docs/'; + if ($folder eq 'default') { + $destination .= 'default/'; + } elsif ($folder =~ /^default_(\d+)$/) { + $destination .= $1.'/'; + } + $destination .= $newidx; + my ($url,$filename); + $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination); + ($filename) = ($url =~ m-^/uploaded/$coursedom/$coursenum/$destination/(.+)$-); + return $filename; +} + # --------------------------------------------------------------- An entry line sub entryline { @@ -709,6 +1305,7 @@ sub entryline { &Apache::lonnet::unescape($title)),'"<>&\''); my $renametitle=$title; my $foldertitle=$title; + my $pagetitle=$title; my $orderidx=$Apache::lonratedt::order[$index]; if ($title=~ /^(\d+)___&&&___(\w+)___&&&___(\w+)___&&&___(.*)$/ ) { $foldertitle=&Apache::lontexconvert::msgtexconverted($4); @@ -720,15 +1317,37 @@ sub entryline { $renametitle=~s/\"\;/\\\"/g; my $line='<tr>'; # Edit commands + my $container; my $folderpath; - if ($ENV{'form.folderpath'}) { - $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'}); - # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); + 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'}); + } + my $cpinfo=''; + if ($env{'form.markedcopy_url'}) { + $cpinfo='&markedcopy_url='. + &Apache::lonnet::escape($env{'form.markedcopy_url'}). + '&markedcopy_title='. + &Apache::lonnet::escape($env{'form.markedcopy_title'}); } if ($allowed) { my $incindex=$index+1; my $selectbox=''; - if ($folder!~/^supplemental/) { + if (($folder!~/^supplemental/) && + ($#Apache::lonratedt::order>0) && + ((split(/\:/, + $Apache::lonratedt::resources[$Apache::lonratedt::order[0]]))[1] + ne '') && + ((split(/\:/, + $Apache::lonratedt::resources[$Apache::lonratedt::order[1]]))[1] + ne '')) { $selectbox= '<input type="hidden" name="currentpos" value="'.$incindex.'" />'. '<select name="newpos" onChange="this.form.submit()">'; @@ -745,33 +1364,73 @@ sub entryline { 'up' => 'Move Up', 'dw' => 'Move Down', 'rm' => 'Remove', - 'rn' => 'Rename'); - $line.=(<<END); + 'ct' => 'Cut', + 'rn' => 'Rename', + 'cp' => 'Copy'); + 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="markedcopy_url" value="$env{'form.markedcopy_url'}" /> +<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" /> +<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$cpinfo'> +<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$cpinfo'> +<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:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'> +<font size="-2" color="#550044">$lt{'ct'}</font></a> +<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'> +<font size="-2" color="#009900">$lt{'rn'}</font></a> +<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'> +<font size="-2" color="#000099">$lt{'cp'}</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="folderpath" value="$env{'form.folderpath'}" /> +<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" /> +<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" /> <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&folderpath=$folderpath'> +<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'> <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&folderpath=$folderpath'> +<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'> <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("$folderpath","$index","$renametitle");'> +<a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'> <font size="-2" color="#990000">$lt{'rm'}</font></a> -<a href='javascript:changename("$folderpath","$index","$renametitle");'> -<font size="-2" color="#009900">$lt{'rn'}</font></a></td> +<a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'> +<font size="-2" color="#550044">$lt{'ct'}</font></a> +<a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'> +<font size="-2" color="#009900">$lt{'rn'}</font></a> +<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'> +<font size="-2" color="#000099">$lt{'cp'}</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'; @@ -779,16 +1438,22 @@ END $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 ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) { + 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. + $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. + $env{'course.'.$env{'request.course.id'}.'.num'}.'/'.$folder. '.sequence'). '___'.$residx.'___'. &Apache::lonnet::declutter($url)); @@ -804,19 +1469,49 @@ END } 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'}; + my $folderpath=$env{'form.folderpath'}; if ($folderpath) { $folderpath.='&' }; $folderpath.=$folderarg.'&'.$foldername; - $url.='folderpath='.&Apache::lonnet::escape($folderpath); - $parameterset=&mt('Randomly Pick: '). - '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'. - (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />'; + $url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo; + $parameterset='<label>'.&mt('Randomly Pick: '). + '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'. + (&Apache::lonratedt::getparameter($orderidx, + 'parameter_randompick'))[0]. + '" />'. +'<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></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).$cpinfo; } $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon. '" border="0"></a></td>'. @@ -824,21 +1519,17 @@ END if (($allowed) && ($folder!~/^supplemental/)) { my %lt=&Apache::lonlocal::texthash( 'hd' => 'Hidden', - 'ec' => 'URL hidden', - 'sp' => 'Store Parameters'); + 'ec' => 'URL hidden'); 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'> -<input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td> +<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td> <td bgcolor="#BBBBFF"><font size='-2'> -<input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td> +<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $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 } $line.="</form></tr>"; @@ -850,14 +1541,14 @@ ENDPARMS sub tiehash { my ($mode)=@_; $hashtied=0; - if ($ENV{'request.course.fn'}) { + if ($env{'request.course.fn'}) { if ($mode eq 'write') { - if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", + 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", + if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db", &GDBM_READER(),0640)) { $hashtied=1; } @@ -874,6 +1565,7 @@ sub untiehash { sub checkonthis { my ($r,$url,$level,$title)=@_; + $url=&Apache::lonnet::unescape($url); $alreadyseen{$url}=1; $r->rflush(); if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { @@ -886,7 +1578,7 @@ sub checkonthis { if ($url=~/^\/res\//) { my $result=&Apache::lonnet::repcopy( &Apache::lonnet::filelocation('',$url)); - if ($result==OK) { + if ($result eq 'ok') { $r->print('<font color="green">'.&mt('ok').'</font>'); $r->rflush(); &Apache::lonnet::countacc($url); @@ -898,23 +1590,20 @@ sub checkonthis { $r->print(' '); } $r->print('- '.&mt('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))); - undef($Apache::lonhomework::parsing_a_problem); - $ENV{'request.filename'}=$oldpath; - if (($Apache::lonxml::errorcount) || - ($Apache::lonxml::warningcount)) { - if ($Apache::lonxml::errorcount) { + my ($errorcount,$warningcount)=split(/:/, + &Apache::lonnet::ssi_body($url, + ('grade_target'=>'web', + 'return_only_error_and_warning_counts' => 1))); + if (($errorcount) || + ($warningcount)) { + if ($errorcount) { $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'. - $Apache::lonxml::errorcount.' '. + $errorcount.' '. &mt('error(s)').'</b></font> '); } - if ($Apache::lonxml::warningcount) { + if ($warningcount) { $r->print('<font color="blue">'. - $Apache::lonxml::warningcount.' '. + $warningcount.' '. &mt('warning(s)').'</font>'); } } else { @@ -929,9 +1618,9 @@ sub checkonthis { &checkonthis($r,$_,$level+1); } } - } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { + } elsif ($result eq 'unavailable') { $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>'); - } elsif ($result==HTTP_NOT_FOUND) { + } elsif ($result eq 'not_found') { unless ($url=~/\$/) { $r->print('<font color="red"><b>'.&mt('not found').'</b></font>'); } else { @@ -952,15 +1641,23 @@ sub verifycontent { my $r=shift; my $loaderror=&Apache::lonnet::overloaderror($r); if ($loaderror) { return $loaderror; } - - $r->print('<html><head><title>Verify Content</title></head>'. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head><title>Verify Content</title></head>'. &Apache::loncommon::bodytag('Verify Course Documents')); $hashtied=0; undef %alreadyseen; %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}); } } @@ -973,7 +1670,8 @@ sub verifycontent { sub checkversions { my $r=shift; - $r->print('<html><head><title>Check Versions</title></head>'. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head><title>Check Versions</title></head>'. &Apache::loncommon::bodytag('Check Course Document Versions')); my $header=''; my $startsel=''; @@ -985,20 +1683,20 @@ sub checkversions { my $starttime=0; my $haschanged=0; my %setversions=&Apache::lonnet::dump('resourceversions', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); $hashtied=0; &tiehash(); my %newsetversions=(); - if ($ENV{'form.setmostrecent'}) { + if ($env{'form.setmostrecent'}) { $haschanged=1; foreach (keys %hash) { if ($_=~/^ids\_(\/res\/.+)$/) { $newsetversions{$1}='mostrecent'; } } - } elsif ($ENV{'form.setcurrent'}) { + } elsif ($env{'form.setcurrent'}) { $haschanged=1; foreach (keys %hash) { if ($_=~/^ids\_(\/res\/.+)$/) { @@ -1008,21 +1706,21 @@ sub checkversions { } } } - } elsif ($ENV{'form.setversions'}) { + } elsif ($env{'form.setversions'}) { $haschanged=1; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.set_version_(.+)$/) { my $src=$1; - if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) { - $newsetversions{$src}=$ENV{$_}; + if (($env{$_}) && ($env{$_} ne $setversions{$src})) { + $newsetversions{$src}=$env{$_}; } } } } if ($haschanged) { if (&Apache::lonnet::put('resourceversions',\%newsetversions, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') { + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>'); } else { $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>'); @@ -1030,7 +1728,7 @@ sub checkversions { &mark_hash_old(); } &changewarning($r,''); - if ($ENV{'form.timerange'} eq 'all') { + if ($env{'form.timerange'} eq 'all') { # show all documents $header=&mt('All Documents in Course'); $allsel=1; @@ -1043,28 +1741,28 @@ sub checkversions { } else { # show documents which changed %changes=&Apache::lonnet::dump - ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + ('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; + unless ($env{'form.timerange'}) { + $env{'form.timerange'}=604800; } - my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' ' + my $seltext=&mt('during the last').' '.$env{'form.timerange'}.' ' .&mt('seconds'); - if ($ENV{'form.timerange'}==-1) { + if ($env{'form.timerange'}==-1) { $seltext='since start of course'; $startsel='selected'; - $ENV{'form.timerange'}=time; + $env{'form.timerange'}=time; } - $starttime=time-$ENV{'form.timerange'}; - if ($ENV{'form.timerange'}==2592000) { + $starttime=time-$env{'form.timerange'}; + if ($env{'form.timerange'}==2592000) { $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; $monthsel='selected'; - } elsif ($ENV{'form.timerange'}==604800) { + } elsif ($env{'form.timerange'}==604800) { $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; $weeksel='selected'; - } elsif ($ENV{'form.timerange'}==86400) { + } elsif ($env{'form.timerange'}==86400) { $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; $daysel='selected'; } @@ -1074,8 +1772,8 @@ sub checkversions { } } %setversions=&Apache::lonnet::dump('resourceversions', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); my %lt=&Apache::lonlocal::texthash ('st' => 'Version changes since start of Course', 'lm' => 'Version changes since last Month', @@ -1236,19 +1934,30 @@ sub is_hash_old { } sub changewarning { - my ($r,$postexec)=@_; + my ($r,$postexec,$message,$url)=@_; if (!&is_hash_old()) { return; } - $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?folderpath='. -&Apache::lonnet::escape($ENV{'form.folderpath'}). + my $pathvar='folderpath'; + my $path=&Apache::lonnet::escape($env{'form.folderpath'}); + if (!defined($url)) { + if (defined($env{'form.pagepath'})) { + $pathvar='pagepath'; + $path=&Apache::lonnet::escape($env{'form.pagepath'}); + $path.='&symb='.&Apache::lonnet::escape($env{'form.pagesymb'}); + } + $url='/adm/coursedocs?'.$pathvar.'='.$path; + } + if (!defined($message)) { + $message='Changes will become active for your current session after [_1], or the next time you log in.'; + } + $r->print("\n\n". +'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". +'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'. +'<input type="hidden" name="orgurl" value="'.$url. '" /><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="'. -&mt('re-initializing course').'" onClick="reinit(this.form)"/>'.&mt(', or the next time you log in.'). -$help{'Caching'}.'</font></h3></form>'); +&mt($message,' <input type="hidden" name="'. + $env{'request.role'}.'" value="1" /><input type="button" value="'. + &mt('re-initializing course').'" onClick="reinit(this.form)" />'). +$help{'Caching'}.'</font></h3></form>'."\n\n"); } # ================================================================ Main Handler @@ -1262,7 +1971,7 @@ sub handler { foreach ('Adding_Course_Doc','Main_Course_Documents', 'Adding_External_Resource','Navigate_Content', 'Adding_Folders','Docs_Overview', 'Load_Map', - 'Supplemental', 'Score_Upload_Form', + '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_'.$_); @@ -1279,41 +1988,55 @@ 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'}) { + + if ($env{'form.verify'}) { &verifycontent($r); - } elsif ($ENV{'form.versions'}) { + } elsif ($env{'form.versions'}) { &checkversions($r); - } elsif ($ENV{'form.dumpcourse'}) { + } elsif ($env{'form.dumpcourse'}) { &dumpcourse($r); - } elsif ($ENV{'form.exportcourse'}) { + } elsif ($env{'form.exportcourse'}) { &exportcourse($r); } else { # is this a standard course? - my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//); - my $forcestandard; + my $standard=($env{'request.course.uri'}=~/^\/uploaded\//); + 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'}, - ['folderpath']); - if ($ENV{'form.folderpath'}) { - my (@folderpath)=split('&',$ENV{'form.folderpath'}); - $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath)); - $ENV{'form.folder'}=pop(@folderpath); - } + ['folderpath','pagepath','pagesymb','markedcopy_url','markedcopy_title']); + 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; } unless ($showdoc) { # got called from remote - $forcestandard=($ENV{'form.folder'}=~/^default_/); - $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/); + 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? - $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); + $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); if ($allowed) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']); $script=&Apache::lonratedt::editscript('simple'); @@ -1326,25 +2049,26 @@ sub handler { } # get course data - my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; - my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; + 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 $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') . "/"; + $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); my $now=time; # print screen + my $html=&Apache::lonxml::xmlbegin(); $r->print(<<ENDDOCUMENT); -<html> +$html <head> <title>The LearningOnline Network with CAPA</title> <script> @@ -1362,6 +2086,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'); @@ -1413,16 +2145,20 @@ function makeabout() { this.document.forms.newaboutsomeone.importdetail.value= 'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; this.document.forms.newaboutsomeone.submit(); - } + } else { + alert("Not a valid user\@domain"); + } + } else { + alert("Please enter both user and domain in the format user\@domain"); } } } 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 + 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; } @@ -1435,24 +2171,63 @@ function finishpick() { '";this.document.forms.'+form+'.submit();'); } -function changename(folderpath,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.folderpath.value=folderpath; + 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(folderpath,index,oldtitle) { - if (confirm('Remove "'+oldtitle+'"?')) { +function removeres(folderpath,index,oldtitle,container,pagesymb) { + if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { this.document.forms.renameform.cmd.value='del_'+index; - this.document.forms.renameform.folderpath.value=folderpath; + 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 cutres(folderpath,index,oldtitle,container,pagesymb) { + if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) { + this.document.forms.renameform.cmd.value='cut_'+index; + this.document.forms.renameform.markcopy.value=index; + 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 markcopy(folderpath,index,oldtitle,container,pagesymb) { + this.document.forms.renameform.markcopy.value=index; + 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 @@ -1462,19 +2237,104 @@ ENDNEWSCRIPT &Apache::loncommon::bodytag('Course Documents','',$events, '','',$showdoc). &Apache::loncommon::help_open_menu('','','','',273,'RAT')); - unless ($showdoc) { + my %allfiles = (); + my %codebase = (); + my ($upload_result,$upload_output); + if ($allowed) { + if (($env{'form.uploaddoc.filename'}) && ($env{'form.cmd'}=~/^upload_(\w+)/)) { +# Process file upload - phase one - upload and parse primary file. + $upload_result = &process_file_upload(\$upload_output,$coursenum,$coursedom,\%allfiles,\%codebase); + if ($upload_result eq 'phasetwo') { + $r->print($upload_output); + } + } elsif ($env{'form.phasetwo'}) { + my %newname = (); + my %origname = (); + my %attribs = (); + my $updateflag = 0; + my $residx = $env{'form.newidx'}; + my $primary_url = &Apache::lonnet::unescape($env{'form.primaryurl'}); +# Process file upload - phase two - gather secondary files. + for (my $i=0; $i<$env{'form.phasetwo'}; $i++) { + if ($env{'form.embedded_item_'.$i.'.filename'}) { + my $javacodebase; + $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx); + $origname{$i} = &Apache::lonnet::unescape($env{'form.embedded_orig_'.$i}); + if (exists($env{'form.embedded_codebase_'.$i})) { + $javacodebase = &Apache::lonnet::unescape($env{'form.embedded_codebase_'.$i}); + $origname{$i} =~ s#^\Q$javacodebase\E/##; + } + my @attributes = (); + if ($env{'form.embedded_attrib_'.$i} =~ /:/) { + @attributes = split/:/,$env{'form.embedded_attrib_'.$i}; + } else { + @attributes = ($env{'form.embedded_attrib_'.$i}); + } + foreach (@attributes) { + push(@{$attribs{$i}},&Apache::lonnet::unescape($_)); + } + if ($javacodebase) { + $codebase{$i} = $javacodebase; + $codebase{$i} =~ s#/$##; + $updateflag = 1; + } + } + unless ($newname{$i} eq $origname{$i}) { + $updateflag = 1; + } + } +# Process file upload - phase three - modify primary file + if ($updateflag) { + my ($content,$rtncode); + my $updateflag = 0; + my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode); + if ($getstatus eq 'ok') { + foreach my $item (keys %newname) { + if ($newname{$item} ne $origname{$item}) { + my $attrib_regexp = ''; + if (@{$attribs{$item}} > 1) { + $attrib_regexp = join('|',@{$attribs{$item}}); + } else { + $attrib_regexp = $attribs{$item}[0]; + } + if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) { + } + $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi; + } + if (exists($codebase{$item})) { + $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i; + } + } +# Save edited file. + my $saveresult; + my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; + my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; + my $docuhome=$env{'course.'.$env{'request.course.id'}.'.home'}; + my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,$docuhome,\$saveresult); + } else { + &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus); + } + } + } + } + + unless ($showdoc || $upload_result eq 'phasetwo') { # ----------------------------------------------------------------------------- my %lt=&Apache::lonlocal::texthash( 'uplm' => 'Upload a new main course document', 'upls' => 'Upload a new supplemental course document', - 'impp' => 'Import a published document', + 'impp' => 'Import a document', + 'pubd' => 'Published documents', + 'copm' => 'All documents out of a published map into this folder', 'spec' => 'Special documents', 'upld' => 'Upload Document', 'srch' => 'Search', 'impo' => 'Import', 'selm' => 'Select Map', 'load' => 'Load Map', + 'reco' => 'Recover Deleted Resources', 'newf' => 'New Folder', + 'newp' => 'New Composite Page', 'extr' => 'External Resource', 'syll' => 'Syllabus', 'navc' => 'Navigate Contents', @@ -1487,7 +2347,8 @@ ENDNEWSCRIPT 'imsf' => 'Import IMS package', 'file' => 'File', 'title' => 'Title', - 'comment' => 'Comment' + 'comment' => 'Comment', + 'parse' => 'If HTML file, upload embedded images/multimedia files' ); # ----------------------------------------------------------------------------- if ($allowed) { @@ -1498,23 +2359,29 @@ ENDNEWSCRIPT 'cv' => 'Check/Set Resource Versions', ); - my $folderpath=$ENV{'form.folderpath'}; + my $folderpath=$env{'form.folderpath'}; if (!$folderpath) { - if ($ENV{'form.folder'} eq '' || - $ENV{'form.folder'} eq 'supplemental') { + 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="folderpath" /> +<input type="hidden" name="markcopy" /> +$containertag </form> <form name="simpleedit" method="post" action="/adm/coursedocs"> <input type=hidden name="importdetail" value=""> -<input type="hidden" name="folderpath" value="$folderpath" /> +$uploadtag </form> <form action="/adm/coursedocs" method="post" name="courseverify"> <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4"> @@ -1536,10 +2403,10 @@ ENDCOURSEVERIFY $r->print('<tr><td bgcolor="#BBBBBB">'); # '<h2>'.&mt('Main Course Documents'). # ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); - my $folder=$ENV{'form.folder'}; + my $folder=$env{'form.folder'}; if ($folder eq '' || $folder eq 'supplemental') { $folder='default'; - $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); + $env{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); } my $postexec=''; if ($folder eq 'default') { @@ -1548,13 +2415,20 @@ ENDCOURSEVERIFY #$postexec='self.close();'; } $hadchanges=0; - &editor($r,$coursenum,$coursedom,$folder,$allowed); + &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output); if ($hadchanges) { &mark_hash_old() } &changewarning($r,$postexec); my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; + my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. + '.page'; + my $container='sequence'; + if ($env{'form.pagepath'}) { + $container='page'; + } + my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; $r->print(<<ENDFORM); <table cellspacing=4 cellpadding=4><tr> <th bgcolor="#DDDDDD">$lt{'uplm'}</th> @@ -1563,13 +2437,20 @@ ENDCOURSEVERIFY </tr> <tr><td bgcolor="#DDDDDD"> $lt{'file'}:<br /> -<form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> +<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data"> <input type="file" name="uploaddoc" size="40"> <br /> $lt{'title'}:<br /> <input type="text" size="50" name="comment"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type="hidden" name="cmd" value="upload_default"> +<br /> +<nobr> +$lt{'parse'}? +<input type="checkbox" name="parserflag" /> +</nobr> +<br /> +<br /> <nobr> <input type="submit" value="$lt{'upld'}"> $help{'Uploading_From_Harddrive'} @@ -1578,7 +2459,8 @@ $lt{'title'}:<br /> </td> <td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="simpleeditdefault"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$lt{'pubd'}<br /> +$uploadtag <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}"> <nobr> <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}"> @@ -1586,16 +2468,42 @@ $help{'Importing_LON-CAPA_Resource'} </nobr> <p> <hr /> -<input type="text" size="20" name="importmap"><br /> +$lt{'copm'}<br /> +<input type="text" size="40" name="importmap"><br /> <nobr><input type=button onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}"> $help{'Load_Map'}</nobr> </p> </form> -</td><td bgcolor="#DDDDDD"> +<hr /> +<form action="/adm/groupsort" method="post" name="recover"> +<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1)" value="$lt{'reco'}" /> +</form> +ENDFORM + unless ($env{'form.pagepath'}) { + $r->print(<<ENDFORM); +<hr /> +<form action="/adm/coursedocs" method="post" name="newext"> +$uploadtag +<input type=hidden name="importdetail" value=""> +<nobr> +<input name="newext" type="button" onClick="javascript:makenewext('newext');" +value="$lt{'extr'}" /> $help{'Adding_External_Resource'} +</nobr> +</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> +ENDFORM + } + $r->print('</td><td bgcolor="#DDDDDD">'); + unless ($env{'form.pagepath'}) { + $r->print(<<ENDFORM); <form action="/adm/coursedocs" method="post" name="newfolder"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> <input type=hidden name="importdetail" value=""> <nobr> <input name="newfolder" type="button" @@ -1603,16 +2511,17 @@ onClick="javascript:makenewfolder(this.f value="$lt{'newf'}" />$help{'Adding_Folders'} </nobr> </form> -<form action="/adm/coursedocs" method="post" name="newext"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<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="newext" type="button" onClick="javascript:makenewext('newext');" -value="$lt{'extr'}" /> $help{'Adding_External_Resource'} +<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="newsyl"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> <nobr> @@ -1621,7 +2530,7 @@ value="Syllabus=/public/$coursedom/$cour </nobr> </form> <form action="/adm/coursedocs" method="post" name="newnav"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value="Navigate Content=/adm/navmaps"> <nobr> @@ -1630,7 +2539,7 @@ $help{'Navigate_Content'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newsmppg"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newsmppg" type="button" value="$lt{'sipa'}" @@ -1638,7 +2547,7 @@ onClick="javascript:makesmppage();" /> $ </nobr> </form> <form action="/adm/coursedocs" method="post" name="newsmpproblem"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newsmpproblem" type="button" value="$lt{'sipr'}" @@ -1646,7 +2555,7 @@ onClick="javascript:makesmpproblem();" / </nobr> </form> <form action="/adm/coursedocs" method="post" name="newexamupload"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newexamupload" type="button" value="$lt{'scuf'}" @@ -1655,7 +2564,7 @@ $help{'Score_Upload_Form'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newbul"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newbulletin" type="button" value="$lt{'bull'}" @@ -1664,7 +2573,7 @@ $help{'Bulletin Board'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newaboutme"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> <nobr> @@ -1673,21 +2582,38 @@ $help{'My Personal Info'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newaboutsomeone"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +$uploadtag <input type=hidden name="importdetail" value=""> <nobr> <input name="newaboutsomeone" type="button" value="$lt{'abou'}" onClick="javascript:makeabout();" /> </nobr> </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();" /> +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> -</td></tr> -</table> -ENDFORM +<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 + } + $r->print('</td></tr>'."\n". +'</table>'); $r->print('</td></tr>'); } # ----------------------------------------------------- Supplemental documents @@ -1695,13 +2621,13 @@ ENDFORM $r->print('<tr><td bgcolor="#BBBBBB">'); # '<h2>'.&mt('Supplemental Course Documents'). # ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); - my $folder=$ENV{'form.folder'}; + my $folder=$env{'form.folder'}; unless ($folder=~/^supplemental/) { $folder='supplemental'; } if ($folder =~ /^supplemental$/ && - $ENV{'form.folderpath'} =~ /^default\&/) { - $ENV{'form.folderpath'}='supplemental&'. + $env{'form.folderpath'} =~ /^default\&/) { + $env{'form.folderpath'}='supplemental&'. &Apache::lonnet::escape(&mt('Supplemental Course Documents')); } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -1722,7 +2648,7 @@ ENDFORM <textarea cols=50 rows=4 name='comment'> </textarea> <br /> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> <input type="hidden" name="cmd" value="upload_supplemental"> <nobr> <input type="submit" value="$lt{'upld'}"> @@ -1732,7 +2658,7 @@ ENDFORM </td> <td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="supnewfolder"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> <input type=hidden name="importdetail" value=""> <nobr> <input name="newfolder" type="button" @@ -1741,7 +2667,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol </nobr> </form> <form action="/adm/coursedocs" method="post" name="supnewext"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> <input type=hidden name="importdetail" value=""> <nobr> <input name="newext" type="button" @@ -1750,7 +2676,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext </nobr> </form> <form action="/adm/coursedocs" method="post" name="supnewsyl"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> <nobr> @@ -1759,7 +2685,7 @@ $help{'Syllabus'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="subnewaboutme"> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> <nobr> @@ -1773,14 +2699,17 @@ ENDSUPFORM } } if ($allowed) { - $r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>'); + $r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>'); } $r->print('</table>'); } else { + unless ($upload_result eq 'phasetwo') { # -------------------------------------------------------- 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>'); + &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>'); + } } } $r->print('</body></html>');