--- loncom/lonnet/perl/lonnet.pm 2006/01/11 07:32:21 1.695 +++ loncom/lonnet/perl/lonnet.pm 2006/01/11 08:24:21 1.697 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.695 2006/01/11 07:32:21 albertel Exp $ +# $Id: lonnet.pm,v 1.697 2006/01/11 08:24:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4965,6 +4965,11 @@ sub EXT { if ($space eq 'time') { return time; } + } elsif ($realm eq 'server') { +# ----------------------------------------------------------------- system.time + if ($space eq 'name') { + return $ENV{'SERVER_NAME'}; + } } return ''; } @@ -6144,10 +6149,10 @@ sub declutter { if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); } $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//; $thisfn=~s/^\///; - $thisfn=~s/^res\///; - $thisfn=~s/\?.+$//; $thisfn=~s|^adm/wrapper/||; $thisfn=~s|^adm/coursedocs/showdoc/||; + $thisfn=~s/^res\///; + $thisfn=~s/\?.+$//; return $thisfn; }