Diff for /loncom/interface/lonmsg.pm between versions 1.25 and 1.27

version 1.25, 2001/11/05 21:01:54 version 1.27, 2002/01/01 18:38:51
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 #  
 # Routines for messaging  # Routines for messaging
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   #
 # (Routines to control the menu  # (Routines to control the menu
 #  #
 # (TeX Conversion Module  # (TeX Conversion Module
Line 15 Line 39
 # 07/27 Guy Albertelli  # 07/27 Guy Albertelli
 # 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,  # 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,
 # 10/1,11/5 Gerd Kortemeyer  # 10/1,11/5 Gerd Kortemeyer
   # YEAR=2002
   # 1/1 Gerd Kortemeyer
   #
 package Apache::lonmsg;  package Apache::lonmsg;
   
 use strict;  use strict;
Line 38  sub packagemsg { Line 64  sub packagemsg {
     $msgcount++;      $msgcount++;
     my $partsubj=$subject;      my $partsubj=$subject;
     $partsubj=&Apache::lonnet::escape($partsubj);      $partsubj=&Apache::lonnet::escape($partsubj);
     $partsubj=substr($partsubj,0,50);  
     my $msgid=&Apache::lonnet::escape(      my $msgid=&Apache::lonnet::escape(
            $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.             $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
            $ENV{'user.domain'}.':'.$msgcount.':'.$$);             $ENV{'user.domain'}.':'.$msgcount.':'.$$);
Line 334  sub disall { Line 359  sub disall {
      '<h1>Display All Messages</h1><form method=post action="/adm/email">'.       '<h1>Display All Messages</h1><form method=post action="/adm/email">'.
      '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.       '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.
      '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');       '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
     map {      foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'.
    $ENV{'user.domain'}.':'.
                                           $ENV{'user.name'}.':nohist_email',
                                           $ENV{'user.home'}))) {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=          my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
     &Apache::lonmsg::unpackmsgid($_);      &Apache::lonmsg::unpackmsgid($_);
        unless ($status eq 'deleted') {         unless ($status eq 'deleted') {
Line 355  sub disall { Line 383  sub disall {
       &Apache::lonnet::unescape($shortsubj).'</td><td>'.        &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $status.'</td></tr>');                        $status.'</td></tr>');
        }         }
     } sort split(/\&/,&Apache::lonnet::reply('keys:'.      }
  $ENV{'user.domain'}.':'.  
                                         $ENV{'user.name'}.':nohist_email',  
                                         $ENV{'user.home'}));  
     $r->print('</table><p>'.      $r->print('</table><p>'.
               '<input type=submit name="markeddel" value="Delete Checked">'.                '<input type=submit name="markeddel" value="Delete Checked">'.
               '</form></body></html>');                '</form></body></html>');
Line 627  sub handler { Line 652  sub handler {
 }  }
 # ================================================= Main program, reset counter  # ================================================= Main program, reset counter
   
 sub BEGIN {  BEGIN {
     $msgcount=0;      $msgcount=0;
 }  }
   

Removed from v.1.25  
changed lines
  Added in v.1.27


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