--- loncom/interface/lonmsg.pm 2006/04/23 05:47:33 1.173.2.1 +++ loncom/interface/lonmsg.pm 2006/03/21 20:54:35 1.179 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.173.2.1 2006/04/23 05:47:33 albertel Exp $ +# $Id: lonmsg.pm,v 1.179 2006/03/21 20:54:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -137,7 +137,7 @@ my $interdis; sub packagemsg { my ($subject,$message,$citation,$baseurl,$attachmenturl, - $recuser,$recdomain,$msgid,$type)=@_; + $recuser,$recdomain,$msgid,$type,$crsmsgid)=@_; $message =&HTML::Entities::encode($message,'<>&"'); $citation=&HTML::Entities::encode($citation,'<>&"'); $subject =&HTML::Entities::encode($subject,'<>&"'); @@ -170,11 +170,19 @@ sub packagemsg { $msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'}, $msgcount,$course_context,$$); } - my $result=''.$env{'user.name'}.''. + my $result = ''.$env{'user.name'}.''. ''.$env{'user.domain'}.''. ''.$subject.''. - ''. - ''.$ENV{'SERVER_NAME'}.''. + ''; + if (defined($crsmsgid)) { + $result.= ''.$course_context.''. + ''.$env{'request.course.sec'}.''. + ''.$msgid.''. + ''.$crsmsgid.''. + ''.$message.''; + return ($msgid,$result); + } + $result .= ''.$ENV{'SERVER_NAME'}.''. ''.$ENV{'HTTP_HOST'}.''. ''.$ENV{'REMOTE_ADDR'}.''. ''.$env{'browser.type'}.''. @@ -536,7 +544,7 @@ sub user_crit_received { sub user_normal_msg_raw { my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl, - $toperm,$currid,$newid,$sentmessage)=@_; + $toperm,$currid,$newid,$sentmessage,$crsmsgid)=@_; # Check if allowed missing my ($status,$packed_message); my $msgid='undefined'; @@ -546,10 +554,9 @@ sub user_normal_msg_raw { if ($homeserver ne 'no_host') { ($msgid,$packed_message)= &packagemsg($subject,$message,$citation,$baseurl, - $attachmenturl,$user,$domain,$currid); - (undef, my $packed_message_no_citation)= - &packagemsg($subject,$message,undef ,$baseurl, - $attachmenturl,$user,$domain,$currid); + $attachmenturl,$user,$domain,$currid, + undef,$crsmsgid); + # Store in user folder $status=&Apache::lonnet::critical( 'put:'.$domain.':'.$user.':nohist_email:'. @@ -565,6 +572,11 @@ sub user_normal_msg_raw { (&Apache::lonnet::allowed('srm',$env{'request.course.id'}) || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. '/'.$env{'request.course.sec'})))) { + (undef, my $packed_message_no_citation)= + &packagemsg($subject,$message,undef ,$baseurl, + $attachmenturl,$user,$domain,$currid, + undef,$crsmsgid); + $status .= &store_sent_mail($msgid,$packed_message_no_citation); } } else { @@ -700,9 +712,8 @@ sub statuschange { &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus}); } if ($newstatus eq 'deleted') { - return &movemsg($msgid,$folder,'trash'); - } - return ; + &movemsg(&Apache::lonnet::unescape($msgid),$folder,'trash'); + } } # ============================================================= Make new folder @@ -723,53 +734,19 @@ sub movemsg { if ($srcfolder eq 'new') { $srcfolder=''; } my $srcsuffix=&foldersuffix($srcfolder); my $trgsuffix=&foldersuffix($trgfolder); - if ($srcsuffix eq $trgsuffix) { - return (0,&mt('Message not moved, Attempted to move message to the same folder as it already is in.')); - } # Copy message my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]); - if (!exists($message{$msgid}) || $message{$msgid} eq '') { - if (&Apache::slotrequest::network_error(%message)) { - return (0,&mt('Message not moved, A network error occurred.')); - } else { - return (0,&mt('Message not moved as the message is no longer in the source folder.')); - } - } - - my $result =&Apache::lonnet::put('nohist_email'.$trgsuffix, - {$msgid => $message{$msgid}}); - if (&Apache::slotrequest::network_error($result)) { - return (0,&mt('Message not moved, A network error occurred.')); - } + &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}}); # Copy status unless ($trgfolder eq 'trash') { - my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); - # a non-existant status is the mark of an unread msg - if (&Apache::slotrequest::network_error(%status)) { - return (0,&mt('Message copied to new folder but status was not, A network error occurred.')); - } - my $result=&Apache::lonnet::put('email_status'.$trgsuffix, - {$msgid => $status{$msgid}}); - if (&Apache::slotrequest::network_error($result)) { - return (0,&mt('Message copied to new folder but status was not, A network error occurred.')); - } + my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); + &Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}}); } - # Delete orginals - my $result_del_msg = - &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); - my $result_del_stat = - &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]); - if (&Apache::slotrequest::network_error($result_del_msg)) { - return (0,&mt('Message copied, but unable to delete the original from the source folder.')); - } - if (&Apache::slotrequest::network_error($result_del_stat)) { - return (0,&mt('Message copied, but unable to delete the original status from the source folder.')); - } - - return (1); + &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); + &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]); } # ======================================================= Display a course list @@ -797,7 +774,7 @@ sub discourse { for (i=0; iprint(""); } - $r->print(''.&Apache::loncommon::endbodytag().''); + $r->print(''); } elsif ($numblocked == 0) { $r->print("

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

"); } @@ -1198,9 +1175,7 @@ ENDDISHEADER $description.''.$status.''."\n"); } elsif ($status eq 'deleted') { # purge - my ($result,$msg) = - &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash'); - + &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash'); } } $r->print("\n

". @@ -1284,8 +1259,9 @@ sub compout { &mt('and return receipt') . '' . $crithelp . '

'. -''; } +'

'; + } my %message; my %content; my $defdom=$env{'user.domain'}; @@ -1461,17 +1437,29 @@ sub disfacetoface { } elsif ($content{'subject'}=~/^Broadcast/) { $result .='

'.&mt('Broadcast Message').'

'; if ($content{'subject'}=~/^Broadcast\./) { - %content=&unpackagemsg($content{'message'}); - $content{'message'}= + if (defined($content{'coursemsgid'})) { + my $crsmsgid = &Apache::lonnet::escape($content{'coursemsgid'}); + my $broadcast_message = &general_message($crsmsgid); + $content{'message'} = ''.&mt('Subject').': '.$content{'message'}.'
'.$broadcast_message; + } else { + %content=&unpackagemsg($content{'message'}); + $content{'message'} = ''.&mt('Subject').': '.$content{'subject'}.'
'. $content{'message'}; + } } } else { $result.='

'.&mt('Critical Message').'

'; - %content=&unpackagemsg($content{'message'}); - $content{'message'}= + if (defined($content{'coursemsgid'})) { + my $crsmsgid=&Apache::lonnet::escape($content{'coursemsgid'}); + my $critical_message = &general_message($crsmsgid); + $content{'message'} = ''.&mt('Subject').': '.$content{'message'}.'
'.$critical_message; + } else { + %content=&unpackagemsg($content{'message'}); + $content{'message'}= ''.&mt('Subject').': '.$content{'subject'}.'
'. $content{'message'}; + } } $result.=&mt('By').': '. &Apache::loncommon::aboutmewrapper( @@ -1494,6 +1482,18 @@ $content{'sendername'}.'@'. } } +sub general_message { + my ($crsmsgid) = @_; + my %general_content; + if ($crsmsgid) { + my %course_content = &Apache::lonnet::get('nohist_email',[$crsmsgid], + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); + %general_content = &unpackagemsg($course_content{$crsmsgid}); + } + return $general_content{'message'}; +} + # ---------------------------------------------------------------- Face to face sub facetoface { @@ -1621,14 +1621,13 @@ sub examblock { $r->print($lt{'ncbc'}.'

'); } &display_addblocker_table($r,$parmcount,\%ltext); - my $endbody=&Apache::loncommon::endbodytag(); + my $end_page=&Apache::loncommon::end_page(); $r->print(<<"END");
-$endbody - +$end_page END return; } @@ -2082,17 +2081,15 @@ sub displayresource { sub header { my ($r,$title,$baseurl)=@_; - $r->print(&Apache::lonxml::xmlbegin(). - ''.&Apache::lonxml::fontsettings(). - 'Communication and Messages'. - &Apache::lonhtmlcommon::htmlareaheaders()); + + my $extra = &Apache::loncommon::studentbrowser_javascript(); if ($baseurl) { - $r->print(""); + $extra .= ""; } - $r->print(&Apache::loncommon::studentbrowser_javascript().''. - &Apache::loncommon::bodytag('Communication and Messages')); - $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,($title?$title:'Communication and Messages'))); + $r->print(&Apache::loncommon::start_page('Communication and Messages', + $extra)); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + (undef,($title?$title:'Communication and Messages'))); } @@ -2125,8 +2122,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(&Apache::lonxml::xmlbegin().''. - &Apache::lonxml::fontsettings().''); + $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef, + {'onlybody' => 1})); if ((keys %msgs)[0]=~/^error\:/) { $r->print(&mt('No stored comments yet.')); } else { @@ -2197,6 +2194,7 @@ sub sendoffmail { my $savemsg; my $msgtype; my %sentmessage; + my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'}); if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && (&Apache::lonnet::allowed('srm',$env{'request.course.id'}) || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. @@ -2218,15 +2216,12 @@ sub sendoffmail { || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. '/'.$env{'request.course.sec'}))) { $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'},\$sentmessage{$_}); + $thismsg=&user_crit_msg($recuname,$recdomain,$msgsubj,$msgtxt, + $env{'form.sendbck'},$env{'form.permanent'}, + \$sentmessage{$_}); } else { $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); - $thismsg=&user_normal_msg($recuname,$recdomain, - &Apache::lonfeedback::clear_out_html($env{'form.subject'}), - $msgtxt, + $thismsg=&user_normal_msg($recuname,$recdomain,$msgsubj,$msgtxt, $content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_}); } if (($env{'request.course.id'}) && (($msgtype eq 'critical') || @@ -2262,7 +2257,7 @@ sub sendoffmail { my $record_sent; my @recusers = (); my @recudoms = (); - my ($stamp,$msgsubj,$msgname,$msgdom,$msgcount,$context,$pid) = + my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = split(/\:/,&Apache::lonnet::unescape($specialmsgid)); foreach my $recipient (sort(keys(%toaddr))) { if ($specialmsg_status{$recipient} eq 'ok') { @@ -2270,8 +2265,8 @@ sub sendoffmail { my $usermsgid = &buildmsgid($stamp,$usersubj,$msgname, $msgdom,$msgcount,$context,$pid); &user_normal_msg_raw($cnum,$cdom,$subj_prefix. - ' ['.$recipient.']',$sentmessage{$recipient}, - undef,undef,undef,undef,$usermsgid); + ' ['.$recipient.']',$msgsubj,undef, + undef,undef,undef,$usermsgid,undef,undef,$specialmsgid); my ($uname,$udom) = split/:/,$recipient; push(@recusers,$uname); push(@recudoms,$udom); @@ -2280,14 +2275,12 @@ sub sendoffmail { if (@recusers) { my $specialmessage; my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '. - &Apache::lonfeedback::clear_out_html($env{'form.subject'}); + $msgsubj; $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"'); my $sentmsgid = &buildmsgid($stamp,$sentsubj,$msgname, $msgdom,$msgcount,$context,$pid); - ($specialmsgid,$specialmessage) = - &packagemsg(&Apache::lonfeedback::clear_out_html( - $env{'form.subject'}),$savemsg,undef,undef,undef, - \@recusers,\@recudoms,$sentmsgid); + ($specialmsgid,$specialmessage) = &packagemsg($msgsubj,$savemsg, + undef,undef,undef,\@recusers,\@recudoms,$sentmsgid); $record_sent = &store_sent_mail($specialmsgid,$specialmessage); } } else { @@ -2415,63 +2408,31 @@ sub handler { &compout($r,$env{'form.forward'},undef,undef,undef,$folder); } elsif ($env{'form.markdel'}) { &printheader($r,'','Deleted Message'); - my ($result,$msg) = - &statuschange($env{'form.markdel'},'deleted',$folder); - if (!$result) { - $r->print('

Failed to delete the message.

'. - '

'.$msg."

\n"); - } + &statuschange($env{'form.markdel'},'deleted',$folder); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode)); } elsif ($env{'form.markedmove'}) { - my ($total,$failed,@failed_msg)=(0,0); - foreach my $key (keys(%env)) { - if ($key=~/^form\.delmark_(.*)$/) { - my ($result,$msg) = - &movemsg(&Apache::lonnet::unescape($1),$folder, - $env{'form.movetofolder'}); - if ($result) { - $total++; - } else { - $failed++; - push(@failed_msg,$msg); - } + my $total=0; + foreach (keys %env) { + if ($_=~/^form\.delmark_(.*)$/) { + &movemsg(&Apache::lonnet::unescape($1),$folder, + $env{'form.movetofolder'}); + $total++; } } &printheader($r,'','Moved Messages'); - if ($failed) { - $r->print('

- Failed to move '.$failed.' message(s)

'); - $r->print('

'. - join("

\n

",@failed_msg). - "

\n"); - } $r->print('Moved '.$total.' message(s)

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

- Failed to delete '.$failed.' message(s)

'); - $r->print('

'. - join("

\n

",@failed_msg). - "

\n"); - } $r->print('Deleted '.$total.' message(s)

'); &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode)); @@ -2511,7 +2472,7 @@ sub handler { &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode)); } - $r->print(&Apache::loncommon::endbodytag().''); + $r->print(&Apache::loncommon::end_page()); return OK; } # ================================================= Main program, reset counter