[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.73 and 1.76

version 1.73, 2007/05/02 19:56:34 version 1.76, 2007/05/03 16:55:08
Line 737  $content{'sendername'}.':'. Line 737  $content{'sendername'}.':'.
             '<br />'.&mt('Subject').': '.$content{'subject'}.              '<br />'.&mt('Subject').': '.$content{'subject'}.
             '<br /><pre>'.              '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).                &Apache::lontexconvert::msgtexconverted($content{'message'}).
             '</pre><small>'.              '</pre><small>';
 &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');
             '</small><br />'.          my $reprec_button = &mt('Move to Inbox/Compose reply');
             '<input type="submit" name="rec_'.$key.'" value="'.&mt('Confirm Receipt').'" />'.          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 .= '</small><br />'.
               '<input type="submit" name="rec_'.$key.'" value="'.$rec_button.'" />'.
             '<input type="submit" name="reprec_'.$key.'" '.              '<input type="submit" name="reprec_'.$key.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'" />';                    'value="'.$reprec_button.'" />';
     }      }
     # Check to see if there were any messages.      # Check to see if there were any messages.
     if ($result eq '') {      if ($result eq '') {
Line 2182  sub retrieve_cc_recips { Line 2190  sub retrieve_cc_recips {
                      ($ccdom eq $env{'user.domain'}))) {                       ($ccdom eq $env{'user.domain'}))) {
                     my $showcc ='<span class="LC_nobreak">';                      my $showcc ='<span class="LC_nobreak">';
                     if ($context eq 'replying') {                       if ($context eq 'replying') { 
                         $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'">';                          $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'" />';
                     }                      }
                     $showcc .= &Apache::loncommon::aboutmewrapper(                      $showcc .= &Apache::loncommon::aboutmewrapper(
                                        &Apache::loncommon::plainname($ccname,                                         &Apache::loncommon::plainname($ccname,
                                          $ccdom),$ccname,$ccdom).'</label></span>';                                           $ccdom),$ccname,$ccdom);
                     push (@ccs,$showcc);      if ($context eq 'replying') {
    $showcc .='</label>';
       }
       $showcc .= '</span>';
       push(@ccs,$showcc);
                 }                  }
             }              }
         }          }
Line 2632  sub handler { Line 2644  sub handler {
  &printheader($r,'','Confirmed Receipt');   &printheader($r,'','Confirmed Receipt');
  my $replying = 0;   my $replying = 0;
  foreach my $envkey (keys(%env)) {   foreach my $envkey (keys(%env)) {
     if ($envkey=~/^form\.rec\_(.*)$/) {      if ($envkey=~/^form\.(rep)?rec\_(.*)$/) {
  $r->print('<b>'.&mt('Confirming Receipt').':</b> '.          my $msgid = $2;
   &Apache::lonmsg::user_crit_received($1).'<br>');   $r->print('<b>'.&mt('Confirming Receipt').':</b> ');
     }   my $result = &Apache::lonmsg::user_crit_received($msgid);
     if ($envkey=~/^form\.reprec\_(.*)$/) {                  if ($result =~ /trans:\s+ok/) {
  my $msgid=$1;                      &statuschange($msgid,'read');
  $r->print('<b>'.&mt('Confirming Receipt').':</b> '.                  }
   &Apache::lonmsg::user_crit_received($msgid).'<br>');                  $r->print($result.'<br />');
  &compout($r,'','','',$msgid);                  if ($1 eq 'rep') {
  $replying = 1;      &compout($r,'','','',$msgid);
       $replying = 1;
                   }
     }      }
  }   }
  if (!$replying) {   if (!$replying) {
Removed from v.1.73  
changed lines
  Added in v.1.76

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>