--- loncom/interface/lonnotify.pm 2005/10/13 22:37:40 1.5
+++ loncom/interface/lonnotify.pm 2006/05/30 12:46:09 1.19
@@ -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) = @_;
@@ -53,37 +55,81 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['command']);
my $command = $env{'form.command'};
+ 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 $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
- my $bodytag = &Apache::loncommon::bodytag('Broadcast e-mail to users');
- my $html=&Apache::lonxml::xmlbegin();
+
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/notify',
text=>"Broadcast E-mail"});
if ($command eq 'process') {
- &print_request_receipt($r,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_request_receipt($r,$command,$cdom,$tablecolor);
} elsif ($command eq 'compose') {
- &print_composition_form($r,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_composition_form($r,$command,$cdom,$tablecolor);
} elsif ($command eq 'pick_target') {
- &print_selection_form($r,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_selection_form($r,$command,$cdom,$tablecolor);
} elsif ($command eq 'pick_display') {
- &print_display_option_form($r,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_display_option_form($r,$command,$cdom,$tablecolor);
} elsif ($command eq 'display') {
- &print_display($r,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_display($r,$command,$cdom,$tablecolor);
} else {
- &print_front_page($r,$cdom,$tablecolor,$bodytag,$html,\%ltext);
+ &print_front_page($r,'front',$cdom,$tablecolor);
}
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,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
- (undef,'Broadcast e-mail to Domain','Broadcast_system_email');
+ my ($r,$formname,$cdom,$tablecolor) = @_;
+
my $jscript = qq|
function next_page(caller) {
if (caller == 'view') {
@@ -95,23 +141,11 @@ 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="front" method="post">'.
- '<input type="hidden" name="command" />';
+
+ my $output = &start_page(&add_script($jscript),
+ 'Broadcast e-mail to Domain', $formname);
+
+ $output .= '<input type="hidden" name="command" />';
$output .= &Apache::lonhtmlcommon::start_pick_box();
$output .= '<table cellspacing="8" cellpadding="8">'.
'<tr><td><a href="javascript:next_page('."'new'".')">'.
@@ -120,50 +154,49 @@ ENDONE
'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,$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 ($r,$formname,$cdom,$tablecolor) = @_;
+ &Apache::lonhtmlcommon::add_breadcrumb({text=>"Display options"});
+
my $table_width = '';
my $col_width = '200';
- my $formname = '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);
my $enddateform = &Apache::lonhtmlcommon::date_setter($formname,
'enddate',
$now);
- my $jscript;
- 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
+ my %elements = (
+ startdate_month => 'selectbox',
+ startdate_hour => 'selectbox',
+ enddate_month => 'selectbox',
+ enddate_hour => 'selectbox',
+ startdate_day => 'text',
+ startdate_year => 'text',
+ startdate_minute => 'text',
+ startdate_second => 'text',
+ enddate_day => 'text',
+ enddate_year => 'text',
+ enddate_minute => 'text',
+ enddate_second => 'text',
+ sender => 'checkbox',
+ );
+ my $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
+
+ my $output = &start_page(&add_script($jscript),
+ 'Broadcast e-mail display options', $formname);
+
$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>'.
@@ -189,76 +222,58 @@ ENDONE
$output .= &Apache::lonhtmlcommon::row_closure();
$output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&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,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
+ my ($r,$formname,$cdom,$tablecolor) = @_;
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/notify?command=pick_display',
+ ({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 $formname = 'display_sent';
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";
function changeSort(caller) {
+ document.$formname.command.value = '$formname';
document.$formname.sortby.value = caller;
- document.$formname.submit();
+ document.$formname.submit();
+}
+function goBack(target) {
+ document.$formname.command.value = target;
+ document.$formname.submit();
}
+
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
- foreach my $server (keys(%sentmail)) {
- foreach my $msgid (keys(%{$sentmail{$server}})) {
- my %content = &unpackagemail($sentmail{$server}{$msgid});
- if (defined($dcmail{$msgid})) {
- foreach my $user (keys(%{$content{'recipients'}})) {
- $dcmail{$msgid}{recipients}{$user} = $content{recipients}{$user};
+ my $output = &start_page(&add_script($jscript),
+ 'Display Broadcast e-mail', $formname);
+
+ foreach my $msgid (keys(%sentmail)) {
+ my %content = &Apache::lonmsg::unpackagemsg($sentmail{$msgid});
+ $msgcount ++;
+ %{$dcmail{$msgid}} = ();
+ foreach my $item (keys(%content)) {
+ if ($item eq 'recipient') {
+ foreach my $user (keys(%{$content{recipient}})) {
+ $dcmail{$msgid}{recipient}{$user} = $content{recipient}{$user};
}
} else {
- $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};
- }
- } else {
- $dcmail{$msgid}{$item} = $content{$item};
- }
- }
+ $dcmail{$msgid}{$item} = $content{$item};
}
}
}
@@ -281,10 +296,11 @@ ENDONE
$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";
@@ -292,15 +308,16 @@ ENDONE
}
} 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;
@@ -321,13 +338,13 @@ ENDONE
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 ++;
@@ -339,20 +356,23 @@ ENDONE
$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::lonhtmlcommon::end_pick_box();
- $output .= &echo_form_input();
- unless (defined($env{'form.sortby'})) {
- $output .= qq(<input type="hidden" name="sortby" value="date" />\n);
- }
- $output .= qq(
-</form>
-</body>
-</html>);
+ $output .= &Apache::lonhtmlcommon::echo_form_input(['sortby','command','origin']);
+ my $curr_sortby;
+ if (defined($env{'form.sortby'})) {
+ $curr_sortby = $env{'form.sortby'};
+ } else {
+ $curr_sortby = 'date';
+ }
+ $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 .= &end_page();
$r->print($output);
return;
}
sub print_selection_form {
- my ($r,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
+ my ($r,$formname,$cdom,$tablecolor) = @_;
my %coursecodes = ();
my %codes = ();
my @codetitles = ();
@@ -365,21 +385,14 @@ sub print_selection_form {
my $totcodes = 0;
my $format_reply;
my $jscript = '';
- my $formname = 'rolefilter';
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.',
'comp' => 'Compose Message'
);
- my $loaditems = qq|
-function initialize_codes() {
- return;
-}
- |;
&Apache::lonhtmlcommon::add_breadcrumb
({text=>"Select Audience"});
@@ -390,79 +403,115 @@ function initialize_codes() {
my $numtypes = @codetitles;
&Apache::lonsupportreq::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
&Apache::lonsupportreq::javascript_code_selections($formname,$numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles);
- $loaditems = '';
}
}
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
- (undef,'Choose e-mail audience','Broadcast_system_email');
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom);
- 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','ad','st','cr');
- my %longtypes = ();
- my %authtypes = ();
- &form_elements(\%longtypes,\%authtypes);
- my $descrip = $lt{'buil'}.'
+
+ my %elements = (
+ roles => 'selectbox',
+ types => 'selectbox',
+ Year => 'selectbox',
+ coursepick => 'radio',
+ coursetotal => 'text',
+ courselist => 'text',
+ internal => 'text',
+ krb4 => 'text',
+ krb5 => 'text',
+ local => 'text',
+ unix => 'text',
+ );
+ $jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements);
+ if ($env{'form.coursepick'} eq 'category') {
+ $jscript .= qq|
+function setCourseCat(formname) {
+ if (formname.Year.options[formname.Year.selectedIndex].value == -1) {
+ return;
+ }
+ courseSet('Year');
+ for (var j=0; j<formname.Semester.length; j++) {
+ if (formname.Semester.options[j].value == "$env{'form.Semester'}") {
+ formname.Semester.options[j].selected = true;
+ }
+ }
+ if (formname.Semester.options[formname.Semester.selectedIndex].value == -1) {
+ return;
+ }
+ courseSet('Semester');
+ for (var j=0; j<formname.Department.length; j++) {
+ if (formname.Department.options[j].value == "$env{'form.Department'}") {
+ formname.Department.options[j].selected = true;
+ }
+ }
+ if (formname.Department.options[formname.Department.selectedIndex].value == -1) {
+ return;
+ }
+ courseSet('Department');
+ for (var j=0; j<formname.Number.length; j++) {
+ if (formname.Number.options[j].value == "$env{'form.Number'}") {
+ formname.Number.options[j].selected = true;
+ }
+ }
+}
+|;
+ }
+
+
+ my $output = &start_page(&add_script($jscript).$cb_jscript,
+ 'Choose e-mail audience', $formname);
+
+ $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'}.'
<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,$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 .= &end_page();
$r->print($output);
return;
}
sub print_composition_form {
- my ($r,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;
+ my ($r,$formname,$cdom,$tablecolor) = @_;
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/notify?command=pick_target',
+ ({href=>"javascript:goBack('pick_target')",
text=>"Select Audience"},
{text=>"Compose Message"});
my $jscript = &Apache::loncommon::check_uncheck_jscript();
- my $breadcrumbs = (&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Broadcast e-mail to users','Broadcast_system_email'));
+ $jscript .= qq|
+function goBack(target) {
+ document.$formname.command.value = target;
+ document.$formname.submit();
+}
+|;
my %lt=&Apache::lonlocal::texthash(
- 'note' => 'Notification E-mail',
'nore' => 'No recipients identified',
'emad' => 'e-mail address',
);
- $r->print(<<ENDONE);
-$html
-<head>
- <title>LON-CAPA $lt{'note'}</title>
-<script type"text/javascript">
-$jscript
-</script>
-</head>
-$bodytag $breadcrumbs
-<br />
-ENDONE
+ my %elements = (
+ subject => 'text',
+ message => 'text',
+ sender => 'text',
+ recipient => 'checkbox',
+ );
+ $jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements);
+
+ $r->print(&start_page(&add_script($jscript),
+ 'Broadcast e-mail to users', $formname));
+
my $coursefilter = $env{'form.coursepick'};
my %courses = ();
if ($coursefilter eq 'all') {
@@ -530,6 +579,7 @@ ENDONE
my %recipients = ();
my %users = ();
my %access = ();
+ my @sections = ();
my $totalrecip = 0;
my @unmatched = ();
foreach my $role (@roles) {
@@ -540,7 +590,7 @@ ENDONE
}
foreach my $course_id (keys(%courses)) {
my ($cdom,$cnum) = split(/_/,$course_id);
- &Apache::loncommon::get_course_users($cdom,$cnum,\%access,\@roles,\%users);
+ &Apache::loncommon::get_course_users($cdom,$cnum,\%access,\@roles,\@sections,\%users);
}
foreach my $role (keys(%users)) {
foreach my $user (keys(%{$users{$role}})) {
@@ -554,7 +604,7 @@ ENDONE
}
}
}
- my $output = '<form name="compose" method="post">'."\n";
+ my $output;
if ($totalrecip > 0) {
$output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
@@ -576,8 +626,8 @@ ENDONE
}
foreach my $username (sort(keys(%recipients))) {
if ($recipients{$username} =~ /\@/) {
- my $value=&Apache::lonnet::escape($username).':'.&Apache::lonnet::escape($recipients{$username});
- $output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" checked="checked" /></td><td>'.$username.'</td><td> </td><td>'.$recipients{$username}.'</td></tr>';
+ my $value=&escape($username).':'.&escape($recipients{$username});
+ $output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td> </td><td>'.$recipients{$username}.'</td></tr>';
}
}
$output .= '</table>';
@@ -596,51 +646,44 @@ ENDONE
$output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),'process',&mt('Send Message'));
$output .= &Apache::lonhtmlcommon::end_pick_box();
} else {
- $output .= $lt{'nore'};
+ $output .= $lt{'nore'}."\n".
+ '<input type="hidden" name="command" value="" />'."\n";
}
- $output .= &echo_form_input('command');
- $output .= '</form></body></html>';
+ $output .= '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
+ $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin','subject','message','recipient','sender'],);
+ $output .= &end_page();
$r->print($output);
return;
}
sub print_request_receipt {
- my ($r,$dom,$tablecolor,$bodytag,$html,$ltext) =@_;
+ my ($r,$formname,$dom,$tablecolor) =@_;
my @recipients = &Apache::loncommon::get_env_multiple('form.recipient');
my $subject = $env{'form.subject'};
my $message = $env{'form.message'};
my $from = $env{'form.sender'};
my $jscript = <<ENDSCRIPT;
-function showCompose() {
- document.goback.command.value = 'compose';
- document.goback.submit();
+function goBack(target) {
+ document.$formname.command.value = target;
+ document.$formname.submit();
}
ENDSCRIPT
+
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/notify?command=pick_target',
+ ({href=>"javascript:goBack('pick_target')",
text=>"Select audience"});
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'javascript:showCompose()',
+ ({href=>"javascript:goBack('compose')",
text=>"Compose Message"});
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/notify?command=process',
+ ({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="goback" method="post">
-ENDONE
+
+
+ my $output = &start_page(&add_script($jscript), 'E-mail Delivery',
+ $formname);
+
$output .= &Apache::lonhtmlcommon::start_pick_box();
my @deliveries = ();
&broadcast_email(\@recipients,$subject,$from,$message,\@deliveries);
@@ -662,36 +705,34 @@ ENDONE
<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);
} 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 .= &echo_form_input();
- $output .= '
-</form>
-</body>
-</html>';
+ $output .= '<input type="hidden" name="command" />'."\n".
+ '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
+ $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']);
+ $output .= &end_page();
$r->print($output);
return;
}
sub broadcast_email {
- my ($recipients,$subject,$from,$message,$deliveries,$ltext)=@_;
-# find some way to spread out delivery for large numbers of recipients.
+ 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");
@@ -732,7 +773,7 @@ sub get_user_info {
}
sub form_elements {
- my ($longtypes,$authtypes,$ltext) = @_;
+ my ($longtypes,$authtypes) = @_;
%{$longtypes} = (
active => 'Currently has access',
previous => 'Previously had access',
@@ -749,120 +790,23 @@ sub form_elements {
}
sub store_mail {
- my ($subject,$message,$domain,$recipients,$attachmenturl,$ltext) = @_;
- my %servers = ();
- my $msgid=&packagemail($subject,$message,$domain,
- $recipients,\%servers,$attachmenturl);
-# Store in dc email db files on appropriate servers.
- foreach my $server (keys(%servers)) {
- unless (&Apache::lonnet::dcmailput($domain,$msgid,\%servers,$server) eq 'ok') {
- &logthis('Storage of dc mail failed for domain'.$domain.' for server: '.
- $server.'. Message ID was '.$msgid);
- }
- }
-}
-
-sub packagemail {
- my ($subject,$message,$dom,$recipients,$servers,$attachmenturl,$ltext) = @_;
- 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);
- my ($uname,$udom) = split(/:/,$username);
- my $uhom=&Apache::lonnet::homeserver($uname,$udom);
- if ($uhom ne 'no_host') {
- $username = &HTML::Entities::encode($username,'<>&"');
- $email = &HTML::Entities::encode($email,'<>&"');
- $record{$uhom} .= '<recipient username="'.$username.'">'.
- $email.'</recipient>';
- }
- }
- foreach my $server (keys(%record)) {
- $$servers{$server} = $result.$record{$server};
- }
- return $msgid;
-}
-
-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 echo_form_input {
- my (@excluded) = @_;
- my $output = '';
- foreach my $key (keys(%env)) {
- if ($key =~ /^form\.(.+)$/) {
- if ((!@excluded) || (!grep/^$1$/,@excluded)) {
- if (ref($env{$key})) {
- foreach my $value (@{$env{$key}}) {
- $output .= qq(<input type="hidden" name="$1" value="$value" />\n);
- }
- } else {
- $output .= qq(<input type="hidden" name="$1" value="$env{$key}" />\n);
- }
- }
+ my ($subject,$message,$domain,$recipients,$attachmenturl) = @_;
+ my $msgid;
+ ($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)) {
+ unless (&Apache::lonnet::dcmailput($domain,$msgid,$message,$server)
+ eq 'ok') {
+ &Apache::lonnet::logthis('Storage of dc mail failed for domain'.
+ $domain.' for server: '. $server.'. Message ID was '.$msgid);
}
+ } else {
+ &Apache::lonnet::logthis('Storage of dc mail failed for domain'.
+ $domain.' as no primary server identified. Message ID was '.$msgid);
}
- return $output;
}
sub cr_to_br {
@@ -871,5 +815,4 @@ sub cr_to_br {
return $incoming;
}
-
1;