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

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.5 and 1.7

version 1.5, 2006/04/22 17:17:49 version 1.7, 2006/04/23 03:50:54
Line 624  ENDDISHEADER Line 624  ENDDISHEADER
       $r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');        $r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }      }
     $r->print("</tr>\n");      $r->print("</tr>\n");
   
       my $suffix = &Apache::lonmsg::foldersuffix($folder);
     for (my $n=$firstdis;$n<=$lastdis;$n++) {      for (my $n=$firstdis;$n<=$lastdis;$n++) {
  my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,$description)= @{$temp[$n]};   my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,$description)= @{$temp[$n]};
  if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {   if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
Line 636  ENDDISHEADER Line 638  ENDDISHEADER
     } else {      } else {
  $r->print('<tr class="LC_mail_other">');   $r->print('<tr class="LC_mail_other">');
     }      }
       my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
       if ($folder eq 'sent') {
    my $msg_id = &Apache::lonnet::unescape($origID);
    my %message=&Apache::lonnet::get('nohist_email'.$suffix,
    [$msg_id]);
    my %content=&Apache::lonmsg::unpackagemsg($message{$msg_id});
    $dis_name   = join('<br />',@{$content{'recuser'}});
    $dis_domain = join('<br />',@{$content{'recdomain'}});
       }
     $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs.       $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
       '">'.&mt('Open').'</a></td><td>'.        '">'.&mt('Open').'</a></td><td>'.
       ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.        ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
       '">'.&mt('Delete'):'&nbsp').'</a></td>'.        '">'.&mt('Delete'):'&nbsp').'</a></td>'.
       '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.        '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
       $fromname.'</td><td>'.$fromdomain.'</td><td>'.        $dis_name.'</td><td>'.$dis_domain.'</td><td>'.
       &Apache::lonnet::unescape($shortsubj).'</td><td>'.        &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $description.'</td><td>'.$status.'</td></tr>'."\n");                        $description.'</td><td>'.$status.'</td></tr>'."\n");
  } elsif ($status eq 'deleted') {   } elsif ($status eq 'deleted') {
Line 1665  sub sendoffmail { Line 1676  sub sendoffmail {
         my $savemsg;          my $savemsg;
         my $msgtype;          my $msgtype;
         my %sentmessage;          my %sentmessage;
         my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'});          my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'},
    undef,1);
         if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&          if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
             (&Apache::lonnet::allowed('srm',$env{'request.course.id'})              (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
      || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.       || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
Removed from v.1.5  
changed lines
  Added in v.1.7

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