--- loncom/publisher/loncleanup.pm	2006/05/30 12:47:41	1.8
+++ loncom/publisher/loncleanup.pm	2008/12/24 07:58:34	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to cleanup XML files
 #
-# $Id: loncleanup.pm,v 1.8 2006/05/30 12:47:41 www Exp $
+# $Id: loncleanup.pm,v 1.10 2008/12/24 07:58:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -335,7 +335,7 @@ sub handler {
 
     if ($env{'form.filename'}) {
 	$fn=$env{'form.filename'};
-	$fn=~s/^http\:\/\/[^\/]+//;
+	$fn=~s/^https?\:\/\/[^\/]+//;
     } else {
 	$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
 		       ' unspecified filename for cleanup', $r->filename); 
@@ -362,7 +362,7 @@ sub handler {
 	return HTTP_NOT_ACCEPTABLE;
     }
 
-    $fn=~s/\/\~(\w+)//;
+    $fn=~s{/~($LONCAPA::username_re)}{};
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;