--- loncom/lonnet/perl/lonuploadrep.pm	2004/09/02 18:01:52	1.4
+++ loncom/lonnet/perl/lonuploadrep.pm	2006/12/20 22:41:07	1.9
@@ -28,12 +28,14 @@ package Apache::lonuploadrep;
 
 use strict;
 use Apache::Constants qw(:common :http);
-use Apache::lonnet();
+use Apache::lonrep();
+use Apache::lonnet;
 use CGI::Cookie();
+use LONCAPA();
 
 sub handler {
     my $r = shift;
-    if ($r->uri =~m|^/*uploaded/(\w+)/(\w+)/(.+)$|) {
+    if ($r->uri =~m{^/*uploaded/($LONCAPA::domain_re)/($LONCAPA::name_re)/(.+)$}) {
         my $chome=&Apache::lonnet::homeserver($2,$1);
 	my @ids=&Apache::lonnet::current_machine_ids();
 	foreach my $id (@ids) { if ($id eq $chome) { return OK; } }
@@ -46,14 +48,14 @@ sub handler {
             } elsif ( ($info > 0) && ($info =~ /\d+/) )  {
                 my @statinfo = stat($filename); 
                 if ($statinfo[9] >= $info ) {
-                    $r->filename($filename);
+                    &Apache::lonrep::update_filename($r,$filename);
                     return OK;
                 }
             }
         }
         my $response=&Apache::lonnet::repcopy_userfile($r->uri);
-        if ($response eq OK) {
-            $r->filename($filename);
+        if ($response eq 'ok') {
+	    &Apache::lonrep::update_filename($r,$filename);
             return OK;
         }
     }