version 1.4, 2005/10/11 21:29:39
|
version 1.5, 2005/10/13 22:37:40
|
Line 176 ENDONE
|
Line 176 ENDONE
|
$output .= '<td>'; |
$output .= '<td>'; |
my @domcc = (); |
my @domcc = (); |
foreach my $server (keys %personnel) { |
foreach my $server (keys %personnel) { |
print STDERR "key level 1 is $server\n"; |
|
foreach my $user (sort(keys %{$personnel{$server}})) { |
foreach my $user (sort(keys %{$personnel{$server}})) { |
print STDERR "key level 2 is $user\n"; |
|
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
unless (grep/^$uname:$udom$/,@domcc) { |
unless (grep/^$uname:$udom$/,@domcc) { |
my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname); |
my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname); |
Line 289 ENDONE
|
Line 287 ENDONE
|
$recipients .= $dcmail{$msgid}{recipients}{$user}.', '; |
$recipients .= $dcmail{$msgid}{recipients}{$user}.', '; |
} |
} |
$recipients =~ s/,\s$//; |
$recipients =~ s/,\s$//; |
$output .= '<tr bgcolor="'.$rowColor.'"><td><small>'.$date.'</small></td><td><small>'.$dcmail{$msgid}{subject}.'</small></td><td><small>'.$sname.':'.$sdom.'</small></td><td><small>'.$dcmail{$msgid}{message}.'</small></td><td><small>'.$recipients.'</small></td></tr>'."\n"; |
$output .= '<tr bgcolor="'.$rowColor.'"><td><small>'.$date.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{subject}).'</small></td><td><small>'.$sname.':'.$sdom.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{message}).'</small></td><td><small>'.$recipients.'</small></td></tr>'."\n"; |
$rowNum ++; |
$rowNum ++; |
} |
} |
} else { |
} else { |
Line 328 ENDONE
|
Line 326 ENDONE
|
} |
} |
$recipients =~ s/,\s$//; |
$recipients =~ s/,\s$//; |
} |
} |
|
|
my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5); |
my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5); |
$date = &Apache::lonlocal::locallocaltime($date); |
$date = &Apache::lonlocal::locallocaltime($date); |
$output .= '<tr bgcolor="'.$rowColor.'"><td><small>'.$date.'</small></td><td><small>'.$dcmail{$msgid}{subject}.'</small></td><td><small>'.$sname.':'.$sdom.'</small></td><td><small>'.$dcmail{$msgid}{message}.'</small></td><td><small>'.$recipients.'</small></td></tr>'."\n"; |
$output .= '<tr bgcolor="'.$rowColor.'"><td><small>'.$date.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{subject}).'</small></td><td><small>'.$sname.':'.$sdom.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{message}).'</small></td><td><small>'.$recipients.'</small></td></tr>'."\n"; |
$rowNum ++; |
$rowNum ++; |
} |
} |
} |
} |
Line 413 $breadcrumbs
|
Line 412 $breadcrumbs
|
<form method="post" name="$formname"> |
<form method="post" name="$formname"> |
ENDONE |
ENDONE |
$output .= &Apache::lonhtmlcommon::start_pick_box($table_width); |
$output .= &Apache::lonhtmlcommon::start_pick_box($table_width); |
my @roles = ('cc','in','ta','ep','ad','st','cr'); |
my @roles = ('ow','cc','in','ta','ep','ad','st','cr'); |
my %longtypes = (); |
my %longtypes = (); |
my %authtypes = (); |
my %authtypes = (); |
&form_elements(\%longtypes,\%authtypes); |
&form_elements(\%longtypes,\%authtypes); |
Line 581 ENDONE
|
Line 580 ENDONE
|
$output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" checked="checked" /></td><td>'.$username.'</td><td> </td><td>'.$recipients{$username}.'</td></tr>'; |
$output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" checked="checked" /></td><td>'.$username.'</td><td> </td><td>'.$recipients{$username}.'</td></tr>'; |
} |
} |
} |
} |
$output .= '</table></td>'; |
$output .= '</table>'; |
|
if (@unmatched) { |
|
$output .= '<br /><br />'.&mt('Could not determine e-mail addresses for the following users:').'<ul>'; |
|
foreach my $username (sort @unmatched) { |
|
$output .= '<li>'.$username.'</li>'; |
|
} |
|
$output .= '</ul>'; |
|
} |
|
$output .= '</td>'; |
$output .= &Apache::lonhtmlcommon::row_closure(); |
$output .= &Apache::lonhtmlcommon::row_closure(); |
$output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Sender e-mail address')); |
$output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Sender e-mail address')); |
$output .= '<td><input type="text" name="sender" value="'.$sender.'" /></td>'; |
$output .= '<td><input type="text" name="sender" value="'.$sender.'" /></td>'; |
Line 638 ENDONE
|
Line 645 ENDONE
|
my @deliveries = (); |
my @deliveries = (); |
&broadcast_email(\@recipients,$subject,$from,$message,\@deliveries); |
&broadcast_email(\@recipients,$subject,$from,$message,\@deliveries); |
if (@deliveries > 0) { |
if (@deliveries > 0) { |
|
&store_mail($subject,$message,$dom,\@deliveries); |
$output .= '<tr> |
$output .= '<tr> |
<td> |
<td> |
<table cellpadding="4" cellspacing="2" width="100%"> |
<table cellpadding="4" cellspacing="2" width="100%"> |
Line 649 ENDONE
|
Line 657 ENDONE
|
</tr> |
</tr> |
<tr bgcolor="#eeeeee"> |
<tr bgcolor="#eeeeee"> |
<td valign="middle">Sent</td> |
<td valign="middle">Sent</td> |
<td valign="middle">'.$subject.'</td> |
<td valign="middle">'.&cr_to_br($subject).'</td> |
<td valign="middle">'.$message.'</td> |
<td valign="middle">'.&cr_to_br($message).'</td> |
<td>'; |
<td>'; |
foreach my $person (@deliveries) { |
foreach my $person (@deliveries) { |
my ($username,$email) = split(/:/,$person); |
my ($username,$email) = split(/:/,$person); |
Line 696 sub broadcast_email {
|
Line 704 sub broadcast_email {
|
} |
} |
|
|
sub get_user_info { |
sub get_user_info { |
my ($user,%email_defaults,$ltext) = @_; |
my ($user,%email_defaults) = @_; |
my ($uname,$udom) = split(/:/,$user); |
my ($uname,$udom) = split(/:/,$user); |
my @emailtypes = ('permanentemail','critnotification','notification'); |
my @emailtypes = ('permanentemail','critnotification','notification'); |
my %userinfo = &Apache::lonnet::get('environment',\@emailtypes,$udom,$uname); |
my %userinfo = &Apache::lonnet::get('environment',\@emailtypes,$udom,$uname); |
Line 715 sub get_user_info {
|
Line 723 sub get_user_info {
|
$email = $uname.'@'.$email_defaults{$authtype}{$autharg}; |
$email = $uname.'@'.$email_defaults{$authtype}{$autharg}; |
} |
} |
} else { |
} else { |
if (defined($email_defaults{$authtype})) { |
if ((defined($email_defaults{$authtype})) && ($email_defaults{$authtype} ne '')) { |
$email = $uname.'@'.$email_defaults{$authtype}; |
$email = $uname.'@'.$email_defaults{$authtype}; |
} |
} |
} |
} |
Line 733 sub form_elements {
|
Line 741 sub form_elements {
|
%{$authtypes} = ( |
%{$authtypes} = ( |
krb4 => 'Kerberos 4', |
krb4 => 'Kerberos 4', |
krb5 => 'Kerberos 5', |
krb5 => 'Kerberos 5', |
int => 'Internal (LON-CAPA)', |
internal => 'Internal (LON-CAPA)', |
unix => 'Filesystem (UNIX)', |
unix => 'Filesystem (UNIX)', |
local => 'Local/Customized', |
local => 'Local/Customized', |
); |
); |
Line 857 sub echo_form_input {
|
Line 865 sub echo_form_input {
|
return $output; |
return $output; |
} |
} |
|
|
|
sub cr_to_br { |
|
my $incoming = shift; |
|
$incoming =~ s/\n/\<br \/\>/g; |
|
return $incoming; |
|
} |
|
|
|
|
1; |
1; |