--- loncom/interface/lonmsg.pm 2004/07/09 21:08:24 1.103 +++ loncom/interface/lonmsg.pm 2005/07/08 10:39:49 1.152 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.103 2004/07/09 21:08:24 albertel Exp $ +# $Id: lonmsg.pm,v 1.152 2005/07/08 10:39:49 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -90,7 +90,7 @@ also has a student role in the course, A Users can ask LON-CAPA to forward messages to conventional e-mail addresses on their B screen, but generally, LON-CAPA messages -are much more useful then traditional email can be made to be, even +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 @@ -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); @@ -117,11 +117,14 @@ use Apache::loncommunicate; # Querystring component with sorting type my $sqs; +my $startdis; +my $interdis; # ===================================================================== Package sub packagemsg { - my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_; + my ($subject,$message,$citation,$baseurl,$attachmenturl, + $recuser,$recdomain)=@_; $message =&HTML::Entities::encode($message,'<>&"'); $citation=&HTML::Entities::encode($citation,'<>&"'); $subject =&HTML::Entities::encode($subject,'<>&"'); @@ -137,25 +140,28 @@ sub packagemsg { 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'}.''. + $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'}.''. + ''.$env{'request.course.id'}.''. + ''.$env{'request.course.sec'}.''. + ''.$env{'request.role'}.''. + ''.$env{'request.filename'}.''. ''.$msgid.''. + ''.$recuser.''. + ''.$recdomain.''. ''.$message.''; if (defined($citation)) { $result.=''.$citation.''; @@ -201,14 +207,16 @@ sub unpackagemsg { # ======================================================= Get info out of msgid sub unpackmsgid { - my $msgid=&Apache::lonnet::unescape(shift); - my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/, + my ($msgid,$folder)=@_; + $msgid=&Apache::lonnet::unescape($msgid); + my $suffix=&foldersuffix($folder); + my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/, &Apache::lonnet::unescape($msgid)); - my %status=&Apache::lonnet::get('email_status',[$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 { @@ -219,22 +227,24 @@ 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)=@_; - my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'}; + my ($to,$touname,$toudom,$subj,$crit,$text)=@_; + my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'}; + unless ($sender=~/\w/) { + $sender=$env{'user.name'}.'@'.$env{'user.domain'}; + } my $critical=($crit?' critical':''); + $text=~s/\<\;/\/gs; + $text=~s/\<\/*[^\>]+\>//gs; my $url='http://'. $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}. '/adm/email?username='.$touname.'&domain='.$toudom; @@ -243,18 +253,22 @@ You received a$critical message from $se $subj +=== Excerpt ============================================================ +$text +======================================================================== + Use $url -to access this message. +to access the full message. ENDMSG &sendemail($to,'New'.$critical.' message from '.$sender,$body); } # ============================================================= Check for email sub newmail { - if ((time-$ENV{'user.mailcheck.time'})>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; } @@ -323,7 +337,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 { @@ -339,11 +366,12 @@ sub all_url_author_res_msg { # ================================================== Critical message to a user sub user_crit_msg_raw { - my ($user,$domain,$subject,$message,$sendback)=@_; + my ($user,$domain,$subject,$message,$sendback,$toperm)=@_; # Check if allowed missing my $status=''; my $msgid='undefined'; unless (($message)&&($user)&&($domain)) { $status='empty'; }; + my $text=$message; my $homeserver=&Apache::lonnet::homeserver($user,$domain); if ($homeserver ne 'no_host') { ($msgid,$message)=&packagemsg($subject,$message); @@ -352,10 +380,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); } @@ -363,17 +391,23 @@ sub user_crit_msg_raw { $status='no_host'; } # Notifications - my %userenv = &Apache::lonnet::get('environment',['critnotification'], + my %userenv = &Apache::lonnet::get('environment',['critnotification', + 'permanentemail'], $domain,$user); if ($userenv{'critnotification'}) { - &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1); + &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1, + $text); + } + if ($toperm && $userenv{'permanentemail'}) { + &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,1, + $text); } # Log this &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; @@ -390,7 +424,7 @@ sub user_crit_msg_raw { =cut sub user_crit_msg { - my ($user,$domain,$subject,$message,$sendback)=@_; + my ($user,$domain,$subject,$message,$sendback,$toperm)=@_; my $status=''; my %userenv = &Apache::lonnet::get('environment',['msgforward'], $domain,$user); @@ -400,10 +434,10 @@ sub user_crit_msg { my ($forwuser,$forwdomain)=split(/\:/,$_); $status.= &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message, - $sendback).' '; + $sendback,$toperm).' '; } } else { - $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback); + $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback,$toperm); } return $status; } @@ -416,8 +450,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" @@ -427,8 +461,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; @@ -437,32 +471,48 @@ sub user_crit_received { # ======================================================== Normal communication sub user_normal_msg_raw { - my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_; + my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl, + $toperm)=@_; # Check if allowed missing my $status=''; my $msgid='undefined'; + my $text=$message; unless (($message)&&($user)&&($domain)) { $status='empty'; }; my $homeserver=&Apache::lonnet::homeserver($user,$domain); if ($homeserver ne 'no_host') { ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl, - $attachmenturl); + $attachmenturl,$user,$domain); +# Store in user folder $status=&Apache::lonnet::critical( 'put:'.$domain.':'.$user.':nohist_email:'. &Apache::lonnet::escape($msgid).'='. &Apache::lonnet::escape($message),$homeserver); +# 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'}); } else { $status='no_host'; } # Notifications - my %userenv = &Apache::lonnet::get('environment',['notification'], + my %userenv = &Apache::lonnet::get('environment',['notification', + 'permanentemail'], $domain,$user); if ($userenv{'notification'}) { - &sendnotification($userenv{'notification'},$user,$domain,$subject,0); + &sendnotification($userenv{'notification'},$user,$domain,$subject,0, + $text); + } + if ($toperm && $userenv{'permanentemail'}) { + &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; } @@ -478,7 +528,8 @@ sub user_normal_msg_raw { =cut sub user_normal_msg { - my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_; + my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl, + $toperm)=@_; my $status=''; my %userenv = &Apache::lonnet::get('environment',['msgforward'], $domain,$user); @@ -488,44 +539,124 @@ sub user_normal_msg { my ($forwuser,$forwdomain)=split(/\:/,$_); $status.= &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message, - $citation,$baseurl,$attachmenturl).' '; + $citation,$baseurl,$attachmenturl,$toperm).' '; } } else { $status=&user_normal_msg_raw($user,$domain,$subject,$message, - $citation,$baseurl,$attachmenturl); + $citation,$baseurl,$attachmenturl,$toperm); } return $status; } +# ============================================================ List all folders + +sub folderlist { + my $folder=shift; + my @allfolders=&Apache::lonnet::getkeys('email_folders'); + if ($allfolders[0]=~/^error:/) { @allfolders=(); } + return '
'. + &mt('Folder').': '. + &Apache::loncommon::select_form($folder,'folder', + ('' => &mt('INBOX'),'trash' => &mt('TRASH'), + 'new' => &mt('New Messages Only'), + 'critical' => &mt('Critical'), + 'sent' => &mt('Sent Messages'), + map { $_ => $_ } @allfolders)). + ' '.&mt('Show'). + ''. + '
'. + ''. + ($folder=~/^(new|critical)/?'
':''); +} + +sub scrollbuttons { + my ($start,$maxdis,$first,$finish,$total)=@_; + unless ($total>0) { return ''; } + $start++; $maxdis++;$first++;$finish++; + return + &mt('Page').': '. + ''. + ''. + ' of '.$maxdis. + ''. + '
'. + &mt('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).''; +} + +# =============================================================== Folder suffix + +sub foldersuffix { + my $folder=shift; + unless ($folder) { return ''; } + return '_'.&Apache::lonnet::escape($folder); +} + # =============================================================== Status Change sub statuschange { - my ($msgid,$newstatus)=@_; - my %status=&Apache::lonnet::get('email_status',[$msgid]); + my ($msgid,$newstatus,$folder)=@_; + my $suffix=&foldersuffix($folder); + my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]); if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; } unless ($status{$msgid}) { $status{$msgid}='new'; } unless (($status{$msgid} eq 'replied') || ($status{$msgid} eq 'forwarded')) { - &Apache::lonnet::put('email_status',{$msgid => $newstatus}); + &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus}); } if (($newstatus eq 'deleted') || ($newstatus eq 'new')) { - &Apache::lonnet::put('email_status',{$msgid => $newstatus}); + &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus}); } + if ($newstatus eq 'deleted') { + &movemsg(&Apache::lonnet::unescape($msgid),$folder,'trash'); + } +} + +# ============================================================= Make new folder + +sub makefolder { + my ($newfolder)=@_; + if (($newfolder eq 'sent') + || ($newfolder eq 'critical') + || ($newfolder eq 'trash') + || ($newfolder eq 'new')) { return; } + &Apache::lonnet::put('email_folders',{$newfolder => time}); +} + +# ======================================================== Move between folders + +sub movemsg { + my ($msgid,$srcfolder,$trgfolder)=@_; + if ($srcfolder eq 'new') { $srcfolder=''; } + my $srcsuffix=&foldersuffix($srcfolder); + my $trgsuffix=&foldersuffix($trgfolder); + +# Copy message + my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]); + &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}}); + +# Copy status + unless ($trgfolder eq 'trash') { + my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); + &Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}}); + } +# Delete orginals + &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); + &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]); } # ======================================================= Display a course list sub discourse { my $r=shift; - my %courselist=&Apache::lonnet::dump( - 'classlist', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $classlist = &Apache::loncoursedata::get_classlist(); my $now=time; - my %lt=&Apache::lonlocal::texthash('cfa' => 'Check for All', - 'cfs' => 'Check for Section/Group', - 'cfn' => 'Check for None'); + my %lt=&Apache::lonlocal::texthash('cfa' => 'Check All', + 'cfs' => 'Check Section/Group', + 'cfn' => 'Uncheck All'); $r->print(<   -  + 

ENDDISHEADER - my %coursepersonnel= - &Apache::lonnet::get_course_adv_roles(); + my %coursepersonnel=&Apache::lonnet::get_course_adv_roles(); + $r->print(''); foreach my $role (sort keys %coursepersonnel) { - foreach (split(/\,/,$coursepersonnel{$role})) { - my ($puname,$pudom)=split(/\:/,$_); - $r->print( - '
'. - &Apache::loncommon::plainname($puname, - $pudom).' ('.$_.'), '.$role.''); - } + foreach (split(/\,/,$coursepersonnel{$role})) { + my ($puname,$pudom)=split(/\:/,$_); + $r->print(''. + ''); + } } - - foreach (sort keys %courselist) { - my ($end,$start)=split(/\:/,$courselist{$_}); - my $active=1; - if (($end) && ($now>$end)) { $active=0; } - if ($active) { - my ($sname,$sdom)=split(/\:/,$_); - my %reply=&Apache::lonnet::get('environment', - ['firstname','middlename','lastname','generation'], - $sdom,$sname); - my $section=&Apache::lonnet::usection - ($sdom,$sname,$ENV{'request.course.id'}); - $r->print( - '
'. - $reply{'firstname'}.' '. - $reply{'middlename'}.' '. - $reply{'lastname'}.' '. - $reply{'generation'}. - ' ('.$_.') '.$section); - } + $r->print('
('.$_.'),'.$role.'
'); + my $sort = sub { + my $aname=lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]); + if (!$aname) { $aname=$a; } + my $bname=lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]); + if (!$bname) { $bname=$b; } + return $aname cmp $bname; + }; + foreach my $student (sort $sort (keys(%{$classlist}))) { + my $info=$classlist->{$student}; + my ($sname,$sdom,$status,$fullname,$section) = + (@{$info}[&Apache::loncoursedata::CL_SNAME(), + &Apache::loncoursedata::CL_SDOM(), + &Apache::loncoursedata::CL_STATUS(), + &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(''); } + $r->print('
'.$sname.'@'.$sdom.''.$section. + '
'); } # ==================================================== Display Critical Message @@ -603,49 +741,50 @@ ENDDISHEADER sub discrit { my $r=shift; my $header = '

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

'. - '
'. - ''; + ''. + ''; my %what=&Apache::lonnet::dump('critical'); my $result = ''; foreach (sort keys %what) { my %content=&unpackagemsg($what{$_}); next if ($content{'senderdomain'} eq ''); - $content{'message'}=~s/\n/\/g; - $result.='
'.&mt('From').': '. + $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'}. - '
'. + '
'.&mt('Subject').': '.$content{'subject'}. + '
'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '
'. + ''. &mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox'). '
'. - ''. - ''; + ''. + ''; } # Check to see if there were any messages. if ($result eq '') { $result = "

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

". - ''.&mt('Select a course').''; + ''.&mt('Select a course').'
'. + ''.&mt('Communicate').''; } else { $r->print($header); } $r->print($result); - $r->print(''); + $r->print(''); } sub sortedmessages { - my ($blocked,$startblock,$endblock,$numblocked) = @_; - my @messages = &Apache::lonnet::getkeys('nohist_email'); + my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_; + my $suffix=&foldersuffix($folder); + my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); #unpack the varibles and repack into temp for sorting my @temp; foreach (@messages) { my $msgid=&Apache::lonnet::escape($_); - my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)= - &Apache::lonmsg::unpackmsgid($msgid); + my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)= + &Apache::lonmsg::unpackmsgid($msgid,$folder); my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status, $msgid); # Check whether message was sent during blocking period. @@ -659,43 +798,142 @@ sub sortedmessages { } #default sort @temp = sort {$a->[0] <=> $b->[0]} @temp; - if ($ENV{'form.sortedby'} eq "date"){ + if ($env{'form.sortedby'} eq "date"){ @temp = sort {$a->[0] <=> $b->[0]} @temp; } - if ($ENV{'form.sortedby'} eq "revdate"){ + if ($env{'form.sortedby'} eq "revdate"){ @temp = sort {$b->[0] <=> $a->[0]} @temp; } - if ($ENV{'form.sortedby'} eq "user"){ + if ($env{'form.sortedby'} eq "user"){ @temp = sort {lc($a->[2]) cmp lc($b->[2])} @temp; } - if ($ENV{'form.sortedby'} eq "revuser"){ + if ($env{'form.sortedby'} eq "revuser"){ @temp = sort {lc($b->[2]) cmp lc($a->[2])} @temp; } - if ($ENV{'form.sortedby'} eq "domain"){ + if ($env{'form.sortedby'} eq "domain"){ @temp = sort {$a->[3] cmp $b->[3]} @temp; } - if ($ENV{'form.sortedby'} eq "revdomain"){ + if ($env{'form.sortedby'} eq "revdomain"){ @temp = sort {$b->[3] cmp $a->[3]} @temp; } - if ($ENV{'form.sortedby'} eq "subject"){ + if ($env{'form.sortedby'} eq "subject"){ @temp = sort {lc($a->[1]) cmp lc($b->[1])} @temp; } - if ($ENV{'form.sortedby'} eq "revsubject"){ + if ($env{'form.sortedby'} eq "revsubject"){ @temp = sort {lc($b->[1]) cmp lc($a->[1])} @temp; } - if ($ENV{'form.sortedby'} eq "status"){ + if ($env{'form.sortedby'} eq "status"){ @temp = sort {$a->[4] cmp $b->[4]} @temp; } - if ($ENV{'form.sortedby'} eq "revstatus"){ + if ($env{'form.sortedby'} eq "revstatus"){ @temp = sort {$b->[4] cmp $a->[4]} @temp; } return @temp; } +# ======================================================== Display new messages + + +sub disnew { + my $r=shift; + my %lt=&Apache::lonlocal::texthash( + 'nm' => 'New Messages', + 'su' => 'Subject', + 'da' => 'Date', + 'us' => 'Username', + 'op' => 'Open', + 'do' => 'Domain' + ); + my @msgids = sort split(/\&/,&Apache::lonnet::reply + ('keys:'.$env{'user.domain'}.':'. + $env{'user.name'}.':nohist_email', + $env{'user.home'})); + my @newmsgs; + my %setters = (); + my $startblock = 0; + my $endblock = 0; + my %blocked = (); + my $numblocked = 0; + # Check for blocking of display because of scheduled online exams. + &blockcheck(\%setters,\$startblock,\$endblock); + foreach (@msgids) { + my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= + &Apache::lonmsg::unpackmsgid($_); + if (defined($sendtime) && $sendtime!~/error/) { + my $numsendtime = $sendtime; + $sendtime = &Apache::lonlocal::locallocaltime($sendtime); + if ($status eq 'new') { + if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) { + $blocked{$_} = 'ON'; + $numblocked ++; + } else { + push @newmsgs, { + msgid => $_, + sendtime => $sendtime, + shortsub => &Apache::lonnet::unescape($shortsubj), + from => $fromname, + fromdom => $fromdom + } + } + } + } + } + if ($#newmsgs >= 0) { + $r->print(<$lt{'nm'} + + +TABLEHEAD + foreach my $msg (@newmsgs) { + $r->print(<<"ENDLINK"); + + +ENDLINK + foreach ('sendtime','from','fromdom','shortsub') { + $r->print(""); + } + $r->print(""); + } + $r->print('
 $lt{'da'}$lt{'us'}$lt{'do'}$lt{'su'}
$lt{'op'}$msg->{$_}
'.&Apache::loncommon::endbodytag().''); + } elsif ($numblocked == 0) { + $r->print("

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

"); + } + if ($numblocked > 0) { + my $beginblock = &Apache::lonlocal::locallocaltime($startblock); + my $finishblock = &Apache::lonlocal::locallocaltime($endblock); + if ($numblocked == 1) { + $r->print("

".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".

"); + $r->print(&mt('This message is not viewable because').' '); + } else { + $r->print("

".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".

"); + $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because ')); + } + $r->print( +&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.'); + &build_block_table($r,$startblock,$endblock,\%setters); + } +} + + # ======================================================== Display all messages sub disall { - my $r=shift; + my ($r,$folder)=@_; + $r->print(&folderlist($folder)); + if ($folder eq 'new') { + &disnew($r); + } elsif ($folder eq 'critical') { + &discrit($r); + } else { + &disfolder($r,$folder); + } +} + +# ============================================================ Display a folder + +sub disfolder { + my ($r,$folder)=@_; my %blocked = (); my %setters = (); my $startblock; @@ -723,67 +961,97 @@ sub disall { } ENDDISHEADER - $r->print('

'.&mt('Display All Messages').'

'. - ''); + my $fsqs='&folder='.$folder; + my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder); + my $totalnumber=$#temp+1; + unless ($totalnumber>0) { + $r->print('

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

'); + return; + } + unless ($interdis) { + $interdis=20; + } + my $number=int($totalnumber/$interdis); + if (($startdis<0) || ($startdis>$number)) { $startdis=$number; } + my $firstdis=$interdis*$startdis; + if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; } + my $lastdis=$firstdis+$interdis-1; + if ($lastdis>$#temp) { $lastdis=$#temp; } + $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber)); + $r->print(''. + '
 '); - if ($ENV{'form.sortedby'} eq "revdate") { - $r->print(''.&mt('Date').'
'); } else { - $r->print(''.&mt('Date').''); + $r->print(''.&mt('Date').''); } $r->print(''); + if ($env{'form.sortedby'} eq "revstatus") { + $r->print(''.&mt('Status').''); } else { - $r->print(''.&mt('Status').''); + $r->print(''.&mt('Status').''); } - $r->print(''); - my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked); - foreach (@temp){ - my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @$_; + $r->print("\n"); + for (my $n=$firstdis;$n<=$lastdis;$n++) { + my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]}; if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { if ($status eq 'new') { - $r->print(''); + $r->print(''); } elsif ($status eq 'read') { - $r->print(''); + $r->print(''); } elsif ($status eq 'replied') { - $r->print(''); + $r->print(''); } else { - $r->print(''); + $r->print(''); } - $r->print(''. + $r->print(''. ''); + $status."\n"); + } elsif ($status eq 'deleted') { +# purge + &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash'); } } - $r->print('
 '); + if ($env{'form.sortedby'} eq "revdate") { + $r->print(''.&mt('Date').''); - if ($ENV{'form.sortedby'} eq "revuser") { - $r->print(''.&mt('Username').''); + if ($env{'form.sortedby'} eq "revuser") { + $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').''); + if ($env{'form.sortedby'} eq "revdomain") { + $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').''); + if ($env{'form.sortedby'} eq "revsubject") { + $r->print(''.&mt('Subject').''); } else { - $r->print(''.&mt('Subject').''); + $r->print(''.&mt('Subject').''); } $r->print(''); - if ($ENV{'form.sortedby'} eq "revstatus") { - $r->print(''.&mt('Status').'
'.&mt('Open').''.&mt('Delete').''.&mt('Open').''. + ($folder ne 'trash'?''.&mt('Delete'):' ').''.&Apache::lonlocal::locallocaltime($sendtime).''. $fromname.''.$fromdomain.''. &Apache::lonnet::unescape($shortsubj).''. - $status.'

'. - ''.&mt('Check All').' '. - ''.&mt('Uncheck All').'

'. - ''. - ''. - '

'); + $r->print("\n

". + ''.&mt('Check All').' '. + ''.&mt('Uncheck All').'

'. + ''); + if ($folder ne 'trash') { + $r->print( + '

'); + } + $r->print('

'); + my @allfolders=&Apache::lonnet::getkeys('email_folders'); + if ($allfolders[0]=~/^error:/) { @allfolders=(); } + $r->print( + &Apache::loncommon::select_form('','movetofolder', + ( map { $_ => $_ } @allfolders)) + ); + my $postedstartdis=$startdis+1; + $r->print(''); if ($numblocked > 0) { my $beginblock = &Apache::lonlocal::locallocaltime($startblock); my $finishblock = &Apache::lonlocal::locallocaltime($endblock); @@ -791,13 +1059,13 @@ ENDDISHEADER $numblocked.' '.&mt('message(s) is/are not viewable because display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams.')); &build_block_table($r,$startblock,$endblock,\%setters); } - $r->print(''); } # ============================================================== Compose output sub compout { - my ($r,$forwarding,$replying,$broadcast,$replycrit)=@_; + my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_; + my $suffix=&foldersuffix($folder); if ($broadcast eq 'individual') { &printheader($r,'/adm/email?compose=individual', @@ -828,6 +1096,7 @@ sub compout { my $dispcrit=''; my $dissub=''; my $dismsg=''; + my $disbase=''; my $func=&mt('Send New'); my %lt=&Apache::lonlocal::texthash('us' => 'Username', 'do' => 'Domain', @@ -836,20 +1105,22 @@ sub compout { 'ca' => 'Cancel', 'ma' => 'Mail'); - if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message"); $dispcrit= - ' '.&mt('Send as critical message').' ' . $crithelp . - '
'. - ' '.&mt('Send as critical message').' ' . - &mt('and return receipt') . $crithelp . '

'; + '

' . $crithelp . + '

'. + '' . $crithelp . + '

'; } my %message; my %content; - my $defdom=$ENV{'user.domain'}; + my $defdom=$env{'user.domain'}; if ($forwarding) { - %message=&Apache::lonnet::get('nohist_email',[$forwarding]); - %content=&unpackagemsg($message{$forwarding}); + %message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]); + %content=&unpackagemsg($message{$forwarding},$folder); $dispcrit.=''; $func=&mt('Forward'); @@ -857,21 +1128,34 @@ sub compout { $dissub=&mt('Forwarding').': '.$content{'subject'}; $dismsg=&mt('Forwarded message from').' '. $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'}; + if ($content{'baseurl'}) { + $disbase=''; + } } if ($replying) { - %message=&Apache::lonnet::get('nohist_email',[$replying]); - %content=&unpackagemsg($message{$replying}); - $dispcrit.=''; - $func=&mt('Replying to'); + %message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]); + %content=&unpackagemsg($message{$replying},$folder); + $dispcrit.=''; + $func=&mt('Send Reply to'); $dissub=&mt('Reply').': '.$content{'subject'}; $dismsg='> '.$content{'message'}; $dismsg=~s/\r/\n/g; $dismsg=~s/\f/\n/g; $dismsg=~s/\n+/\n\> /g; + if ($content{'baseurl'}) { + $disbase=''; + if ($env{'user.adv'}) { + $disbase.=' '. + &mt('Show re-usable messages').'
'; + } + } } - if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; } + my $citation=&displayresource(%content); + if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; } $r->print( '
'."\n". @@ -892,7 +1176,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 @@ -907,11 +1191,15 @@ ENDREC $lt{'sb'}: $latexHelp -


$dispcrit +$disbase + + - +
+$citation ENDCOMP } else { # $broadcast is 'upload' $r->print(<

General message text
-

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

'); + $r->print(''. + &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'})) { + return; + } + my %records=&Apache::lonnet::dump('nohist_email', + $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/); + # &Apache::lonfeedback::newline_to_br(\$content{'message'}); + $result.='Recorded by '. + $content{'sendername'}.'@'.$content{'senderdomain'}."\n"; + $result.= + &Apache::lontexconvert::msgtexconverted($content{'message'})."\n"; + } + return $result; +} + 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/) { @@ -981,9 +1295,9 @@ sub disfacetoface { &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'
 ('. $content{'sendername'}.'@'. $content{'senderdomain'}.') '.$content{'time'}. - '
'. + '
'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-	      '
'; + ''; } # Check to see if there were any messages. if ($result eq '') { @@ -1001,7 +1315,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, @@ -1009,12 +1323,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 @@ -1030,7 +1344,7 @@ sub facetoface {
- + @@ -1041,23 +1355,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'}
@@ -1074,8 +1388,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', @@ -1115,12 +1429,13 @@ sub examblock { $r->print($lt{'ncbc'}.'

'); } &display_addblocker_table($r,$parmcount,\%ltext); + my $endbody=&Apache::loncommon::endbodytag(); $r->print(<<"END");
- +$endbody END return; @@ -1144,7 +1459,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; @@ -1162,23 +1477,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; @@ -1212,8 +1527,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}; @@ -1231,7 +1546,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', @@ -1266,8 +1581,8 @@ END - - + END $parmcount ++; @@ -1297,7 +1612,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', @@ -1319,8 +1634,8 @@ sub display_addblocker_table { - - + +
$lt{'user'}:
$lt{'user'}: $stdbrws
$$ltext{'star'}: $startform
$$ltext{'endd'}:  $endform		 $settername$lt{'modi'}? 
$lt{'canc'}?   +
$$ltext{'star'}: $startform
$$ltext{'endd'}:  $endform		$lt{'addb'}? 
@@ -1340,12 +1655,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; @@ -1357,14 +1672,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}} = (); @@ -1395,7 +1710,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', @@ -1437,7 +1752,8 @@ END # ----------------------------------------------------------- Display a message sub displaymessage { - my ($r,$msgid)=@_; + my ($r,$msgid,$folder)=@_; + my $suffix=&foldersuffix($folder); my %blocked = (); my %setters = (); my $startblock = 0; @@ -1445,16 +1761,17 @@ sub displaymessage { my $numblocked = 0; # info to generate "next" and "previous" buttons and check if message is blocked &blockcheck(\%setters,\$startblock,\$endblock); - my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked); + my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder); 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); return; } - &statuschange($msgid,'read'); - my %message=&Apache::lonnet::get('nohist_email',[$msgid]); + &statuschange($msgid,'read',$folder); + my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]); my %content=&unpackagemsg($message{$msgid}); + my $counter=0; $r->print('
');
     my $escmsgid=&Apache::lonnet::escape($msgid);
@@ -1478,9 +1795,10 @@ sub displaymessage {
 	      ''.&mt('Mark Unread').''.
 	      'Delete'.
-	      ''.&mt('Display all Messages').'');
+	      '">'.&mt('Delete').''.
+	      ''.&mt('Back to Folder Display').'');
     if ($counter > 0){
 	$r->print(''.&mt('Previous').'');
@@ -1490,27 +1808,85 @@ sub displaymessage {
 		  '">'.&mt('Next').'');
     }
     $r->print('');
+    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').'
');
+    }
     $r->print('
'.&mt('Subject').': '.$content{'subject'}.
-	      '
'.&mt('From').': '.
+	      ($folder ne 'sent'?'
'.&mt('From').': '.
 	      &Apache::loncommon::aboutmewrapper(
 						 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
 						 $content{'sendername'},$content{'senderdomain'}).' ('.
 	      $content{'sendername'}.' at '.
-	      $content{'senderdomain'}.') '.
+	      $content{'senderdomain'}.') ':'
'.&mt('To').': '.
+	      &Apache::loncommon::aboutmewrapper(
+						 &Apache::loncommon::plainname($content{'recuser'},$content{'recdomain'}),
+						 $content{'recuser'},$content{'recdomain'}).' ('.
+	      $content{'recuser'}.' at '.
+	      $content{'recdomain'}.') ').
 	      ($content{'courseid'}?'
'.&mt('Course').': '.$courseinfo{'description'}.
 	       ($content{'coursesec'}?' ('.&mt('Group/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).
-	      '
'.$content{'citation'}.'
');
+	      '
'.&displayresource(%content).'

'); return; } +# =========================================================== Show the citation + +sub displayresource { + my %content=@_; +# +# 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'}) + && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) { + my $symb=&Apache::lonnet::symbread($content{'baseurl'}); +# Could not get a symb, give up + unless ($symb) { return $content{'citation'}; } +# Have a symb, can render + return '

'.&mt('Current attempts of student (if applicable)').'

'. + &Apache::loncommon::get_previous_attempt($symb, + $content{'sendername'}, + $content{'senderdomain'}, + $content{'courseid'}). + '

'.&mt('Current screen output (if applicable)').'

'. + &Apache::loncommon::get_student_view($symb, + $content{'sendername'}, + $content{'senderdomain'}, + $content{'courseid'}). + '

'.&mt('Correct Answer(s) (if applicable)').'

'. + &Apache::loncommon::get_student_answers($symb, + $content{'sendername'}, + $content{'senderdomain'}, + $content{'courseid'}); + } else { + return $content{'citation'}; + } +} + # ================================================================== The Header sub header { my ($r,$title,$baseurl)=@_; - $r->print('Communication and Messages'); + $r->print(&Apache::lonxml::xmlbegin(). + ''.&Apache::lonxml::fontsettings(). + 'Communication and Messages'. + &Apache::lonhtmlcommon::htmlareaheaders()); if ($baseurl) { $r->print(""); } @@ -1531,6 +1907,144 @@ sub printheader { &header($r,$title,$baseurl); } +# ------------------------------------------------------------ Store the comment + +sub storecomment { + my ($r)=@_; + 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; + &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'}))); + $r->print(&Apache::lonxml::xmlbegin().''. + &Apache::lonxml::fontsettings().''); + if ((keys %msgs)[0]=~/^error\:/) { + $r->print(&mt('No stored comments yet.')); + } else { + my $found=0; + foreach (sort keys %msgs) { + $r->print("\n".$msgs{$_}."
"); + $found=1; + } + unless ($found) { + $r->print(&mt('No stored comments yet for this resource.')); + } + } +} + +# ---------------------------------------------------------------- Send an email + +sub sendoffmail { + my ($r,$folder)=@_; + my $suffix=&foldersuffix($folder); + my $sendstatus=''; + if ($env{'form.send'}) { + &printheader($r,'','Messages being sent.'); + $r->rflush(); + my %content=(); + undef %content; + 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". + $content{'message'}; + } + 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 ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) { + $toaddr{$1}=''; + } + } + } elsif ($env{'form.sendmode'} eq 'upload') { + foreach (split(/[\n\r\f]+/,$env{'form.upfile'})) { + my ($rec,$txt)=split(/\s*\:\s*/,$_); + if ($txt) { + $rec=~s/\@/\:/; + $toaddr{$rec}.=$txt."\n"; + } + } + } else { + $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; + } + if ($env{'form.additionalrec'}) { + foreach (split(/\,/,$env{'form.additionalrec'})) { + my ($auname,$audom)=split(/\@/,$_); + $toaddr{$auname.':'.$audom}=''; + } + } + + 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'}); + } + if ($toaddr{$_}) { $msgtxt.='
'.$toaddr{$_}; } + 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'}), + $msgtxt, + $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'}), + $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); + } + } + $r->print($thismsg.'
'); + $sendstatus.=' '.$thismsg; + } + } else { + &printheader($r,'','No messages sent.'); + } + if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { + $r->print('
'.&mt('Completed.').''); + if ($env{'form.displayedcrit'}) { + &discrit($r); + } 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') + ); + } +} # ===================================================================== Handler @@ -1548,10 +2062,12 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['display','replyto','forward','markread','markdel','markunread', 'sendreply','compose','sendmail','critical','recname','recdom', - 'recordftf','sortedby','block']); - $sqs='&sortedby='.$ENV{'form.sortedby'}; + 'recordftf','sortedby','block','folder','startdis','interdis', + 'showcommentbaseurl','dismode']); + $sqs='&sortedby='.$env{'form.sortedby'}; + # ------------------------------------------------------ They checked for email - unless ($ENV{'form.block'}) { + unless ($env{'form.block'}) { &Apache::lonnet::put('email_status',{'recnewemail'=>0}); } @@ -1563,15 +2079,57 @@ sub handler { text=>"Communication/Messages", faq=>12,bug=>'Communication Tools',}); +# ------------------------------------------------------------------ Get 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--; + unless ($startdis) { $startdis=0; } + + $interdis=$env{'form.interdis'}; + unless ($interdis) { $interdis=20; } + $sqs.='&interdis='.$interdis; + + if ($env{'form.firstview'}) { + $startdis=0; + } + if ($env{'form.lastview'}) { + $startdis=-1; + } + if ($env{'form.prevview'}) { + $startdis--; + } + if ($env{'form.nextview'}) { + $startdis++; + } + my $postedstartdis=$startdis+1; + $sqs.='&startdis='.$postedstartdis; + # --------------------------------------------------------------- Render Output - if ($ENV{'form.display'}) { - &displaymessage($r,$ENV{'form.display'}); - } elsif ($ENV{'form.replyto'}) { - &compout($r,'',$ENV{'form.replyto'}); - } 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).'
'); @@ -1584,127 +2142,71 @@ 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'}); - } 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'); - &disall($r); - } elsif ($ENV{'form.markeddel'}) { + &statuschange($env{'form.markdel'},'deleted',$folder); + &Apache::loncommunicate::menu($r); + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.markedmove'}) { my $total=0; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.delmark_(.*)$/) { - &statuschange(&Apache::lonnet::unescape($1),'deleted'); + &movemsg(&Apache::lonnet::unescape($1),$folder, + $env{'form.movetofolder'}); + $total++; + } + } + &printheader($r,'','Moved Messages'); + $r->print('Moved '.$total.' message(s)

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

'); - &disall($r); - } elsif ($ENV{'form.markunread'}) { + &Apache::loncommunicate::menu($r); + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.markunread'}) { &printheader($r,'','Marked Message as Unread'); - &statuschange($ENV{'form.markunread'},'new'); - &disall($r); - } 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'}) { - my $sendstatus=''; - if ($ENV{'form.send'}) { - &printheader($r,'','Messages being sent.'); - $r->rflush(); - my %content=(); - undef %content; - if ($ENV{'form.forwid'}) { - my $msgid=$ENV{'form.forwid'}; - my %message=&Apache::lonnet::get('nohist_email',[$msgid]); - %content=&unpackagemsg($message{$msgid},1); - &statuschange($msgid,'forwarded'); - $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n". - $content{'message'}; - } - my %toaddr=(); - undef %toaddr; - 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'})) { - my ($rec,$txt)=split(/\s*\:\s*/,$_); - if ($txt) { - $rec=~s/\@/\:/; - $toaddr{$rec}.=$txt."\n"; - } - } - } else { - $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}=''; - } - if ($ENV{'form.additionalrec'}) { - foreach (split(/\,/,$ENV{'form.additionalrec'})) { - my ($auname,$audom)=split(/\@/,$_); - $toaddr{$auname.':'.$audom}=''; - } - } - - foreach (keys %toaddr) { - my ($recuname,$recdomain)=split(/\:/,$_); - my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); - if ($toaddr{$_}) { $msgtxt.='

'.$toaddr{$_}; } - 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'}), - $msgtxt, - $ENV{'form.sendbck'}); - } else { - $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); - $thismsg=&user_normal_msg($recuname,$recdomain, - &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), - $msgtxt, - $content{'citation'}); - 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); - } - } - $r->print($thismsg.'
'); - $sendstatus.=' '.$thismsg; - } - } else { - &printheader($r,'','No messages sent.'); - } - if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { - $r->print('
'.&mt('Completed.').''); - if ($ENV{'form.displayedcrit'}) { - &discrit($r); - } 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') - ); + &statuschange($env{'form.markunread'},'new'); + &Apache::loncommunicate::menu($r); + &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'}) { + &storecomment($r); } + &disall($r,($folder?$folder:$dismode)); + } elsif ($env{'form.newfolder'}) { + &printheader($r,'','New Folder'); + &makefolder($env{'form.newfolder'}); + &Apache::loncommunicate::menu($r); + &disall($r,$env{'form.newfolder'}); + } elsif ($env{'form.showcommentbaseurl'}) { + &storedcommentlisting($r); } else { &printheader($r,'','Display All Messages'); - &disall($r); + &Apache::loncommunicate::menu($r); + &disall($r,($folder?$folder:$dismode)); } - $r->print(''); + $r->print(&Apache::loncommon::endbodytag().''); return OK; } # ================================================= Main program, reset counter