--- loncom/interface/lonnotify.pm 2006/10/12 22:47:31 1.24 +++ loncom/interface/lonnotify.pm 2021/03/06 13:41:46 1.44 @@ -1,3 +1,7 @@ +# The LearningOnline Network with CAPA +# Sending messages +# +# $Id: lonnotify.pm,v 1.44 2021/03/06 13:41:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -114,7 +118,7 @@ sub start_page { $start_page $breadcrumbs
-
+ ENDONE return $output; @@ -139,19 +143,35 @@ function next_page(caller) { } |; - my $output = &start_page(&add_script($jscript), - 'Broadcast e-mail to Domain', $formname); - - $output .= ''; - $output .= ''. - ''. - '
'. - 'Send a new e-mail message to selected users from this domain
'. - 'Display e-mail sent by Domain Coordinators in this domain'. - '
'; - $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) + .'' + .&Apache::lonhtmlcommon::generate_menu(@menu) + .&end_page() + ); return; } @@ -160,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; @@ -200,12 +220,12 @@ 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); - $output .= ' '.$userinfo{firstname}.' '.$userinfo{lastname}.'  ('.$uname.':'.$udom.')'; + $output .= ' '.$userinfo{'firstname'}.' '.$userinfo{'lastname'}.'  ('.$uname.':'.$udom.')'; push (@domcc,$uname.':'.$udom); } } @@ -266,11 +286,11 @@ ENDSCRIPT $output .= &Apache::loncommon::start_data_table(); if ($msgcount > 0) { $output .= &Apache::loncommon::start_data_table_header_row(). - 'Date'. - 'Subject'. - 'Sender'. - 'Message'. - 'Recipients'. + ''.&mt('Date').''. + ''.&mt('Subject').''. + ''.&mt('Sender').''. + ''.&mt('Message').''. + ''.&mt('Recipients').''. &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))) { @@ -337,7 +357,7 @@ ENDSCRIPT } } else { $output .= &Apache::loncommon::start_data_table_empty_row(). - 'No mail sent matching supplied criteria'. + ''.&mt('No mail sent matching supplied criteria').''. &Apache::loncommon::end_data_table_empty_row(); } $output .= &Apache::loncommon::end_data_table(); @@ -358,7 +378,6 @@ ENDSCRIPT sub print_selection_form { my ($r,$formname,$cdom) = @_; - my %coursecodes = (); my %codes = (); my @codetitles = (); my %cat_titles = (); @@ -366,23 +385,26 @@ 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:', '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' + 'comp' => 'Compose E-mail' ); &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); @@ -390,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); @@ -406,7 +429,7 @@ sub print_selection_form { internal => 'text', krb4 => 'text', krb5 => 'text', - local => 'text', + localauth => 'text', unix => 'text', ); $jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements); @@ -416,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'."\n"; 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::role_select_row(\@roles,&mt('Roles')); + $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(); @@ -476,7 +499,7 @@ sub print_composition_form { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:goBack('pick_target')", text=>"Select Audience"}, - {text=>"Compose Message"}); + {text=>"Compose E-mail"}); my $jscript = &Apache::loncommon::check_uncheck_jscript(); $jscript .= qq| function goBack(target) { @@ -501,30 +524,25 @@ function goBack(target) { 'Broadcast e-mail to users', $formname)); my $coursefilter = $env{'form.coursepick'}; - my %courses = (); + my %courses; if ($coursefilter eq 'all') { %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'}); - foreach (@course_ids) { - $courses{$_} = ''; + foreach my $cid (@course_ids) { + $courses{$cid} = ''; } } else { $courses{$env{'form.courselist'}} = ''; @@ -577,7 +595,10 @@ function goBack(target) { $access{$type} = $type; } foreach my $course_id (keys(%courses)) { - my ($cdom,$cnum) = split(/_/,$course_id); + my %coursehash = + &Apache::lonnet::coursedescription($course_id,{'one_time' => 1}); + my $cdom = $coursehash{'domain'}; + my $cnum = $coursehash{'num'}; &Apache::loncommon::get_course_users($cdom,$cnum,\%access,\@roles,\@sections,\%users); } foreach my $role (keys(%users)) { @@ -626,7 +647,7 @@ function goBack(target) { $output .= &Apache::loncommon::end_data_table(); if (@unmatched) { $output .= '

'.&mt('Could not determine e-mail addresses for the following users:').''; @@ -635,7 +656,7 @@ function goBack(target) { $output .= &Apache::lonhtmlcommon::row_title(&mt('Sender e-mail address')); $output .= ''; $output .= &Apache::lonhtmlcommon::row_closure(); - $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),'process',&mt('Send Message')); + $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),'process',&mt('Send')); $output .= &Apache::lonhtmlcommon::end_pick_box(); } else { $output .= $lt{'nore'}."\n". @@ -667,7 +688,7 @@ ENDSCRIPT text=>"Select audience"}); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:goBack('compose')", - text=>"Compose Message"}); + text=>"Compose E-mail"}); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/notify?command=process", text=>"Outcome"}); @@ -686,7 +707,7 @@ ENDSCRIPT ''.&mt('Status').''. ''.&mt('Subject').''. ''.&mt('Message').''. - ''.&mt('Recipents').''. + ''.&mt('Recipients').''. &Apache::loncommon::end_data_table_header_row(); $output .= &Apache::loncommon::start_data_table_row(). ''.&mt('Sent').''. @@ -701,9 +722,9 @@ 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 .= '
Send another message?'."\n"; + $output .= '
'.&mt('Send another e-mail').''."\n"; $output .= ''."\n". ''."\n"; $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']); @@ -723,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; @@ -735,7 +757,7 @@ sub get_user_info { my ($user,%email_defaults) = @_; my ($uname,$udom) = split(/:/,$user); my @emailtypes = ('permanentemail','critnotification','notification'); - my %userinfo = &Apache::lonnet::get('environment',\@emailtypes,$udom,$uname); + my %userinfo = &Apache::loncommon::getemails($uname,$udom); my $email = ''; foreach my $type (@emailtypes) { $email = $userinfo{$type}; @@ -762,16 +784,16 @@ sub get_user_info { sub form_elements { my ($longtypes,$authtypes) = @_; %{$longtypes} = ( - active => 'Currently has access', - previous => 'Previously had access', - future => 'Will have future access', + active => &mt('Currently has access'), + 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)', unix => 'Filesystem (UNIX)', - local => 'Local/Customized', + localauth => 'Local/Customized', ); return; } @@ -783,7 +805,7 @@ sub store_mail { $attachmenturl,$recipients,undef,undef,'dcmail'); # Store in dc email db files on primary library server for domain. - my $server = $Apache::lonnet::domain_primary{$domain}; + my $server = &Apache::lonnet::domain($domain,'primary'); if (defined($server)) { unless (&Apache::lonnet::dcmailput($domain,$msgid,$message,$server) eq 'ok') {