Diff for /loncom/interface/loncommunicate.pm between versions 1.23 and 1.24

version 1.23, 2004/09/10 06:38:24 version 1.24, 2004/11/09 16:29:32
Line 45  sub menu { Line 45  sub menu {
 'dmu' => 'Distribute Messages from Uploaded File to Course',  'dmu' => 'Distribute Messages from Uploaded File to Course',
 'unr' =>   'unr' => 
      'User Notes, Records of Face-to-Face Discussions, and Critical Messages',       'User Notes, Records of Face-to-Face Discussions, and Critical Messages',
 'nm' => 'New Messages',  
 'su' => 'Subject',  
 'da' => 'Date',  
 'us' => 'Username',  
 'op' => 'Open',  
 'do' => 'Domain',  
 'cbs' => 'Configure blocking of student communication during exams'   'cbs' => 'Configure blocking of student communication during exams' 
   
 );  );
Line 90  END Line 85  END
 END  END
     }      }
     $r->print('</table>');      $r->print('</table>');
     my @msgids = sort split(/\&/,&Apache::lonnet::reply  
                             ('keys:'.$ENV{'user.domain'}.':'.  
                              $ENV{'user.name'}.':nohist_email',  
                              $ENV{'user.home'}));  
     my @newmsgs;  
     my %setters = ();  
     my $startblock = 0;  
     my $endblock = 0;  
     my %blocked = ();  
     my $numblocked = 0;  
     # Check for blocking of display because of scheduled online exams.  
     &Apache::lonmsg::blockcheck(\%setters,\$startblock,\$endblock);  
     foreach (@msgids) {  
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=  
     &Apache::lonmsg::unpackmsgid($_);  
         if (defined($sendtime) && $sendtime!~/error/) {  
             my $numsendtime = $sendtime;  
             $sendtime = &Apache::lonlocal::locallocaltime($sendtime);  
             if ($status eq 'new') {  
                 if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {  
                     $blocked{$_} = 'ON';  
                     $numblocked ++;  
                 } else {  
                     push @newmsgs, {   
                         msgid    => $_,  
                         sendtime => $sendtime,  
                         shortsub => &Apache::lonnet::unescape($shortsubj),  
                         from     => $fromname,  
                         fromdom  => $fromdom   
                         }  
                 }  
             }  
         }  
     }  
     if ($#newmsgs >= 0) {  
         $r->print(<<TABLEHEAD);  
 <h2>$lt{'nm'}</h2>  
 <table border=2><tr><th>&nbsp</th>  
 <th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>  
 TABLEHEAD  
         foreach my $msg (@newmsgs) {  
             $r->print(<<"ENDLINK");  
 <tr bgcolor="#FFBB77">  
 <td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>  
 ENDLINK  
             foreach ('sendtime','from','fromdom','shortsub') {  
                 $r->print("<td>$msg->{$_}</td>");  
             }  
             $r->print("</td></tr>");  
         }  
         $r->print('</table></body></html>');  
     } elsif ($numblocked == 0) {  
         $r->print("<h3>".&mt('You have no unread messages')."</h3>");  
     }  
     if ($numblocked > 0) {  
         my $beginblock = &Apache::lonlocal::locallocaltime($startblock);  
         my $finishblock = &Apache::lonlocal::locallocaltime($endblock);  
         if ($numblocked == 1) {  
             $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");  
             $r->print(&mt('This message is not viewable because').' ');  
         } else {  
             $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");  
             $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));  
         }  
         $r->print(  
 &mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');  
         &Apache::lonmsg::build_block_table($r,$startblock,$endblock,\%setters);  
     }  
 }  }
   
 sub handler {  sub handler {
Line 185  END Line 112  END
 # ---------------------------------------------------------------------- Header  # ---------------------------------------------------------------------- Header
     &Apache::lonmsg::header($r);      &Apache::lonmsg::header($r);
     &menu($r);      &menu($r);
       &Apache::lonmsg::disnew($r);
     return OK;      return OK;
 }  }
   

Removed from v.1.23  
changed lines
  Added in v.1.24


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