--- loncom/interface/lonnotify.pm 2005/10/11 21:29:39 1.4
+++ loncom/interface/lonnotify.pm 2005/10/14 19:10:20 1.6
@@ -176,9 +176,7 @@ ENDONE
$output .= '
';
my @domcc = ();
foreach my $server (keys %personnel) {
- print STDERR "key level 1 is $server\n";
foreach my $user (sort(keys %{$personnel{$server}})) {
- print STDERR "key level 2 is $user\n";
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
unless (grep/^$uname:$udom$/,@domcc) {
my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname);
@@ -218,8 +216,7 @@ sub print_display {
my $start = &Apache::lonhtmlcommon::get_date_from_form('startdate');
my $end = &Apache::lonhtmlcommon::get_date_from_form('enddate');
my @senders = &Apache::loncommon::get_env_multiple('form.sender');
- my $senderlist = join('&',@senders);
- my %sentmail = &Apache::lonnet::dcmaildump($cdom,$start,$end,$senderlist);
+ my %sentmail = &Apache::lonnet::dcmaildump($cdom,$start,$end,\@senders);
my %dcmail = ();
my %Sortby = ();
my $jscript = <<"ENDSCRIPT";
@@ -289,7 +286,7 @@ ENDONE
$recipients .= $dcmail{$msgid}{recipients}{$user}.', ';
}
$recipients =~ s/,\s$//;
- $output .= ' | '.$date.' | '.$dcmail{$msgid}{subject}.' | '.$sname.':'.$sdom.' | '.$dcmail{$msgid}{message}.' | '.$recipients.' |
'."\n";
+ $output .= ''.$date.' | '.&cr_to_br($dcmail{$msgid}{subject}).' | '.$sname.':'.$sdom.' | '.&cr_to_br($dcmail{$msgid}{message}).' | '.$recipients.' |
'."\n";
$rowNum ++;
}
} else {
@@ -328,9 +325,10 @@ ENDONE
}
$recipients =~ s/,\s$//;
}
+
my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5);
$date = &Apache::lonlocal::locallocaltime($date);
- $output .= ''.$date.' | '.$dcmail{$msgid}{subject}.' | '.$sname.':'.$sdom.' | '.$dcmail{$msgid}{message}.' | '.$recipients.' |
'."\n";
+ $output .= ''.$date.' | '.&cr_to_br($dcmail{$msgid}{subject}).' | '.$sname.':'.$sdom.' | '.&cr_to_br($dcmail{$msgid}{message}).' | '.$recipients.' |
'."\n";
$rowNum ++;
}
}
@@ -413,7 +411,7 @@ $breadcrumbs