--- loncom/lonnet/perl/lonnet.pm 2017/10/16 17:41:33 1.1172.2.93.4.4 +++ loncom/lonnet/perl/lonnet.pm 2017/11/01 08:49:57 1.1172.2.93.4.6 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1172.2.93.4.4 2017/10/16 17:41:33 raeburn Exp $ +# $Id: lonnet.pm,v 1.1172.2.93.4.6 2017/11/01 08:49:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1899,7 +1899,7 @@ sub usersearch { my ($major,$minor,$subver) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.([\w.\-]+)\'?$/); next if (($major eq '' && $minor eq '') || ($major < 2) || (($major == 2) && ($minor < 11)) || - (($major == 2) && ($minor == 11) && ($subver !~ /^2\.B/))) { + (($major == 2) && ($minor == 11) && ($subver !~ /^2\.B/))); } } my $host=&hostname($tryserver); @@ -3443,12 +3443,12 @@ sub userfileupload { '_'.$env{'user.domain'}.'/pending'; } elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) { my ($docuname,$docudom); - if ($destudom) { + if ($destudom =~ /^$match_domain$/) { $docudom = $destudom; } else { $docudom = $env{'user.domain'}; } - if ($destuname) { + if ($destuname =~ /^$match_username$/) { $docuname = $destuname; } else { $docuname = $env{'user.name'};