--- loncom/interface/lonmsg.pm 2001/08/03 14:00:07 1.12 +++ loncom/interface/lonmsg.pm 2002/01/01 18:38:51 1.27 @@ -1,7 +1,31 @@ # The LearningOnline Network with CAPA -# # Routines for messaging # +# $Id: lonmsg.pm,v 1.27 2002/01/01 18:38:51 www Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# +# # (Routines to control the menu # # (TeX Conversion Module @@ -13,8 +37,11 @@ # 10/19,10/20,10/30, # 02/06/01 Gerd Kortemeyer # 07/27 Guy Albertelli -# 07/27,07/28,07/30,08/03 Gerd Kortemeyer - +# 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15, +# 10/1,11/5 Gerd Kortemeyer +# YEAR=2002 +# 1/1 Gerd Kortemeyer +# package Apache::lonmsg; use strict; @@ -37,7 +64,6 @@ sub packagemsg { $msgcount++; my $partsubj=$subject; $partsubj=&Apache::lonnet::escape($partsubj); - $partsubj=substr($partsubj,0,50); my $msgid=&Apache::lonnet::escape( $now.':'.$partsubj.':'.$ENV{'user.name'}.':'. $ENV{'user.domain'}.':'.$msgcount.':'.$$); @@ -114,15 +140,15 @@ sub author_res_msg { # ================================================== Critical message to a user sub user_crit_msg { - my ($user,$domain,$subject,$message)=@_; + my ($user,$domain,$subject,$message,$sendback)=@_; # Check if allowed missing my $status=''; my $msgid='undefined'; unless (($message)&&($user)&&($domain)) { $status='empty'; }; my $homeserver=&Apache::lonnet::homeserver($user,$domain); if ($homeserver ne 'no_host') { - my $msgid; ($msgid,$message)=&packagemsg($subject,$message); + if ($sendback) { $message.='true'; } $status=&Apache::lonnet::critical( 'put:'.$domain.':'.$user.':critical:'. &Apache::lonnet::escape($msgid).'='. @@ -146,13 +172,13 @@ sub user_crit_received { my $msgid=shift; my %message=&Apache::lonnet::get('critical',[$msgid]); my %contents=&unpackagemsg($message{$msgid}); - my $status='rec: '. + my $status='rec: '.($contents{'sendback'}? &user_normal_msg($contents{'sendername'},$contents{'senderdomain'}, 'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}, 'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}. ' acknowledged receipt of message "'. $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n" - .'Message ID: '.$contents{'msgid'}); + .'Message ID: '.$contents{'msgid'}):'no msg req'); $status.=' trans: '. &Apache::lonnet::put( 'nohist_email',{$contents{'msgid'} => $message{$msgid}}); @@ -175,7 +201,6 @@ sub user_normal_msg { unless (($message)&&($user)&&($domain)) { $status='empty'; }; my $homeserver=&Apache::lonnet::homeserver($user,$domain); if ($homeserver ne 'no_host') { - my $msgid; ($msgid,$message)=&packagemsg($subject,$message,$citation); $status=&Apache::lonnet::critical( 'put:'.$domain.':'.$user.':nohist_email:'. @@ -201,8 +226,80 @@ sub statuschange { ($status{$msgid} eq 'forwarded')) { &Apache::lonnet::put('email_status',{$msgid => $newstatus}); } + if (($newstatus eq 'deleted') || ($newstatus eq 'new')) { + &Apache::lonnet::put('email_status',{$msgid => $newstatus}); + } } -# ===================================================================== Handler + +# ======================================================= 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 $now=time; + $r->print(< + +  + +  + +

+ENDDISHEADER + map { + 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); + } + } sort keys %courselist; +} + +# ==================================================== Display Critical Message sub discrit { my $r=shift; @@ -216,11 +313,161 @@ sub discrit { $r->print('

From: '.$content{'sendername'}.'@'. $content{'senderdomain'}.' ('.$content{'time'}. ')
'.$content{'message'}.'
'. - ''); + ''. + ''); } sort keys %what; - $r->print(''); + $r->print( + ''); +} + +# =============================================================== Compose reply + +sub comprep { + my ($r,$msgid)=@_; + my %message=&Apache::lonnet::get('nohist_email',[$msgid]); + my %content=&unpackagemsg($message{$msgid}); + my $quotemsg='> '.$content{'message'}; + $quotemsg=~s/\r/\n/g; + $quotemsg=~s/\f/\n/g; + $quotemsg=~s/\n+/\n\> /g; + my $subject='Re: '.$content{'subject'}; + my $dispcrit=''; + if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + $dispcrit= + ' Send as critical message
'. + ' Send as critical message'. + ' and return receipt

'; + } + $r->print(<<"ENDREPLY"); +

+ +Subject:

+

+$dispcrit + +

+ENDREPLY +} + +# ======================================================== Display all messages + +sub disall { + my $r=shift; + $r->print( + '

Display All Messages

'. + ''. + ''); + foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'. + $ENV{'user.domain'}.':'. + $ENV{'user.name'}.':nohist_email', + $ENV{'user.home'}))) { + my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)= + &Apache::lonmsg::unpackmsgid($_); + unless ($status eq 'deleted') { + if ($status eq 'new') { + $r->print(''); + } elsif ($status eq 'read') { + $r->print(''); + } elsif ($status eq 'replied') { + $r->print(''); + } else { + $r->print(''); + } + $r->print(''. + ''); + } + } + $r->print('
 DateUsernameDomainSubjectStatus
OpenDelete'.localtime($sendtime).''. + $fromname.''.$fromdomain.''. + &Apache::lonnet::unescape($shortsubj).''. + $status.'

'. + ''. + '

'); +} + +# ============================================================== Compose output + +sub compout { + my ($r,$forwarding,$broadcast)=@_; + my $dispcrit=''; + my $dissub=''; + my $dismsg=''; + my $func='Send New'; + if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + $dispcrit= + ' Send as critical message
'. + ' Send as critical message'. + ' and return receipt

'; + } + if ($forwarding) { + $dispcrit.=''; + $func='Forward'; + my %message=&Apache::lonnet::get('nohist_email',[$forwarding]); + my %content=&unpackagemsg($message{$forwarding}); + + $dissub='Forwarding: '.$content{'subject'}; + $dismsg='Forwarded message from '. + $content{'sendername'}.' at '.$content{'senderdomain'}; + } + my $defdom=$ENV{'user.domain'}; + $r->print( + '

'. + ''); + unless (($broadcast eq 'group') || ($broadcast eq 'upload')) { + $r->print(<<"ENDREC"); +
+ + + +ENDREC + } + unless ($broadcast eq 'upload') { + $r->print(<<"ENDCOMP"); + +
Username:
Domain:
Additional Recipients
username\@domain,username\@domain, ... +		 +
Subject: +
+

+$dispcrit + +ENDCOMP + } + if ($broadcast eq 'upload') { + $r->print(< +

Generate messages from a file

+Subject: +
+username1\@domain1: text
+username2\@domain2: text
+username1\@domain1: text
+
+The messages will be assembled from all lines with the respective +username\@domain, and appended to the general message text.

+

+General message text:

+

+$dispcrit + +ENDUPLOAD + } + if ($broadcast eq 'group') { + &discourse; + } + $r->print('

'); } +# ===================================================================== Handler + sub handler { my $r=shift; @@ -238,7 +485,8 @@ sub handler { $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; if (($name eq 'display') || ($name eq 'replyto') || - ($name eq 'forward') || ($name eq 'mark') || + ($name eq 'forward') || ($name eq 'markread') || + ($name eq 'markdel') || ($name eq 'markunread') || ($name eq 'sendreply') || ($name eq 'compose') || ($name eq 'sendmail') || ($name eq 'critical')) { unless ($ENV{'form.'.$name}) { @@ -261,108 +509,142 @@ sub handler { $r->print('Subject: '.$content{'subject'}. '
From: '.$content{'sendername'}.' at '. $content{'senderdomain'}. - '
Time: '.$content{'time'}.'
Functions: '. - 'Reply
'.
+             '
Time: '.$content{'time'}.'
'.
+             ''.
+           ''.
+           ''.
+        ''.
+        ''.
+             '
Functions:ReplyForwardMark UnreadDisplay all Messages
'.
              $content{'message'}.'
'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
-      my $msgid=$ENV{'form.replyto'};
-      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
-      my $quotemsg='> '.$content{'message'};
-      $quotemsg=~s/\r/\n/g;
-      $quotemsg=~s/\f/\n/g;
-      $quotemsg=~s/\n+/\n\> /g;
-      my $subject='Re: '.$content{'subject'};
-      my $dispcrit='';
-      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-         $dispcrit=
-	     ' Send as critical message
';
-      }
-      $r->print(<<"ENDREPLY");
-

-
-Subject: 

-

-$dispcrit
-
-

-ENDREPLY
+      &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {
       my $msgid=$ENV{'form.sendreply'};
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});
       &statuschange($msgid,'replied');
-      if (($ENV{'form.critmsg'}) && 
+      if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
          $r->print('Sending critical: '.
                 &user_crit_msg($content{'sendername'},
                                  $content{'senderdomain'},
                                  $ENV{'form.subject'},
-                                 $ENV{'form.message'}));
+                                 $ENV{'form.message'},
+                                 $ENV{'form.sendbck'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($content{'sendername'},
                                  $content{'senderdomain'},
                                  $ENV{'form.subject'},
                                  $ENV{'form.message'}));
       }
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
   } elsif ($ENV{'form.confirm'}) {
       map {
           if ($_=~/^form\.rec\_(.*)$/) {
 	      $r->print('Confirming Receipt: '.
                         &user_crit_received($1).'
');
           }
+          if ($_=~/^form\.reprec\_(.*)$/) {
+              my $msgid=$1;
+	      $r->print('Confirming Receipt: '.
+                        &user_crit_received($msgid).'
');
+              &comprep($r,$msgid);
+          }
       } keys %ENV;
       &discrit($r);
   } elsif ($ENV{'form.critical'}) {
       &discrit($r);
   } elsif ($ENV{'form.forward'}) {
-  } elsif ($ENV{'form.mark'}) {
+      &compout($r,$ENV{'form.forward'});
+  } elsif ($ENV{'form.markread'}) {
+  } elsif ($ENV{'form.markdel'}) {
+      &statuschange($ENV{'form.markdel'},'deleted');
+      &disall($r);
+  } elsif ($ENV{'form.markeddel'}) {
+      my $total=0;
+      map {
+          if ($_=~/^form\.delmark_(.*)$/) {
+	      &statuschange(&Apache::lonnet::unescape($1),'deleted');
+              $total++;
+          }
+      } keys %ENV;
+      $r->print('Deleted '.$total.' message(s)
');
+      &disall($r);
+  } elsif ($ENV{'form.markunread'}) {
+      &statuschange($ENV{'form.markunread'},'new');
+      &disall($r);
   } elsif ($ENV{'form.compose'}) {
-      my $dispcrit='';
-      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-         $dispcrit=
-	     ' Send as critical message
';
-      }
-      $r->print(<<"ENDCOMP");
-

-
-Subject: 

-

-$dispcrit
-
-

-ENDCOMP
+      &compout($r,'',$ENV{'form.compose'});
   } elsif ($ENV{'form.sendmail'}) {
-  } else {
-    $r->print(''.
-     '');
+      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});
+        &statuschange($msgid,'forwarded');
+        $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+	                       $content{'message'};
+      }
+      my %toaddr=();
+      undef %toaddr;
+      if ($ENV{'form.sendmode'} eq 'group') {
+          map {
+	      if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+		  $toaddr{$1}='';
+              }
+          } keys %ENV;
+      } elsif ($ENV{'form.sendmode'} eq 'upload') {
+          map {
+              my ($rec,$txt)=split(/\s*\:\s*/,$_);
+              if ($txt) {
+		  $rec=~s/\@/\:/;
+                  $toaddr{$rec}.=$txt."\n";
+              }
+          } split(/[\n\r\f]+/,$ENV{'form.upfile'});
+      } else {
+	  $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
+      }
+      if ($ENV{'form.additionalrec'}) {
+	  map {
+              my ($auname,$audom)=split(/\@/,$_);
+              $toaddr{$auname.':'.$audom}='';
+          } split(/\,/,$ENV{'form.additionalrec'});
+      }
     map {
-        my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
-	    &Apache::lonmsg::unpackmsgid($_);
-        if ($status eq 'new') {
-	    $r->print('');
-        } elsif ($status eq 'read') {
-	    $r->print('');
-        } elsif ($status eq 'replied') {
-	    $r->print('');
-	} else {
-	    $r->print('');
-        }
-        $r->print('');
-    } sort split(/\&/,&Apache::lonnet::reply('keys:'.
-					$ENV{'user.domain'}.':'.
-                                        $ENV{'user.name'}.':nohist_email',
-                                        $ENV{'user.home'}));
-    $r->print('
 DateUsernameDomainSubjectStatus
Open'.localtime($sendtime).''.
-                  $fromname.''.$fromdomain.''.
-		      &Apache::lonnet::unescape($shortsubj).''.
-                      $status.'
');
-
+      my ($recuname,$recdomain)=split(/\:/,$_);
+      my $msgtxt=$ENV{'form.message'};
+      if ($toaddr{$_}) { $msgtxt.='
'.$toaddr{$_}; }    
+      if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
+          (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+         $r->print('Sending critical: '.
+                &user_crit_msg($recuname,$recdomain,
+                                 $ENV{'form.subject'},
+                                 $msgtxt,
+                                 $ENV{'form.sendbck'}));
+      } else {
+         $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
+                                 $ENV{'form.subject'},
+                                 $msgtxt,
+                                 $content{'citation'}));
+      }
+      $r->print('
');
+    } keys %toaddr;
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
+  } else {
+      &disall($r);
   }
   $r->print('');
   return OK;
@@ -370,7 +652,7 @@ ENDCOMP
 }
 # ================================================= Main program, reset counter
 
-sub BEGIN {
+BEGIN {
     $msgcount=0;
 }