--- loncom/interface/lonmsgdisplay.pm 2006/12/23 06:22:36 1.56.2.1 +++ loncom/interface/lonmsgdisplay.pm 2008/11/04 06:22:53 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.56.2.1 2006/12/23 06:22:36 albertel Exp $ +# $Id: lonmsgdisplay.pm,v 1.95 2008/11/04 06:22:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,12 +33,13 @@ package Apache::lonmsgdisplay; =head1 NAME -Apache::lonmsg: supports internal messaging +Apache::lonmsgdisplay: supports internal messaging =head1 SYNOPSIS -lonmsg provides routines for sending messages, receiving messages, and -a handler to allow users to read, send, and delete messages. +lonmsgdisplay provides a handler to allow users to read, send, +and delete messages, and to create and delete message folders, +and to move messages between folders. =head1 OVERVIEW @@ -93,25 +94,6 @@ addresses on their B screen, but g are much more useful than traditional email can be made to be, even with HTML support. -Right now, this document will cover just how to send a message, since -it is likely you will not need to programmatically read messages, -since lonmsg already implements that functionality. - -The routines used to package messages and unpackage messages are not -only used by lonmsg when creating/extracting messages for LON-CAPA's -internal messaging system, but also by lonnotify.pm which is available -for use by Domain Coordinators to broadcast standard e-mail to specified -users in their domain. The XML packaging used in the two cases is very -similar. The differences are the use of $uname and -$udom in stored internal messages, compared -with $email in stored -Domain Coordinator e-mail for the storage of information about -recipients of the message/e-mail. - -=head1 FUNCTIONS - -=over 4 - =cut use strict; @@ -119,6 +101,7 @@ use Apache::lonnet; use HTML::TokeParser(); use Apache::Constants qw(:common); use Apache::loncommon(); +use Apache::lonhtmlcommon(); use Apache::lontexconvert(); use HTML::Entities(); use Apache::lonlocal; @@ -132,7 +115,6 @@ use LONCAPA; # Querystring component with sorting type my $sqs; my $startdis; -my $interdis; # ============================================================ List all folders @@ -230,6 +212,10 @@ function folder_choice(targetform,caller } } |; + my %show = ('select_form_order' => [10,20,50,100,200], + map {$_=>$_} (10,20,50,100,200)); + + $output .= '
@@ -240,12 +226,9 @@ function folder_choice(targetform,caller - '); + + } else { + $r->print(&mt('The sender did not designate a reply to address for this message.').'
'.$lt{'fold'}.'
'."\n". &Apache::loncommon::select_form($folder,'folder',%formhash).' 		'.$lt{'show'}.'
- + 		'.$lt{'show'}.'
'."\n". + &Apache::loncommon::select_form($env{'form.interdis'},'interdis', + %show).' 		'.$lt{'status'}.'
'."\n". &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).' @@ -301,16 +284,20 @@ sub scrollbuttons { $start++; $maxdis++;$first++;$finish++; my %statushash = &get_msgstatus_types(); - + my $status; + if ($msgstatus eq '') { + $status = &mt('All'); + } else { + $status = $statushash{$msgstatus}; + } return - ''.&mt('Page').': '. - ''. - ''. - ' of '.$maxdis. - ''. - '
'. - &mt('_location_in_mail_folder',$msgstatus,$statushash{$msgstatus}, - $first,$finish,$total).''; + ''.&mt('Page').': '. + ''. + ''. + ' of '.$maxdis. + ''. + '
'. + &mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).''; } # =============================================================== Status Change @@ -389,8 +376,8 @@ sub deletefolder { my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); if (@messages > 0) { return &mt('The folder "[_1]" contains messages so it may not be deleted.',$folder). - '
'. - &mt('Delete or move the messages to a different folder first.'); + '
'. + &mt('Delete or move the messages to a different folder first.'); } my $delresult = &Apache::lonnet::del('email_folders',[$folder]); return $delresult; @@ -403,6 +390,9 @@ sub renamefolder { if ($env{'form.renamed'} eq '') { return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is an invalid name.',$folder,$newname); } + if (defined($permfolders{$folder})) { + return &mt('The folder "[_1]" may not be renamed as it is a folder provided by the system.',$folder); + } if (defined($permfolders{$newname})) { return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is reserved for folders provided automatically by the system.',$folder,$newname); } @@ -512,7 +502,8 @@ sub movemsg { # ======================================================= Display a course list sub discourse { - my $result; + my ($statushash) = @_; + my ($result,$active,$previous,$future); my ($course_personnel, $current_members, $expired_members, @@ -521,29 +512,50 @@ 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') + ) { + $result .= '
'.&mt('Bcc: course members with current access').'
'; + $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') + ) { + $result .= '
'.&mt('Bcc: course members with expired access').'
'; + $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') + ) { + $result .= '
'.&mt('Bcc: course members with future access').'
'; + $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 ($cdom,$cnum,$group,$access_status) = @_; my $result; # Needs to be in a course if (!($env{'request.course.fn'})) { @@ -557,6 +569,10 @@ sub disgroup { 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')); } @@ -565,7 +581,6 @@ sub disgroup { 'recipients to select.'); return $result; } else { - $result = &mt('Select message recipients from the group members listed below.
'); my %Sortby = ( active => {}, previous => {}, @@ -575,9 +590,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}; @@ -592,26 +607,34 @@ sub disgroup { } } $result .= &group_check_uncheck(); - $result .= ''. - ''; foreach my $status (@statustypes) { if (ref($numitems) eq 'HASH') { if ((defined($$numitems{$status})) && ($$numitems{$status})) { - $result.='". + 'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'. + ''; + if ($status eq 'active') { + $result .= '   '; + } + $result .= '
'.&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + "". "". "". - &Apache::loncommon::end_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 .= @@ -625,12 +648,10 @@ sub disgroup { &Apache::loncommon::end_data_table_row(); } } - $result .= &Apache::loncommon::end_data_table(); + $result .= &Apache::loncommon::end_data_table().'
'; } } - $result .= ''; } - $result .= '
'. - '
'.$lt{$status}. - ''. + my $formname = $status.'users'; + if (ref($access_status) eq 'HASH') { + $access_status->{$status} = $$numitems{$status}; + } + $result.='
'.$lt{$status}. + '
'. + ''. ''. + 'onclick="javascript:toggleAll('."this.form,'check'".')" />'. '  '. ''. - '

'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(); - $result .= "
$lt{'name'}$lt{'name'}$lt{'usnm'}$lt{'doma'}  
'; } return $result; } @@ -638,24 +659,19 @@ sub disgroup { sub group_check_uncheck { my $output = 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').' '. @@ -1232,7 +1382,7 @@ sub compout { %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'}; @@ -1242,56 +1392,136 @@ sub compout { if ($content{'baseurl'}) { $disbase=''; if ($env{'user.adv'}) { - $disbase.='
'.&mt('Replying to').' '); + if ($content{'replytoaddr'}) { + my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'}); + if ($replytoname ne '' && $replytodom ne '') { + $r->print(&Apache::loncommon::plainname($replytoname, + $replytodom).' ('.$replytoname.':'. + $replytodom.')'); + $r->print(''. + '
'); + return; + } + } else { + $r->print(&Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.':'. - $content{'senderdomain'}.')'. - ''. - ''. - ''); + $content{'senderdomain'}.')'); + $r->print(''. + ''); + } + if ($content{'recipid'}) { + 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| + + +    + + +|; + } + 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(); + my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'
'; my $subj_size; if ($multiforward) { $r->print(&additional_rec_row(\%lt)); @@ -1299,7 +1529,7 @@ sub compout { &mt('Unless you choose otherwise:').''); - $func=&mt('Forward'); + $func1='Forward'; # do not translate here! $dissub = &mt('Forwarding').': '; $subj_size = '10'; my $extra = '<'.&mt('original subject').'>   '. @@ -1309,31 +1539,39 @@ sub compout { $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". +''. +$wysiwyglink); 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'; $r->print(&additional_rec_row(\%lt)); + if (&Apache::lonnet::allowed('srm',$env{'request.course.id'}) + || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. + '/'.$env{'request.course.sec'})) { + $r->print(&reply_to_row(\%lt)); + } $r->print(&msg_subject_row($dissub,\%lt,$subj_size)); $r->print(<<"ENDCOMP"); -
+$attachrow +
$latexHelp


+$wysiwyglink +$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'}:

+$wysiwyglink

$lt{'tff'}: ENDBLOCK @@ -1374,22 +1612,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'); @@ -1397,42 +1643,76 @@ sub recipient_input_row { &Apache::loncommon::selectstudent_link('compemail','recuname', 'recdomain'); my $output = <<"ENDREC"; -$lt{'us'}:$selectlink -$lt{'do'}: -$domform +$lt{'to'} $lt{'us'}:  $lt{'do'}: $domform  $selectlink ENDREC return $output; } +sub reply_to_row { + my ($lt) = @_; + my $radioyes = &mt('Yes'); + my $radiono = &mt('No'); + my $output = <<"ENDREP"; +$lt->{'ar'}:      $lt->{'rt'}:  +ENDREP + return $output; +} + sub additional_rec_row { my ($lt) = @_; + my $cc = &mt('Cc:'); + my $bcc = &mt('Bcc:'); + my $exmpl = &mt('username:domain,username:domain,...'); my $output = <<"ENDADD"; -$lt->{'ad'}:
username:domain,username:domain, ... - - +
$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 $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'}; @@ -1494,7 +1774,20 @@ sub disfacetoface { ''.&mt('Subject').': '.$content{'subject'}.'
'. $content{'message'}; } - } + } + } elsif ($content{'subject'}=~/^Archive/) { + $result.='

'.&mt('Archived Message').'

'; + if (defined($content{'coursemsgid'})) { + my $crsmsgid = &escape($content{'coursemsgid'}); + my $archive_message = &general_message($crsmsgid); + $content{'message'} = ''.&mt('Subject').': '.$content{'message'}.'
'.$archive_message; + } else { + %content=&Apache::lonmsg::unpackagemsg($content{'message'}); + $content{'message'} = + ''.&mt('Subject').': '.$content{'subject'}.'
'; if (defined($content{'coursemsgid'})) { @@ -1557,7 +1850,7 @@ sub facetoface { : 'faculty and staff'; &printheader($r, '/adm/email?recordftf=query', - "User Notes, Face-to-Face, Critical Messages, Broadcast Messages"); + "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages"); # from query string if ($env{'form.recname'}) { $env{'form.recuname'}=$env{'form.recname'}; } @@ -1572,7 +1865,7 @@ sub facetoface { ('stdselect','recuname','recdomain'); my %lt=&Apache::lonlocal::texthash('user' => 'Username', 'dom' => 'Domain', - 'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in $crstype", + 'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, Broadcast Messages and Archived Messages in $crstype", 'subm' => 'Retrieve discussion and message records', 'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')', 'post' => 'Post this Record'); @@ -1636,8 +1929,8 @@ sub examblock { '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.", 'mecb' => 'Modify existing communication blocking periods', - 'ncbc' => 'No communication blocks currently stored', - 'stor' => 'Store', + 'ncbc' => 'No communication blocks currently saved', + 'stor' => 'Save', ); my %ltext = &Apache::lonlocal::texthash( @@ -1935,12 +2228,12 @@ sub displaymessage { &build_block_table($r,$startblock,$endblock,\%setters); return; } - &statuschange($msgid,'read',$folder); + if ($msgstatus eq '') { + &statuschange($msgid,'read',$folder); + } 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){
@@ -1948,16 +2241,33 @@ sub displaymessage {
 	}
 	$counter++;
     }
-    $r->print('
'); + + my $see_anonymous; + my $from_student = 0; + if ($env{'request.course.id'} eq $content{'courseid'}) { + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $username = $content{'sendername'}.':'.$content{'senderdomain'}; + my %classlist_entry = + &Apache::lonnet::get('classlist',[$username],$cdom,$cnum); + if (exists($classlist_entry{$username})) { + $from_student = 1; + $see_anonymous = &Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + } + } + + my $number_of_messages = scalar(@messages); #subtract 1 for last index # start output &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'}); my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); # Functions - $r->print(''. - ''. - ''); + if (!$content{'noreplies'}) { + $r->print(''); + } + $r->print(''. ''. @@ -1974,47 +2284,412 @@ sub displaymessage { '">'.&mt('Next').''); } $r->print('
'.&mt('Functions').':'.&mt('Reply').'
'.&mt('Functions').':'.&mt('Reply').''.&mt('Forward').''.&mt('Mark Unread').'
'); + my $symb; + if (defined($content{'symb'})) { + $symb = $content{'symb'}; + } elsif (defined($content{'baseurl'})) { + $symb=&Apache::lonnet::symbread($content{'baseurl'}); + } if ($env{'user.adv'}) { - $r->print(''); - my $symb=&Apache::lonnet::symbread($content{'baseurl'}); + my $actionlist=''; if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { - $r->print(''); - } + $actionlist.=''; + } if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) { - $r->print(''); + $actionlist.=''; } if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) { - $r->print(''); - } - $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::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::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; - my @recipients = (); - for (my $i=0; $i<@{$content{'recuser'}}; $i++) { - $recipients[$i] = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($content{'recuser'}[$i], + $actionlist.='' + .&Apache::loncommon::pgrdlink( + &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check') + .''; + } + if ($actionlist) { + $r->print('' + .'' + .$actionlist + .'
' + .&mt('Currently available actions (will open extra window):') + .'
'); + } + } + 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'}}); + } + } + if (!$tolist && 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].' at '.$content{'recdomain'}[$i].') '; + $content{'recuser'}[$i],$content{'recdomain'}[$i]). + ' ('.$content{'recuser'}[$i].':'.$content{'recdomain'}[$i].') '; + } + $tolist = join(', ',@recipients); + } + my ($restitle,$baseurl,$refers_to); + if (defined($content{'resource_title'})) { + $restitle = $content{'resource_title'}; + } else { + if (defined($content{'baseurl'})) { + $restitle = &Apache::lonnet::gettitle($content{'baseurl'}); + } + } + if (defined($content{'baseurl'})) { + $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'}); + } + if ($from_student && $see_anonymous ) { + $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'})); + } + + 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); + } + + # Display LON-CAPA Message (Start) + # Subject + $r->print('
' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title(&mt('Subject')) + .$content{'subject'} + .&Apache::lonhtmlcommon::row_closure() + ); + if ($folder eq 'sent') { + # To + $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(&Apache::lonhtmlcommon::row_title(&mt('Reply To')) + .$replytoname.':'.$replytodom + .&Apache::lonhtmlcommon::row_closure() + ); + } + } + } else { + # 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').')' + .&Apache::lonhtmlcommon::row_closure() + ); + } else { + if ($content{'replytoaddr'}) { + my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'}); + if ($replytoname ne '' && $replytodom ne '') { + $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'}.':'.$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'})) { + $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(&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(&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'}) { + my $symblink; + my $showsymb = &Apache::lonenc::check_decrypt($symb); + my $showurl = &Apache::lonenc::check_decrypt($baseurl); + my $encrypturl = &Apache::lonnet::EXT('resource.0.encrypturl', + $showsymb,$env{'user.domain'},$env{'user.name'}); + if ($symb) { + if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) { + $showsymb = &Apache::lonenc::check_encrypt($symb); + } + $symblink = '?symb='.$showsymb; + } + if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) { + $showurl = $baseurl; + } + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to')) + .''.$restitle.'' + .&Apache::lonhtmlcommon::row_closure() + ); + $refers_to = 1; + } + } + if (!$refers_to) { + if ($baseurl =~ m-^/enc/-) { + if (defined($content{'courseid'})) { + if (!$env{'request.course.id'}) { + my $unencurl = + &Apache::lonenc::unencrypted($baseurl, + $content{'courseid'}); + if ($unencurl ne '') { + if (&Apache::lonnet::allowed('bre',$unencurl)) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to')) + .''.$restitle.'' + .&Apache::lonhtmlcommon::row_closure() + ); + } + } + } + } + } else { + if (&Apache::lonnet::allowed('bre',$baseurl)) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to')) + .''.$restitle.'' + .&Apache::lonhtmlcommon::row_closure() + ); + + } + } + } + } + + # 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_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 $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; + my $start_page = + &Apache::loncommon::start_page('Broadcast List', undef, + {only_body => 1, + js_ready => 1,}); + my $end_page = &Apache::loncommon::end_page({js_ready => 1,}); + my $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(< +function showBroadcastList() { + var caller = this; + var newWindow = null; + try { + newWindow = window.open($nothing,"broadcast","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" ); + } + catch(error) { + writeWin(caller); + return; + } + if (newWindow) { + caller = newWindow; + } + writeWin(caller); + return; +} + +function writeWin(caller) { + caller.document.writeln('$start_page $body $end_page'); + caller.document.close(); + caller.focus(); +} + + + +ENDJS + $broadcast_link = 1; + } } - $tolist = join(', ',@recipients); - $r->print('
'.&mt('Subject').': '.$content{'subject'}. - ($folder ne 'sent'?'
'.&mt('From').': '. - &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}), - $content{'sendername'},$content{'senderdomain'}).' ('. - $content{'sendername'}.' at '. - $content{'senderdomain'}.') ':'
'.&mt('To').': '. - $tolist). - ($content{'courseid'}?'
'.&mt($crstype).': '.$courseinfo{'description'}. - ($content{'coursesec'}?' ('.&mt('Section').': '.$content{'coursesec'}.')':''):''). - '
'.&mt('Time').': '.$content{'time'}. - ($content{'baseurl'}?'
'.&mt('Refers to').': '. - $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')':''). - '

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

'); - return; + return $broadcast_link; } # =========================================================== Show the citation @@ -2027,7 +2702,12 @@ sub displayresource { # if (($env{'request.course.id'} eq $content{'courseid'}) && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) { - my $symb=&Apache::lonnet::symbread($content{'baseurl'}); + my $symb; + if (defined($content{'symb'})) { + $symb = $content{'symb'}; + } else { + $symb=&Apache::lonnet::symbread($content{'baseurl'}); + } # Could not get a symb, give up unless ($symb) { return $content{'citation'}; } # Have a symb, can render @@ -2096,10 +2776,10 @@ sub storedcommentlisting { my ($r)=@_; my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef, '^'.&escape(&escape($env{'form.showcommentbaseurl'}))); - $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef, + $r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef, {'onlybody' => 1})); if ((keys %msgs)[0]=~/^error\:/) { - $r->print(&mt('No stored comments yet.')); + $r->print(&mt('No saved comments yet.')); } else { my $found=0; foreach my $key (sort(keys(%msgs))) { @@ -2107,7 +2787,7 @@ sub storedcommentlisting { $found=1; } unless ($found) { - $r->print(&mt('No stored comments yet for this resource.')); + $r->print(&mt('No saved comments yet for this resource.')); } } } @@ -2118,8 +2798,11 @@ sub sendoffmail { my ($r,$folder)=@_; my $suffix=&Apache::lonmsg::foldersuffix($folder); my $sendstatus=''; - my %specialmsg_status; - my $numspecial = 0; + 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'}; @@ -2142,10 +2825,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'}; @@ -2154,50 +2840,109 @@ 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; - 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 =~ /^([^:]+:[^:]+):(.*)$/); if ($txt) { $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'}}=''; + $tos->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; } } - if ($env{'form.additionalrec'}) { - foreach my $rec (split(/\,/,$env{'form.additionalrec'})) { + 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}=''; + $toaddr{$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) { + my ($auname,$audom)=split(/:/,$rec); + if (($auname ne "") && ($audom ne "")) { + $toaddr{$auname.':'.$audom}=''; + if (!defined($tos->{$auname.':'.$audom})) { + $cc->{$auname.':'.$audom}=''; + } + } + } + } + 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}=''; + 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}=''; + } + } + } + } my $savemsg; my $msgtype; my %sentmessage; @@ -2213,120 +2958,166 @@ sub sendoffmail { } else { $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 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}; } + if ($toaddr{$address}) { + $msgtxt.='
'.$toaddr{$address}; + } my @thismsg; - if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && - (&Apache::lonnet::allowed('srm',$env{'request.course.id'}) - || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. - '/'.$env{'request.course.sec'}))) { - $r->print(&mt('Sending critical message').' '.$recuname.':'.$recdomain.': '); + if ($msgtype eq 'critical') { + $r->print(&mt('Sending critical message').' '. + $recuname.':'.$recdomain.': '); @thismsg= &Apache::lonmsg::user_crit_msg($recuname,$recdomain, $msgsubj,$msgtxt, $env{'form.sendbck'}, $env{'form.permanent'}, - \$sentmessage{$address}); + \$sentmessage{$address}, + $nosentstore,$recipid); } else { $r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': '); @thismsg= &Apache::lonmsg::user_normal_msg($recuname,$recdomain, $msgsubj,$msgtxt, $content{'citation'}, - undef,undef, + undef,$attachmenturl, $env{'form.permanent'}, - \$sentmessage{$address}); - } - if (($env{'request.course.id'}) && (($msgtype eq 'critical') || - ($env{'form.sendmode'} eq 'group'))) { - $specialmsg_status{$recuname.':'.$recdomain} = - join(' ',@thismsg); - foreach my $result (@thismsg) { - if ($result eq 'ok') { - $numspecial++; - } - } + \$sentmessage{$address}, + undef,undef,undef, + $nosentstore,$recipid); + } + $msg_status{$recuname.':'.$recdomain}=join(' ',@thismsg); + if ($msg_status{$recuname.':'.$recdomain} =~ /(ok|con_delayed)/) { + $numsent++; + push(@recusers,$recuname); + push(@recudoms,$recdomain); } $sendstatus.=' '.join(' ',@thismsg); } - if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group') - || ($msgtype eq 'critical'))) { - my $subj_prefix; - if ($msgtype eq 'critical') { - $subj_prefix = 'Critical.'; - } else { - $subj_prefix = 'Broadcast.'; - } - my ($specialmsgid,$specialresult); - my $course_str = &escape('['.$cnum.':'.$cdom.']'); - - if ($numspecial) { - $specialresult = &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix. - ' '.$course_str,$savemsg,undef,undef,undef, - undef,undef,\$specialmsgid); + my $subj_prefix; + if ($numsent > 0) { + if (($env{'request.course.id'}) && + (($mode eq 'group') || + ($env{'form.courserecord'}) || + ($msgtype eq 'critical')) || + ($env{'form.replyid'} && + (($content{'courseid'} ne '') && + ($mode eq 'group')))) { + if ($msgtype eq 'critical') { + $subj_prefix = 'Critical.'; + } elsif ($mode eq 'group') { + $subj_prefix = 'Broadcast.'; + } else { + $subj_prefix = 'Archive'; + } + my ($specialmsgid,$specialresult); + 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, + $attachmenturl,undef,undef,\$specialmsgid,undef,undef,undef, + undef,undef,1); $specialmsgid = &unescape($specialmsgid); - } - if ($specialresult eq 'ok') { - my $record_sent; - my @recusers; - my @recudoms; - my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = - split(/\:/,&unescape($specialmsgid)); - - foreach my $recipient (sort(keys(%toaddr))) { - if ($specialmsg_status{$recipient} eq 'ok') { - my $usersubj = $subj_prefix.'['.$recipient.']'; - my $usermsgid = - &Apache::lonmsg::buildmsgid($stamp,$usersubj, - $msgname,$msgdom, - $msgcount,$context, - $pid); - &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix. - ' ['.$recipient.']',$msgsubj,undef, - undef,undef,undef,$usermsgid,undef,undef,$specialmsgid); - my ($uname,$udom) = split(/:/,$recipient); - push(@recusers,$uname); - push(@recudoms,$udom); - } - } - if (@recusers) { - my $specialmessage; - my $sentsubj = - $subj_prefix.' ('.$numspecial.' sent) '.$msgsubj; - $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"'); - my $sentmsgid = - &Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname, - $msgdom,$msgcount,$context, - $pid); - ($specialmsgid,$specialmessage) = &Apache::lonmsg::packagemsg($msgsubj,$savemsg, - undef,undef,undef,\@recusers,\@recudoms,$sentmsgid); - $record_sent = &Apache::lonmsg::store_sent_mail($specialmsgid,$specialmessage); + if ($specialresult eq 'ok') { + my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = + split(/\:/,&unescape($specialmsgid)); + + foreach my $recipient (sort(keys(%toaddr))) { + if ($msg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) { + my $usersubj = $subj_prefix.'['.$recipient.']'; + my $usermsgid = + &Apache::lonmsg::buildmsgid($stamp,$usersubj, + $msgname,$msgdom, + $msgcount,$context, + $pid); + &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom, + $subj_prefix.' ['.$recipient.']',$msgsubj, + undef,undef,$attachmenturl,undef,$usermsgid,undef, + undef,$specialmsgid,undef,undef,undef,1); + } + } + if (($mode ne 'upload') && (@recusers > 0)) { + &Apache::lonmsg::process_sent_mail($msgsubj, + $subj_prefix,$numsent,$stamp,$msgname,$msgdom, + $msgcount,$context,$pid,$savemsg,\@recusers, + \@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'); } } else { - &Apache::lonnet::logthis('Failed to create record of critical message or broadcast in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated'); + my $stamp = time; + my $msgcount = &Apache::lonmsg::get_uniq(); + my $context = &Apache::lonmsg::get_course_context(); + &Apache::lonmsg::process_sent_mail($msgsubj,$subj_prefix, + $numsent,$stamp,$env{'user.name'}, + $env{'user.domain'},$msgcount,$context, + $$,$savemsg,\@recusers,\@recudoms,undef,$attachmenturl, + '','','','',$recipid); } } - } else { - &printheader($r,'','No messages sent.'); - } - if (!$env{'form.multiforward'}) { - if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { - $r->print('
'.&mt('Completed.'). - ''); - if ($env{'form.displayedcrit'}) { - &discrit($r); + if (!$env{'form.multiforward'}) { + if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { + $r->print('
'.&mt('Completed.'). + ''); + if ($env{'form.displayedcrit'}) { + &discrit($r); + } + if ($group ne '') { + $r->print(&groupmail_sent($group,$cdom,$cnum)); + } else { + &Apache::loncommunicate::menu($r); + } + } else { + $r->print('

'.&mt('Could not deliver message').' '. + &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'

'); } - if ($group ne '') { - $r->print(&groupmail_sent($group,$cdom,$cnum)); - } else { - &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)").'

'); } } return $sendstatus; @@ -2391,10 +3182,6 @@ sub handler { } unless ($startdis) { $startdis=0; } - $interdis=$env{'form.interdis'}; - unless ($interdis) { $interdis=20; } - $sqs.='&interdis='.$interdis; - if ($env{'form.firstview'}) { $startdis=0; } @@ -2420,16 +3207,19 @@ sub handler { &printheader($r,'','Confirmed Receipt'); my $replying = 0; foreach my $envkey (keys(%env)) { - if ($envkey=~/^form\.rec\_(.*)$/) { - $r->print(''.&mt('Confirming Receipt').': '. - &Apache::lonmsg::user_crit_received($1).'
'); - } - if ($envkey=~/^form\.reprec\_(.*)$/) { - my $msgid=$1; - $r->print(''.&mt('Confirming Receipt').': '. - &Apache::lonmsg::user_crit_received($msgid).'
'); - &compout($r,'','','',$msgid); - $replying = 1; + if ($envkey=~/^form\.(rep)?rec\_(.*)$/) { + my $repchk = $1; + my $msgid = $2; + $r->print(''.&mt('Confirming Receipt').': '); + my $result = &Apache::lonmsg::user_crit_received($msgid); + if ($result =~ /trans:\s+ok/) { + &statuschange($msgid,'read'); + } + $r->print($result.'
'); + if ($repchk eq 'rep') { + &compout($r,'','','',$msgid); + $replying = 1; + } } } if (!$replying) { @@ -2561,7 +3351,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 { @@ -2575,8 +3365,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); @@ -2643,6 +3435,7 @@ sub handler { my $delresult = &deletefolder($folder); if ($delresult eq 'ok') { $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'
'); + $env{'form.folder'} = ''; } else { $r->print(&mt('Deletion failed.').' '.$delresult.'
'); $showfolder = $folder; @@ -2673,8 +3466,6 @@ sub handler { =pod -=back - =cut 1;