--- loncom/lonnet/perl/lonnet.pm 2005/10/11 21:29:38 1.662 +++ loncom/lonnet/perl/lonnet.pm 2005/10/18 21:27:46 1.665 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.662 2005/10/11 21:29:38 raeburn Exp $ +# $Id: lonnet.pm,v 1.665 2005/10/18 21:27:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1862,10 +1862,11 @@ sub dcmaildump { foreach my $tryserver (keys(%libserv)) { if ($hostdom{$tryserver} eq $dom) { %{$returnhash{$tryserver}}=(); - foreach ( - split(/\&/,&reply('dcmaildump:'.$dom.':'. - &escape($startdate).':'.&escape($enddate).':'. - &escape($senders), $tryserver))) { + my $cmd='dcmaildump:'.$dom.':'. + &escape($startdate).':'.&escape($enddate).':'; + my @esc_senders=map { &escape($_)} @$senders; + $cmd.=&escape(join('&',@esc_senders)); + foreach (split(/\&/,&reply($cmd,$tryserver))) { my ($key,$value) = split(/\=/,$_); if (($key) && ($value)) { $returnhash{$tryserver}{&unescape($key)} = &unescape($value); @@ -3075,9 +3076,10 @@ sub allowed { $thisallowed.=$1; } -# URI is an uploaded document for this course +# URI is an uploaded document for this course, default permissions don't matter # not allowing 'edit' access (editupload) to uploaded course docs if (($priv eq 'bre') && ($uri=~m|^uploaded/|)) { + $thisallowed=''; my $refuri=$env{'httpref.'.$orguri}; if ($refuri) { if ($refuri =~ m|^/adm/|) { @@ -3669,7 +3671,7 @@ sub assignrole { my $answer=&reply($command,&homeserver($uname,$udom)); # log new user role if status is ok if ($answer eq 'ok') { - &userrolelog($mrole,$uname,$udom,$url,$start,$end); + &userrolelog($role,$uname,$udom,$url,$start,$end); } return $answer; }