| '.&mt('Internal Filename').' | '.&mt('Title').' | '.&mt('Save as ...').' |
|---|
');
@@ -223,12 +229,13 @@ sub dumpcourse {
my ($ext)=($_=~/\.(\w+)$/);
my $title=$hash{'title_'.$hash{
'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+ $title=~s/:/:/g;
$r->print(''.($title?$title:' ').' | ');
unless ($title) {
$title=$_;
}
$title=~s/\.(\w+)$//;
- $title=~s/[^\w\/]+/\_/gs;
+ $title=&clean($title);
$title.='.'.$ext;
$r->print("\n | \n");
}
@@ -242,6 +249,7 @@ sub dumpcourse {
# ------------------------------------------------------ Generate "export" button
sub exportbutton {
+ return '';
return ''.
''.
@@ -251,7 +259,7 @@ 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);
@@ -260,26 +268,12 @@ sub exportcourse {
&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 @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
+ my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
if (@exportitems == 0 && @discussions == 0) {
$outcome = '
As you did not select any content items or discussions for export, an IMS package has not been created. Please go back to select either content items or discussions for export';
} else {
@@ -296,20 +290,14 @@ sub exportcourse {
#Create zip file in prtspool
my $imszipfile = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+ $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 IMS course archive
';
if ($copyresult) {
$outcome .= 'The following errors occurred during export - '.$copyresult;
@@ -318,8 +306,8 @@ sub exportcourse {
$outcome = '
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.
';
}
}
-
- $r->print('Export Course'.
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'Export Course'.
&Apache::loncommon::bodytag('Export course to IMS content package'));
$r->print($outcome);
$r->print('');
@@ -460,7 +448,8 @@ function containerCheck(item) {
|;
- $r->print('Export Course'.$scripttag.''.
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'Export Course'.$scripttag.''.
&Apache::loncommon::bodytag('Export course to IMS content package'
));
@@ -482,7 +471,7 @@ sub create_ims_store {
if (!-e $$tempexport) {
mkdir($$tempexport,0700);
}
- $$tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
+ $$tempexport .= '/'.$env{'user.domain'}.'_'.$env{'user.name'};
if (!-e $$tempexport) {
mkdir($$tempexport,0700);
}
@@ -499,13 +488,13 @@ sub create_ims_store {
''."\n".
-' '."\n".
-' '."\n".
+' '."\n".
-' '.$ENV{'request.'.$ENV{'request.course.id'}.'.description'}.''
+' '.$env{'request.'.$env{'request.course.id'}.'.description'}.''
} else {
$$outcome .= 'An error occurred opening the IMS manifest file.
'
;
@@ -523,8 +512,8 @@ sub build_package {
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'};
+ 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 ++;
@@ -574,7 +563,7 @@ sub build_package {
$isvisible = 'false';
}
unless ($curRes->is_sequence()) {
- $resourceref = 'identifierref="RES-'.$ENV{'request.course.id'}.'-'.$count.'"';
+ $resourceref = 'identifierref="RES-'.$env{'request.course.id'}.'-'.$count.'"';
}
if (($depth <= $prevdepth) && ($count > 1) && ($included)) {
print $ims_manifest "\n".' '."\n";
@@ -583,7 +572,7 @@ sub build_package {
$prevdepth = $depth;
my $itementry =
- '- '.
''.$curRes->title().'';
print $ims_manifest "\n".$itementry;
@@ -594,7 +583,7 @@ sub build_package {
&process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport);
if ($content_file) {
$imsresources .= "\n".
- ' '."\n".
' '."\n";
foreach (@hrefs) {
@@ -658,7 +647,6 @@ sub process_content {
my $content_type;
my $message;
# find where user is author or co-author
- my %roleshash = &Apache::lonnet::get_my_roles();
my @uploads = ();
if ($curRes->is_sequence()) {
$content_type = 'sequence';
@@ -705,29 +693,20 @@ sub process_content {
if ($contents) {
$$content_file = &store_template($contents,$tempexport,$count,$content_type);
}
- } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
- $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
} 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 $coauth = $3.':'.$2.':ca';
+ } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) {
my $canedit = 0;
- if ($2 eq $ENV{'user.domain'} && $3 eq $ENV{'user.name'}) {
+ if ($2 eq $env{'user.domain'} && $3 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) {
$$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) {
@@ -769,14 +748,14 @@ sub replicate_content {
if ($copiedfile = Apache::File->new('>'.$destination)) {
my $content;
if ($caller eq 'resource') {
- $content = &Apache::lonnet::getfile($url);
+ $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 'noedit' || $caller eq 'uploaded' || $caller eq 'templateupload') {
+ } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') {
my $rtncode;
$repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode);
if ($repstatus eq 'ok') {
@@ -786,6 +765,10 @@ sub replicate_content {
} 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;
@@ -856,7 +839,7 @@ sub group_import {
''."\n".
''."\n".
'';
- $ENV{'form.output'}=$newmapstr;
+ $env{'form.output'}=$newmapstr;
my $home=&Apache::lonnet::homeserver($coursenum,$coursedom);
my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$home,
'output',$1.$2);
@@ -886,12 +869,20 @@ sub breadcrumbs {
my ($where)=@_;
&Apache::lonhtmlcommon::clear_breadcrumbs();
my (@folders);
- if ($ENV{'form.pagepath'}) {
- @folders = split('&',$ENV{'form.pagepath'});
+ if ($env{'form.pagepath'}) {
+ @folders = split('&',$env{'form.pagepath'});
} else {
- @folders=split('&',$ENV{'form.folderpath'});
+ @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);
@@ -900,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'=>''.
&Apache::lonnet::unescape($foldername).''
@@ -914,12 +905,10 @@ sub breadcrumbs {
sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
-
- $r->print(&breadcrumbs($folder));
my $errtext='';
my $fatal=0;
my $container='sequence';
- if ($ENV{'form.pagepath'}) {
+ if ($env{'form.pagepath'}) {
$container='page';
}
($errtext,$fatal)=
@@ -928,38 +917,45 @@ sub editor {
$Apache::lonratedt::order[0]=1;
$Apache::lonratedt::resources[1]='';
}
+ 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('
'.$errtext.' ');
} 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) {
@@ -998,26 +994,61 @@ sub editor {
}
}
+ 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;
+ my $ext='false';
+ if ($url=~/^http\:\/\//) { $ext='true'; }
+ $url=~s/\:/\:/g;
+# Now insert the URL at the bottom
+ my $newidx=1+$#Apache::lonratedt::resources;
+ $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(''.$errtext.' ');
+ return;
+ }
+ }
# upload a file, if present
- if (($ENV{'form.uploaddoc.filename'}) &&
- ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
+ 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 $newidx=$#Apache::lonratedt::resources+1;
+ my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);
my $ext='false';
if ($url=~/^http\:\/\//) { $ext='true'; }
$url=~s/\:/\:/g;
- my $comment=$ENV{'form.comment'};
+ my $comment=$env{'form.comment'};
$comment=~s/\/\>\;/g;
$comment=~s/\:/\:/g;
if ($folder=~/^supplemental/) {
- $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
- $ENV{'user.domain'}.'___&&&___'.$comment;
+ $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]=
@@ -1030,8 +1061,8 @@ sub editor {
}
}
}
- if ($ENV{'form.cmd'}) {
- my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
+ 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/|) {
@@ -1042,6 +1073,13 @@ sub editor {
$Apache::lonratedt::order[$i+1];
}
$#Apache::lonratedt::order--;
+ } elsif ($cmd eq 'cut') {
+ my (undef,$url)=split(':',$Apache::lonratedt::resources[$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];
@@ -1062,7 +1100,7 @@ sub editor {
$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;
@@ -1081,9 +1119,9 @@ sub editor {
}
}
# 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);
@@ -1100,8 +1138,8 @@ sub editor {
}
}
# Loading a complete map
- if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
- foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+ if (($env{'form.importmap'}) && ($env{'form.loadmap'})) {
+ foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
my $idx=$#Apache::lonratedt::resources;
$idx++;
$Apache::lonratedt::resources[$idx]=$_;
@@ -1134,7 +1172,30 @@ sub editor {
unless ($shown) {
$r->print('| '.&mt('Currently no documents.').' | ');
}
- $r->print(' |
');
+ $r->print("\n\n");
+ if ($env{'form.markedcopy_url'}) {
+ $r->print(<
'.
- $Apache::lonxml::errorcount.' '.
+ $errorcount.' '.
&mt('error(s)').' ');
}
- if ($Apache::lonxml::warningcount) {
+ if ($warningcount) {
$r->print(''.
- $Apache::lonxml::warningcount.' '.
+ $warningcount.' '.
&mt('warning(s)').'');
}
} else {
@@ -1438,9 +1521,9 @@ sub checkonthis {
&checkonthis($r,$_,$level+1);
}
}
- } elsif ($result==HTTP_SERVICE_UNAVAILABLE) {
+ } elsif ($result eq 'unavailable') {
$r->print(''.&mt('connection down').'');
- } elsif ($result==HTTP_NOT_FOUND) {
+ } elsif ($result eq 'not_found') {
unless ($url=~/\$/) {
$r->print(''.&mt('not found').'');
} else {
@@ -1461,8 +1544,8 @@ sub verifycontent {
my $r=shift;
my $loaderror=&Apache::lonnet::overloaderror($r);
if ($loaderror) { return $loaderror; }
-
- $r->print('