version 1.79, 2004/01/15 15:12:31
|
version 1.85, 2004/02/02 22:27:08
|
Line 139 sub packagemsg {
|
Line 139 sub packagemsg {
|
'<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'. |
'<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'. |
'<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'. |
'<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'. |
'<courseid>'.$ENV{'request.course.id'}.'</courseid>'. |
'<courseid>'.$ENV{'request.course.id'}.'</courseid>'. |
|
'<coursesec>'.$ENV{'request.course.sec'}.'</coursesec>'. |
'<role>'.$ENV{'request.role'}.'</role>'. |
'<role>'.$ENV{'request.role'}.'</role>'. |
'<resource>'.$ENV{'request.filename'}.'</resource>'. |
'<resource>'.$ENV{'request.filename'}.'</resource>'. |
'<msgid>'.$msgid.'</msgid>'. |
'<msgid>'.$msgid.'</msgid>'. |
Line 274 sub author_res_msg {
|
Line 275 sub author_res_msg {
|
sub retrieve_author_res_msg { |
sub retrieve_author_res_msg { |
my $url=shift; |
my $url=shift; |
$url=&Apache::lonnet::declutter($url); |
$url=&Apache::lonnet::declutter($url); |
my ($domain,$author,$file)=($url=~/^(\w+)\/(\w+)\/(.+)$/); |
my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//); |
my $listall=($file eq 'allbombs'); |
|
my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author); |
my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author); |
my $msgs=''; |
my $msgs=''; |
foreach (keys %errormsgs) { |
foreach (keys %errormsgs) { |
if (($_=~/^\Q$url\E\_\d+$/) || ($listall)) { |
if ($_=~/^\Q$url\E\_\d+$/) { |
my ($errurl)=($_=~/^(.+)\_(\d+)$/); |
|
my %content=&unpackagemsg($errormsgs{$_}); |
my %content=&unpackagemsg($errormsgs{$_}); |
$msgs.='<p><img src="/adm/lonMisc/bomb.gif" /><b>'. |
$msgs.='<p><img src="/adm/lonMisc/bomb.gif" /><b>'. |
($listall?"<a href='".&Apache::lonnet::clutter($errurl)."'><tt>". |
|
$errurl. |
|
'</tt></a> ':' '). |
|
$content{'time'}.'</b>: '.$content{'message'}. |
$content{'time'}.'</b>: '.$content{'message'}. |
'<br /></p>'; |
'<br /></p>'; |
} |
} |
Line 401 sub user_crit_received {
|
Line 397 sub user_crit_received {
|
my %contents=&unpackagemsg($message{$msgid},1); |
my %contents=&unpackagemsg($message{$msgid},1); |
my $status='rec: '.($contents{'sendback'}? |
my $status='rec: '.($contents{'sendback'}? |
&user_normal_msg($contents{'sendername'},$contents{'senderdomain'}, |
&user_normal_msg($contents{'sendername'},$contents{'senderdomain'}, |
&mt('Receipt').': '.$ENV{'user.name'}.' 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'}. |
&mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}. |
' acknowledged receipt of message'."\n".' "'. |
' acknowledged receipt of message'."\n".' "'. |
$contents{'subject'}.'"'."\n".&mt('dated').' '. |
$contents{'subject'}.'"'."\n".&mt('dated').' '. |
Line 604 $content{'sendername'}.'@'.
|
Line 600 $content{'sendername'}.'@'.
|
'<br>'.&mt('Subject').': '.$content{'subject'}. |
'<br>'.&mt('Subject').': '.$content{'subject'}. |
'<br><blockquote>'. |
'<br><blockquote>'. |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
'</blockquote>'. |
'</blockquote><small>'. |
|
&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox'). |
|
'</small><br />'. |
'<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'. |
'<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'. |
'<input type=submit name="reprec_'.$_.'" '. |
'<input type=submit name="reprec_'.$_.'" '. |
'value="'.&mt('Confirm Receipt and Reply').'">'; |
'value="'.&mt('Confirm Receipt and Reply').'">'; |
Line 1061 sub handler {
|
Line 1059 sub handler {
|
&Apache::loncommon::bodytag('EMail and Messages'). |
&Apache::loncommon::bodytag('EMail and Messages'). |
&Apache::loncommon::help_open_faq(12). |
&Apache::loncommon::help_open_faq(12). |
&Apache::loncommon::help_open_bug('Communication Tools')); |
&Apache::loncommon::help_open_bug('Communication Tools')); |
$r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}. |
my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); |
'<br><b>'.&mt('From').':</b> '. |
|
|
$r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}. |
|
'<br /><b>'.&mt('From').':</b> '. |
&Apache::loncommon::aboutmewrapper( |
&Apache::loncommon::aboutmewrapper( |
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}), |
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}), |
$content{'sendername'},$content{'senderdomain'}).' ('. |
$content{'sendername'},$content{'senderdomain'}).' ('. |
$content{'sendername'}.' at '. |
$content{'sendername'}.' at '. |
$content{'senderdomain'}.') '. |
$content{'senderdomain'}.') '. |
'<br><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'. |
($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}. |
|
($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):''). |
|
'<br /><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'. |
'<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'. |
'<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'. |
'<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs. |
'<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs. |
'"><b>'.&mt('Reply').'</b></a></td>'. |
'"><b>'.&mt('Reply').'</b></a></td>'. |
Line 1089 $content{'sendername'},$content{'senderd
|
Line 1091 $content{'sendername'},$content{'senderd
|
'"><b>'.&mt('Next').'</b></a></td>'); |
'"><b>'.&mt('Next').'</b></a></td>'); |
} |
} |
$r->print('</tr></table><p><pre>'. |
$r->print('</tr></table><p><pre>'. |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
&Apache::lontexconvert::msgtexconverted($content{'message'},1). |
'</pre><hr>'.$content{'citation'}); |
'</pre><hr>'.$content{'citation'}); |
} elsif ($ENV{'form.replyto'}) { |
} elsif ($ENV{'form.replyto'}) { |
&comprep($r,$ENV{'form.replyto'}); |
&comprep($r,$ENV{'form.replyto'}); |
Line 1218 $content{'sendername'},$content{'senderd
|
Line 1220 $content{'sendername'},$content{'senderd
|
} |
} |
} |
} |
if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { |
if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { |
|
$r->print('<br /><font color="green">'.&mt('Completed.').'</font>'); |
if ($ENV{'form.displayedcrit'}) { |
if ($ENV{'form.displayedcrit'}) { |
&discrit($r); |
&discrit($r); |
} else { |
} else { |