--- loncom/interface/lonmsg.pm 2005/01/01 18:24:12 1.127 +++ loncom/interface/lonmsg.pm 2005/02/17 04:39:58 1.137 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.127 2005/01/01 18:24:12 www Exp $ +# $Id: lonmsg.pm,v 1.137 2005/02/17 04:39:58 albertel 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 @@ -239,9 +239,15 @@ sub sendemail { # ==================================================== Send notification emails sub sendnotification { - my ($to,$touname,$toudom,$subj,$crit)=@_; + 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; @@ -250,11 +256,15 @@ 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); } @@ -346,11 +356,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); @@ -370,10 +381,16 @@ 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( @@ -397,7 +414,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); @@ -407,10 +424,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; } @@ -444,10 +461,12 @@ 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') { @@ -471,10 +490,16 @@ sub user_normal_msg_raw { $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'}, @@ -493,7 +518,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); @@ -503,11 +529,11 @@ 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; } @@ -598,12 +624,9 @@ sub movemsg { &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}}); # Copy status - my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); - &Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}}); -# See if was deleted -> becomes "read" in trash - my $currentstatus=(&unpackmsgid($status{$msgid}),$srcfolder); - if ($currentstatus eq 'deleted') { - &statuschange($msgid,'read',$trgfolder); + 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]); @@ -652,7 +675,7 @@ sub discourse {   -  + 

ENDDISHEADER @@ -670,7 +693,15 @@ ENDDISHEADER } } $r->print(''); - while (my ($student,$info) = each(%$classlist)) { + 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(), @@ -678,11 +709,11 @@ ENDDISHEADER &Apache::loncoursedata::CL_FULLNAME(), &Apache::loncoursedata::CL_SECTION()]); next if ($status ne 'Active'); - my $key = 'send_to_&&&'.$section.'&&&'.$student; + my $key = 'send_to_&&&'.$section.'&&&_'.$student; if (! defined($fullname) || $fullname eq '') { $fullname = $sname; } $r->print(''); } $r->print('
'.$sname.'@'.$sdom.''.$section. + qq{}.(' 'x2). + $fullname.''.$sname.'@'.$sdom.''.$section. '
'); @@ -693,8 +724,8 @@ ENDDISHEADER sub discrit { my $r=shift; my $header = '

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

'. - '
'. - ''; + ''. + ''; my %what=&Apache::lonnet::dump('critical'); my $result = ''; foreach (sort keys %what) { @@ -706,14 +737,14 @@ sub discrit { $content{'sendername'}.'@'. $content{'senderdomain'}.') '.$content{'time'}. '
'.&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 '') { @@ -839,7 +870,7 @@ TABLEHEAD foreach my $msg (@newmsgs) { $r->print(<<"ENDLINK"); -$lt{'op'} +$lt{'op'} ENDLINK foreach ('sendtime','from','fromdom','shortsub') { $r->print("$msg->{$_}"); @@ -956,9 +987,9 @@ ENDDISHEADER } $r->print(''); if ($ENV{'form.sortedby'} eq "revstatus") { - $r->print(''.&mt('Status').''); + $r->print(''.&mt('Status').''); } else { - $r->print(''.&mt('Status').''); + $r->print(''.&mt('Status').''); } $r->print("\n"); for (my $n=$firstdis;$n<=$lastdis;$n++) { @@ -973,10 +1004,10 @@ ENDDISHEADER } else { $r->print(''); } - $r->print(''.&mt('Open').''. ($folder ne 'trash'?''.&mt('Delete'):' ').''. + '">'.&mt('Delete'):' ').''. ''.&Apache::lonlocal::locallocaltime($sendtime).''. $fromname.''.$fromdomain.''. &Apache::lonnet::unescape($shortsubj).''. @@ -1059,10 +1090,12 @@ sub compout { 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; @@ -1096,8 +1129,8 @@ sub compout { if ($content{'baseurl'}) { $disbase=''; if ($ENV{'user.adv'}) { - $disbase.=''.&mt('Store message for re-use'). - ' '.&mt('Store message for re-use'). + ' '. &mt('Show re-usable messages').'
'; } @@ -1125,7 +1158,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 @@ -1241,9 +1274,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 '') { @@ -1526,8 +1559,8 @@ END $$ltext{'star'}: $startform
$$ltext{'endd'}:  $endform $settername - - $lt{'modi'}? 
$lt{'canc'}?   + +
END $parmcount ++; @@ -1579,8 +1612,8 @@ sub display_addblocker_table { $$ltext{'star'}: $startform
$$ltext{'endd'}:  $endform - - $lt{'addb'}?  + + @@ -1742,6 +1775,7 @@ sub displaymessage { 'Delete'. ''.&mt('Back to Folder Display').''); if ($counter > 0){ $r->print('"); } @@ -1853,7 +1889,8 @@ 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(''); + $r->print(&Apache::lonxml::xmlbegin().''. + &Apache::lonxml::fontsettings().''); if ((keys %msgs)[0]=~/^error\:/) { $r->print(&mt('No stored comments yet.')); } else { @@ -1936,13 +1973,13 @@ sub sendoffmail { $thismsg=&user_crit_msg($recuname,$recdomain, &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), $msgtxt, - $ENV{'form.sendbck'}); + $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'}); + $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'}, @@ -1989,7 +2026,7 @@ sub handler { ['display','replyto','forward','markread','markdel','markunread', 'sendreply','compose','sendmail','critical','recname','recdom', 'recordftf','sortedby','block','folder','startdis','interdis', - 'showcommentbaseurl']); + 'showcommentbaseurl','dismode']); $sqs='&sortedby='.$ENV{'form.sortedby'}; # ------------------------------------------------------ They checked for email