--- loncom/interface/lonnotify.pm 2005/12/09 00:08:35 1.9
+++ loncom/interface/lonnotify.pm 2006/07/11 15:37:59 1.22
@@ -34,6 +34,8 @@ use Apache::lonlocal;
use Mail::Send;
use HTML::TokeParser;
use HTML::Entities;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
sub handler {
my ($r) = @_;
@@ -56,49 +58,75 @@ sub handler {
my $origin = $env{'form.origin'};
&Apache::lonhtmlcommon::clear_breadcrumbs();
- my %ltext=&Apache::lonlocal::texthash(
- 'note' => 'Notification E-mail',
- );
- my $function = &Apache::loncommon::get_users_function();
- my $loadcode;
- my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
- if ((defined($env{'form.origin'})) && ($command eq 'compose' || $command eq 'pick_target' || $command eq 'pick_display')) {
- unless ($env{'form.origin'} eq '') {
- $loadcode = 'javascript:setFormElements(document.'.$env{'form.command'}.')';
- if (($command eq 'pick_target') && (
- ($origin eq 'compose') || ($origin eq 'process'))) {
- if ($env{'form.coursepick'} eq 'category') {
- $loadcode .= ';javascript:setCourseCat(document.'.$env{'form.command'}.')';
- }
- }
- }
- }
- my $loaditems = ' onLoad="'.$loadcode.'" ';
- my $bodytag = &Apache::loncommon::bodytag('Broadcast e-mail to users',$function,$loaditems);
- my $html=&Apache::lonxml::xmlbegin();
+
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/notify',
text=>"Broadcast E-mail"});
if ($command eq 'process') {
- &print_request_receipt($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_request_receipt($r,$command,$cdom);
} elsif ($command eq 'compose') {
- &print_composition_form($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_composition_form($r,$command,$cdom);
} elsif ($command eq 'pick_target') {
- &print_selection_form($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_selection_form($r,$command,$cdom);
} elsif ($command eq 'pick_display') {
- &print_display_option_form($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_display_option_form($r,$command,$cdom);
} elsif ($command eq 'display') {
- &print_display($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_display($r,$command,$cdom);
} else {
- &print_front_page($r,'front',$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_front_page($r,'front',$cdom);
}
return OK;
}
+sub add_script {
+ my ($js) = @_;
+ return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+}
+
+sub start_page {
+ my ($jscript,$bread_title,$formname) = @_;
+
+ my $loadcode;
+ if ((defined($env{'form.origin'}))
+ && ($env{'form.command'} eq 'compose'
+ || $env{'form.command'} eq 'pick_target'
+ || $env{'form.command'} eq 'pick_display')) {
+ if ($env{'form.origin'} ne '') {
+ $loadcode = 'javascript:setFormElements(document.'.$env{'form.command'}.')';
+ if (($env{'form.command'} eq 'pick_target')
+ && (($env{'form.origin'} eq 'compose')
+ || ($env{'form.origin'} eq 'process'))) {
+ if ($env{'form.coursepick'} eq 'category') {
+ $loadcode .= ';javascript:setCourseCat(document.'.$env{'form.command'}.')';
+ }
+ }
+ }
+ }
+
+ my $start_page =
+ &Apache::loncommon::start_page('Broadcast e-mail to users', $jscript,
+ {'add_entries' =>
+ {'onload' => $loadcode,},});
+ my $breadcrumbs =
+ &Apache::lonhtmlcommon::breadcrumbs($bread_title,
+ 'Broadcast_system_email');
+ my $output = <<"ENDONE";
+$start_page
+$breadcrumbs
+<br />
+<form name="$formname" method="POST">
+ENDONE
+
+ return $output;
+}
+
+sub end_page {
+ return '</form>'.&Apache::loncommon::end_page();
+}
+
sub print_front_page {
- my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
- (undef,'Broadcast e-mail to Domain','Broadcast_system_email');
+ my ($r,$formname,$cdom) = @_;
+
my $jscript = qq|
function next_page(caller) {
if (caller == 'view') {
@@ -110,54 +138,32 @@ function next_page(caller) {
document.front.submit()
}
|;
- my %lt=&Apache::lonlocal::texthash(
- 'note' => 'Notification E-mail',
- );
- my $output = <<"ENDONE";
-$html
-<head>
- <title>LON-CAPA $lt{'note'}</title>
-<script type"text/javascript">
-$jscript
-</script>
-</head>
-$bodytag
-$breadcrumbs
-<br />
-ENDONE
- $output .= '<form name="'.$formname.'" method="post">'.
- '<input type="hidden" name="command" />';
- $output .= &Apache::lonhtmlcommon::start_pick_box();
- $output .= '<table cellspacing="8" cellpadding="8">'.
+
+ my $output = &start_page(&add_script($jscript),
+ 'Broadcast e-mail to Domain', $formname);
+
+ $output .= '<input type="hidden" name="command" />';
+ $output .= '<table class="LC_notify_front_page">'.
'<tr><td><a href="javascript:next_page('."'new'".')">'.
'Send a new e-mail message to selected users from this domain</a></td></tr><tr>'.
'<td><a href="javascript:next_page('."'view'".')">'.
'Display e-mail sent by Domain Coordinators in this domain'.
'</a></td></tr></table>';
- $output .= &Apache::lonhtmlcommon::end_pick_box();
- $output .= qq(
-</form>
-</body>
-</html>);
+ $output .= &end_page();
+
$r->print($output);
return;
}
sub print_display_option_form {
- my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
- &Apache::lonhtmlcommon::add_breadcrumb
- ({text=>"Display options"});
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
- (undef,'Broadcast e-mail display options','Broadcast_system_email');
- my $table_width = '';
- my $col_width = '200';
+ my ($r,$formname,$cdom) = @_;
+ &Apache::lonhtmlcommon::add_breadcrumb({text=>"Display options"});
+
my $cmd = 'display';
my $submit_text = 'Display e-mail';
my @roles = ('dc');
my $now = time;
- my %lt=&Apache::lonlocal::texthash(
- 'note' => 'Notification E-mail',
- );
+
my $startdateform = &Apache::lonhtmlcommon::date_setter($formname,
'startdate',
$now);
@@ -180,29 +186,19 @@ sub print_display_option_form {
sender => 'checkbox',
);
my $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
- my $output = <<"ENDONE";
-$html
-<head>
- <title>LON-CAPA $lt{'note'}</title>
-<script type"text/javascript">
-$jscript
-</script>
-</head>
-$bodytag
-$breadcrumbs
-<br />
-<form method="post" name="$formname">
-ENDONE
- $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
- $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Date range'));
- $output .= '<td><table><tr><td>Earliest to display: </td><td>'.
+
+ my $output = &start_page(&add_script($jscript),
+ 'Broadcast e-mail display options', $formname);
+
+ $output .= &Apache::lonhtmlcommon::start_pick_box();
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Date range'));
+ $output .= '<table><tr><td>'.&mt('Earliest to display:').' </td><td>'.
$startdateform.'</td></tr>';
- $output .= '<tr><td>Latest to display: </td><td>'.$enddateform.
- '</td></tr></table></td>';
+ $output .= '<tr><td>'.&mt('Latest to display:').' </td><td>'.$enddateform.
+ '</td></tr></table>';
$output .= &Apache::lonhtmlcommon::row_closure();
- $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Choose sender(s)'));
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Choose sender(s)'));
my %personnel = &Apache::lonnet::get_domain_roles($cdom,\@roles);
- $output .= '<td>';
my @domcc = ();
foreach my $server (keys %personnel) {
foreach my $user (sort(keys %{$personnel{$server}})) {
@@ -214,32 +210,22 @@ ENDONE
}
}
}
- $output .= '</td>';
$output .= &Apache::lonhtmlcommon::row_closure();
- $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);
+ $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),$cmd,$submit_text);
$output .= &Apache::lonhtmlcommon::end_pick_box();
- $output .= qq(
-<input type="hidden" name="sortby" value="date" />
-</form>
-</body>
-</html>);
+ $output .= qq(<input type="hidden" name="sortby" value="date" />\n).
+ &end_page();
$r->print($output);
return;
}
sub print_display {
- my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
+ my ($r,$formname,$cdom) = @_;
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:goBack('pick_display')",
text=>"Display options"},
{text=>"E-mail display"});
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
- (undef,'Display Broadcast e-mail','Broadcast_system_email');
- my $table_width = '';
- my $col_width = '200';
- my $rowColor1 = "#ffffff";
- my $rowColor2 = "#eeeeee";
- my $rowColor;
+
my $msgcount = 0;
my $start = &Apache::lonhtmlcommon::get_date_from_form('startdate');
my $end = &Apache::lonhtmlcommon::get_date_from_form('enddate');
@@ -259,73 +245,63 @@ function goBack(target) {
}
ENDSCRIPT
- my $output = <<"ENDONE";
-$html
-<head>
- <title>LON-CAPA $$ltext{'note'}</title>
- <script type"text/javascript">
-$jscript
- </script>
-</head>
-$bodytag
-$breadcrumbs
-<br />
-<form method="post" name="$formname">
-ENDONE
+
+ my $output = &start_page(&add_script($jscript),
+ 'Display Broadcast e-mail', $formname);
foreach my $msgid (keys(%sentmail)) {
- my %content = &unpackagemail($sentmail{$msgid});
+ my %content = &Apache::lonmsg::unpackagemsg($sentmail{$msgid});
$msgcount ++;
%{$dcmail{$msgid}} = ();
foreach my $item (keys(%content)) {
- if ($item eq 'recipients') {
- foreach my $user (keys(%{$content{recipients}})) {
- $dcmail{$msgid}{recipients}{$user} = $content{recipients}{$user};
+ if ($item eq 'recipient') {
+ foreach my $user (keys(%{$content{recipient}})) {
+ $dcmail{$msgid}{recipient}{$user} = $content{recipient}{$user};
}
} else {
$dcmail{$msgid}{$item} = $content{$item};
}
}
}
- $output .= &Apache::lonhtmlcommon::start_pick_box();
+ $output .= &Apache::loncommon::start_data_table();
if ($msgcount > 0) {
- my $rowNum = 0;
- $output .= '<tr><td><table cellpadding="4" cellspacing="2" width="100%">
- <tr bgcolor="'.$tablecolor.'" align="center">
- <td><b><a href="javascript:changeSort('."'date'".')">Date</a></b></td>
- <td><b><a href="javascript:changeSort('."'subject'".')">Subject</a></b></td>
- <td><b><a href="javascript:changeSort('."'sender'".')">Sender</a></b></td>
- <td><b><a href="javascript:changeSort('."'message'".')">Message</a></b></td>
- <td><b><a href="javascript:changeSort('."'recipients'".')">Recipients</a></b></td>
- </tr>';
+ $output .= &Apache::loncommon::start_data_table_header_row().
+ '<th><a href="javascript:changeSort(\'date\')">Date</a></th>'.
+ '<th><a href="javascript:changeSort(\'subject\')">Subject</a></th>'.
+ '<th><a href="javascript:changeSort(\'sender\')">Sender</a></th>'.
+ '<th><a href="javascript:changeSort(\'message\')">Message</a></th>'.
+ '<th><a href="javascript:changeSort(\'recipients\')">Recipients</a></th>'.
+ &Apache::loncommon::end_data_table_header_row();
+
if (($env{'form.sortby'} eq 'date') || ($env{'form.sortby'} eq '') || (!defined($env{'form.sortby'})) || (($env{'form.sortby'} eq 'sender') && (@senders <= 1))) {
foreach my $msgid (sort(keys(%dcmail))) {
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
my $recipients = '';
- my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5);
+ my ($date,undef,$sname,$sdom) =
+ &Apache::lonmsg::unpackmsgid($msgid,undef,1);
$date = &Apache::lonlocal::locallocaltime($date);
- foreach my $user (sort(keys(%{$dcmail{$msgid}{recipients}}))) {
- $recipients .= $dcmail{$msgid}{recipients}{$user}.', ';
+ foreach my $user (sort(keys(%{$dcmail{$msgid}{recipient}}))) {
+ $recipients .= $dcmail{$msgid}{recipient}{$user}.', ';
}
$recipients =~ s/,\s$//;
- $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 ++;
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<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>'."\n".
+ &Apache::loncommon::end_data_table_row();
}
} else {
foreach my $msgid (sort(keys(%dcmail))) {
- my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5);
+ my ($date,undef,$sname,$sdom) =
+ &Apache::lonmsg::unpackmsgid($msgid,undef,1);
if ($env{'form.sortby'} eq 'subject') {
push @{$Sortby{$dcmail{$msgid}{subject}}},$msgid;
} elsif ($env{'form.sortby'} eq 'message') {
push @{$Sortby{$dcmail{$msgid}{message}}},$msgid;
} elsif ($env{'form.sortby'} eq 'recipients') {
my $recipients ='';
- foreach my $user (sort(keys(%{$dcmail{$msgid}{recipients}}))) {
- $recipients .= $dcmail{$msgid}{recipients}{$user}.', ';
+ foreach my $user (sort(keys(%{$dcmail{$msgid}{recipient}}))) {
+ $recipients .= $dcmail{$msgid}{recipient}{$user}.', ';
}
$recipients =~ s/,\s$//;
push @{$Sortby{$recipients}},$msgid;
@@ -337,33 +313,34 @@ ENDONE
}
foreach my $key (sort(keys(%Sortby))) {
foreach my $msgid (@{$Sortby{$key}}) {
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
my $recipients = '';
if ($env{'form.sortby'} eq 'recipients') {
$recipients = $key;
} else {
- foreach my $user (sort(keys(%{$dcmail{$msgid}{recipients}}))) {
- $recipients .= $dcmail{$msgid}{recipients}{$user}.', ';
+ foreach my $user (sort(keys(%{$dcmail{$msgid}{recipient}}))) {
+ $recipients .= $dcmail{$msgid}{recipient}{$user}.', ';
}
$recipients =~ s/,\s$//;
}
-
- my ($date,$subj,$sname,$sdom,$cdom) = split(/:/,$msgid,5);
+ my ($date,undef,$sname,$sdom) =
+ &Apache::lonmsg::unpackmsgid($msgid,undef,1);
$date = &Apache::lonlocal::locallocaltime($date);
- $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 ++;
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<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>'."\n".
+ &Apache::loncommon::end_data_table_row();
}
}
}
- $output .= '</table></td></tr>';
} else {
- $output .= '<tr bgcolor="#ffffff"><td> </td><td><br><center><i><b><small> No mail sent matching supplied criteria </small><br><br></b></i></td><td> </td></tr>';
+ $output .= &Apache::loncommon::start_data_table_empty_row().
+ '<td>No mail sent matching supplied criteria</td>'.
+ &Apache::loncommon::end_data_table_empty_row();
}
- $output .= &Apache::lonhtmlcommon::end_pick_box();
+ $output .= &Apache::loncommon::end_data_table();
$output .= &Apache::lonhtmlcommon::echo_form_input(['sortby','command','origin']);
my $curr_sortby;
if (defined($env{'form.sortby'})) {
@@ -374,16 +351,13 @@ ENDONE
$output .= qq(<input type="hidden" name="origin" value="$formname" />\n);
$output .= qq(<input type="hidden" name="command" />\n);
$output .= qq(<input type="hidden" name="sortby" value="$curr_sortby" />\n);
- $output .= qq(
-</form>
-</body>
-</html>);
+ $output .= &end_page();
$r->print($output);
return;
}
sub print_selection_form {
- my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
+ my ($r,$formname,$cdom) = @_;
my %coursecodes = ();
my %codes = ();
my @codetitles = ();
@@ -396,10 +370,7 @@ sub print_selection_form {
my $totcodes = 0;
my $format_reply;
my $jscript = '';
- my $table_width = '100%';
- my $col_width = '200';
my %lt=&Apache::lonlocal::texthash(
- 'note' => 'Notification E-mail',
'buil' => 'Building valid e-mail address from username, if missing from preferences:',
'kerb' => 'Kerberos: enter default for each realm used in the domain, with comma separation of entries',
'infs' => 'Internal, Filesystem and Local authentication: enter single default.',
@@ -418,8 +389,6 @@ sub print_selection_form {
}
}
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
- (undef,'Choose e-mail audience','Broadcast_system_email');
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom);
my %elements = (
@@ -469,48 +438,36 @@ function setCourseCat(formname) {
}
|;
}
- my $output = <<"ENDONE";
-$html
-<head>
- <title>LON-CAPA $lt{'note'}</title>
-<script type"text/javascript">
-$jscript
-</script>
-$cb_jscript
-</head>
-$bodytag
-$breadcrumbs
-<br />
-<form method="post" name="$formname">
-ENDONE
- $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
- my @roles = ('ow','cc','in','ta','ep','st','cr');
- my %longtypes = ();
- my %authtypes = ();
- &form_elements(\%longtypes,\%authtypes);
- my $descrip = $lt{'buil'}.'
+
+
+ my $output = &start_page(&add_script($jscript).$cb_jscript,
+ 'Choose e-mail audience', $formname);
+
+ $output .= &Apache::lonhtmlcommon::start_pick_box();
+ my @roles = ('ow','cc','in','ta','ep','st','cr');
+ my %longtypes = ();
+ my %authtypes = ();
+ &form_elements(\%longtypes,\%authtypes);
+ my $descrip = $lt{'buil'}.'
<ul>
<li>'.$lt{'kerb'}.'<br />(e.g., MSU.EDU=msu.edu, MSUE.EDU=msue.msu.edu).</li>
<li>'.$lt{'infs'}.'</li>
</ul>'."\n";
- my $submit_text = $lt{'comp'};
- my $cmd = 'compose';
- $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,$col_width,$tablecolor,'Roles');
- $output .= &Apache::lonhtmlcommon::course_select_row($col_width,$tablecolor,'Courses',$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
- $output .= &Apache::lonhtmlcommon::status_select_row(\%longtypes,$col_width,$tablecolor,&mt('Access status'));
- $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,$col_width,$tablecolor,&mt('Username -> Email conversion'),$descrip);
- $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);
- $output .= &Apache::lonhtmlcommon::end_pick_box();
- $output .= qq(
-</form>
-</body>
-</html>);
+ my $submit_text = $lt{'comp'};
+ my $cmd = 'compose';
+ $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,'Roles');
+ $output .= &Apache::lonhtmlcommon::course_select_row('Courses',$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
+ $output .= &Apache::lonhtmlcommon::status_select_row(\%longtypes,&mt('Access status'));
+ $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,&mt('Username -> Email conversion'),$descrip);
+ $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),$cmd,$submit_text);
+ $output .= &Apache::lonhtmlcommon::end_pick_box();
+ $output .= &end_page();
$r->print($output);
return;
}
sub print_composition_form {
- my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
+ my ($r,$formname,$cdom) = @_;
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:goBack('pick_target')",
text=>"Select Audience"},
@@ -522,11 +479,8 @@ function goBack(target) {
document.$formname.submit();
}
|;
- my $breadcrumbs = (&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Broadcast e-mail to users','Broadcast_system_email'));
my %lt=&Apache::lonlocal::texthash(
- 'note' => 'Notification E-mail',
'nore' => 'No recipients identified',
'emad' => 'e-mail address',
);
@@ -538,21 +492,14 @@ function goBack(target) {
);
$jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements);
- $r->print(<<ENDONE);
-$html
-<head>
- <title>LON-CAPA $lt{'note'}</title>
-<script type="text/javascript">
-$jscript
-</script>
-</head>
-$bodytag $breadcrumbs
-<br />
-ENDONE
+ $r->print(&start_page(&add_script($jscript),
+ 'Broadcast e-mail to users', $formname));
+
my $coursefilter = $env{'form.coursepick'};
my %courses = ();
if ($coursefilter eq 'all') {
- %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.');
+ %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
+ undef,undef,'Course');
} elsif ($coursefilter eq 'category') {
my $instcode = '';
my @cats = ('Semester','Year','Department','Number');
@@ -566,7 +513,8 @@ ENDONE
if ($instcode eq '') {
$instcode = '.';
}
- %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.');
+ %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
+ undef,undef,'Course');
} elsif ($coursefilter eq 'specific') {
if ($env{'form.coursetotal'} > 1) {
my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -584,8 +532,6 @@ ENDONE
my %longtypes = ();
my %authtypes = ();
my %email_defaults = ();
- my $table_width = '100%';
- my $col_width = '200';
&form_elements(\%longtypes,\%authtypes);
foreach my $auth (keys(%authtypes)) {
@@ -641,33 +587,38 @@ ENDONE
}
}
}
- my $output = '<form name="'.$formname.'" method="post">'."\n";
+ my $output;
if ($totalrecip > 0) {
- $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
- $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Subject'));
- $output .= ' <td><input type="text" name="subject" size="30" /></td>';
+ $output .= &Apache::lonhtmlcommon::start_pick_box();
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Subject'));
+ $output .= '<input type="text" name="subject" size="30" />';
$output .= &Apache::lonhtmlcommon::row_closure();
- $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Message'));
- $output .= ' <td><textarea name="message" id="message"
- cols="60" rows="10" wrap="hard"></textarea></td>';
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Message'));
+ $output .= ' <textarea name="message" id="message"
+ cols="60" rows="10" wrap="hard"></textarea>';
$output .= &Apache::lonhtmlcommon::row_closure();
- $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Recipients'));
- $output .= '<td><input type="button" value="check all"
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Recipients'));
+ $output .= '<input type="button" value="check all"
onclick="javascript:checkAll(document.compose.recipient)" />
<input type="button" value="uncheck all"
onclick="javascript:uncheckAll(document.compose.recipient)" />
- <br /><table border="0">';
+ <br />';
+ $output .= &Apache::loncommon::start_data_table();
if (keys(%recipients) > 0) {
- $output .= '<tr><td> </td><td><small><b>username:domain</b></small></td><td> </td><td><small><b>'.$lt{'emad'}.'</b></small></td></tr>';
+ $output .= &Apache::loncommon::start_data_table_header_row();
+ $output .= '<th> <th>username:domain</th><th> </th><th>'.$lt{'emad'}.'</th>';
+ $output .= &Apache::loncommon::end_data_table_header_row();
}
foreach my $username (sort(keys(%recipients))) {
+ $output .= &Apache::loncommon::start_data_table_row();
if ($recipients{$username} =~ /\@/) {
- my $value=&Apache::lonnet::escape($username).':'.&Apache::lonnet::escape($recipients{$username});
- $output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td> </td><td>'.$recipients{$username}.'</td></tr>';
+ my $value=&escape($username).':'.&escape($recipients{$username});
+ $output .= '<td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td> </td><td>'.$recipients{$username}.'</td>';
}
+ $output .= &Apache::loncommon::end_data_table_row();
}
- $output .= '</table>';
+ $output .= &Apache::loncommon::end_data_table();
if (@unmatched) {
$output .= '<br /><br />'.&mt('Could not determine e-mail addresses for the following users:').'<ul>';
foreach my $username (sort @unmatched) {
@@ -675,12 +626,11 @@ ENDONE
}
$output .= '</ul>';
}
- $output .= '</td>';
$output .= &Apache::lonhtmlcommon::row_closure();
- $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Sender e-mail address'));
- $output .= '<td><input type="text" name="sender" value="'.$sender.'" /></td>';
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Sender e-mail address'));
+ $output .= '<input type="text" name="sender" value="'.$sender.'" />';
$output .= &Apache::lonhtmlcommon::row_closure();
- $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),'process',&mt('Send Message'));
+ $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),'process',&mt('Send Message'));
$output .= &Apache::lonhtmlcommon::end_pick_box();
} else {
$output .= $lt{'nore'}."\n".
@@ -688,14 +638,14 @@ ENDONE
}
$output .= '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
$output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin','subject','message','recipient','sender'],);
- $output .= '</form></body></html>';
+ $output .= &end_page();
$r->print($output);
return;
}
sub print_request_receipt {
- my ($r,$formname,$dom,$tablecolor,$bodytag,$html,$ltext) =@_;
+ my ($r,$formname,$dom) =@_;
my @recipients = &Apache::loncommon::get_env_multiple('form.recipient');
my $subject = $env{'form.subject'};
my $message = $env{'form.message'};
@@ -706,6 +656,7 @@ function goBack(target) {
document.$formname.submit();
}
ENDSCRIPT
+
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:goBack('pick_target')",
text=>"Select audience"});
@@ -715,74 +666,55 @@ ENDSCRIPT
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/notify?command=process",
text=>"Outcome"});
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
- (undef,'E-mail Delivery','Broadcast_system_email');
- my $output = <<ENDONE;
-$html
-<head>
- <title>LON-CAPA Notification E-mail</title>
-<script type="text/javascript">
-$jscript
-</script>
-</head>
-$bodytag
-$breadcrumbs
-<br />
-<form name="$formname" method="post">
-ENDONE
- $output .= &Apache::lonhtmlcommon::start_pick_box();
+
+
+ my $output = &start_page(&add_script($jscript), 'E-mail Delivery',
+ $formname);
+
+
my @deliveries = ();
&broadcast_email(\@recipients,$subject,$from,$message,\@deliveries);
if (@deliveries > 0) {
+ $output .= &Apache::loncommon::start_data_table();
&store_mail($subject,$message,$dom,\@deliveries);
- $output .= '<tr>
- <td>
- <table cellpadding="4" cellspacing="2" width="100%">
- <tr bgcolor="'.$tablecolor.'" align="center">
- <td><b>Status</b></td>
- <td><b>Subject</b></td>
- <td><b>Message</b></td>
- <td><b>Recipients</b></td>
- </tr>
- <tr bgcolor="#eeeeee">
- <td valign="middle">Sent</td>
- <td valign="middle">'.&cr_to_br($subject).'</td>
- <td valign="middle">'.&cr_to_br($message).'</td>
- <td>';
+ $output .= &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Status').'</th>'.
+ '<th>'.&mt('Subject').'</th>'.
+ '<th>'.&mt('Message').'</th>'.
+ '<th>'.&mt('Recipents').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td valign="middle">'.&mt('Sent').'</td>'.
+ '<td valign="middle">'.&cr_to_br($subject).'</td>'.
+ '<td valign="middle">'.&cr_to_br($message).'</td>'.
+ '<td>';
foreach my $person (@deliveries) {
my ($username,$email) = split(/:/,$person);
- $output .= &Apache::lonnet::unescape($email).' ('.&Apache::lonnet::unescape($username).')<br />'."\n";
+ $output .= &unescape($email).' ('.&unescape($username).')<br />'."\n";
}
- $output .= '</td>
- </tr>
- </table>
- </td>
- </tr>';
- &store_mail($subject,$message,$dom,\@deliveries);
+ $output .= '</td>'.
+ &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table();
} else {
$output .= 'No mail sent - no recipients identified';
}
- $output .= &Apache::lonhtmlcommon::end_pick_box();
$output .= '<br /><a href="/adm/notify">Send another message?</a>'."\n";
$output .= '<input type="hidden" name="command" />'."\n".
'<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
$output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']);
- $output .= '
-</form>
-</body>
-</html>';
+ $output .= &end_page();
$r->print($output);
return;
}
sub broadcast_email {
- my ($recipients,$subject,$from,$message,$deliveries,$ltext)=@_;
+ my ($recipients,$subject,$from,$message,$deliveries)=@_;
# Should implement staggered delivery for large numbers of recipients?.
foreach my $user (@{$recipients}) {
my $msg = new Mail::Send;
my ($username,$to) = split(/:/,$user);
- $username = &Apache::lonnet::unescape($username);
- $to = &Apache::lonnet::unescape($to);
+ $username = &unescape($username);
+ $to = &unescape($to);
$msg->to($to);
$msg->subject($subject);
$msg->add('From',"$from");
@@ -823,7 +755,7 @@ sub get_user_info {
}
sub form_elements {
- my ($longtypes,$authtypes,$ltext) = @_;
+ my ($longtypes,$authtypes) = @_;
%{$longtypes} = (
active => 'Currently has access',
previous => 'Previously had access',
@@ -840,10 +772,11 @@ sub form_elements {
}
sub store_mail {
- my ($subject,$message,$domain,$recipients,$attachmenturl,$ltext) = @_;
+ my ($subject,$message,$domain,$recipients,$attachmenturl) = @_;
my $msgid;
- ($msgid,$message) = &packagemail($subject,$message,$domain,$recipients,
- $attachmenturl);
+ ($msgid,$message) = &Apache::lonmsg::packagemsg($subject,$message,undef,undef,
+ $attachmenturl,$recipients,undef,undef,'dcmail');
+
# Store in dc email db files on primary library server for domain.
my $server = $Apache::lonnet::domain_primary{$domain};
if (defined($server)) {
@@ -858,83 +791,6 @@ sub store_mail {
}
}
-sub packagemail {
- my ($subject,$message,$dom,$recipients,$attachmenturl) = @_;
- my %record = ();
- my $partsubj=$subject;
- $partsubj=&Apache::lonnet::escape($partsubj);
- $message =&HTML::Entities::encode($message,'<>&"');
- $subject =&HTML::Entities::encode($subject,'<>&"');
- #remove machine specification
- $attachmenturl =~ s|^http://[^/]+/|/|;
- $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
- my $now=time;
- my $msgid= &Apache::lonnet::escape($now).':'.$partsubj.':'.
- &Apache::lonnet::escape($env{'user.name'}).':'.
- &Apache::lonnet::escape($env{'user.domain'}).':'.
- &Apache::lonnet::escape($dom).':'.$$;
- my $result='<sendername>'.$env{'user.name'}.'</sendername>'.
- '<senderdomain>'.$env{'user.domain'}.'</senderdomain>'.
- '<time>'.&Apache::lonlocal::locallocaltime($now).'</time>'.
- '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
- '<host>'.$ENV{'HTTP_HOST'}.'</host>'.
- '<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
- '<msgid>'.$msgid.'</msgid>'.
- '<dcdomain>'.$dom.'</dcdomain>'.
- '<subject>'.$subject.'</subject>'.
- '<message>'.$message.'</message>'."\n";
- if (defined($attachmenturl)) {
- $result.= '<attachmenturl>'.$attachmenturl.'</attachmenturl>';
- }
- foreach my $recip (@{$recipients}) {
- my ($username,$email) = split(/:/,$recip);
- $username = &Apache::lonnet::unescape($username);
- $email = &Apache::lonnet::unescape($email);
- $username = &HTML::Entities::encode($username,'<>&"');
- $email = &HTML::Entities::encode($email,'<>&"');
- $result .= '<recipient username="'.$username.'">'.
- $email.'</recipient>';
- }
- return ($msgid,$result);
-}
-
-sub unpackagemail {
- my ($message,$notoken,$ltext)=@_;
- my $parser=HTML::TokeParser->new(\$message);
- my $token;
- my %content=();
- %{$content{recipients}} = ();
- while ($token=$parser->get_token()) {
- if ($token->[0] eq 'S') {
- my $entry=$token->[1];
- my $value=$parser->get_text('/'.$entry);
- my ($username,$email);
- if ($entry eq 'recipient') {
- $username = $token->[2]{'username'};
- $username = &HTML::Entities::decode($username,'<>&"');
- $content{recipients}{$username} =
- &HTML::Entities::decode($value,'<>&"');
- } elsif ($entry eq 'subject' || $entry eq 'message') {
- $content{$entry}=&HTML::Entities::decode($value,'<>&"');
- } else {
- $content{$entry}=$value;
- }
- }
- }
- if ($content{'attachmenturl'}) {
- my ($fname)=($content{'attachmenturl'}=~m|/([^/]+)$|);
- if ($notoken) {
- $content{'message'}.='<p>'.&mt('Attachment').': <tt>'.$fname.'</tt>'; } else {
- &Apache::lonnet::allowuploaded('/adm/notify',
- $content{'attachmenturl'});
- $content{'message'}.='<p>'.&mt('Attachment').
- ': <a href="'.$content{'attachmenturl'}.'"><tt>'.
- $fname.'</tt></a>';
- }
- }
- return %content;
-}
-
sub cr_to_br {
my $incoming = shift;
$incoming =~ s/\n/\<br \/\>/g;