--- loncom/imspackages/imsimport.pm 2015/06/09 21:22:51 1.47 +++ loncom/imspackages/imsimport.pm 2023/07/23 13:33:52 1.49 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: imsimport.pm,v 1.47 2015/06/09 21:22:51 damieng Exp $ +# $Id: imsimport.pm,v 1.49 2023/07/23 13:33:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,7 @@ use HTML::Entities(); use Apache::lonlocal; use Apache::lonupload; use File::Basename(); +use File::Path(); use LONCAPA; # ---------------------------------------------------------------- Jscript One @@ -640,7 +641,7 @@ sub display_three { ); my $londocroot = $r->dir_config('lonDocRoot'); if ($destdir =~ m{^\Q$londocroot/priv/$udom/$uname/$dirpath\E}) { - system (" rm -r -f $destdir/temp"); + &File::Path::remove_tree("$destdir/temp",{ safe => 1 }); } } elsif ($manifest_result eq 'nomanifest') { $r->print( @@ -772,13 +773,25 @@ END_JS } my $title = 'Upload IMS package to Authoring Space'; + my $crsauthor; + if ($env{'request.course.id'}) { + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + if (($udom eq $cdom) && ($uname eq $cnum)) { + $title = 'Upload IMS package to Course Authoring Space'; + $crsauthor = 1; + } + } + $r->print(&Apache::loncommon::start_page($title, $javascript)); - if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { - $r->print('

' - .&mt('Co-Author [_1]',$uname.':'.$udom) - .'

' - ); + unless ($crsauthor) { + if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { + $r->print('

' + .&mt('Co-Author [_1]',$uname.':'.$udom) + .'

' + ); + } } if ($env{'form.phase'} eq 'two') { my $flag = &Apache::lonupload::phasetwo($r,$fn,'imsimport');