--- loncom/interface/lonmsgdisplay.pm 2007/08/06 22:00:53 1.82 +++ loncom/interface/lonmsgdisplay.pm 2010/11/20 13:06:58 1.155 @@ -1,7 +1,7 @@ -# The LearningOnline Network with CAPA +# $textareaclass The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.82 2007/08/06 22:00:53 albertel Exp $ +# $Id: lonmsgdisplay.pm,v 1.155 2010/11/20 13:06:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -113,8 +113,8 @@ use lib '/home/httpd/lib/perl/'; use LONCAPA; # Querystring component with sorting type -my $sqs; -my $startdis; +my $sqs=''; +my $startdis=''; # ============================================================ List all folders @@ -136,6 +136,9 @@ sub folderlist { ); + # set se lastvisit for the new mail check in the toplevel menu + &Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time}); + my %actions = &Apache::lonlocal::texthash( view => 'View Folder', rename => 'Rename Folder', @@ -143,7 +146,7 @@ sub folderlist { ); $actions{'select_form_order'} = ['view','rename','delete']; - my %statushash = &get_msgstatus_types(); + my %statushash = &Apache::lonlocal::texthash(&get_msgstatus_types()); $statushash{'select_form_order'} = ['','new','read','replied','forwarded']; @@ -170,6 +173,7 @@ sub folderlist { $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash']; my $output = qq||; my %show = ('select_form_order' => [10,20,50,100,200], map {$_=>$_} (10,20,50,100,200)); - - + $output .= '
- - - - - -
- +
- - + - -
'.$lt{'fold'}.'
'."\n". - &Apache::loncommon::select_form($folder,'folder',%formhash).' +
'.$lt{'fold'}.'
'."\n". + &Apache::loncommon::select_form($folder,'folder',\%formhash).'
'.$lt{'show'}.'
'."\n". +
'.$lt{'show'}.'
'."\n". &Apache::loncommon::select_form($env{'form.interdis'},'interdis', - %show).' + \%show).' +
'.$lt{'status'}.'
'."\n". + &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
'.$lt{'status'}.'
'."\n". - &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).' +
'.$lt{'actn'}.'
'."\n".' + '. + &Apache::loncommon::select_form('view','folderaction',\%actions). + ' +
'.$lt{'actn'}.'
'. - &Apache::loncommon::select_form('view','folderaction',%actions).' -

'. - ' +
'.&mt('New Folder').'
'."\n".' + + + +
-
     - '. - '

-
'.&mt('New Folder').'
'. - ' -
-
'."\n". +'."\n". ''. ''. ($folder=~/^critical/?'
':''); @@ -268,12 +268,13 @@ sub get_permanent_folders { } sub get_msgstatus_types { - my %statushash = &Apache::lonlocal::texthash( - '' => 'Any', - new => 'Unread', - read => 'Read', - replied => 'Replied to', - forwarded => 'Forwarded', + # Don't translate here! + my %statushash = ( + '' => 'Any', + 'new' => 'Unread', + 'read' => 'Read', + 'replied' => 'Replied to', + 'forwarded' => 'Forwarded', ); return %statushash; } @@ -286,18 +287,31 @@ sub scrollbuttons { my %statushash = &get_msgstatus_types(); my $status; if ($msgstatus eq '') { - $status = &mt('All'); + $status = 'All'; # Don't translate here! } else { $status = $statushash{$msgstatus}; } - return - ''.&mt('Page').': '. - ''. - ''. - ' of '.$maxdis. - ''. - '
'. - &mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).''; + my $output = ''.&mt('Page:').' '; + if ($maxdis == 1) { + # No buttons if only one page is displayed + $output .= '1/1'; + } else { + $output .= + ''. + ''. + ' / '.$maxdis.' '. + ''. + ''; + } + $output .= + '

' + .''.&mt($status.' messages:').' ' + .&mt('showing messages [_1] through [_2] of [_3].', + $first,$finish,$total) + .'

' + .''; + + return $output; } # =============================================================== Status Change @@ -353,7 +367,7 @@ sub makefolder { } } else { $outcome = - &mt('Error - could not obtain lock on email folders record.'); + &mt('Error - could not obtain lock on message folders record.'); } return ($outcome,$warning); } @@ -364,7 +378,7 @@ sub deletefolder { my ($folder)=@_; my %permfolders = &get_permanent_folders(); if (defined($permfolders{$folder})) { - return &mt('The folder "[_1]" may not be deleted',$folder); + return &mt('The folder "[_1]" may not be deleted.',$folder); } my %userfolders = &Apache::lonmsg::get_user_folders(); if (!defined($userfolders{$folder})) { @@ -502,7 +516,9 @@ sub movemsg { # ======================================================= Display a course list sub discourse { - my $result; + my ($statushash) = @_; + my ($result,$active,$previous,$future); + my $crstype = &Apache::loncommon::course_type(); my ($course_personnel, $current_members, $expired_members, @@ -511,51 +527,106 @@ sub discourse { unshift @$current_members, (@$course_personnel); my %defaultUsers; - $result .= ''."\n"; + my $tmptext; + if ($tmptext = &Apache::lonselstudent::render_student_list($current_members, + "activeusers", + "current", + \%defaultUsers, + 1,"selectedusers",1,'email') + ) { + my $bcc_curr_hdr; + if ($crstype eq 'Community') { + $bcc_curr_hdr = &mt('Bcc: community participants with current access'); + } else { + $bcc_curr_hdr = &mt('Bcc: course members with current access'); + } + $result .= '
' + .$bcc_curr_hdr + .'' + .'
'; + $result .= $tmptext.'

'; + if (ref($statushash) eq 'HASH') { + $statushash->{'active'} = 1; + } + } + if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members, + "previoususers", + "expired", + \%defaultUsers, + 1, "selectedusers",0,'email') + ) { + my $bcc_prev_hdr; + if ($crstype eq 'Community') { + $bcc_prev_hdr = &mt('Bcc: community participants with expired access'); + } else { + $bcc_prev_hdr = &mt('Bcc: course members with expired access'); + } + $result .= '
' + .$bcc_prev_hdr + .'' + .'
'; + $result .= $tmptext.'

'; + if (ref($statushash) eq 'HASH') { + $statushash->{'previous'} = 1; + } + + } + if ($tmptext = &Apache::lonselstudent::render_student_list($future_members, + "futureusers", + "future", + \%defaultUsers, + 1, "selectedusers",0,'email') + ) { + my $bcc_future_hdr; + if ($crstype eq 'Community') { + $bcc_future_hdr = &mt('Bcc: community participants with future access'); + } else { + $bcc_future_hdr = &mt('Bcc: course members with future access'); + } + + $result .= '
' + .$bcc_future_hdr + .'' + .'
'; + $result .= $tmptext.'
'; + if (ref($statushash) eq 'HASH') { + $statushash->{'future'} = 1; + } - $result .= &Apache::lonselstudent::render_student_list($current_members, - "compemail", - "current", - \%defaultUsers, - 1,"selectedusers",1); - - $result .= &Apache::lonselstudent::render_student_list($expired_members, - "compemail", - "expired", - \%defaultUsers, - 1, "selectedusers",0); - $result .= &Apache::lonselstudent::render_student_list($future_members, - "compemail", - "future", - \%defaultUsers, - 1, "selectedusers", 0); + } return $result; } sub disgroup { - my ($cdom,$cnum,$group,$viewgrps,$editgrps) = @_; - my $result; + my ($r,$cdom,$cnum,$group,$access_status) = @_; + my $hasfloat; # Needs to be in a course if (!($env{'request.course.fn'})) { - $result = &mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.'); - return $result; + $r->print(''.&mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.').''); + return; } if ($cdom eq '' || $cnum eq '') { - $result = &mt('Error: could not determine domain or number of course'); - return $result; + $r->print(''.&mt('Error: could not determine domain or number of course').''); + return; } my ($memberinfo,$numitems) = &Apache::longroup::group_memberlist($cdom,$cnum,$group,{},[]); my @statustypes = ('active'); + my $viewgrps = &Apache::lonnet::allowed('vcg',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + my $editgrps = &Apache::lonnet::allowed('mdg',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); if ($viewgrps || $editgrps) { push(@statustypes,('future','previous')); } if (keys(%{$memberinfo}) == 0) { - $result = &mt('As this group has no members, there are no '. - 'recipients to select.'); - return $result; + $r->print(''. + &mt('As this group has no members, there are no recipients to select'). + ''); + return; } else { - $result = &mt('Select message recipients from the group members listed below.
'); + $hasfloat = 1; + $r->print('
'); my %Sortby = ( active => {}, previous => {}, @@ -565,9 +636,9 @@ sub disgroup { 'name' => 'Name', 'usnm' => 'Username', 'doma' => 'Domain', - 'active' => 'Active Members', - 'previous' => 'Former Members', - 'future' => 'Future Members', + 'active' => 'Broadcast to Active Members', + 'previous' => 'Broadcast (Bcc) to Former Members', + 'future' => 'Broadcast (Bcc) to Future Members', ); foreach my $user (sort(keys(%{$memberinfo}))) { my $status = $$memberinfo{$user}{status}; @@ -581,75 +652,80 @@ sub disgroup { push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user); } } - $result .= &group_check_uncheck(); - $result .= ''. - ''; + $r->print(&group_check_uncheck()); foreach my $status (@statustypes) { if (ref($numitems) eq 'HASH') { if ((defined($$numitems{$status})) && ($$numitems{$status})) { - $result.='". - "". - "". - &Apache::loncommon::end_data_table_header_row(); + my $formname = $status.'users'; + if (ref($access_status) eq 'HASH') { + $access_status->{$status} = $$numitems{$status}; + } + $r->print('
'. + ''.$lt{$status}.''. + '
'. + ''. + ''. + '  '. + ''. + ''); + if ($status eq 'active') { + $r->print((' 'x3).''); + } + $r->print('
'.&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + "
". + "". + "". + &Apache::loncommon::end_data_table_header_row()); foreach my $key (sort(keys(%{$Sortby{$status}}))) { foreach my $user (@{$Sortby{$status}{$key}}) { - $result .= - &Apache::loncommon::start_data_table_row(). - ''. + $$memberinfo{$user}{'fullname'}.''. ''. ''. - &Apache::loncommon::end_data_table_row(); + &Apache::loncommon::end_data_table_row()); } } - $result .= &Apache::loncommon::end_data_table(); + $r->print(&Apache::loncommon::end_data_table().''. + '
'); } } - $result .= ''; } - $result .= '
'. - '
'.$lt{$status}. - ''. - ''. - '  '. - ''. - '

'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(); - $result .= "
$lt{'name'}$lt{'usnm'}$lt{'doma'}$lt{'name'}$lt{'usnm'}$lt{'doma'}print(&Apache::loncommon::start_data_table_row(). + ''. - $$memberinfo{$user}{'fullname'}.''.$$memberinfo{$user}{'uname'}.''.$$memberinfo{$user}{'udom'}.'  
'; + $r->print('
'); } - return $result; + return $hasfloat; } sub group_check_uncheck { my $output = qq| |; } @@ -679,10 +755,16 @@ sub groupmail_header { } &Apache::lonhtmlcommon::clear_breadcrumbs(); if ($refarg) { + my $brtitle; + if (&Apache::loncommon::course_type() eq 'Community') { + $brtitle = 'View community groups'; + } else { + $brtitle = 'View course groups'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursegroups", text=>"Groups", - title=>"View course groups"}); + title=>$brtitle}); } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg", @@ -691,13 +773,13 @@ sub groupmail_header { {href=>"/adm/email?compose=group&group=". "$env{'form.group'}&$refarg", text=>"Send a Message in a Group", - title=>"Compose Group Email Message"},); + title=>"Compose Group Message"},); if ($action eq 'sending') { &Apache::lonhtmlcommon::add_breadcrumb ({text=>"Messages being sent.", - title=>"Messages sent"},); + title=>"E-mails sent"},); } - my $groupheader = &Apache::loncommon::start_page('Group Email'); + my $groupheader = &Apache::loncommon::start_page('Group Message'); $groupheader .= &Apache::lonhtmlcommon::breadcrumbs ('Group - '.$env{'form.group'}.' Email'); return $groupheader; @@ -711,7 +793,7 @@ sub groupmail_sent { } my $output .= '

'. - &mt('Send another group email').''.'   '. + &mt('Send another group message').''.'   '. ''. &mt('Return to group page').''; return $output; @@ -721,23 +803,34 @@ sub groupmail_sent { sub discrit { my $r=shift; - my $header = '

'.&mt('Critical Messages').'

'. - '
'. - ''; + my $header = '

'.&mt('Critical Messages').'

' + .'
' + .&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.') + .'

' + .'' + .''; my %what=&Apache::lonnet::dump('critical'); my $result = ''; foreach my $key (sort(keys(%what))) { my %content=&Apache::lonmsg::unpackagemsg($what{$key}); next if ($content{'senderdomain'} eq ''); - $result.='
'.&mt('From').': '. -&Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. -$content{'sendername'}.':'. - $content{'senderdomain'}.') '.$content{'time'}. - '
'.&mt('Subject').': '.$content{'subject'}. - '
'.
-              &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '
'; + $result .= &Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value') + .''.&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'' + .' ('.$content{'sendername'}.':'.$content{'senderdomain'}.')' + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::row_title(&mt('Date'),undef,'LC_evenrow_value') + .$content{'time'} + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value') + .$content{'subject'} + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value') + .'
'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'
' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value') + .'
'; my ($rec_button,$reprec_button); $rec_button = &mt('Move to Inbox'); if (!$content{'noreplies'}) { @@ -752,17 +845,25 @@ $content{'sendername'}.':'. } else { $result .= &mt('Access to other pages will be prevented until you have moved the message to your inbox.'); } - $result .= '
'. - ''; + $result .= '
' + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::row_title('',undef,'LC_evenrow_value') + .''; if (!$content{'noreplies'}) { - $result .= ''; + $result .= '' } + $result .= &Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'
'; } # Check to see if there were any messages. if ($result eq '') { - $result = "

".&mt('You have no critical messages.')."

". - ''.&mt('Select a course').'
'. + $result = + '

'. + &mt('You have no critical messages.'). + '

'. + ''.&mt('Select a course').'
'. ''.&mt('Communicate').''; } else { $r->print($header); @@ -788,6 +889,7 @@ sub sortedmessages { } foreach my $msgid (@messages) { + next if ($msgid eq ''); my $esc_msgid=&escape($msgid); my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) = &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef, @@ -921,24 +1023,15 @@ sub disfolder { my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com'); my %lt = &Apache::lonlocal::texthash( sede => 'Select a destination folder to which the messages will be moved.', - nome => 'No messages have been selected to apply ths action to.', + nome => 'No messages have been selected to apply this action to.', chec => 'Check the checkbox for at least one message.', ); my $jscript = &Apache::loncommon::check_uncheck_jscript(); $r->print(< +// ENDDISHEADER - my $fsqs='&folder='.$folder; + my $fsqs='&folder='.$folder; my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); my $totalnumber=$#temp+1; if ($totalnumber < 1) { + $r->print('

'); if ($msgstatus eq '') { - $r->print('

'.&mt('Empty Folder').'

'); + $r->print(&mt('There are no messages in this folder.')); } elsif ($msgstatus eq 'replied') { - $r->print('

'.&mt('You have not replied to any messages in this folder.').'

'); - } else { - $r->print('

'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'

'); + $r->print(&mt('You have not replied to any messages in this folder.')); + } else { + $r->print(&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.')); } + $r->print('

'); if ($numblocked > 0) { $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, \%setters)); } - return; + return; } my $interdis = $env{'form.interdis'}; my $number=int($totalnumber/$interdis); @@ -999,59 +1094,65 @@ ENDDISHEADER if ($lastdis>$#temp) { $lastdis=$#temp; } $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus)); $r->print(''. - ''); + $r->print(''.&mt('Date').''); } else { - $r->print(''.&mt('Date').''); + $r->print(''.&mt('Date').''); } $r->print(''); + $r->print(''.&mt('Status').''); } else { - $r->print(''.&mt('Status').''); + $r->print(''.&mt('Status').''); } $r->print("\n"); my $suffix = &Apache::lonmsg::foldersuffix($folder); + my $count = $firstdis; for (my $n=$firstdis;$n<=$lastdis;$n++) { my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID, $description,$recv_name,$recv_domain)= @{$temp[$n]}; - if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { - if ($status eq 'new') { - $r->print(''); - } elsif ($status eq 'read') { - $r->print(''); - } elsif ($status eq 'replied') { - $r->print(''); - } else { - $r->print(''); - } + if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { + my $class_msgstatus = ''; + $count ++; + if ($status eq 'new') { + $class_msgstatus = 'LC_mail_new'; + } elsif ($status eq 'read') { + $class_msgstatus = 'LC_mail_read'; + } elsif ($status eq 'replied') { + $class_msgstatus = 'LC_mail_replied'; + } else { + $class_msgstatus = 'LC_mail_other'; + } + $r->print(&Apache::loncommon::start_data_table_row($class_msgstatus)); my ($dis_name,$dis_domain) = ($fromname,$fromdomain); if ($folder eq 'sent') { if (defined($recv_name) && defined($recv_domain)) { @@ -1074,16 +1175,16 @@ ENDDISHEADER } } my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime); - my $count = $n +1; - $r->print(''); + ' value="'.$origID.'" />'); foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) { $r->print(''); + $item.(($status eq 'new')?'':'').''); } + # Description and Status my $showstatus; my %statushash = &get_msgstatus_types(); if ($status eq '') { @@ -1091,26 +1192,41 @@ ENDDISHEADER } else { $showstatus = $statushash{$status}; } - $r->print(''."\n"); - } elsif ($status eq 'deleted') { + $r->print(''); + $r->print(''. + ''); + + $r->print(&Apache::loncommon::end_data_table_row()); + + } elsif ($status eq 'deleted') { # purge - my ($result,$msg) = - &movemsg(&unescape($origID),$folder,'trash'); - - } + my ($result,$msg) = + &movemsg(&unescape($origID),$folder,'trash'); + } } - $r->print("
 '); + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + ' '); if ($env{'form.sortedby'} eq "revdate") { - $r->print(''.&mt('Date').''); if ($env{'form.sortedby'} eq "revuser") { - $r->print(''.&mt('Username').''); + $r->print(''.&mt('Username').''); } else { - $r->print(''.&mt('Username').''); + $r->print(''.&mt('Username').''); } $r->print(''); if ($env{'form.sortedby'} eq "revdomain") { - $r->print(''.&mt('Domain').''); + $r->print(''.&mt('Domain').''); } else { - $r->print(''.&mt('Domain').''); + $r->print(''.&mt('Domain').''); } $r->print(''); if ($env{'form.sortedby'} eq "revsubject") { - $r->print(''.&mt('Subject').''); + $r->print(''.&mt('Subject').''); } else { - $r->print(''.&mt('Subject').''); + $r->print(''.&mt('Subject').''); } $r->print(''); if ($env{'form.sortedby'} eq "revcourse") { - $r->print(''.&mt('Course').''); + $r->print(''.&mt('Course').''); } else { - $r->print(''.&mt('Course').''); + $r->print(''.&mt('Course').''); } - $r->print(''); + $r->print(''); if ($env{'form.sortedby'} eq "revstatus") { - $r->print(''.&mt('Status').'
'.(($status eq 'new')?'':''). + $r->print(''.(($status eq 'new')?'':''). $count.'.'.(($status eq 'new')?'':'').' '. ''.(($status eq 'new')?'':''). ''. - $item.(($status eq 'new')?'':'').''.(($status eq 'new')?'':'').$description. - (($status eq 'new')?'':'').''. - (($status eq 'new')?'':'').$showstatus. - (($status eq 'new')?'':'').'
'.(($status eq 'new')?'':'').$description. + (($status eq 'new')?'':''). + '  '. + (($status eq 'new')?'':'').&mt($showstatus). + (($status eq 'new')?'':''). + '
\n"); - $r->print(' + $r->print(&Apache::loncommon::end_data_table()); + + + # Bottom Functions + $r->print('
- '."\n". - ''."\n". + ''."\n"); if (keys(%gotfolders) > 0) { - $r->print(''); } - $r->print(''."\n". '
'. - '
'."\n". - ''."\n". - '
 '.&mt('Action').'
'."\n". - '
+
+ '.&mt('Select').' + + '."\n". + ' '."\n". + ' + +
+
'.&mt('Action').'
'."\n". + '
'.&mt('Destination folder').'
'); + $r->print('
'.&mt('Destination folder').'
'); my %userfolders; foreach my $key (keys(%gotfolders)) { $userfolders{$key} = $key; } $userfolders{''} = ""; - $r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders). + $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders). '
   '. + $r->print(''. '
'); my $postedstartdis=$startdis+1; - $r->print(''); + $r->print(''); if ($numblocked > 0) { $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, \%setters)); @@ -1158,8 +1274,12 @@ sub blocked_in_folder { my $finishblock = &Apache::lonlocal::locallocaltime($endblock); my $output = '

'. &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock); - $output .= &Apache::loncommon::build_block_table($startblock,$endblock, - $setters); + #$output .= &Apache::loncommon::build_block_table($startblock,$endblock, + # $setters); + + my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com"); + $output .="

".$blocktext; + return $output; } @@ -1204,8 +1324,10 @@ sub compout { &printheader($r,'/adm/email?compose=multiforward', 'Forwarding Multiple Messages'); if ($multiforward > 1) { - $r->print(&mt('Each of the [quant,_1,message] you checked -will be forwarded to the recipient(s) you select below.',$multiforward).'
'); + $r->print(&mt('Each of the[_1] [quant,_2,message] [_3]you checked' + .' will be forwarded to the recipient(s) you select below.' + ,'',$multiforward,'') + .'
'); } else { $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'
'); } @@ -1219,7 +1341,12 @@ will be forwarded to the recipient(s) yo my $dissub=''; my $dismsg=''; my $disbase=''; - my $func=&mt('Send New'); + my $attachrow; + my $func1='Send'; # do not translate here! + my %func2=( # do not translate here! + 'ma' => 'Message', + 'msg' => 'Messages', + ); my %lt=&Apache::lonlocal::texthash('us' => 'Username', 'do' => 'Domain', 'ad' => 'Additional Recipients', @@ -1227,48 +1354,123 @@ will be forwarded to the recipient(s) yo 'ar' => 'Allow replies', 'sb' => 'Subject', 'ca' => 'Cancel', - 'ma' => 'Mail', - 'msg' => 'Messages', 'gen' => 'Generate messages from a file', 'gmt' => 'General message text', 'tff' => 'The file format for the uploaded portion of the message is', 'uas' => 'Upload and Send', + 'atta' => 'Attachment', + 'to' => 'To:', ); + my %attachmax = ( + text => &mt('(128 KB max size)'), + num => 131072, + ); + if (!$forwarding && !$multiforward) { + $attachrow = ''.$lt{'atta'}.' '.$attachmax{'text'}.': '; + } if (&Apache::lonnet::allowed('srm',$env{'request.course.id'}) || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. '/'.$env{'request.course.sec'})) { + my $crstype = &Apache::loncommon::course_type(); my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message"); + my $rsstxt; + if (&Apache::loncommon::course_type() eq 'Community') { + $rsstxt = &mt('Include in community RSS newsfeed'); + } else { + $rsstxt = &mt('Include in course RSS newsfeed'); + } $dispcrit= - '

' . $crithelp . - '

'. - '' . $crithelp . - '

'. -'

'; + ''.$crithelp.'  '.&mt('Require return receipt?').'  
'. + '
'. +'
'; } if ($broadcast ne 'group') { if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) || &Apache::lonnet::allowed('dff',$env{'request.course.id'}. '/'.$env{'request.course.sec'})) { - $dispcrit.='

'; + $rectxt. + '
'; } } my %message; my %content; + my ($hasfloat,$broadcast_js,$sendmode,$can_grp_broadcast); my $defdom=$env{'user.domain'}; + if ($broadcast eq 'group') { + my %access_status = ( + active => 0, + previous => 0, + future => 0, + ); + + if ($group eq '') { + my $studentsel = &discourse(\%access_status); + if ($studentsel) { + $r->print('
'.$studentsel.'
'); + $hasfloat = 1; + } + } else { + $can_grp_broadcast = &check_group_priv($group); + if ($can_grp_broadcast) { + $hasfloat = &disgroup($r,$cdom,$cnum,$group,\%access_status); + } + } + if ($hasfloat) { + $sendmode = ''."\n"; + $broadcast_js = qq| + + +|; + } + } if ($forwarding) { %message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]); %content=&Apache::lonmsg::unpackagemsg($message{$forwarding},$folder); $dispcrit.=''; - $func=&mt('Forward'); + $func1='Forward'; # do not translate here! $dissub=&mt('Forwarding').': '.$content{'subject'}; $dismsg=&mt('Forwarded message from').' '. @@ -1282,7 +1484,7 @@ will be forwarded to the recipient(s) yo %content=&Apache::lonmsg::unpackagemsg($message{$replying},$folder); $dispcrit.=''; - $func=&mt('Send Reply to'); + $func1='Send Reply to'; # do not translate here! $dissub=&mt('Reply').': '.$content{'subject'}; $dismsg='> '.$content{'message'}; @@ -1301,45 +1503,36 @@ will be forwarded to the recipient(s) yo my $jscript = &Apache::loncommon::check_uncheck_jscript(); $r->print(<<"ENDREPSCRIPT"); ENDREPSCRIPT } my $citation=&displayresource(%content); - my ($can_grp_broadcast,$viewgrps,$editgrps); + my $onsubmit; if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; } if ($env{'form.text'}) { $dismsg=$env{'form.text'}; } if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; } + if ($hasfloat) { + $r->print($broadcast_js.'
'); + $onsubmit = ' onsubmit="javascript:courseRecipients();" '; + } $r->print( '
'."\n". - ''."\n"); - if ($broadcast eq 'group' && $env{'form.group'} ne '') { - $can_grp_broadcast = - &Apache::lonnet::allowed('sgb',$env{'request.course.id'}.'/'. - $group); - $viewgrps = - &Apache::lonnet::allowed('vcg',$env{'request.course.id'}. - ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); - $editgrps = - &Apache::lonnet::allowed('mdg',$env{'request.course.id'}. - ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); - if ($viewgrps || $editgrps || $can_grp_broadcast) { - $r->print(&disgroup($cdom,$cnum,$group,$viewgrps,$editgrps)); - } - } - $r->print(''); - if (($broadcast eq 'group') && ($group ne '') && - (!$can_grp_broadcast && !$viewgrps && !$editgrps)) { + ' enctype="multipart/form-data"'.$onsubmit.'>'."\n". + ''."\n". + '
'); + if (($broadcast eq 'group') && ($group ne '') && (!$can_grp_broadcast)) { $r->print(&recipient_input_row($cdom,%lt)); - } + } if (($broadcast ne 'group') && ($broadcast ne 'upload')) { if ($replying) { if ($content{'noreplies'}) { $r->print('
'.&mt('This message was designated by the sender not to allow replies.').'
'); return; } - $r->print(''.&mt('Replying to').' '); + $r->print(''.&mt('Replying to').' '); if ($content{'replytoaddr'}) { my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'}); if ($replytoname ne '' && $replytodom ne '') { @@ -1366,9 +1559,31 @@ ENDREPSCRIPT $content{'senderdomain'}.'" />'); } if ($content{'recipid'}) { - my @ccs = &retrieve_cc_recips('replying',%content); - if (@ccs > 0) { - my $replyall = qq| + my %recips; + &retrieve_recips('replying',\%content,\%recips); + if (ref($recips{'to'}) eq 'ARRAY') { + if (@{$recips{'to'}} > 0) { + my $replyall; + if (@{$recips{'to'}} > 1) { + $replyall = qq| + + +    + + +|; + } + my $tolist = join(' ',@{$recips{'to'}}); + $r->print('
'.&mt('[_1]Send reply[_2] to other recipients','','').':
'.$replyall.'
'.$tolist.'
'); + } + } + if (ref($recips{'cc'}) eq 'ARRAY') { + if (@{$recips{'cc'}} > 0) { + my $replyall; + if (@{$recips{'cc'}} > 1) { + $replyall = qq| @@ -1377,15 +1592,44 @@ ENDREPSCRIPT onclick="javascript:uncheckAll(document.compemail.replying_cc)" /> |; - my $cclist = join(' ',@ccs); - $r->print(''.&mt('Reply to other recipients').':
'.$replyall.''.$cclist.''); + } + my $cclist = join(' ',@{$recips{'cc'}}); + $r->print('
'.&mt('[_1]Cc[_2] to other copied recipients','','').':
'.$replyall.'
'.$cclist.'
'); + } + } + if ($content{'group'} ne '') { + if (&check_group_priv($content{'group'})) { + if (ref($recips{'group_cc_broadcast'}) eq 'ARRAY') { + if (@{$recips{'group_cc_broadcast'}} > 0) { + my $replyall; + if (@{$recips{'group_cc_broadcast'}} > 1) { + $replyall = qq| + + +    + + +|; + } + my $groupcclist = join(' ',@{$recips{'group_cc_broadcast'}}); + $r->print('
'.&mt('[_1]Cc[_2] to other copied group members','','').':
'.$replyall.'
'.$groupcclist.'
'); + } + } + } } } } else { $r->print(&recipient_input_row($defdom,%lt)); } } - my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); + my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1); + my $textareaclass; + if (&Apache::lonhtmlcommon::htmlareabrowser()) { + $r->print(&Apache::lonhtmlcommon::htmlareaselectactive()); + $textareaclass = 'class="LC_richDefaultOff"'; + } my $subj_size; if ($multiforward) { $r->print(&additional_rec_row(\%lt)); @@ -1393,7 +1637,7 @@ ENDREPSCRIPT &mt('Unless you choose otherwise:').'
  • '. &mt("The subject in each forwarded message will be 'Forwarding:' followed by the original subject.").'
  • '. &mt("The message itself will begin with a first line: 'Forwarded message from' followed by the original sender's name.").'
'); - $func=&mt('Forward'); + $func1='Forward'; # do not translate here! $dissub = &mt('Forwarding').': '; $subj_size = '10'; my $extra = '<'.&mt('original subject').'>   '. @@ -1403,16 +1647,16 @@ ENDREPSCRIPT $r->print(&msg_subject_row($dissub,\%lt,$subj_size,$extra)); $r->print(''.&mt('Message begins with:').' '.$sender.'   '.&mt('Yes').' '.&mt('No').' -
'. -$latexHelp. -&mt("Any new text to display before the text of the original messages:").'
-


'); +
+
'."\n". +$latexHelp."
\n". +&mt("Any new text to display before the text of the original messages:").'
'."\n". +''); my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark'); foreach my $msg (@to_forward) { $r->print(''); } - $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'msg'}, + $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'msg'}), \%lt)); } elsif ($broadcast ne 'upload') { $subj_size = '50'; @@ -1424,15 +1668,18 @@ $latexHelp. } $r->print(&msg_subject_row($dissub,\%lt,$subj_size)); $r->print(<<"ENDCOMP"); -
-$latexHelp -


+$attachrow +
+$latexHelp
+ +
+$sendmode $dispcrit $disbase ENDCOMP - $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'ma'}, - \%lt)); + $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}), + \%lt,$hasfloat,$group)); $r->print($citation); if (exists($env{'form.ref'})) { $r->print('

$lt{'gmt'}:
-

$lt{'tff'}: @@ -1473,22 +1720,30 @@ $dispcrit

ENDUPLOAD } - if ($broadcast eq 'group') { - if ($group eq '') { - my $studentsel = &discourse(); - $r->print($studentsel); - } - } if ($env{'form.displayedcrit'}) { $r->print(''); } - $r->print(''. - &Apache::lonfeedback::generate_preview_button('compemail','message'). - &Apache::lonhtmlcommon::htmlareaselectactive('message')); + $r->print(''); + if ($hasfloat) { + $r->print('
'); + } + $r->print(&generate_preview_form); +} + +sub check_group_priv { + my ($group) = @_; + my $cid = $env{'request.course.id'}; + my $sec = $env{'request.course.sec'}; + return if !$cid; + my $can_broadcast = &Apache::lonnet::allowed('sgb',$cid.'/'.$group); + my $viewgrps = &Apache::lonnet::allowed('vcg',$cid.($sec?'/'.$sec:'')); + my $editgrps = &Apache::lonnet::allowed('mdg',$cid.($sec?'/'.$sec:'')); + if ($viewgrps || $editgrps || $can_broadcast) { + return 1; + } + return; } -# ---------------------------------------------------- Display all face to face - sub recipient_input_row { my ($dom,%lt) = @_; my $domform = &Apache::loncommon::select_dom_form($dom,'recdomain'); @@ -1496,7 +1751,7 @@ sub recipient_input_row { &Apache::loncommon::selectstudent_link('compemail','recuname', 'recdomain'); my $output = <<"ENDREC"; -$lt{'us'}:  $lt{'do'}: $domform  $selectlink +$lt{'to'} $lt{'us'}:  $lt{'do'}: $domform  $selectlink ENDREC return $output; } @@ -1506,7 +1761,7 @@ sub reply_to_row { my $radioyes = &mt('Yes'); my $radiono = &mt('No'); my $output = <<"ENDREP"; -$lt->{'ar'}:      $lt->{'rt'}:  +$lt->{'ar'}:      $lt->{'rt'}:  ENDREP return $output; } @@ -1514,35 +1769,59 @@ ENDREP sub additional_rec_row { my ($lt) = @_; my $cc = &mt('Cc:'); - my $bcc = &mt('Bcc:'); + my $bcc = &mt('Bcc:'); + my $exmpl = &mt('username:domain,username:domain,...'); my $output = <<"ENDADD"; -$lt->{'ad'} :
username:domain,username:domain, ... - $cc -
-$bcc +
$lt->{'ad'} ($exmpl) + + +
 $lt->{'to'}
 $cc
 $bcc
ENDADD return $output; } sub submit_button_row { - my ($folder,$dismode,$sendtext,$lt) = @_; - my $output = qq| + my ($folder,$dismode,$sendtext,$lt,$is_crsform,$group) = @_; + my $pre=&mt("Show Preview and Check Spelling"); + my $value=&mt('Send'); + my $prevbutton = ''; + my $output = qq| - - -
+|; + if ($is_crsform) { + $output .= ''."\n"; + if ($group ne '') { + $output .= ''."\n"; + } + } + $output .= qq| +
+ + + $prevbutton
|; return $output; } sub msg_subject_row { my ($dissub,$lt,$subj_size,$extra) = @_; - my $output = ''.$lt->{'sb'}.': '.$lt->{'sb'}.''.$extra. ''; return $output; } +sub generate_preview_form { + my $prevbutton = (< + + + +ENDPREVIEW +} + +# ---------------------------------------------------- Display all face to face + sub retrieve_instructor_comments { my ($user,$domain)=@_; my $target=$env{'form.grade_target'}; @@ -1571,8 +1850,10 @@ sub retrieve_instructor_comments { } sub disfacetoface { - my ($r,$user,$domain)=@_; - my $target=$env{'form.grade_target'}; + my ($r,$user,$domain,$target)=@_; + if ($target eq '') { + $target=$env{'form.grade_target'}; + } unless ($env{'request.course.id'}) { return; } if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'}) && ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. @@ -1584,11 +1865,13 @@ sub disfacetoface { $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}, '%255b'.$user.'%253a'.$domain.'%255d'); - my $result=''; + my $result='
'; foreach my $key (sort(keys(%records))) { my %content=&Apache::lonmsg::unpackagemsg($records{$key}); next if ($content{'senderdomain'} eq ''); - &Apache::lonfeedback::newline_to_br(\$content{'message'}); + if (!&Apache::lonfeedback::contains_block_html($content{'message'})) { + &Apache::lonfeedback::newline_to_br(\$content{'message'}); + } if ($content{'subject'}=~/^Record/) { $result.='

'.&mt('Record').'

'; } elsif ($content{'subject'}=~/^Broadcast/) { @@ -1642,15 +1925,17 @@ $content{'sendername'}.':'. } # Check to see if there were any messages. if ($result eq '') { - my $lctype = lc(&Apache::loncommon::course_type()); + my $lctype = &mt(lc(&Apache::loncommon::course_type())); if ($target ne 'tex') { $r->print("

".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."

"); } else { $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\'); } + } elsif ($target ne 'tex') { + $r->print($result.'
'); } else { - $r->print($result); - } + $r->print(&Apache::lonxml::xmlparse($r, 'tex', $result)); + } } sub general_message { @@ -1676,8 +1961,8 @@ sub facetoface { return; } my $crstype = &Apache::loncommon::course_type(); - my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders' - : 'faculty and staff'; + my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders' + : 'faculty and staff'; &printheader($r, '/adm/email?recordftf=query', "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages"); @@ -1699,21 +1984,24 @@ sub facetoface { 'subm' => 'Retrieve discussion and message records', 'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')', 'post' => 'Post this Record'); - $r->print(<<"ENDTREC"); -

$lt{'head'}

-
- - - - - - - -
$lt{'user'}: -$stdbrws -
$lt{'dom'}:$domform
-
-ENDTREC + + $r->print('

'.$lt{'head'}.'

' + .'
' + .'' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title($lt{'user'}) + .'' + .' '.$stdbrws + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'dom'}) + .$domform + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'
' + .'' + .'
' + ); + if (($stage ne 'query') && ($env{'form.recdomain'}) && ($env{'form.recuname'})) { chomp($env{'form.newrecord'}); @@ -1722,8 +2010,17 @@ ENDTREC $env{'form.recuname'}, $env{'form.recdomain'}); } - $r->print('

'.&Apache::loncommon::plainname($env{'form.recuname'}, - $env{'form.recdomain'}).'

'); + my $aboutmelink=&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($env{'form.recuname'} + ,$env{'form.recdomain'}) + ,$env{'form.recuname'},$env{'form.recdomain'}); + $r->print('
' + .'

' + .&mt('Discussion and message records for [_1] ([_2])' + ,$aboutmelink + ,$env{'form.recuname'}.':'.$env{'form.recdomain'}) + .'

' + ); &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'}); $r->print(< @@ -1752,12 +2049,18 @@ sub examblock { $r->print('Not allowed'); return; } - my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members' - : 'students'; + my $usertype; + my $crstype = &Apache::loncommon::course_type(); + if ($crstype eq 'Community') { + $usertype = 'members'; + } else { + $usertype = 'students'; + } + my $lctype = lc($crstype); my %lt=&Apache::lonlocal::texthash( 'comb' => 'Communication Blocking', 'cbds' => 'Communication blocking during scheduled exams', - 'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.", + 'desc' => "You can use communication blocking to prevent $usertype enrolled in this $lctype from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course or community, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.", 'mecb' => 'Modify existing communication blocking periods', 'ncbc' => 'No communication blocks currently saved', 'stor' => 'Save', @@ -1934,7 +2237,7 @@ sub display_blocker_status { $ltext->{'setb'} $ltext->{'even'} $ltext->{'blck'} - $ltext->{'actn'}? + $ltext->{'actn'} END foreach my $record (sort(keys(%{$records}))) { @@ -1954,7 +2257,7 @@ END $setuname,$setudom); $r->print(&Apache::loncommon::start_data_table_row()); $r->print(<<"END"); - $ltext->{'star'}: $startform
$ltext->{'endd'}:  $endform + $ltext->{'star'}: $startform
$ltext->{'endd'}:  $endform $settername @@ -1962,13 +2265,18 @@ END foreach my $block (@{$typeorder}) { my $blockstatus = ''; if ($blocks->{$block} eq 'on') { - $blockstatus = 'checked="true"'; + $blockstatus = 'checked="checked"'; } - $r->print('
'); + $r->print('
'); } $r->print(<<"END"); -
+
+ END $r->print(&Apache::loncommon::end_data_table_row()); $parmcount++; @@ -2005,7 +2313,7 @@ END $ltext->{'dura'} $ltext->{'even'} $lt{'exam'} $ltext->{'blck'} - $ltext->{'actn'}? + $ltext->{'actn'} END $r->print(&Apache::loncommon::start_data_table_row()); @@ -2015,11 +2323,13 @@ END END foreach my $block (@{$typeorder}) { - $r->print('
'); + $r->print('
'); } $r->print(<<"END"); - - + + END $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); @@ -2029,7 +2339,7 @@ END sub blocktype_text { my %types = &Apache::lonlocal::texthash( 'com' => 'Messaging', - 'chat' => 'Chat', + 'chat' => 'Chat Room', 'boards' => 'Discussion', 'port' => 'Portfolio', 'groups' => 'Groups', @@ -2054,8 +2364,10 @@ sub displaymessage { my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); if ( $blocked{$msgid} eq 'ON' ) { &printheader($r,'/adm/email',&mt('Display a Message')); - $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.')); - &build_block_table($r,$startblock,$endblock,\%setters); + #$r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.')); + #&build_block_table($r,$startblock,$endblock,\%setters); + my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com"); + $r->print("
".$blocktext); return; } if ($msgstatus eq '') { @@ -2064,7 +2376,6 @@ sub displaymessage { my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); my %content=&Apache::lonmsg::unpackagemsg($message{$msgid}); my $counter=0; - $r->print('
');
     my $escmsgid=&escape($msgid);
     foreach (@messages) {
 	if ($_->[5] eq $escmsgid){
@@ -2072,7 +2383,6 @@ sub displaymessage {
 	}
 	$counter++;
     }
-    $r->print('
'); my $see_anonymous; my $from_student = 0; @@ -2093,64 +2403,128 @@ sub displaymessage { # start output &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'}); my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); -# Functions - $r->print(''); + +# Prepare available functions + my @functionlist; if (!$content{'noreplies'}) { - $r->print(''); - } - $r->print(''. - ''. - ''. - ''); + push(@functionlist,'' + .&mt('Reply') + .''); + } + push(@functionlist,'' + .&mt('Forward') + .''); + push(@functionlist,'' + .&mt('Mark Unread') + .''); + push(@functionlist,'' + .&mt('Delete') + .''); + push(@functionlist,'' + .&mt('Back to Folder Display') + .''); if ($counter > 0){ - $r->print(''); + push(@functionlist,'' + .&mt('Previous') + .''); } if ($counter < $number_of_messages - 1){ - $r->print(''); + push(@functionlist,'' + .&mt('Next') + .''); } - $r->print('
'.&mt('Functions').':'.&mt('Reply').''.&mt('Forward').''.&mt('Mark Unread').''.&mt('Delete').''.&mt('Back to Folder Display').''.&mt('Previous').''.&mt('Next').'
'); + +# Prepare available actions my $symb; if (defined($content{'symb'})) { $symb = $content{'symb'}; } elsif (defined($content{'baseurl'})) { $symb=&Apache::lonnet::symbread($content{'baseurl'}); } + my @actionlist; if ($env{'user.adv'}) { - my $adv_actions; - $r->print(''); + if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { - $r->print(''); - } + push(@actionlist,&Apache::loncommon::track_student_link( + &mt('View recent activity') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,'check')); + } if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) { - $r->print(''); + push(@actionlist,&Apache::loncommon::pprmlink( + &mt('Set/Change parameters') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,$symb + ,'check')); } if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) { - $r->print(''); + push(@actionlist,&Apache::loncommon::pgrdlink( + &mt('Set/Change grades') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,$symb + ,'check')); } - $r->print('
'.&mt('Currently available actions (will open extra window)').':'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').''.&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check').''.&Apache::loncommon::pgrdlink(&mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'
'); } - my ($tolist,$cclist); - my (@recipients,@ccs); - if (ref($content{'recuser'}) eq 'ARRAY') { + +# Print functionlist and actionlist in page header + my $functions='
'; + + # Functionlist + $functions.=&Apache::lonhtmlcommon::start_funclist(); + foreach my $item (@functionlist) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); + } + $functions .= &Apache::lonhtmlcommon::end_funclist(); + + # Actionlist + if (@actionlist) { + my $legendtext=&mt('Currently available actions (will open extra window)'); + $functions.=&Apache::lonhtmlcommon::start_funclist($legendtext); + foreach my $item (@actionlist) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); + } + $functions.=&Apache::lonhtmlcommon::end_funclist(); + } + + $functions.='
'; + $r->print(&Apache::loncommon::head_subbox($functions)); + + + my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients); + if ($content{'recipid'}) { + $tonum = &retrieve_recips('display',\%content,\%recipients); + if (ref($recipients{'cc'}) eq 'ARRAY') { + $cclist = join(', ',@{$recipients{'cc'}}); + } + if (ref($recipients{'to'}) eq 'ARRAY') { + $tolist = join(', ',@{$recipients{'to'}}); + } + if (ref($recipients{'bcc'}) eq 'ARRAY') { + $bcclist = join(', ',@{$recipients{'bcc'}}); + } + } + + my $broadcast_link; + if (($content{'courseid'}) && ($content{'recipid'} && + (ref($recipients{'course_broadcast'}) eq 'ARRAY') || + (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') || + (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) { + $broadcast_link = &recipients_link($r,\%content,\%recipients); + } + + if (((!$tolist) && (!$broadcast_link)) && ref($content{'recuser'}) eq 'ARRAY') { + my @recipients; for (my $i=0; $i<@{$content{'recuser'}}; $i++) { $recipients[$i] = &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($content{'recuser'}[$i], $content{'recdomain'}[$i]), $content{'recuser'}[$i],$content{'recdomain'}[$i]). - ' ('.$content{'recuser'}[$i].' '.&mt('at').' '.$content{'recdomain'}[$i].') '; + ' ('.$content{'recuser'}[$i].':'.$content{'recdomain'}[$i].') '; } - } - $tolist = join(', ',@recipients); - if ($content{'recipid'}) { - @ccs = &retrieve_cc_recips('display',%content); - $cclist = join(', ',@ccs); + $tolist = join(', ',@recipients); } my ($restitle,$baseurl,$refers_to); if (defined($content{'resource_title'})) { @@ -2163,50 +2537,145 @@ sub displaymessage { if (defined($content{'baseurl'})) { $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'}); } + $r->print('' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title(&mt('Subject')) + .$content{'subject'} + .&Apache::lonhtmlcommon::row_closure() + ); if ($folder eq 'sent') { - $r->print('
'.&mt('To').': '.$tolist); + # To + if ($tolist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('To')) + .$tolist + .&Apache::lonhtmlcommon::row_closure() + ); + } + if ($cclist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc')) + .$cclist + .&Apache::lonhtmlcommon::row_closure() + ); + } + if ($bcclist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Bcc')) + .$bcclist + .&Apache::lonhtmlcommon::row_closure() + ); + } + if (($content{'courseid'}) && ($content{'recipid'})) { + my %broadcast_types = + &Apache::lonlocal::texthash ( + course_broadcast => 'Broadcast to', + group_cc_broadcast => 'Cc to group', + group_bcc_broadcast => 'Bcc to group', + ); + foreach my $type (sort(keys(%broadcast_types))) { + if (ref($recipients{$type}) eq 'ARRAY') { + my $num = @{$recipients{$type}}; + my $broadcastlist = join(', ',@{$recipients{$type}}); + if ($broadcastlist && $broadcast_link) { + if ($type eq 'group_cc_broadcast') { + $groupcclist = $broadcastlist; + } + $r->print(&Apache::lonhtmlcommon::row_title( + $broadcast_types{$type}) + .&mt('[quant,_1,recipient]',$num) + .' [' + .&mt('Show').']' + .&Apache::lonhtmlcommon::row_closure()); + } + } + } + } if ($content{'replytoaddr'}) { my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'}); if ($replytoname ne '' && $replytodom ne '') { - $r->print('
'.&mt('Reply To').': '. - $replytoname.' '.&mt('at').' '.$replytodom); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Reply To')) + .$replytoname.':'.$replytodom + .&Apache::lonhtmlcommon::row_closure() + ); } } } else { - $r->print('
'.&mt('From').': '. - &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}), - $content{'sendername'},$content{'senderdomain'})); + # From, Reply + $r->print(&Apache::lonhtmlcommon::row_title(&mt('From')) + .&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}), + $content{'sendername'},$content{'senderdomain'}) + ); if ($content{'noreplies'}) { - $r->print(' ('.&mt('No replies to sender').')'); + $r->print(' ('.&mt('No replies to sender').')' + .&Apache::lonhtmlcommon::row_closure() + ); } else { if ($content{'replytoaddr'}) { my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'}); if ($replytoname ne '' && $replytodom ne '') { - $r->print('
'.&mt('Reply To').': '. - $replytoname.' '.&mt('at').' '.$replytodom); + $r->print(&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title(&mt('Reply To')) + .$replytoname.':'.$replytodom + .&Apache::lonhtmlcommon::row_closure() + ); + } else { + $r->print(&Apache::lonhtmlcommon::row_closure()); } } else { - $r->print(' ('.$content{'sendername'}.' '.&mt('at').' '. - $content{'senderdomain'}.') '); - } - if ($cclist) { - $r->print('
'.&mt('Cc').': '.$cclist); + $r->print(' ('.$content{'sendername'}.':'.$content{'senderdomain'}.') ' + .&Apache::lonhtmlcommon::row_closure() + ); + } + if ($tonum && $tolist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('To')) + .$tolist + .&Apache::lonhtmlcommon::row_closure() + ); + } + if ($cclist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc')) + .$cclist + .&Apache::lonhtmlcommon::row_closure() + ); + } + if ($content{'group'} ne '') { + if (&check_group_priv($content{'group'})) { + if (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') { + $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}}); + if ($groupcclist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc')) + .$groupcclist + .&Apache::lonhtmlcommon::row_closure() + ); + } + } + } } - } + } } + + # Course if ($content{'courseid'}) { - $r->print('
'.&mt($crstype).': '.$courseinfo{'description'}); + $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype)) + .$courseinfo{'description'} + ); if ($content{'coursesec'}) { $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')'); } + $r->print(&Apache::lonhtmlcommon::row_closure()); } - $r->print('
'.&mt('Time').': '.$content{'time'}); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Time')) + .$content{'time'} + .&Apache::lonhtmlcommon::row_closure() + ); + + # Refers to if ($baseurl) { if (defined($content{'courseid'}) && defined($env{'request.course.id'})) { if ($content{'courseid'} eq $env{'request.course.id'}) { @@ -2224,7 +2693,10 @@ sub displaymessage { if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) { $showurl = $baseurl; } - $r->print('
'.&mt('Refers to').': '.$restitle.''); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to')) + .''.$restitle.'' + .&Apache::lonhtmlcommon::row_closure() + ); $refers_to = 1; } } @@ -2237,58 +2709,168 @@ sub displaymessage { $content{'courseid'}); if ($unencurl ne '') { if (&Apache::lonnet::allowed('bre',$unencurl)) { - $r->print('
'.&mt('Refers to'). - ': '. - $restitle.''); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to')) + .''.$restitle.'' + .&Apache::lonhtmlcommon::row_closure() + ); } } } } } else { if (&Apache::lonnet::allowed('bre',$baseurl)) { - $r->print('
'.&mt('Refers to'). - ': '.$restitle.''); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to')) + .''.$restitle.'' + .&Apache::lonhtmlcommon::row_closure() + ); + } } } } - $r->print('

'.
-	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
-	      '

'.&displayresource(%content).'

'); + + # Message + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message')) + .'
'
+	     .&Apache::lontexconvert::msgtexconverted($content{'message'},1)
+	     .'
' + ); + if (&displayresource(%content)) { + $r->print(&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title(&mt('Resource Details')) + .&displayresource(%content) + ); + } + $r->print(&Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::end_pick_box()); + # Display LON-CAPA Message (End) return; } -sub retrieve_cc_recips { - my ($context,%content) = @_; - my %reciphash = - &Apache::lonnet::get('nohist_emailrecip',[$content{'recipid'}], - $content{'senderdomain'},$content{'sendername'}); - my $recipinfo = $reciphash{$content{'recipid'}}; - my @ccs; - if (ref($recipinfo) eq 'HASH') { - if (ref($recipinfo->{'cc'}) eq 'HASH') { - foreach my $cc (sort(keys(%{$recipinfo->{'cc'}}))) { - my ($ccname,$ccdom) = split(/:/,$cc); - if (!(($ccname eq $env{'user.name'}) && - ($ccdom eq $env{'user.domain'}))) { - my $showcc =''; - if ($context eq 'replying') { - $showcc = ''; - } - $showcc .= ''; - push(@ccs,$showcc); +sub retrieve_recips { + my ($context,$content,$recips)= @_; + my $tonum = 0; + if (ref($content) eq 'HASH') { + my %reciphash = + &Apache::lonnet::get('nohist_emailrecip',[$content->{'recipid'}], + $content->{'senderdomain'},$content->{'sendername'}); + my $recipinfo = $reciphash{$content->{'recipid'}}; + if (ref($recipinfo) eq 'HASH') { + foreach my $type ('to','cc','course_broadcast','group_cc_broadcast','group_bcc_broadcast') { + if (ref($recipinfo->{$type}) eq 'HASH') { + if ($type eq 'to') { + $tonum = keys(%{$recipinfo->{$type}}); + } + foreach my $user (sort(keys(%{$recipinfo->{$type}}))) { + my ($uname,$udom) = split(/:/,$user); + next if (($context eq 'replying') && ($uname eq $env{'user.name'}) + && ($udom eq $env{'user.domain'})); + my $showuser =''; + if ($context eq 'replying') { + if (($type eq 'to') || ($type eq 'cc')) { + $showuser = ''; + if (ref($recips) eq 'HASH') { + push(@{$recips->{$type}},$showuser); + } + } } } } } - return @ccs; + return $tonum; +} + +sub recipients_link { + my ($r,$content,$recipients) = @_; + my ($broadcast_link,$show); + if ((ref($content) eq 'HASH') && (ref($recipients) eq 'HASH')) { + if (ref($recipients->{'course_broadcast'}) eq 'ARRAY') { + if (@{$recipients->{'course_broadcast'}} > 0) { + $show = 'course'; + } + } elsif (ref($recipients->{'group_cc_broadcast'}) eq 'ARRAY') { + if (@{$recipients->{'group_cc_broadcast'}} > 0) { + $show = 'group_cc'; + } + } elsif (ref($recipients->{'group_bcc_broadcast'}) eq 'ARRAY') { + if (@{$recipients->{'group_bcc_broadcast'}} > 0) { + $show = 'group_bcc'; + } + } + if ($show) { + my ($nothing,$height,$width,$start_page,$end_page,$body); + $nothing=&Apache::lonhtmlcommon::javascript_nothing(); + $height = 400; + $width = 600; + $start_page = + &Apache::loncommon::start_page('Broadcast List', undef, + {only_body => 1, + js_ready => 1,}); + $end_page = &Apache::loncommon::end_page({js_ready => 1,}); + $body = '

'.&mt("Recipients of broadcast message").'

'. + &Apache::loncommon::start_data_table(); + my $cell = 0; + $body .= &Apache::loncommon::start_data_table_row(); + foreach my $item (@{$recipients->{$show.'_broadcast'}}) { + $item =~ s/'/\\'/g; + if (!($cell%2) && $cell > 0) { + $body .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::start_data_table_row(); + } + $cell ++; + $body .= ''.$cell.' '.$item.'  '; + } + if ($cell%2) { + $body .= ' '; + } + $body .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(); + $body =~ s{print(< +// + + +ENDJS + $broadcast_link = 1; + } + } + return $broadcast_link; } # =========================================================== Show the citation @@ -2335,15 +2917,14 @@ sub displayresource { sub header { my ($r,$title,$baseurl)=@_; - my $extra = &Apache::loncommon::studentbrowser_javascript(); if ($baseurl) { $extra .= ""; } - $r->print(&Apache::loncommon::start_page('Communication and Messages', + $r->print(&Apache::loncommon::start_page('Messages', $extra)); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (($title?$title:'Communication and Messages'))); + (($title?$title:'Send and display messages'))); } # ---------------------------------------------------------------- Print header @@ -2400,6 +2981,8 @@ sub sendoffmail { my %msg_status; my $numsent = 0; my $nosentstore = 1; + my $attachmenturl; + my $now = time; my ($cdom,$cnum,$group); if (exists($env{'form.group'})) { $group = $env{'form.group'}; @@ -2422,10 +3005,13 @@ sub sendoffmail { if ($env{'form.forwid'}) { my $msgid=$env{'form.forwid'}; my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); - %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1); + %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1,1); &statuschange($msgid,'forwarded',$folder); - $env{'form.message'}.="\n\n-- Forwarded message --\n\n". - $content{'message'}; + if ($content{'attachmenturl'} ne '') { + $attachmenturl = $content{'attachmenturl'}; + } + $env{'form.message'} .= "\n\n-- Forwarded message --\n\n". + $content{'message'}; } if ($env{'form.replyid'}) { my $msgid=$env{'form.replyid'}; @@ -2434,28 +3020,24 @@ sub sendoffmail { &statuschange($msgid,'replied',$folder); } - my @to = - &Apache::loncommon::get_env_multiple('form.selectedusers_forminput'); my $mode = $env{'form.sendmode'}; + my (%toaddr,$tos,$cc,$bcc,$broadcast); - my (%toaddr,$cc,$bcc); - if (@to) { - foreach my $dest (@to) { - my ($user,$domain) = split(/:/, $dest); - if (($user ne '') && ($domain ne '')) { - my $address = $user.":".$domain; # How the code below expects it. - $toaddr{$address} = ''; - } - } - } - - if ($env{'form.sendmode'} eq 'group') { - foreach my $address (keys(%env)) { - if ($address=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) { - $toaddr{$1}=''; - } - } - } elsif ($env{'form.sendmode'} eq 'upload') { + if ($mode eq 'group') { + if (defined($env{'form.courserecips'})) { + my $courseusers = $env{'form.courserecips'}; + $courseusers =~ s/^_\&\&\&_//; + my @to = split('_&&&_',$courseusers); + foreach my $dest (@to) { + my ($user,$domain) = split(/:/, $dest); + if (($user ne '') && ($domain ne '')) { + my $rec = $user.":".$domain; + $toaddr{$rec} = ''; + $broadcast->{$rec} = ''; + } + } + } + } elsif ($mode eq 'upload') { $nosentstore = 0; foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) { my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/); @@ -2463,40 +3045,81 @@ sub sendoffmail { $rec =~ s/^\s+//; $rec =~ s/\s+$//; $toaddr{$rec}.=$txt."\n"; + $broadcast->{$rec} = ''; } } } else { if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) { $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; - $cc->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; + $tos->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; } } + if ($env{'form.additionalrec_to'}) { + foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_to'})) { + my ($auname,$audom)=split(/:/,$rec); + if (($auname ne "") && ($audom ne "")) { + $toaddr{$auname.':'.$audom}=''; + $tos->{$auname.':'.$audom}=''; + } + } + } + if ($env{'form.replying_to'}) { + my @toreplies = + &Apache::loncommon::get_env_multiple('form.replying_to'); + foreach my $rec (@toreplies) { + my ($auname,$audom)=split(/:/,$rec); + if (($auname ne "") && ($audom ne "")) { + $toaddr{$auname.':'.$audom}=''; + $tos->{$auname.':'.$audom}=''; + } + } + } if ($env{'form.additionalrec_cc'}) { foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_cc'})) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { $toaddr{$auname.':'.$audom}=''; - $cc->{$auname.':'.$audom}=''; + if (!defined($tos->{$auname.':'.$audom})) { + $cc->{$auname.':'.$audom}=''; + } } } } - if ($env{'form.additionalrec_bcc'}) { - foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_bcc'})) { + if ($env{'form.replying_cc'}) { + my @ccreplies = + &Apache::loncommon::get_env_multiple('form.replying_cc'); + foreach my $rec (@ccreplies) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { $toaddr{$auname.':'.$audom}=''; - $bcc->{$auname.':'.$audom}=''; + if (!defined($tos->{$auname.':'.$audom})) { + $cc->{$auname.':'.$audom}=''; + } } } } - if ($env{'form.replying_cc'}) { - my @ccreplies = - &Apache::loncommon::get_env_multiple('form.replying_cc'); - foreach my $rec (@ccreplies) { + if ($env{'form.replying_groupcc'}) { + my @groupreplies = + &Apache::loncommon::get_env_multiple('form.replying_groupcc'); + foreach my $rec (@groupreplies) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { $toaddr{$auname.':'.$audom}=''; - $cc->{$auname.':'.$audom}=''; + if (!defined($tos->{$auname.':'.$audom})) { + $broadcast->{$auname.':'.$audom}=''; + } + } + } + } + if ($env{'form.additionalrec_bcc'}) { + foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_bcc'})) { + my ($auname,$audom)=split(/:/,$rec); + if (($auname ne "") && ($audom ne "")) { + $toaddr{$auname.':'.$audom}=''; + if ((!defined($tos->{$auname.':'.$audom})) && + (!defined($cc->{$auname.':'.$audom}))) { + $bcc->{$auname.':'.$audom}=''; + } } } } @@ -2516,22 +3139,45 @@ sub sendoffmail { $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'}); } my %reciphash = ( + to => $tos, cc => $cc, bcc => $bcc, - ); + ); + if ($mode eq 'group') { + if ($group eq '') { + $reciphash{'course_broadcast'} = $broadcast; + } else { + if ($env{'form.groupmail'} eq 'cc') { + $reciphash{'group_cc_broadcast'} = $broadcast; + } else { + $reciphash{'group_bcc_broadcast'} = $broadcast; + } + } + } my ($recipid,$recipstatus) = &Apache::lonmsg::store_recipients($msgsubj,$env{'user.name'}, $env{'user.domain'},\%reciphash); if ($recipstatus ne 'ok') { - &Apache::lonnet::logthis('Failed to store Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'}); - } + &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'}); + } + if ($env{'form.attachment'}) { + if (length($env{'form.attachment'})<131072) { + $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now); + } else { + $r->print('

'.&mt('Attachment not included - exceeded permitted length').'

'); + } + } elsif ($env{'form.multiforward'}) { + if ($env{'form.attachmenturl'} ne '') { + $attachmenturl = $env{'form.attachmenturl'}; + } + } my @recusers; my @recudoms; foreach my $address (sort(keys(%toaddr))) { my ($recuname,$recdomain)=split(/\:/,$address); my $msgtxt = $savemsg; if ($toaddr{$address}) { - $msgtxt.='
'.$toaddr{$address}; + $msgtxt.="\n".'
'."\n".$toaddr{$address}; } my @thismsg; if ($msgtype eq 'critical') { @@ -2550,7 +3196,7 @@ sub sendoffmail { &Apache::lonmsg::user_normal_msg($recuname,$recdomain, $msgsubj,$msgtxt, $content{'citation'}, - undef,undef, + undef,$attachmenturl, $env{'form.permanent'}, \$sentmessage{$address}, undef,undef,undef, @@ -2567,23 +3213,35 @@ sub sendoffmail { my $subj_prefix; if ($numsent > 0) { if (($env{'request.course.id'}) && - (($env{'form.sendmode'} eq 'group') || + (($mode eq 'group') || ($env{'form.courserecord'}) || - ($msgtype eq 'critical'))) { + ($msgtype eq 'critical')) || + ($env{'form.replyid'} && + (($content{'courseid'} ne '') && + ($mode eq 'group')))) { if ($msgtype eq 'critical') { $subj_prefix = 'Critical.'; - } elsif ($env{'form.sendmode'} eq 'group') { + } elsif ($mode eq 'group') { $subj_prefix = 'Broadcast.'; } else { $subj_prefix = 'Archive'; } my ($specialmsgid,$specialresult); - my $course_str = &escape('['.$cnum.':'.$cdom.']'); - + my $course_str; + if ($env{'form.replyid'}) { + if ($content{'courseid'} ne '') { + my %crsdesc = + &Apache::lonnet::coursedescription($content{'courseid'}, + {'one_time' => 1}); + $course_str = &escape('['.$crsdesc{'num'}.':'.$crsdesc{'domain'}.']'); + } + } elsif ($env{'request.course.id'}) { + $course_str = &escape('['.$cnum.':'.$cdom.']'); + } $specialresult = &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom, $subj_prefix.' '.$course_str,$savemsg,undef,undef, - undef,undef,undef,\$specialmsgid,undef,undef,undef, + $attachmenturl,undef,undef,\$specialmsgid,undef,undef,undef, undef,undef,1); $specialmsgid = &unescape($specialmsgid); if ($specialresult eq 'ok') { @@ -2600,15 +3258,15 @@ sub sendoffmail { $pid); &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom, $subj_prefix.' ['.$recipient.']',$msgsubj, - undef,undef,undef,undef,$usermsgid,undef, + undef,undef,$attachmenturl,undef,$usermsgid,undef, undef,$specialmsgid,undef,undef,undef,1); } } - if (($env{'form.sendmode'} ne 'upload') && (@recusers > 0)) { + if (($mode ne 'upload') && (@recusers > 0)) { &Apache::lonmsg::process_sent_mail($msgsubj, $subj_prefix,$numsent,$stamp,$msgname,$msgdom, $msgcount,$context,$pid,$savemsg,\@recusers, - \@recudoms); + \@recudoms,undef,$attachmenturl,'','','','',$recipid); } } else { &Apache::lonnet::logthis('Failed to create record of critical, broadcast or archived message in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' '&mt('at').' '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated'); @@ -2620,13 +3278,15 @@ sub sendoffmail { &Apache::lonmsg::process_sent_mail($msgsubj,$subj_prefix, $numsent,$stamp,$env{'user.name'}, $env{'user.domain'},$msgcount,$context, - $$,$savemsg,\@recusers,\@recudoms); + $$,$savemsg,\@recusers,\@recudoms,undef,$attachmenturl, + '','','','',$recipid); } } - if (!$env{'form.multiforward'}) { + if (!$env{'form.multiforward'}) { if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { - $r->print('
'.&mt('Completed.'). - ''); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Completed.')); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); if ($env{'form.displayedcrit'}) { &discrit($r); } @@ -2636,10 +3296,15 @@ sub sendoffmail { &Apache::loncommunicate::menu($r); } } else { - $r->print('

'.&mt('Could not deliver message').' '. - &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1); + $message .= '
'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } } + } else { + &printheader($r,'','Messages cancelled.'); + return 'cancelled'; } return $sendstatus; } @@ -2663,7 +3328,7 @@ sub handler { 'recordftf','sortedby','block','folder','startdis','interdis', 'showcommentbaseurl','dismode','group','subject','text','ref', 'msgstatus']); - $sqs='&sortedby='.$env{'form.sortedby'}; + $sqs='&sortedby='.$env{'form.sortedby'}; # ------------------------------------------------------ They checked for email unless ($env{'form.block'}) { @@ -2675,7 +3340,7 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/communicate", - text=>"Communication/Messages", + text=>"Messages", faq=>12,bug=>'Communication Tools',}); # ------------------------------------------------------------------ Get Folder @@ -2684,7 +3349,7 @@ sub handler { unless ($folder) { $folder=''; } else { - $sqs.='&folder='.&escape($folder); + $sqs.='&folder='.&escape($folder); } # ------------------------------------------------------------ Get Display Mode @@ -2716,7 +3381,7 @@ sub handler { $startdis++; } my $postedstartdis=$startdis+1; - $sqs.='&startdis='.$postedstartdis; + $sqs.='&startdis='.$postedstartdis; # --------------------------------------------------------------- Render Output @@ -2756,9 +3421,10 @@ sub handler { my ($result,$msg) = &statuschange($env{'form.markdel'},'deleted',$folder); if (!$result) { - $r->print('

'. - &mt('Failed to delete the message.').'

'. - '

'.$msg."

\n"); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1); + $message .= '

'.$msg.'

'; + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); @@ -2780,7 +3446,10 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Read'); - $r->print(&mt('Marked [_1] message(s) read',$total).'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] read',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markedaction'} eq 'markedunread') { @@ -2791,7 +3460,10 @@ sub handler { $total ++; } &printheader($r,'','Marked Messages Unread'); - $r->print(&mt('Marked [_1] message(s) unread',$total).'

'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] unread',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markedaction'} eq 'markedmove') { @@ -2800,7 +3472,7 @@ sub handler { &printheader($r,'','Moved Messages'); if (!defined($gotfolders{$destfolder})) { $r->print(&mt('Destination folder [_1] is not a valid folder', - $destfolder)); + ''.$destfolder.'')); } else { my ($total,$failed,@failed_msg)=(0,0); my @to_move = &Apache::loncommon::get_env_multiple('form.delmark'); @@ -2814,15 +3486,17 @@ sub handler { push(@failed_msg,$msg); } } - if ($failed) { - $r->print('

- '.&mt('Failed to move [_1] message(s)',$failed). - '

'); - $r->print('

'. - join("

\n

",@failed_msg). - "

\n"); - } - $r->print(&mt('Moved [_1] message(s)',$total).'

'); + my $message = ''; + if ($failed) { + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1); + $message .= '

'. + join("

\n

",@failed_msg). + "

\n"; + } + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

'); } &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); @@ -2840,15 +3514,17 @@ sub handler { } } &printheader($r,'','Deleted Messages'); + my $message = ''; if ($failed) { - $r->print('

- '.&mt('Failed to delete [_1] message(s)',$failed). - '

'); - $r->print('

'. - join("

\n

",@failed_msg). - "

\n"); - } - $r->print(&mt('Deleted [_1] message(s)',$total).'

'); + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1); + $message .= '

'. + join("

\n

",@failed_msg). + "

\n"; + } + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + # $r->print('

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } elsif ($env{'form.markunread'}) { @@ -2872,7 +3548,7 @@ sub handler { foreach my $item (@to_forward) { my $msgid=&unescape($item); my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); - my %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1); + my %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1,1); if ($env{'form.showorigsubj'}) { $env{'form.subject'} = $fixed_subj.$content{'subject'}; } else { @@ -2886,8 +3562,10 @@ sub handler { &Apache::loncommon::plainname($uname,$udom).' ('. $uname.':'.$udom.')'; } - $env{'form.message'} .= "\n\n-- Forwarded message --\n\n". - $content{'message'}; + $env{'form.message'}.="\n\n-- Forwarded message --\n\n". + $content{'message'}; + $env{'form.attachmenturl'} = $content{'attachmenturl'}; + $env{'form.multiforwid'} = $item; $fwdcount ++; $r->print($fwdcount.': '); $sendresult{$msgid} = &sendoffmail($r,$folder); @@ -2902,19 +3580,19 @@ sub handler { } if (keys(%forwardok) > 0) { my $count = keys(%forwardok); - $r->print('
'. - &mt('[quant,_1,message] forwarded.',$count). - ''); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('[quant,_1,message] forwarded.',$count)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } if (keys(%forwardfail) > 0) { my $count = keys(%forwardfail); - $r->print('

'. - &mt('Could not forward [quant,_1,message].',$count). - ' '); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1); foreach my $key (keys(%forwardfail)) { - $r->print(&mt('Could not deliver forwarded message.').' '. - &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.').

'); + $message .= '
'.&mt('Could not deliver forwarded message.').' '. + &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')'; } + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } &Apache::loncommunicate::menu($r); } else { @@ -2938,10 +3616,13 @@ sub handler { my $showfolder = $env{'form.newfolder'}; my ($makeresult,$warning) = &makefolder($env{'form.newfolder'}); if ($makeresult eq 'ok') { - $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'
'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" created.',$showfolder)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } else { - $r->print(&mt('Creation failed.').' '.$makeresult.'
'. - $warning); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Creation failed.').' '.$makeresult.'
'.$warning,1); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -2953,10 +3634,14 @@ sub handler { my $showfolder = ''; my $delresult = &deletefolder($folder); if ($delresult eq 'ok') { - $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'
'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" deleted.',$folder)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $env{'form.folder'} = ''; } else { - $r->print(&mt('Deletion failed.').' '.$delresult.'
'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Deletion failed.').' '.$delresult,1); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $showfolder = $folder; } &Apache::loncommunicate::menu($r); @@ -2966,9 +3651,13 @@ sub handler { my $showfolder = $env{'form.renamed'}; my $renresult = &renamefolder($folder); if ($renresult eq 'ok') { - $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'
'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder)); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } else { - $r->print(&mt('Renaming failed.').' '.$renresult.'
'); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Renaming failed.').' '.$renresult,1); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); $showfolder = $folder; } &Apache::loncommunicate::menu($r);