--- loncom/interface/loncommon.pm	2017/11/01 02:54:35	1.1075.2.127.2.3
+++ loncom/interface/loncommon.pm	2017/11/16 15:06:35	1.1075.2.127.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.127.2.3 2017/11/01 02:54:35 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.127.2.4 2017/11/16 15:06:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,7 +81,7 @@ use LWP::UserAgent;
 use Crypt::DES;
 use DynaLoader; # for Crypt::DES version
 use File::Copy();
-use File::Path::Tiny();
+use File::Path();
 
 # ---------------------------------------------- Designs
 use vars qw(%defaultdesign);
@@ -12149,7 +12149,7 @@ sub process_decompression {
                                 if (-f "$dir/$tempdir/$item") {
                                     unlink("$dir/$tempdir/$item");
                                 } elsif (-d "$dir/$tempdir/$item") {
-                                    &File::Path::Tiny::rm("$dir/$tempdir/$item");
+                                    &File::Path::remove_tree("$dir/$tempdir/$item",{ safe => 1 });
                                 }
                             }
                         }
@@ -12159,14 +12159,14 @@ sub process_decompression {
                                     if (-f "$dir/$item") {
                                         unlink("$dir/$item");
                                     } elsif (-d "$dir/$item") {
-                                        &File::Path::Tiny::rm("$dir/$item");
+                                        &File::Path::remove_tree("$dir/$item",{ safe => 1 });
                                     }
                                     &File::Copy::move("$dir/$tempdir/$item","$dir/$item");
                                 }
                             }
                         }
                         if (&File::Copy::move("$dir/$tempdir/$file","$dir/$file")) {
-                            &File::Path::Tiny::rm("$dir/$tempdir");
+                            &File::Path::remove_tree("$dir/$tempdir",{ safe => 1 });
                         }
                     }
                 } else {
@@ -12811,7 +12811,9 @@ sub process_extracted_files {
                                                             '.'.$containers{$outer},1,1);
                                 unless ($errtext) {
                                     if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") {
-                                        $result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n";
+                                        $result .= '<li>'.&mt('File: [_1] added to course',
+                                                              &HTML::Entities::encode($docstitle,'<>&"')).
+                                                   '</li>'."\n";
                                     }
                                 }
                             } else {
@@ -12884,7 +12886,9 @@ sub process_extracted_files {
                         }
                         if ($fullpath ne '') {
                             if (-e "$prefix$path") {
-                                system("mv $prefix$path $fullpath/$title");
+                                unless (rename("$prefix$path","$fullpath/$title")) {
+                                     $warning .= &mt('Failed to rename dependency').'<br />';
+                                }
                             }
                             if (-e "$fullpath/$title") {
                                 my $showpath;
@@ -13186,8 +13190,10 @@ sub upfile_store {
     $env{'form.upfile'}=~s/\n+/\n/gs;
     $env{'form.upfile'}=~s/\n+$//gs;
 
-    my $datatoken=$env{'user.name'}.'_'.$env{'user.domain'}.
-	'_enroll_'.$env{'request.course.id'}.'_'.time.'_'.$$;
+    my $datatoken = &valid_datatoken($env{'user.name'}.'_'.$env{'user.domain'}.
+	                             '_enroll_'.$env{'request.course.id'}.'_'.
+                                     time.'_'.$$);
+    return if ($datatoken eq '');
     {
         my $datafile = $r->dir_config('lonDaemons').
                            '/tmp/'.$datatoken.'.tmp';
@@ -15652,8 +15658,7 @@ sub init_user_environment {
 
     my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
     my ($tmp) = keys(%userenv);
-    if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-    } else {
+    if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
 	undef(%userenv);
     }
     if (($userenv{'interface'}) && (!$form->{'interface'})) {