--- loncom/interface/lonnotify.pm 2008/12/05 17:41:34 1.32
+++ loncom/interface/lonnotify.pm 2021/03/06 13:41:46 1.44
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Sending messages
#
-# $Id: lonnotify.pm,v 1.32 2008/12/05 17:41:34 schafran Exp $
+# $Id: lonnotify.pm,v 1.44 2021/03/06 13:41:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,7 +118,7 @@ sub start_page {
$start_page
$breadcrumbs
<br />
-<form name="$formname" method="POST">
+<form name="$formname" method="post" action="">
ENDONE
return $output;
@@ -143,19 +143,35 @@ function next_page(caller) {
}
|;
- 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'".')">'.
- &mt('Send a new e-mail to selected users from this domain').'</a></td></tr><tr>'.
- '<td><a href="javascript:next_page('."'view'".')">'.
- &mt('Display e-mail sent by Domain Coordinators in this domain').
- '</a></td></tr></table>';
- $output .= &end_page();
- $r->print($output);
+ my @menu=
+ ({ categorytitle=>'Broadcast e-mail to Domain',
+ items =>[
+ { linktext => 'Send e-mail to selected users',
+ url => 'javascript:next_page('."'new'".')',
+ permission => 1,
+ #help => '',
+ icon => 'mail-reply-all.png',
+ linktitle => 'Send a new e-mail to selected users from this domain'
+ },
+ { linktext => 'Display sent e-mails',
+ url => 'javascript:next_page('."'view'".')',
+ permission => 1,
+ #help => '',
+ icon => 'messalog.png',
+ linktitle => 'Display e-mail sent by Domain Coordinators in this domain'
+ },
+ ]
+ },
+ );
+
+ $r->print(
+ &start_page(&add_script($jscript),
+ 'Broadcast e-mail to Domain', $formname)
+ .'<input type="hidden" name="command" />'
+ .&Apache::lonhtmlcommon::generate_menu(@menu)
+ .&end_page()
+ );
return;
}
@@ -164,7 +180,7 @@ sub print_display_option_form {
&Apache::lonhtmlcommon::add_breadcrumb({text=>"Display options"});
my $cmd = 'display';
- my $submit_text = 'Display e-mail';
+ my $submit_text = &mt('Display e-mail');
my @roles = ('dc');
my $now = time;
@@ -204,8 +220,8 @@ sub print_display_option_form {
$output .= &Apache::lonhtmlcommon::row_title(&mt('Choose sender(s)'));
my %personnel = &Apache::lonnet::get_domain_roles($cdom,\@roles);
my @domcc = ();
- foreach my $server (keys %personnel) {
- foreach my $user (sort(keys %{$personnel{$server}})) {
+ foreach my $server (keys(%personnel)) {
+ foreach my $user (sort(keys(%{$personnel{$server}}))) {
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
unless (grep/^$uname:$udom$/,@domcc) {
my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname);
@@ -270,11 +286,11 @@ ENDSCRIPT
$output .= &Apache::loncommon::start_data_table();
if ($msgcount > 0) {
$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>'.
+ '<th><a href="javascript:changeSort(\'date\')">'.&mt('Date').'</a></th>'.
+ '<th><a href="javascript:changeSort(\'subject\')">'.&mt('Subject').'</a></th>'.
+ '<th><a href="javascript:changeSort(\'sender\')">'.&mt('Sender').'</a></th>'.
+ '<th><a href="javascript:changeSort(\'message\')">'.&mt('Message').'</a></th>'.
+ '<th><a href="javascript:changeSort(\'recipients\')">'.&mt('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))) {
@@ -341,7 +357,7 @@ ENDSCRIPT
}
} else {
$output .= &Apache::loncommon::start_data_table_empty_row().
- '<td>No mail sent matching supplied criteria</td>'.
+ '<td>'.&mt('No mail sent matching supplied criteria').'</td>'.
&Apache::loncommon::end_data_table_empty_row();
}
$output .= &Apache::loncommon::end_data_table();
@@ -362,7 +378,6 @@ ENDSCRIPT
sub print_selection_form {
my ($r,$formname,$cdom) = @_;
- my %coursecodes = ();
my %codes = ();
my @codetitles = ();
my %cat_titles = ();
@@ -370,9 +385,7 @@ sub print_selection_form {
my %idlist = ();
my %idnums = ();
my %idlist_titles = ();
- my $caller = 'global';
my $totcodes = 0;
- my $format_reply;
my $jscript = '';
my %lt=&Apache::lonlocal::texthash(
'buil' => 'Building valid e-mail address from username, if missing from preferences:',
@@ -383,10 +396,15 @@ sub print_selection_form {
&Apache::lonhtmlcommon::add_breadcrumb
({text=>"Select Audience"});
- $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$cdom,$totcodes);
- if ($totcodes > 0) {
- $format_reply = &Apache::lonnet::auto_instcode_format($caller,$cdom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
- if ($format_reply eq 'ok') {
+ my $instcats = &Apache::lonnet::get_dom_instcats($cdom);
+ if (ref($instcats) eq 'HASH') {
+ if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH') &&
+ (ref($instcats->{'cat_titles'}) eq 'HASH') && (ref($instcats->{'cat_order'}) eq 'HASH')) {
+ %codes = %{$instcats->{'codes'}};
+ @codetitles = @{$instcats->{'codetitles'}};
+ %cat_titles = %{$instcats->{'cat_titles'}};
+ %cat_order = %{$instcats->{'cat_order'}};
+ $totcodes = scalar(keys(%codes));
my $numtypes = @codetitles;
&Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
@@ -394,9 +412,10 @@ sub print_selection_form {
my $allidlist = $idlist{$codetitles[0]};
$jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist);
$jscript .= $scripttext;
- $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles);
+ $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,\@codetitles);
}
}
+ my @standardnames = &Apache::loncommon::get_standard_codeitems();
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom);
@@ -420,7 +439,7 @@ function setCourseCat(formname) {
if (formname.Year.options[formname.Year.selectedIndex].value == -1) {
return;
}
- courseSet('Year');
+ courseSet('$codetitles[0]');
for (var j=0; j<formname.Semester.length; j++) {
if (formname.Semester.options[j].value == "$env{'form.Semester'}") {
formname.Semester.options[j].selected = true;
@@ -429,7 +448,7 @@ function setCourseCat(formname) {
if (formname.Semester.options[formname.Semester.selectedIndex].value == -1) {
return;
}
- courseSet('Semester');
+ courseSet('$codetitles[1]');
for (var j=0; j<formname.Department.length; j++) {
if (formname.Department.options[j].value == "$env{'form.Department'}") {
formname.Department.options[j].selected = true;
@@ -438,7 +457,7 @@ function setCourseCat(formname) {
if (formname.Department.options[formname.Department.selectedIndex].value == -1) {
return;
}
- courseSet('Department');
+ courseSet('$codetitles[2]');
for (var j=0; j<formname.Number.length; j++) {
if (formname.Number.options[j].value == "$env{'form.Number'}") {
formname.Number.options[j].selected = true;
@@ -465,9 +484,9 @@ function setCourseCat(formname) {
my $submit_text = $lt{'comp'};
my $cmd = 'compose';
$output .= &Apache::lonhtmlcommon::role_select_row(\@roles,&mt('Roles'));
- $output .= &Apache::lonhtmlcommon::course_select_row(&mt('Courses'),$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
+ $output .= &Apache::lonhtmlcommon::course_select_row(&mt('Courses'),$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles,undef,undef,\@standardnames);
$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::email_default_row(\%authtypes,&mt('Username -> E-mail conversion'),$descrip);
$output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),$cmd,$submit_text);
$output .= &Apache::lonhtmlcommon::end_pick_box();
$output .= &end_page();
@@ -510,20 +529,15 @@ function goBack(target) {
%courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
undef,undef,'Course');
} elsif ($coursefilter eq 'category') {
- my $instcode = '';
- my @cats = ('Semester','Year','Department','Number');
- foreach my $category (@cats) {
- if (defined($env{'form.'.$category})) {
- unless ($env{'form.'.$category} eq '-1') {
- $instcode .= $env{'form.'.$category};
- }
- }
- }
+ my $instcode = &Apache::courseclassifier::instcode_from_selectors($cdom);
+ my $regexp = '';
if ($instcode eq '') {
$instcode = '.';
+ } else {
+ $regexp = 1;
}
%courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
- undef,undef,'Course');
+ undef,undef,'Course',$regexp);
} elsif ($coursefilter eq 'specific') {
if ($env{'form.coursetotal'} > 1) {
my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -633,7 +647,7 @@ function goBack(target) {
$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) {
+ foreach my $username (sort(@unmatched)) {
$output .= '<li>'.$username.'</li>';
}
$output .= '</ul>';
@@ -693,7 +707,7 @@ ENDSCRIPT
'<th>'.&mt('Status').'</th>'.
'<th>'.&mt('Subject').'</th>'.
'<th>'.&mt('Message').'</th>'.
- '<th>'.&mt('Recipents').'</th>'.
+ '<th>'.&mt('Recipients').'</th>'.
&Apache::loncommon::end_data_table_header_row();
$output .= &Apache::loncommon::start_data_table_row().
'<td valign="middle">'.&mt('Sent').'</td>'.
@@ -708,7 +722,7 @@ ENDSCRIPT
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
} else {
- $output .= 'No mail sent - no recipients identified';
+ $output .= &mt('No mail sent - no recipients identified');
}
$output .= '<br /><a href="/adm/notify">'.&mt('Send another e-mail').'</a>'."\n";
$output .= '<input type="hidden" name="command" />'."\n".
@@ -730,6 +744,7 @@ sub broadcast_email {
$msg->to($to);
$msg->subject($subject);
$msg->add('From',"$from");
+ $msg->add('Content-type','text/plain; charset=UTF-8');
if (my $fh = $msg->open()) {
print $fh $message;
$fh->close;
@@ -773,7 +788,7 @@ sub form_elements {
previous => &mt('Previously had access'),
future => &mt('Will have future access'),
);
- %{$authtypes} = (
+ %{$authtypes} = &Apache::lonlocal::texthash (
krb4 => 'Kerberos 4',
krb5 => 'Kerberos 5',
internal => 'Internal (LON-CAPA)',