--- loncom/lonnet/perl/lonnet.pm	2005/10/04 16:26:15	1.658
+++ loncom/lonnet/perl/lonnet.pm	2005/10/10 18:15:52	1.661
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.658 2005/10/04 16:26:15 raeburn Exp $
+# $Id: lonnet.pm,v 1.661 2005/10/10 18:15:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1685,9 +1685,10 @@ sub linklog {
   
 sub userrolelog {
     my ($trole,$username,$domain,$area,$tstart,$tend)=@_;
-    if (($trole=~/^ca/) || ($trole=~/^in/) || 
-        ($trole=~/^cc/) || ($trole=~/^ep/) ||
-        ($trole=~/^cr/) || ($trole=~/^ta/)) {
+    if (($trole=~/^ca/) || ($trole=~/^aa/) ||
+        ($trole=~/^in/) || ($trole=~/^cc/) || 
+        ($trole=~/^ep/) || ($trole=~/^cr/) ||
+        ($trole=~/^ta/)) {
        my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
        $userrolehash
          {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
@@ -1815,7 +1816,7 @@ sub courseiddump {
 sub dcmaildump {
     my ($dom,$startdate,$enddate,$senders) = @_;
     my %returnhash=(); 
-    foreach my $tryserver (keys %libserv) {
+    foreach my $tryserver (keys(%libserv)) {
         if ($hostdom{$tryserver} eq $dom) {
             %{$returnhash{$tryserver}}=();
             foreach (
@@ -1824,7 +1825,7 @@ sub dcmaildump {
                    &escape($senders), ,$tryserver))) {
                 my($key,$value) = split(/\=/,$_);
                 if (($key) && ($value)) {
-                    $returnhash{$tryserver}{$key} = $value;
+                    $returnhash{$tryserver}{&unescape($key)} = &unescape($value);
                 }
             }
         }
@@ -3228,8 +3229,7 @@ sub allowed {
 # --------------------------------------------------- Is a resource on the map?
 
 sub is_on_map {
-    my $uri=&declutter(shift);
-    $uri=~s/\.\d+\.(\w+)$/\.$1/;
+    my $uri=&deversion(&declutter(shift));
     my @uriparts=split(/\//,$uri);
     my $filename=$uriparts[$#uriparts];
     my $pathname=$uri;