'.
-&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
- ' '.
- ''.
+ '';
+ my $rec_button = &mt('Move to Inbox');
+ my $reprec_button = &mt('Move to Inbox/Compose reply');
+ if ($content{'sendback'}) {
+ $rec_button = &mt('Confirm Receipt');
+ $reprec_button = &mt('Confirm Receipt and Reply');
+ $result .= &mt('You have to confirm that you have received this message before you can view other pages. After confirmation, this message will be moved to your regular inbox');
+ } else {
+ $result .= &mt('Click one of the buttons below to move the message to your inbox').' '.&mt('Access to other pages will be prevented until you have done this.');
+ }
+ $result .= ' '.
+ ''.
'';
+ 'value="'.$reprec_button.'" />';
}
# Check to see if there were any messages.
if ($result eq '') {
@@ -2182,12 +2190,16 @@ sub retrieve_cc_recips {
($ccdom eq $env{'user.domain'}))) {
my $showcc ='';
if ($context eq 'replying') {
- $showcc = '';
- push (@ccs,$showcc);
+ $ccdom),$ccname,$ccdom);
+ if ($context eq 'replying') {
+ $showcc .='';
+ }
+ $showcc .= '';
+ push(@ccs,$showcc);
}
}
}
@@ -2632,16 +2644,18 @@ sub handler {
&printheader($r,'','Confirmed Receipt');
my $replying = 0;
foreach my $envkey (keys(%env)) {
- if ($envkey=~/^form\.rec\_(.*)$/) {
- $r->print(''.&mt('Confirming Receipt').': '.
- &Apache::lonmsg::user_crit_received($1).' ');
- }
- if ($envkey=~/^form\.reprec\_(.*)$/) {
- my $msgid=$1;
- $r->print(''.&mt('Confirming Receipt').': '.
- &Apache::lonmsg::user_crit_received($msgid).' ');
- &compout($r,'','','',$msgid);
- $replying = 1;
+ if ($envkey=~/^form\.(rep)?rec\_(.*)$/) {
+ my $msgid = $2;
+ $r->print(''.&mt('Confirming Receipt').': ');
+ my $result = &Apache::lonmsg::user_crit_received($msgid);
+ if ($result =~ /trans:\s+ok/) {
+ &statuschange($msgid,'read');
+ }
+ $r->print($result.' ');
+ if ($1 eq 'rep') {
+ &compout($r,'','','',$msgid);
+ $replying = 1;
+ }
}
}
if (!$replying) {