--- loncom/interface/lonmsg.pm 2005/03/01 03:28:14 1.139 +++ loncom/interface/lonmsg.pm 2005/11/23 22:32:11 1.156 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.139 2005/03/01 03:28:14 albertel Exp $ +# $Id: lonmsg.pm,v 1.156 2005/11/23 22:32:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -104,7 +104,7 @@ since lonmsg already implements that fun =cut use strict; -use Apache::lonnet(); +use Apache::lonnet; use vars qw($msgcount); use HTML::TokeParser(); use Apache::Constants qw(:common); @@ -114,6 +114,8 @@ use HTML::Entities(); use Mail::Send; use Apache::lonlocal; use Apache::loncommunicate; +use Apache::lonfeedback; +use Apache::lonrss(); # Querystring component with sorting type my $sqs; @@ -124,7 +126,7 @@ my $interdis; sub packagemsg { my ($subject,$message,$citation,$baseurl,$attachmenturl, - $recuser,$recdomain)=@_; + $recuser,$recdomain,$msgid)=@_; $message =&HTML::Entities::encode($message,'<>&"'); $citation=&HTML::Entities::encode($citation,'<>&"'); $subject =&HTML::Entities::encode($subject,'<>&"'); @@ -139,29 +141,39 @@ sub packagemsg { $msgcount++; my $partsubj=$subject; $partsubj=&Apache::lonnet::escape($partsubj); - my $msgid=&Apache::lonnet::escape( - $now.':'.$partsubj.':'.$ENV{'user.name'}.':'. - $ENV{'user.domain'}.':'.$msgcount.':'.$$); - my $result=''.$ENV{'user.name'}.''. - ''.$ENV{'user.domain'}.''. + unless(defined($msgid)) { + $msgid=&Apache::lonnet::escape( + $now.':'.$partsubj.':'.$env{'user.name'}.':'. + $env{'user.domain'}.':'.$msgcount.':'. + $env{'request.course.id'}.':'.$$); + } + my $result=''.$env{'user.name'}.''. + ''.$env{'user.domain'}.''. ''.$subject.''. ''. ''.$ENV{'SERVER_NAME'}.''. ''.$ENV{'HTTP_HOST'}.''. ''.$ENV{'REMOTE_ADDR'}.''. - ''.$ENV{'browser.type'}.''. - ''.$ENV{'browser.os'}.''. - ''.$ENV{'browser.version'}.''. - ''.$ENV{'browser.mathml'}.''. + ''.$env{'browser.type'}.''. + ''.$env{'browser.os'}.''. + ''.$env{'browser.version'}.''. + ''.$env{'browser.mathml'}.''. ''.$ENV{'HTTP_USER_AGENT'}.''. - ''.$ENV{'request.course.id'}.''. - ''.$ENV{'request.course.sec'}.''. - ''.$ENV{'request.role'}.''. - ''.$ENV{'request.filename'}.''. - ''.$msgid.''. - ''.$recuser.''. - ''.$recdomain.''. - ''.$message.''; + ''.$env{'request.course.id'}.''. + ''.$env{'request.course.sec'}.''. + ''.$env{'request.role'}.''. + ''.$env{'request.filename'}.''. + ''.$msgid.''; + if (ref($recuser) eq 'ARRAY') { + for (my $i=0; $i<@{$recuser}; $i++) { + $result .= ''.$$recuser[$i].''. + ''.$$recdomain[$i].''; + } + } else { + $result .= ''.$recuser.''. + ''.$recdomain.''; + } + $result .= ''.$message.''; if (defined($citation)) { $result.=''.$citation.''; } @@ -185,7 +197,11 @@ sub unpackagemsg { if ($token->[0] eq 'S') { my $entry=$token->[1]; my $value=$parser->get_text('/'.$entry); - $content{$entry}=$value; + if (($entry eq 'recuser') || ($entry eq 'recdomain')) { + push(@{$content{$entry}},$value); + } else { + $content{$entry}=$value; + } } } if ($content{'attachmenturl'}) { @@ -209,13 +225,13 @@ sub unpackmsgid { my ($msgid,$folder)=@_; $msgid=&Apache::lonnet::unescape($msgid); my $suffix=&foldersuffix($folder); - my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/, + my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/, &Apache::lonnet::unescape($msgid)); my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]); if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; } unless ($status{$msgid}) { $status{$msgid}='new'; } - return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid}); -} + return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid); +} sub sendemail { @@ -226,23 +242,19 @@ sub sendemail { my $msg = new Mail::Send; $msg->to($to); $msg->subject('[LON-CAPA] '.$subject); - my %oldENV=%ENV; - undef(%ENV); if (my $fh = $msg->open()) { print $fh $body; $fh->close; } - %ENV=%oldENV; - undef(%oldENV); } # ==================================================== Send notification emails sub sendnotification { my ($to,$touname,$toudom,$subj,$crit,$text)=@_; - my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'}; + my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'}; unless ($sender=~/\w/) { - $sender=$ENV{'user.name'}.'@'.$ENV{'user.domain'}; + $sender=$env{'user.name'}.'@'.$env{'user.domain'}; } my $critical=($crit?' critical':''); $text=~s/\<\;/\300) { + if ((time-$env{'user.mailcheck.time'})>300) { my %what=&Apache::lonnet::get('email_status',['recnewemail']); &Apache::lonnet::appenv('user.mailcheck.time'=>time); if ($what{'recnewemail'}>0) { return 1; } @@ -340,7 +352,20 @@ sub del_url_author_res_msg { } return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author); } +# =================================== Clear out all author messages in URL path +sub clear_author_res_msg { + my $url=shift; + $url=&Apache::lonnet::declutter($url); + my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//); + my @delmsgs=(); + foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) { + if ($_=~/^\Q$url\E/) { + push (@delmsgs,$_); + } + } + return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author); +} # ================= Return hash with URLs for which there is a resource message sub all_url_author_res_msg { @@ -370,10 +395,10 @@ sub user_crit_msg_raw { 'put:'.$domain.':'.$user.':critical:'. &Apache::lonnet::escape($msgid).'='. &Apache::lonnet::escape($message),$homeserver); - if ($ENV{'request.course.id'}) { + if ($env{'request.course.id'}) { &user_normal_msg_raw( - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, 'Critical ['.$user.':'.$domain.']', $message); } @@ -396,8 +421,8 @@ sub user_crit_msg_raw { &Apache::lonnet::logthis( 'Sending critical email '.$msgid. ', log status: '. - &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'}, - $ENV{'user.home'}, + &Apache::lonnet::log($env{'user.domain'},$env{'user.name'}, + $env{'user.home'}, 'Sending critical '.$msgid.' to '.$user.' at '.$domain.' with status: ' .$status)); return $status; @@ -440,8 +465,8 @@ sub user_crit_received { my %contents=&unpackagemsg($message{$msgid},1); my $status='rec: '.($contents{'sendback'}? &user_normal_msg($contents{'sendername'},$contents{'senderdomain'}, - &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'}, - &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}. + &mt('Receipt').': '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.', '.$contents{'subject'}, + &mt('User').' '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}. ' acknowledged receipt of message'."\n".' "'. $contents{'subject'}.'"'."\n".&mt('dated').' '. $contents{'time'}.".\n" @@ -451,8 +476,8 @@ sub user_crit_received { 'nohist_email',{$contents{'msgid'} => $message{$msgid}}); $status.=' del: '. &Apache::lonnet::del('critical',[$contents{'msgid'}]); - &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'}, - $ENV{'user.home'},'Received critical message '. + &Apache::lonnet::log($env{'user.domain'},$env{'user.name'}, + $env{'user.home'},'Received critical message '. $contents{'msgid'}. ', '.$status); return $status; @@ -462,7 +487,7 @@ sub user_crit_received { sub user_normal_msg_raw { my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl, - $toperm)=@_; + $toperm,$newid)=@_; # Check if allowed missing my $status=''; my $msgid='undefined'; @@ -480,15 +505,16 @@ sub user_normal_msg_raw { # Save new message received time &Apache::lonnet::put ('email_status',{'recnewemail'=>time},$domain,$user); -# Into sent-mail folder - $status.=' '.&Apache::lonnet::critical( - 'put:'.$ENV{'user.domain'}.':'.$ENV{'user.name'}. - ':nohist_email_sent:'. - &Apache::lonnet::escape($msgid).'='. - &Apache::lonnet::escape($message),$ENV{'user.home'}); +# Into sent-mail folder unless a broadcast message + unless (($env{'request.course.id'}) && ($env{'form.sendmode'} eq 'group')) { + $status .= &store_sent_mail($msgid,$message); + } } else { $status='no_host'; } + if (defined($newid)) { + $$newid = $msgid; + } # Notifications my %userenv = &Apache::lonnet::get('environment',['notification', 'permanentemail'], @@ -501,8 +527,8 @@ sub user_normal_msg_raw { &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0, $text); } - &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'}, - $ENV{'user.home'}, + &Apache::lonnet::log($env{'user.domain'},$env{'user.name'}, + $env{'user.home'}, 'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status); return $status; } @@ -538,6 +564,15 @@ sub user_normal_msg { return $status; } +sub store_sent_mail { + my ($msgid,$message) = @_; + my $status =' '.&Apache::lonnet::critical( + 'put:'.$env{'user.domain'}.':'.$env{'user.name'}. + ':nohist_email_sent:'. + &Apache::lonnet::escape($msgid).'='. + &Apache::lonnet::escape($message),$env{'user.home'}); + return $status; +} # ============================================================ List all folders @@ -559,7 +594,7 @@ sub folderlist { ($_==$interdis?' selected="selected"':'').'>'.$_.'' } (10,20,50,100,200)).''. '
'. - ''. + ''. ($folder=~/^(new|critical)/?'':''); } @@ -567,13 +602,14 @@ sub scrollbuttons { my ($start,$maxdis,$first,$finish,$total)=@_; unless ($total>0) { return ''; } $start++; $maxdis++;$first++;$finish++; - return + return + &mt('Page').': '. ''. ''. ' of '.$maxdis. ''. '
'. - &mt('Messages [_1] through [_2] of [_3]',$first,$finish,$total).''; + &mt('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).''; } # =============================================================== Folder suffix @@ -599,6 +635,9 @@ sub statuschange { if (($newstatus eq 'deleted') || ($newstatus eq 'new')) { &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus}); } + if ($newstatus eq 'deleted') { + &movemsg(&Apache::lonnet::unescape($msgid),$folder,'trash'); + } } # ============================================================= Make new folder @@ -616,6 +655,7 @@ sub makefolder { sub movemsg { my ($msgid,$srcfolder,$trgfolder)=@_; + if ($srcfolder eq 'new') { $srcfolder=''; } my $srcsuffix=&foldersuffix($srcfolder); my $trgsuffix=&foldersuffix($trgfolder); @@ -709,6 +749,8 @@ ENDDISHEADER &Apache::loncoursedata::CL_FULLNAME(), &Apache::loncoursedata::CL_SECTION()]); next if ($status ne 'Active'); + next if ($env{'request.course.sec'} && + $section ne $env{'request.course.sec'}); my $key = 'send_to_&&&'.$section.'&&&_'.$student; if (! defined($fullname) || $fullname eq '') { $fullname = $sname; } $r->print('

'. +'

'; } my %message; my %content; - my $defdom=$ENV{'user.domain'}; + my $defdom=$env{'user.domain'}; if ($forwarding) { %message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]); %content=&unpackagemsg($message{$forwarding},$folder); @@ -1128,7 +1172,7 @@ sub compout { $dismsg=~s/\n+/\n\> /g; if ($content{'baseurl'}) { $disbase=''; - if ($ENV{'user.adv'}) { + if ($env{'user.adv'}) { $disbase.=' '. @@ -1137,7 +1181,7 @@ sub compout { } } my $citation=&displayresource(%content); - if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; } + if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; } $r->print( '
'."\n". @@ -1158,7 +1202,7 @@ sub compout { my $selectlink=&Apache::loncommon::selectstudent_link ('compemail','recuname','recdomain'); $r->print(<<"ENDREC"); -$lt{'us'}:$selectlink +$lt{'us'}:$selectlink $lt{'do'}: $domform ENDREC @@ -1173,10 +1217,12 @@ ENDREC $lt{'sb'}: $latexHelp -


$dispcrit $disbase + +
$citation @@ -1190,7 +1236,7 @@ ENDCOMP Subject:

General message text
-

The file format for the uploaded portion of the message is: @@ -1212,29 +1258,31 @@ ENDUPLOAD if ($broadcast eq 'group') { &discourse; } - $r->print('

'); + $r->print(''. + &Apache::lonfeedback::generate_preview_button('compemail','message'). + &Apache::lonhtmlcommon::htmlareaselectactive('message')); } # ---------------------------------------------------- Display all face to face sub retrieve_instructor_comments { my ($user,$domain)=@_; - my $target=$ENV{'form.grade_target'}; - if (! $ENV{'request.course.id'}) { return; } - if (! &Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + my $target=$env{'form.grade_target'}; + if (! $env{'request.course.id'}) { return; } + if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})) { return; } my %records=&Apache::lonnet::dump('nohist_email', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}, '%255b'.$user.'%253a'.$domain.'%255d'); my $result=''; foreach (sort(keys(%records))) { my %content=&unpackagemsg($records{$_}); next if ($content{'senderdomain'} eq ''); next if ($content{'subject'} !~ /^Record/); - # $content{'message'}=~s/\n/\/g; - $result.='Recorded by '. + # &Apache::lonfeedback::newline_to_br(\$content{'message'}); + $result.='Recorded by '. $content{'sendername'}.'@'.$content{'senderdomain'}."\n"; $result.= &Apache::lontexconvert::msgtexconverted($content{'message'})."\n"; @@ -1244,20 +1292,20 @@ sub retrieve_instructor_comments { sub disfacetoface { my ($r,$user,$domain)=@_; - my $target=$ENV{'form.grade_target'}; - unless ($ENV{'request.course.id'}) { return; } - unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + my $target=$env{'form.grade_target'}; + unless ($env{'request.course.id'}) { return; } + unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { return; } my %records=&Apache::lonnet::dump('nohist_email', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}, '%255b'.$user.'%253a'.$domain.'%255d'); my $result=''; foreach (sort keys %records) { my %content=&unpackagemsg($records{$_}); next if ($content{'senderdomain'} eq ''); - $content{'message'}=~s/\n/\/g; + &Apache::lonfeedback::newline_to_br(\$content{'message'}); if ($content{'subject'}=~/^Record/) { $result.='

'.&mt('Record').'

'; } elsif ($content{'subject'}=~/^Broadcast/) { @@ -1294,7 +1342,7 @@ $content{'sendername'}.'@'. sub facetoface { my ($r,$stage)=@_; - unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { return; } &printheader($r, @@ -1302,12 +1350,12 @@ sub facetoface { "User Notes, Face-to-Face, Critical Messages, Broadcast Messages"); # from query string - if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; } - if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; } + if ($env{'form.recname'}) { $env{'form.recuname'}=$env{'form.recname'}; } + if ($env{'form.recdom'}) { $env{'form.recdomain'}=$env{'form.recdom'}; } - my $defdom=$ENV{'user.domain'}; + my $defdom=$env{'user.domain'}; # already filled in - if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; } + if ($env{'form.recdomain'}) { $defdom=$env{'form.recdomain'}; } # generate output my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain'); my $stdbrws = &Apache::loncommon::selectstudent_link @@ -1323,7 +1371,7 @@ sub facetoface {
- + @@ -1334,23 +1382,23 @@ $stdbrws ENDTREC if (($stage ne 'query') && - ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) { - chomp($ENV{'form.newrecord'}); - if ($ENV{'form.newrecord'}) { + ($env{'form.recdomain'}) && ($env{'form.recuname'})) { + chomp($env{'form.newrecord'}); + if ($env{'form.newrecord'}) { &user_normal_msg_raw( - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, &mt('Record'). - ' ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']', - $ENV{'form.newrecord'}); + ' ['.$env{'form.recuname'}.':'.$env{'form.recdomain'}.']', + $env{'form.newrecord'}); } - $r->print('

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

'); - &disfacetoface($r,$ENV{'form.recuname'},$ENV{'form.recdomain'}); + $r->print('

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

'); + &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'}); $r->print(< - - + + ENDRHEAD $r->print(<$lt{'newr'}
@@ -1367,8 +1415,8 @@ ENDBFORM sub examblock { my ($r,$action) = @_; - unless ($ENV{'request.course.id'}) { return;} - unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { $r->print('Not allowed'); } + unless ($env{'request.course.id'}) { return;} + unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { $r->print('Not allowed'); } my %lt=&Apache::lonlocal::texthash( 'comb' => 'Communication Blocking', 'cbds' => 'Communication blocking during scheduled exams', @@ -1438,7 +1486,7 @@ sub blockstore { my $addtotal = 0; my %blocking = (); $r->print('

'.$lt{'head'}.'

'); - foreach (keys %ENV) { + foreach (keys %env) { if ($_ =~ m/^form\.modify_(\w+)$/) { $adds{$1} = $1; $removals{$1} = $1; @@ -1456,23 +1504,23 @@ sub blockstore { } foreach (keys %removals) { - my $hashkey = $ENV{'form.key_'.$_}; + my $hashkey = $env{'form.key_'.$_}; &Apache::lonnet::del('comm_block',["$hashkey"], - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'} + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'} ); } foreach (keys %adds) { unless ( defined($cancels{$_}) ) { my ($newstart,$newend) = &get_dates_from_form($_); my $newkey = $newstart.'____'.$newend; - $blocking{$newkey} = $ENV{'user.name'}.'@'.$ENV{'user.domain'}.':'.$ENV{'form.title_'.$_}; + $blocking{$newkey} = $env{'user.name'}.'@'.$env{'user.domain'}.':'.$env{'form.title_'.$_}; } } if ($addtotal + $modtotal > 0) { &Apache::lonnet::put('comm_block',\%blocking, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'} + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'} ); } my $chgestotal = $canceltotal + $modtotal + $addtotal; @@ -1506,8 +1554,8 @@ sub get_blockdates { my ($records,$blockcount) = @_; $$blockcount = 0; %{$records} = &Apache::lonnet::dump('comm_block', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'} + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'} ); $$blockcount = keys %{$records}; @@ -1525,7 +1573,7 @@ sub display_blocker_status { my @bgcols = ("#eeeeee","#dddddd"); my $function = &Apache::loncommon::get_users_function(); my $color = &Apache::loncommon::designparm($function.'.tabbg', - $ENV{'user.domain'}); + $env{'user.domain'}); my %lt = &Apache::lonlocal::texthash( 'modi' => 'Modify', 'canc' => 'Cancel', @@ -1591,7 +1639,7 @@ sub display_addblocker_table { my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange); my $function = &Apache::loncommon::get_users_function(); my $color = &Apache::loncommon::designparm($function.'.tabbg', - $ENV{'user.domain'}); + $env{'user.domain'}); my %lt = &Apache::lonlocal::texthash( 'addb' => 'Add block', 'exam' => 'e.g., Exam 1', @@ -1634,12 +1682,12 @@ sub blockcheck { my @staffcses = (); $$startblock = 0; $$endblock = 0; - foreach (keys %ENV) { + foreach (keys %env) { if ($_ =~ m-^user\.role\.(st|cc|in)\./(.+)$-) { my $role = $1; my $cse = $2; $cse =~ s|/|_|; - if ($ENV{$_} =~ m/^(\d*)\.(\d*)$/) { + if ($env{$_} =~ m/^(\d*)\.(\d*)$/) { unless (($2 > 0 && $2 < time) || ($1 > time)) { if ($role eq 'st') { push @livecses, $cse; @@ -1651,14 +1699,14 @@ sub blockcheck { } } } elsif ($_ =~ m-user\.role\.cr/(\w+)/(\w+)/([^/]+)\./(.+)$- ) { - my $rolepriv = $ENV{'user.role..rolesdef_'.$3}; + my $rolepriv = $env{'user.role..rolesdef_'.$3}; } } # Retrieve blocking times and identity of blocker for active courses for students. if (@livecses > 0) { foreach my $cse (@livecses) { my ($cdom,$crs) = split/_/,$cse; - if ( (grep/^$cse$/,@staffcses) && ($ENV{'request.role'} !~ m-^st\./$cdom/$crs$-) ) { + if ( (grep/^$cse$/,@staffcses) && ($env{'request.role'} !~ m-^st\./$cdom/$crs$-) ) { next; } else { %{$$setters{$cse}} = (); @@ -1689,7 +1737,7 @@ sub build_block_table { my ($r,$startblock,$endblock,$setters) = @_; my $function = &Apache::loncommon::get_users_function(); my $color = &Apache::loncommon::designparm($function.'.tabbg', - $ENV{'user.domain'}); + $env{'user.domain'}); my %lt = &Apache::lonlocal::texthash( 'cacb' => 'Currently active communication blocks', 'cour' => 'Course', @@ -1774,9 +1822,9 @@ sub displaymessage { ''. ''. + '">'.&mt('Delete').''. ''); if ($counter > 0){ $r->print(''); } $r->print('
$lt{'user'}:
$lt{'user'}: $stdbrws '.&mt('Mark Unread').'Delete'.&mt('Back to Folder Display').''.&mt('Next').'
'); + if ($env{'user.adv'}) { + $r->print(''); + my $symb=&Apache::lonnet::symbread($content{'baseurl'}); + if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { + $r->print(''); + } + if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) { + $r->print(''); + } + 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::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], + $content{'recdomain'}[$i]), + $content{'recuser'}[$i],$content{'recdomain'}[$i]). + ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') '; + } + $tolist = join(', ',@recipients); $r->print('
'.&mt('Subject').': '.$content{'subject'}. ($folder ne 'sent'?'
'.&mt('From').': '. &Apache::loncommon::aboutmewrapper( @@ -1794,11 +1866,7 @@ sub displaymessage { $content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.' at '. $content{'senderdomain'}.') ':'
'.&mt('To').': '. - &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($content{'recuser'},$content{'recdomain'}), - $content{'recuser'},$content{'recdomain'}).' ('. - $content{'recuser'}.' at '. - $content{'recdomain'}.') '). + $tolist). ($content{'courseid'}?'
'.&mt('Course').': '.$courseinfo{'description'}. ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):''). '
'.&mt('Time').': '.$content{'time'}. @@ -1818,7 +1886,7 @@ sub displayresource { # If the recipient is in the same course that the message was sent from and # has sufficient privileges, show "all details," else show citation # - if (($ENV{'request.course.id'} eq $content{'courseid'}) + if (($env{'request.course.id'} eq $content{'courseid'}) && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) { my $symb=&Apache::lonnet::symbread($content{'baseurl'}); # Could not get a symb, give up @@ -1850,7 +1918,8 @@ sub header { my ($r,$title,$baseurl)=@_; $r->print(&Apache::lonxml::xmlbegin(). ''.&Apache::lonxml::fontsettings(). - 'Communication and Messages'); + 'Communication and Messages'. + &Apache::lonhtmlcommon::htmlareaheaders()); if ($baseurl) { $r->print(""); } @@ -1875,21 +1944,21 @@ sub printheader { sub storecomment { my ($r)=@_; - my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); + my $msgtxt=&Apache::lonfeedback::clear_out_html($env{'form.message'}); my $cleanmsgtxt=''; foreach (split(/[\n\r]/,$msgtxt)) { unless ($_=~/^\s*(\>|\>\;)/) { $cleanmsgtxt.=$_."\n"; } } - my $key=&Apache::lonnet::escape($ENV{'form.baseurl'}).'___'.time; + my $key=&Apache::lonnet::escape($env{'form.baseurl'}).'___'.time; &Apache::lonnet::put('nohist_stored_comments',{ $key => $cleanmsgtxt }); } sub storedcommentlisting { my ($r)=@_; my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef, - '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($ENV{'form.showcommentbaseurl'}))); + '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($env{'form.showcommentbaseurl'}))); $r->print(&Apache::lonxml::xmlbegin().''. &Apache::lonxml::fontsettings().''); if ((keys %msgs)[0]=~/^error\:/) { @@ -1912,35 +1981,37 @@ sub sendoffmail { my ($r,$folder)=@_; my $suffix=&foldersuffix($folder); my $sendstatus=''; - if ($ENV{'form.send'}) { + my %broadcast_status; + my $numbroadcast = 0; + if ($env{'form.send'}) { &printheader($r,'','Messages being sent.'); $r->rflush(); my %content=(); undef %content; - if ($ENV{'form.forwid'}) { - my $msgid=$ENV{'form.forwid'}; + if ($env{'form.forwid'}) { + my $msgid=$env{'form.forwid'}; my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); %content=&unpackagemsg($message{$msgid},1); &statuschange($msgid,'forwarded',$folder); - $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n". + $env{'form.message'}.="\n\n-- Forwarded message --\n\n". $content{'message'}; } - if ($ENV{'form.replyid'}) { - my $msgid=$ENV{'form.replyid'}; + if ($env{'form.replyid'}) { + my $msgid=$env{'form.replyid'}; my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); %content=&unpackagemsg($message{$msgid},1); &statuschange($msgid,'replied',$folder); } my %toaddr=(); undef %toaddr; - if ($ENV{'form.sendmode'} eq 'group') { - foreach (keys %ENV) { + if ($env{'form.sendmode'} eq 'group') { + foreach (keys %env) { if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) { $toaddr{$1}=''; } } - } elsif ($ENV{'form.sendmode'} eq 'upload') { - foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) { + } elsif ($env{'form.sendmode'} eq 'upload') { + foreach (split(/[\n\r\f]+/,$env{'form.upfile'})) { my ($rec,$txt)=split(/\s*\:\s*/,$_); if ($txt) { $rec=~s/\@/\:/; @@ -1948,56 +2019,95 @@ sub sendoffmail { } } } else { - $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}=''; + $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; } - if ($ENV{'form.additionalrec'}) { - foreach (split(/\,/,$ENV{'form.additionalrec'})) { + if ($env{'form.additionalrec'}) { + foreach (split(/\,/,$env{'form.additionalrec'})) { my ($auname,$audom)=split(/\@/,$_); $toaddr{$auname.':'.$audom}=''; } } + + my $basicmsg; + my $msgtype; + if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && + (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) { + $basicmsg=&Apache::lonfeedback::clear_out_html($env{'form.message'},1); + $msgtype = '(critical)'; + } else { + $basicmsg=&Apache::lonfeedback::clear_out_html($env{'form.message'}); + } foreach (keys %toaddr) { my ($recuname,$recdomain)=split(/\:/,$_); - my $msgtxt; - if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && - (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { - $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'},1); - } else { - $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); - } + my $msgtxt = $basicmsg; if ($toaddr{$_}) { $msgtxt.='
'.$toaddr{$_}; } - my $thismsg; - if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && - (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { + my $thismsg; + if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && + (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) { $r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': '); $thismsg=&user_crit_msg($recuname,$recdomain, - &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), + &Apache::lonfeedback::clear_out_html($env{'form.subject'}), $msgtxt, - $ENV{'form.sendbck'},$ENV{'form.permanent'}); + $env{'form.sendbck'},$env{'form.permanent'}); } else { $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); $thismsg=&user_normal_msg($recuname,$recdomain, - &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), + &Apache::lonfeedback::clear_out_html($env{'form.subject'}), $msgtxt, - $content{'citation'},undef,undef,$ENV{'form.permanent'}); - if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) { - &user_normal_msg_raw( - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - 'Broadcast ['.$recuname.':'.$recdomain.']', - $msgtxt); - } + $content{'citation'},undef,undef,$env{'form.permanent'}); + } + if (($env{'request.course.id'}) && + ($env{'form.sendmode'} eq 'group')) { + $broadcast_status{$recuname.':'.$recdomain} = $thismsg; + if ($thismsg eq 'ok') { + $numbroadcast ++; + } } $r->print($thismsg.'
'); $sendstatus.=' '.$thismsg; } + if (($env{'request.course.id'}) && ($env{'form.sendmode'} eq 'group')) { + my $subj_prefix; + if ($msgtype eq 'critical') { + $subj_prefix = 'Critical broadcast'; + } else { + $subj_prefix = 'Broadcast'; + } + my ($broadmsgid,$broadresult); + if ($numbroadcast) { + $broadresult = &user_normal_msg_raw( + $env{'course.'.$env{'request.course.id'}.'.num'}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, $subj_prefix.' to: '.$env{'course.'.$env{'request.course.id'}.'.description'}. + ' ('.$numbroadcast.' sent)',$basicmsg,undef,undef,undef, + undef,\$broadmsgid); + } + if ($broadresult eq 'ok') { + my $record_sent; + my @recusers = (); + my @recudoms = (); + foreach my $recipient (sort(keys(%toaddr))) { + if ($broadcast_status{$recipient} eq 'ok') { + my ($uname,$udom) = split/:/,$recipient; + push(@recusers,$uname); + push(@recudoms,$udom); + } + } + if (@recusers) { + my $broadmessage; + ($broadmsgid,$broadmessage)=&packagemsg(&Apache::lonfeedback::clear_out_html($env{'form.subject'}),$basicmsg,undef,undef,undef,\@recusers,\@recudoms,$broadmsgid); + $record_sent = &store_sent_mail($broadmsgid,$broadmessage); + } + } else { + &Apache::lonnet::logthis('Failed to create record of broadcast in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated'); + } + } } else { &printheader($r,'','No messages sent.'); } if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { $r->print('
'.&mt('Completed.').''); - if ($ENV{'form.displayedcrit'}) { + if ($env{'form.displayedcrit'}) { &discrit($r); } else { &Apache::loncommunicate::menu($r); @@ -2028,10 +2138,10 @@ sub handler { 'sendreply','compose','sendmail','critical','recname','recdom', 'recordftf','sortedby','block','folder','startdis','interdis', 'showcommentbaseurl','dismode']); - $sqs='&sortedby='.$ENV{'form.sortedby'}; + $sqs='&sortedby='.$env{'form.sortedby'}; # ------------------------------------------------------ They checked for email - unless ($ENV{'form.block'}) { + unless ($env{'form.block'}) { &Apache::lonnet::put('email_status',{'recnewemail'=>0}); } @@ -2045,33 +2155,41 @@ sub handler { # ------------------------------------------------------------------ Get Folder - my $folder=$ENV{'form.folder'}; + my $folder=$env{'form.folder'}; unless ($folder) { $folder=''; } else { $sqs.='&folder='.&Apache::lonnet::escape($folder); } +# ------------------------------------------------------------ Get Display Mode + + my $dismode=$env{'form.dismode'}; + unless ($dismode) { + $dismode=''; + } else { + $sqs.='&dismode='.&Apache::lonnet::escape($dismode); + } # --------------------------------------------------------------------- Display - $startdis=$ENV{'form.startdis'}; + $startdis=$env{'form.startdis'}; $startdis--; unless ($startdis) { $startdis=0; } - $interdis=$ENV{'form.interdis'}; + $interdis=$env{'form.interdis'}; unless ($interdis) { $interdis=20; } $sqs.='&interdis='.$interdis; - if ($ENV{'form.firstview'}) { + if ($env{'form.firstview'}) { $startdis=0; } - if ($ENV{'form.lastview'}) { + if ($env{'form.lastview'}) { $startdis=-1; } - if ($ENV{'form.prevview'}) { + if ($env{'form.prevview'}) { $startdis--; } - if ($ENV{'form.nextview'}) { + if ($env{'form.nextview'}) { $startdis++; } my $postedstartdis=$startdis+1; @@ -2079,13 +2197,13 @@ sub handler { # --------------------------------------------------------------- Render Output - if ($ENV{'form.display'}) { - &displaymessage($r,$ENV{'form.display'},$folder); - } elsif ($ENV{'form.replyto'}) { - &compout($r,'',$ENV{'form.replyto'},undef,undef,$folder); - } elsif ($ENV{'form.confirm'}) { + if ($env{'form.display'}) { + &displaymessage($r,$env{'form.display'},$folder); + } elsif ($env{'form.replyto'}) { + &compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode); + } elsif ($env{'form.confirm'}) { &printheader($r,'','Confirmed Receipt'); - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.rec\_(.*)$/) { $r->print(''.&mt('Confirming Receipt').': '. &user_crit_received($1).'
'); @@ -2098,32 +2216,32 @@ sub handler { } } &discrit($r); - } elsif ($ENV{'form.critical'}) { + } elsif ($env{'form.critical'}) { &printheader($r,'','Displaying Critical Messages'); &discrit($r); - } elsif ($ENV{'form.forward'}) { - &compout($r,$ENV{'form.forward'},undef,undef,undef,$folder); - } elsif ($ENV{'form.markdel'}) { + } elsif ($env{'form.forward'}) { + &compout($r,$env{'form.forward'},undef,undef,undef,$folder); + } elsif ($env{'form.markdel'}) { &printheader($r,'','Deleted Message'); - &statuschange($ENV{'form.markdel'},'deleted',$folder); + &statuschange($env{'form.markdel'},'deleted',$folder); &Apache::loncommunicate::menu($r); - &disall($r,$folder); - } elsif ($ENV{'form.markedmove'}) { + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.markedmove'}) { my $total=0; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.delmark_(.*)$/) { &movemsg(&Apache::lonnet::unescape($1),$folder, - $ENV{'form.movetofolder'}); + $env{'form.movetofolder'}); $total++; } } &printheader($r,'','Moved Messages'); $r->print('Moved '.$total.' message(s)

'); &Apache::loncommunicate::menu($r); - &disall($r,$folder); - } elsif ($ENV{'form.markeddel'}) { + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.markeddel'}) { my $total=0; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.delmark_(.*)$/) { &statuschange(&Apache::lonnet::unescape($1),'deleted',$folder); $total++; @@ -2132,35 +2250,42 @@ sub handler { &printheader($r,'','Deleted Messages'); $r->print('Deleted '.$total.' message(s)

'); &Apache::loncommunicate::menu($r); - &disall($r,$folder); - } elsif ($ENV{'form.markunread'}) { + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.markunread'}) { &printheader($r,'','Marked Message as Unread'); - &statuschange($ENV{'form.markunread'},'new'); + &statuschange($env{'form.markunread'},'new'); &Apache::loncommunicate::menu($r); - &disall($r,$folder); - } elsif ($ENV{'form.compose'}) { - &compout($r,'','',$ENV{'form.compose'}); - } elsif ($ENV{'form.recordftf'}) { - &facetoface($r,$ENV{'form.recordftf'}); - } elsif ($ENV{'form.block'}) { - &examblock($r,$ENV{'form.block'}); - } elsif ($ENV{'form.sendmail'}) { + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.compose'}) { + &compout($r,'','',$env{'form.compose'}); + } elsif ($env{'form.recordftf'}) { + &facetoface($r,$env{'form.recordftf'}); + } elsif ($env{'form.block'}) { + &examblock($r,$env{'form.block'}); + } elsif ($env{'form.sendmail'}) { &sendoffmail($r,$folder); - if ($ENV{'form.storebasecomment'}) { + if ($env{'form.storebasecomment'}) { &storecomment($r); } - &disall($r,$folder); - } elsif ($ENV{'form.newfolder'}) { + if (($env{'form.rsspost'}) && ($env{'request.course.id'})) { + &Apache::lonrss::addentry($env{'course.'.$env{'request.course.id'}.'.num'}, + $env{'course.'.$env{'request.course.id'}.'.domain'}, + 'Course_Announcements', + $env{'form.subject'}, + $env{'form.message'},'/adm/communicate','public'); + } + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.newfolder'}) { &printheader($r,'','New Folder'); - &makefolder($ENV{'form.newfolder'}); + &makefolder($env{'form.newfolder'}); &Apache::loncommunicate::menu($r); - &disall($r,$ENV{'form.newfolder'}); - } elsif ($ENV{'form.showcommentbaseurl'}) { + &disall($r,$env{'form.newfolder'}); + } elsif ($env{'form.showcommentbaseurl'}) { &storedcommentlisting($r); } else { &printheader($r,'','Display All Messages'); - &Apache::loncommunicate::menu($r); - &disall($r,$folder); + &Apache::loncommunicate::menu($r); + &disall($r,($folder?$folder:$dismode)); } $r->print(&Apache::loncommon::endbodytag().''); return OK;