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

Diff for /loncom/interface/lonmsg.pm between versions 1.106 and 1.107

version 1.106, 2004/09/10 06:38:24 version 1.107, 2004/09/10 08:42:21
Line 552  sub makefolder { Line 552  sub makefolder {
   
 sub movemsg {  sub movemsg {
     my ($msgid,$srcfolder,$trgfolder)=@_;      my ($msgid,$srcfolder,$trgfolder)=@_;
       my $unmsgid=&Apache::lonnet::unescape($msgid);
     my $srcsuffix=&foldersuffix($srcfolder);      my $srcsuffix=&foldersuffix($srcfolder);
     my $trgsuffix=&foldersuffix($trgfolder);      my $trgsuffix=&foldersuffix($trgfolder);
     my $srcstatus=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);  
     my $trgstatus=$srcstatus;  # Copy message
     if ($trgstatus eq 'deleted') { $trgstatus='read'; }      my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]);
     &Apache::lonnet::put(      &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}});
      'nohist_email'.$trgsuffix,{$msgid =>   
      &Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid])});  # Copy status
     &statuschange($msgid,$trgstatus,$trgfolder);      my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]);
       &Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}});
   # See if was deleted -> becomes "read" in trash
       my $currentstatus=(&unpackmsgid($status{$unmsgid}));
       if ($currentstatus eq 'deleted') {
    &statuschange($msgid,'read',$trgfolder);
       }
   # Delete orginals
     &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);      &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
     &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]);      &Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]);
 }  }
   
 # ======================================================= Display a course list  # ======================================================= Display a course list
Line 1538  sub displaymessage { Line 1546  sub displaymessage {
     my $numblocked = 0;      my $numblocked = 0;
 # info to generate "next" and "previous" buttons and check if message is blocked  # info to generate "next" and "previous" buttons and check if message is blocked
     &blockcheck(\%setters,\$startblock,\$endblock);      &blockcheck(\%setters,\$startblock,\$endblock);
     my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked);      my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
     if ( $blocked{$msgid} eq 'ON' ) {      if ( $blocked{$msgid} eq 'ON' ) {
         &printheader($r,'/adm/email',&mt('Display a Message'));          &printheader($r,'/adm/email',&mt('Display a Message'));
         $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));          $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
         &build_block_table($r,$startblock,$endblock,\%setters);          &build_block_table($r,$startblock,$endblock,\%setters);
         return;          return;
     }      }
     &statuschange($msgid,'read');      &statuschange($msgid,'read',$folder);
     my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);      my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
     my %content=&unpackagemsg($message{$msgid});      my %content=&unpackagemsg($message{$msgid});
   
     my $counter=0;      my $counter=0;
     $r->print('<pre>');      $r->print('<pre>');
     my $escmsgid=&Apache::lonnet::escape($msgid);      my $escmsgid=&Apache::lonnet::escape($msgid);
Line 1573  sub displaymessage { Line 1582  sub displaymessage {
       '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.        '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
       '"><b>Delete</b></a></td>'.        '"><b>Delete</b></a></td>'.
       '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.        '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
         '&folder='.&Apache::lonnet::escape($folder).
       '"><b>'.&mt('Display all Messages').'</b></a></td>');        '"><b>'.&mt('Display all Messages').'</b></a></td>');
     if ($counter > 0){      if ($counter > 0){
  $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.   $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
Removed from v.1.106  
changed lines
  Added in v.1.107

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