--- loncom/interface/lonmsg.pm 2001/08/16 01:42:07 1.22
+++ loncom/interface/lonmsg.pm 2002/04/23 21:06:07 1.31
@@ -1,7 +1,31 @@
# The LearningOnline Network with CAPA
-#
# Routines for messaging
#
+# $Id: lonmsg.pm,v 1.31 2002/04/23 21:06:07 matthew 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,08/06,08/08,08/09,08/10,8/13,8/15 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,3/18 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,7 +140,7 @@ 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';
@@ -122,6 +148,7 @@ sub user_crit_msg {
my $homeserver=&Apache::lonnet::homeserver($user,$domain);
if ($homeserver ne 'no_host') {
($msgid,$message)=&packagemsg($subject,$message);
+ if ($sendback) { $message.='<sendback>true</sendback>'; }
$status=&Apache::lonnet::critical(
'put:'.$domain.':'.$user.':critical:'.
&Apache::lonnet::escape($msgid).'='.
@@ -145,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}});
@@ -250,7 +277,7 @@ sub discourse {
<input type=button onClick="uncheckall()" value="Check for None">
<p>
ENDDISHEADER
- map {
+ foreach (sort keys %courselist) {
my ($end,$start)=split(/\:/,$courselist{$_});
my $active=1;
if (($end) && ($now>$end)) { $active=0; }
@@ -269,28 +296,37 @@ ENDDISHEADER
$reply{'generation'}.
' ('.$_.') '.$section);
}
- } sort keys %courselist;
+ }
}
# ==================================================== Display Critical Message
sub discrit {
my $r=shift;
- $r->print('<h1><font color=red>Critical Messages</font></h1>'.
- '<form action=/adm/email method=post>'.
- '<input type=hidden name=confirm value=true>');
- my %what=&Apache::lonnet::dump('critical');
- map {
- my %content=&unpackagemsg($what{$_});
- $content{'message'}=~s/\n/\<br\>/g;
- $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.
- $content{'senderdomain'}.'</b> ('.$content{'time'}.
- ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
- '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
- '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
- } sort keys %what;
- $r->print(
- '<input type=hidden name="displayedcrit" value="true"></form>');
+ my $header = '<h1><font color=red>Critical Messages</font></h1>'.
+ '<form action=/adm/email method=post>'.
+ '<input type=hidden name=confirm value=true>';
+ 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/\<br\>/g;
+ $result.='<hr>From: <b>'.$content{'sendername'}.'@'.
+ $content{'senderdomain'}.'</b> ('.$content{'time'}.
+ ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
+ '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
+ '<input type=submit name="reprec_'.$_.'" '.
+ 'value="Confirm Receipt and Reply">';
+ }
+ # Check to see if there were any messages.
+ if ($result eq '') {
+ $result = "<h2>You have no critical messages.</h2>";
+ } else {
+ $r->print($header);
+ }
+ $r->print($result);
+ $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
}
# =============================================================== Compose reply
@@ -307,13 +343,15 @@ sub comprep {
my $dispcrit='';
if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
$dispcrit=
- '<input type=checkbox name=critmsg> Send as critical message<p>';
+ '<input type=checkbox name=critmsg> Send as critical message<br>'.
+ '<input type=checkbox name=sendbck> Send as critical message'.
+ ' and return receipt<p>';
}
$r->print(<<"ENDREPLY");
<form action="/adm/email" method=post>
<input type=hidden name=sendreply value="$msgid">
Subject: <input type=text size=50 name=subject value="$subject"><p>
-<textarea name=message cols=60 rows=10>
+<textarea name=message cols=64 rows=10 wrap=hard>
$quotemsg
</textarea><p>
$dispcrit
@@ -326,10 +364,36 @@ ENDREPLY
sub disall {
my $r=shift;
- $r->print('<h1>Display All Messages</h1>'.
+ $r->print(<<ENDDISHEADER);
+<script>
+ function checkall() {
+ for (i=0; i<document.forms.disall.elements.length; i++) {
+ if
+ (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
+ document.forms.disall.elements[i].checked=true;
+ }
+ }
+ }
+
+ function uncheckall() {
+ for (i=0; i<document.forms.disall.elements.length; i++) {
+ if
+ (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
+ document.forms.disall.elements[i].checked=false;
+ }
+ }
+ }
+</script>
+ENDDISHEADER
+ $r->print(
+ '<h1>Display All Messages</h1><form method=post name=disall '.
+ 'action="/adm/email">'.
'<table border=2><tr><th colspan=2> </th><th>Date</th>'.
'<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
- map {
+ 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') {
@@ -344,16 +408,18 @@ sub disall {
}
$r->print('<td><a href="/adm/email?display='.$_.
'">Open</a></td><td><a href="/adm/email?markdel='.$_.
- '">Delete</a></td><td>'.localtime($sendtime).'</td><td>'.
+ '">Delete</a><input type=checkbox name="delmark_'.$_.'"></td>'.
+ '<td>'.localtime($sendtime).'</td><td>'.
$fromname.'</td><td>'.$fromdomain.'</td><td>'.
&Apache::lonnet::unescape($shortsubj).'</td><td>'.
$status.'</td></tr>');
}
- } sort split(/\&/,&Apache::lonnet::reply('keys:'.
- $ENV{'user.domain'}.':'.
- $ENV{'user.name'}.':nohist_email',
- $ENV{'user.home'}));
- $r->print('</table></body></html>');
+ }
+ $r->print('</table><p>'.
+ '<a href="javascript:checkall()">Check All</a> '.
+ '<a href="javascript:uncheckall()">Uncheck All</a><p>'.
+ '<input type=submit name="markeddel" value="Delete Checked">'.
+ '</form></body></html>');
}
# ============================================================== Compose output
@@ -366,7 +432,9 @@ sub compout {
my $func='Send New';
if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
$dispcrit=
- '<input type=checkbox name=critmsg> Send as critical message<p>';
+ '<input type=checkbox name=critmsg> Send as critical message<br>'.
+ '<input type=checkbox name=sendbck> Send as critical message'.
+ ' and return receipt<p>';
}
if ($forwarding) {
$dispcrit.='<input type=hidden name=forwid value="'.
@@ -381,46 +449,55 @@ sub compout {
}
my $defdom=$ENV{'user.domain'};
$r->print(
- '<form action="/adm/email" name="compemail" method=post'.
- ' enctype="multipart/form-data">'.
- '<input type=hidden name=sendmail value=on><table>');
+ '<form action="/adm/email" name="compemail" method="post"'.
+ ' enctype="multipart/form-data">'."\n".
+ '<input type="hidden" name="sendmail" value="on">'."\n".
+ '<table>');
unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
+ my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
+
$r->print(<<"ENDREC");
<table>
<tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>
<tr><td>Domain:</td>
-<td><input type=text size=12 name=recdomain value="$defdom"></td></tr>
+<td>$domform</td></tr>
ENDREC
}
- unless ($broadcast eq 'upload') {
+ if ($broadcast ne 'upload') {
$r->print(<<"ENDCOMP");
<tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
</tt></td><td>
<input type=text size=50 name=additionalrec></td></tr>
<tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
</td></tr></table>
-<textarea name=message cols=60 rows=10>$dismsg
+<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
</textarea><p>
$dispcrit
<input type=submit value="$func Mail">
ENDCOMP
- }
- if ($broadcast eq 'upload') {
+ } else { # $broadcast is 'upload'
$r->print(<<ENDUPLOAD);
<input type=hidden name=sendmode value=upload>
<h3>Generate messages from a file</h3>
+<p>
Subject: <input type=text size=50 name=subject>
+</p>
+<p>General message text<br />
+<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
+</textarea></p>
+<p>
+The file format for the uploaded portion of the message is:
<pre>
username1\@domain1: text
username2\@domain2: text
-username1\@domain1: text
+username3\@domain1: text
</pre>
+</p>
+<p>
The messages will be assembled from all lines with the respective
-<tt>username\@domain</tt>, and appended to the general message text.<p>
+<tt>username\@domain</tt>, and appended to the general message text.</p>
+<p>
<input type=file name=upfile size=20><p>
-General message text:<p>
-<textarea name=message cols=60 rows=10>$dismsg
-</textarea><p>
$dispcrit
<input type=submit value="Upload and send">
ENDUPLOAD
@@ -445,7 +522,7 @@ sub handler {
# --------------------------- Get query string for limited number of parameters
- map {
+ foreach (split(/&/,$ENV{'QUERY_STRING'})) {
my ($name, $value) = split(/=/,$_);
$value =~ tr/+/ /;
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
@@ -458,7 +535,7 @@ sub handler {
$ENV{'form.'.$name}=$value;
}
}
- } (split(/&/,$ENV{'QUERY_STRING'}));
+ }
# --------------------------------------------------------------- Render Output
@@ -492,13 +569,14 @@ sub handler {
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'},
@@ -511,7 +589,7 @@ sub handler {
&disall($r);
}
} elsif ($ENV{'form.confirm'}) {
- map {
+ foreach (keys %ENV) {
if ($_=~/^form\.rec\_(.*)$/) {
$r->print('<b>Confirming Receipt:</b> '.
&user_crit_received($1).'<br>');
@@ -522,7 +600,7 @@ sub handler {
&user_crit_received($msgid).'<br>');
&comprep($r,$msgid);
}
- } keys %ENV;
+ }
&discrit($r);
} elsif ($ENV{'form.critical'}) {
&discrit($r);
@@ -532,6 +610,16 @@ sub handler {
} elsif ($ENV{'form.markdel'}) {
&statuschange($ENV{'form.markdel'},'deleted');
&disall($r);
+ } elsif ($ENV{'form.markeddel'}) {
+ my $total=0;
+ foreach (keys %ENV) {
+ if ($_=~/^form\.delmark_(.*)$/) {
+ &statuschange(&Apache::lonnet::unescape($1),'deleted');
+ $total++;
+ }
+ }
+ $r->print('Deleted '.$total.' message(s)<p>');
+ &disall($r);
} elsif ($ENV{'form.markunread'}) {
&statuschange($ENV{'form.markunread'},'new');
&disall($r);
@@ -551,39 +639,39 @@ sub handler {
my %toaddr=();
undef %toaddr;
if ($ENV{'form.sendmode'} eq 'group') {
- map {
+ foreach (keys %ENV) {
if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
$toaddr{$1}='';
}
- } keys %ENV;
+ }
} elsif ($ENV{'form.sendmode'} eq 'upload') {
- map {
+ foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
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 {
+ foreach (split(/\,/,$ENV{'form.additionalrec'})) {
my ($auname,$audom)=split(/\@/,$_);
$toaddr{$auname.':'.$audom}='';
- } split(/\,/,$ENV{'form.additionalrec'});
+ }
}
- map {
+ foreach (keys %toaddr) {
my ($recuname,$recdomain)=split(/\:/,$_);
my $msgtxt=$ENV{'form.message'};
if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }
- 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($recuname,$recdomain,
$ENV{'form.subject'},
$msgtxt,
- $content{'citation'}));
+ $ENV{'form.sendbck'}));
} else {
$r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
$ENV{'form.subject'},
@@ -591,7 +679,7 @@ sub handler {
$content{'citation'}));
}
$r->print('<br>');
- } keys %toaddr;
+ }
if ($ENV{'form.displayedcrit'}) {
&discrit($r);
} else {
@@ -606,7 +694,7 @@ sub handler {
}
# ================================================= Main program, reset counter
-sub BEGIN {
+BEGIN {
$msgcount=0;
}