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

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.4 and 1.6

version 1.4, 2006/04/22 17:10:07 version 1.6, 2006/04/23 03:00:34
Line 313  ENDDISHEADER Line 313  ENDDISHEADER
   
 sub discrit {  sub discrit {
     my $r=shift;      my $r=shift;
     my $header = '<h1><font color=red>'.&mt('Critical Messages').'</font></h1>'.      my $header = '<h1><font color="red">'.&mt('Critical Messages').'</font></h1>'.
         '<form action="/adm/email" method="POST">'.          '<form action="/adm/email" method="POST">'.
         '<input type="hidden" name="confirm" value="true" />';          '<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');      my %what=&Apache::lonnet::dump('critical');
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 1767  sub sendoffmail { Line 1778  sub sendoffmail {
  &printheader($r,'','No messages sent.');    &printheader($r,'','No messages sent.'); 
     }      }
     if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {      if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
  $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');   $r->print('<br /><span class="LC_success">'.&mt('Completed.').'</span>');
  if ($env{'form.displayedcrit'}) {   if ($env{'form.displayedcrit'}) {
     &discrit($r);      &discrit($r);
  } else {   } else {
     &Apache::loncommunicate::menu($r);      &Apache::loncommunicate::menu($r);
  }   }
     } else {      } else {
  $r->print(   $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
   '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.    &mt('Please use the browser "Back" button and correct the recipient addresses').'</p>');
   &mt('Please use the browser "Back" button and correct the recipient addresses')  
   );  
     }      }
 }  }
   
Removed from v.1.4  
changed lines
  Added in v.1.6

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