version 1.79, 2004/01/15 15:12:31
|
version 1.84, 2004/01/31 02:42:44
|
Line 274 sub author_res_msg {
|
Line 274 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 396 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 599 $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 1089 $content{'sendername'},$content{'senderd
|
Line 1086 $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 1215 $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 { |