Diff for /loncom/interface/lonmsg.pm between versions 1.73 and 1.87

version 1.73, 2003/12/30 14:57:49 version 1.87, 2004/03/01 01:19:51
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 #  
 # (Routines to control the menu  
 #  
 # (TeX Conversion Module  
 #  
 # 05/29/00,05/30 Gerd Kortemeyer)  
 #  
 # 10/05 Gerd Kortemeyer)  
 #  
 # 10/19,10/20,10/30,  
 # 02/06/01 Gerd Kortemeyer  
 # 07/27 Guy Albertelli  
 # 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  
 # YEAR=2002  
 # 1/1,3/18 Gerd Kortemeyer  
 #  
 package Apache::lonmsg;  package Apache::lonmsg;
   
 =pod  =pod
Line 154  sub packagemsg { Line 139  sub packagemsg {
            '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.             '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.
    '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.     '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.
    '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.     '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.
      '<coursesec>'.$ENV{'request.course.sec'}.'</coursesec>'.
    '<role>'.$ENV{'request.role'}.'</role>'.     '<role>'.$ENV{'request.role'}.'</role>'.
    '<resource>'.$ENV{'request.filename'}.'</resource>'.     '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.             '<msgid>'.$msgid.'</msgid>'.
Line 287  sub author_res_msg { Line 273  sub author_res_msg {
 # =========================================== Retrieve author resource messages  # =========================================== Retrieve author resource messages
   
 sub retrieve_author_res_msg {  sub retrieve_author_res_msg {
     my ($author,$domain,$url)=@_;      my $url=shift;
     $url=&Apache::lonnet::declutter($url);      $url=&Apache::lonnet::declutter($url);
     my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);      my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
       my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author);
     my $msgs='';      my $msgs='';
     foreach (keys %errormsgs) {      foreach (keys %errormsgs) {
  if ($_=~/^\Q$url\E\_\d+$/) {   if ($_=~/^\Q$url\E\_\d+$/) {
     my %content=&unpackagemsg($errormsgs{$_});      my %content=&unpackagemsg($errormsgs{$_});
     $msgs.='<b>'.$content{'time'}.'</b>: '.$content{'message'}.      $msgs.='<p><img src="/adm/lonMisc/bomb.gif" /><b>'.
       '<br />';   $content{'time'}.'</b>: '.$content{'message'}.
    '<br /></p>';
  }   }
     }       } 
     return $msgs;           return $msgs;     
Line 305  sub retrieve_author_res_msg { Line 293  sub retrieve_author_res_msg {
 # =============================== Delete all author messages related to one URL  # =============================== Delete all author messages related to one URL
   
 sub del_url_author_res_msg {  sub del_url_author_res_msg {
     my ($author,$domain,$url)=@_;      my $url=shift;
     $url=&Apache::lonnet::declutter($url);      $url=&Apache::lonnet::declutter($url);
       my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
       my @delmsgs=();
       foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
    if ($_=~/^\Q$url\E\_\d+$/) {
       push (@delmsgs,$_);
    }
       }
       return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
 }  }
   
 # ================= Return hash with URLs for which there is a resource message  # ================= Return hash with URLs for which there is a resource message
   
 sub all_url_author_res_msg {  sub all_url_author_res_msg {
     my ($author,$domain)=@_;      my ($author,$domain)=@_;
       my %returnhash=();
       foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
    $_=~/^(.+)\_\d+/;
    $returnhash{$1}=1;
       }
       return %returnhash;
 }  }
   
 # ================================================== Critical message to a user  # ================================================== Critical message to a user
Line 395  sub user_crit_received { Line 397  sub user_crit_received {
     my %contents=&unpackagemsg($message{$msgid},1);      my %contents=&unpackagemsg($message{$msgid},1);
     my $status='rec: '.($contents{'sendback'}?      my $status='rec: '.($contents{'sendback'}?
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},       &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},                       &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
                      &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.                       &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
                      ' acknowledged receipt of message'."\n".'   "'.                       ' acknowledged receipt of message'."\n".'   "'.
                      $contents{'subject'}.'"'."\n".&mt('dated').' '.                       $contents{'subject'}.'"'."\n".&mt('dated').' '.
Line 598  $content{'sendername'}.'@'. Line 600  $content{'sendername'}.'@'.
             '<br>'.&mt('Subject').': '.$content{'subject'}.              '<br>'.&mt('Subject').': '.$content{'subject'}.
             '<br><blockquote>'.              '<br><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).                &Apache::lontexconvert::msgtexconverted($content{'message'}).
             '</blockquote>'.              '</blockquote><small>'.
   &mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
               '</small><br />'.
             '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.              '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
             '<input type=submit name="reprec_'.$_.'" '.              '<input type=submit name="reprec_'.$_.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'">';                    'value="'.&mt('Confirm Receipt and Reply').'">';
Line 864  ENDCOMP Line 868  ENDCOMP
     } else { # $broadcast is 'upload'      } else { # $broadcast is 'upload'
  $r->print(<<ENDUPLOAD);   $r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>  <input type=hidden name=sendmode value=upload>
   <input type="hidden" name="send" value="on" />
 <h3>Generate messages from a file</h3>  <h3>Generate messages from a file</h3>
 <p>  <p>
 Subject: <input type=text size=50 name=subject>  Subject: <input type=text size=50 name=subject>
Line 1005  sub handler { Line 1010  sub handler {
     my $r=shift;      my $r=shift;
   
 # ----------------------------------------------------------- Set document type  # ----------------------------------------------------------- Set document type
       
   &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;      $r->send_http_header;
       
   return OK if $r->header_only;      return OK if $r->header_only;
       
 # --------------------------- Get query string for limited number of parameters  # --------------------------- Get query string for limited number of parameters
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',          ['display','replyto','forward','markread','markdel','markunread',
Line 1018  sub handler { Line 1023  sub handler {
          'recordftf','sortedby']);           'recordftf','sortedby']);
     $sqs='&sortedby='.$ENV{'form.sortedby'};      $sqs='&sortedby='.$ENV{'form.sortedby'};
 # ------------------------------------------------------ They checked for email  # ------------------------------------------------------ They checked for email
   &Apache::lonnet::put('email_status',{'recnewemail'=>0});      &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
   if (!$ENV{'form.display'}) {      if (!$ENV{'form.display'}) {
       $r->print('<html><head><title>EMail and Messaging</title>'.   $r->print('<html><head><title>EMail and Messaging</title>'.
  &Apache::loncommon::studentbrowser_javascript().'</head>'.    &Apache::loncommon::studentbrowser_javascript().'</head>'.
  &Apache::loncommon::bodytag('EMail and Messages'));    &Apache::loncommon::bodytag('EMail and Messages').
   }    &Apache::loncommon::help_open_faq(12).
   if ($ENV{'form.display'}) {    &Apache::loncommon::help_open_bug('Communication Tools'));
       my $msgid=$ENV{'form.display'};      }
       &statuschange($msgid,'read');      if ($ENV{'form.display'}) {
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);   my $msgid=$ENV{'form.display'};
       my %content=&unpackagemsg($message{$msgid});   &statuschange($msgid,'read');
    my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
    my %content=&unpackagemsg($message{$msgid});
 # info to generate "next" and "previous" buttons  # info to generate "next" and "previous" buttons
       my @messages=&sortedmessages();   my @messages=&sortedmessages();
       my $counter=0;   my $counter=0;
       $r->print('<pre>');   $r->print('<pre>');
       my $escmsgid=&Apache::lonnet::escape($msgid);   my $escmsgid=&Apache::lonnet::escape($msgid);
       foreach (@messages) {   foreach (@messages) {
    if ($_->[5] eq $escmsgid){      if ($_->[5] eq $escmsgid){
        last;   last;
    }      }
    $counter++;      $counter++;
       }   }
       $r->print('</pre>');   $r->print('</pre>');
       my $number_of_messages = scalar(@messages); #subtract 1 for last index   my $number_of_messages = scalar(@messages); #subtract 1 for last index
 # start output  # start output
       $r->print('<html><head><title>EMail and Messaging</title>');   $r->print('<html><head><title>EMail and Messaging</title>');
       if (defined($content{'baseurl'})) {   if (defined($content{'baseurl'})) {
   $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");      $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");
       }   }
       $r->print(&Apache::loncommon::studentbrowser_javascript().   $r->print(&Apache::loncommon::studentbrowser_javascript().
  '</head>'.    '</head>'.
  &Apache::loncommon::bodytag('EMail and Messages'));    &Apache::loncommon::bodytag('EMail and Messages').
       $r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.    &Apache::loncommon::help_open_faq(12).
              '<br><b>'.&mt('From').':</b> '.    &Apache::loncommon::help_open_bug('Communication Tools'));
 &Apache::loncommon::aboutmewrapper(   my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),  
 $content{'sendername'},$content{'senderdomain'}).' ('.   $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
                                  $content{'sendername'}.' at '.    '<br /><b>'.&mt('From').':</b> '.
                                  $content{'senderdomain'}.') '.    &Apache::loncommon::aboutmewrapper(
              '<br><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.       &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
              '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.       $content{'sendername'},$content{'senderdomain'}).' ('.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.    $content{'sendername'}.' at '.
              '"><b>'.&mt('Reply').'</b></a></td>'.    $content{'senderdomain'}.') '.
            '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.    ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
              '"><b>'.&mt('Forward').'</b></a></td>'.     ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
         '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.    '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
              '"><b>'.&mt('Mark Unread').'</b></a></td>'.    '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
         '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.    '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
              '"><b>Delete</b></a></td>'.    '"><b>'.&mt('Reply').'</b></a></td>'.
  '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.    '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
  '"><b>'.&mt('Display all Messages').'</b></a></td>');    '"><b>'.&mt('Forward').'</b></a></td>'.
       if ($counter > 0){    '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
    $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.    '"><b>'.&mt('Mark Unread').'</b></a></td>'.
            '"><b>'.&mt('Previous').'</b></a></td>');    '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
        }    '"><b>Delete</b></a></td>'.
        if ($counter < $number_of_messages - 1){    '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
    $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.    '"><b>'.&mt('Display all Messages').'</b></a></td>');
            '"><b>'.&mt('Next').'</b></a></td>');   if ($counter > 0){
        }      $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
        $r->print('</tr></table><p><pre>'.        '"><b>'.&mt('Previous').'</b></a></td>');
              &Apache::lontexconvert::msgtexconverted($content{'message'}).   }
              '</pre><hr>'.$content{'citation'});   if ($counter < $number_of_messages - 1){
   } elsif ($ENV{'form.replyto'}) {      $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
       &comprep($r,$ENV{'form.replyto'});        '"><b>'.&mt('Next').'</b></a></td>');
   } elsif ($ENV{'form.sendreply'}) {   }
       if ($ENV{'form.send'}) {   $r->print('</tr></table><p><pre>'.
   my $msgid=$ENV{'form.sendreply'};    &Apache::lontexconvert::msgtexconverted($content{'message'},1).
   my %message=&Apache::lonnet::get('nohist_email',[$msgid]);    '</pre><hr>'.$content{'citation'});
   my %content=&unpackagemsg($message{$msgid},1);      } elsif ($ENV{'form.replyto'}) {
   &statuschange($msgid,'replied');   &comprep($r,$ENV{'form.replyto'});
   if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&       } elsif ($ENV{'form.sendreply'}) {
       (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {   if ($ENV{'form.send'}) {
       $r->print(&mt('Sending critical message').': '.      my $msgid=$ENV{'form.sendreply'};
  &user_crit_msg($content{'sendername'},      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
        $content{'senderdomain'},      my %content=&unpackagemsg($message{$msgid},1);
        &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),      &statuschange($msgid,'replied');
        &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),      if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
        $ENV{'form.sendbck'}));   (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
   } else {   $r->print(&mt('Sending critical message').': '.
       $r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'},    &user_crit_msg($content{'sendername'},
      $content{'senderdomain'},   $content{'senderdomain'},
      &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),   &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
      &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));   &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
   }   $ENV{'form.sendbck'}));
       }      } else {
       if ($ENV{'form.displayedcrit'}) {   $r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'},
           &discrit($r);         $content{'senderdomain'},
       } else {         &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
   &disall($r);         &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
       }      }
   } elsif ($ENV{'form.confirm'}) {   }
       foreach (keys %ENV) {   if ($ENV{'form.displayedcrit'}) {
           if ($_=~/^form\.rec\_(.*)$/) {      &discrit($r);
       $r->print('<b>Confirming Receipt:</b> '.   } else {
                         &user_crit_received($1).'<br>');      &disall($r);
           }   }
           if ($_=~/^form\.reprec\_(.*)$/) {      } elsif ($ENV{'form.confirm'}) {
               my $msgid=$1;   foreach (keys %ENV) {
       $r->print('<b>Confirming Receipt:</b> '.      if ($_=~/^form\.rec\_(.*)$/) {
                         &user_crit_received($msgid).'<br>');   $r->print('<b>Confirming Receipt:</b> '.
               &comprep($r,$msgid);    &user_crit_received($1).'<br>');
           }      }
       }      if ($_=~/^form\.reprec\_(.*)$/) {
       &discrit($r);   my $msgid=$1;
   } elsif ($ENV{'form.critical'}) {   $r->print('<b>Confirming Receipt:</b> '.
       &discrit($r);    &user_crit_received($msgid).'<br>');
   } elsif ($ENV{'form.forward'}) {   &comprep($r,$msgid);
       &compout($r,$ENV{'form.forward'});      }
   } elsif ($ENV{'form.markread'}) {   }
   } elsif ($ENV{'form.markdel'}) {   &discrit($r);
       &statuschange($ENV{'form.markdel'},'deleted');      } elsif ($ENV{'form.critical'}) {
       &disall($r);   &discrit($r);
   } elsif ($ENV{'form.markeddel'}) {      } elsif ($ENV{'form.forward'}) {
       my $total=0;   &compout($r,$ENV{'form.forward'});
       foreach (keys %ENV) {      } elsif ($ENV{'form.markread'}) {
           if ($_=~/^form\.delmark_(.*)$/) {      } elsif ($ENV{'form.markdel'}) {
       &statuschange(&Apache::lonnet::unescape($1),'deleted');   &statuschange($ENV{'form.markdel'},'deleted');
               $total++;   &disall($r);
           }      } elsif ($ENV{'form.markeddel'}) {
       }   my $total=0;
       $r->print('Deleted '.$total.' message(s)<p>');   foreach (keys %ENV) {
       &disall($r);      if ($_=~/^form\.delmark_(.*)$/) {
   } elsif ($ENV{'form.markunread'}) {   &statuschange(&Apache::lonnet::unescape($1),'deleted');
       &statuschange($ENV{'form.markunread'},'new');   $total++;
       &disall($r);      }
   } elsif ($ENV{'form.compose'}) {   }
       &compout($r,'',$ENV{'form.compose'});   $r->print('Deleted '.$total.' message(s)<p>');
   } elsif ($ENV{'form.recordftf'}) {   &disall($r);
       &facetoface($r,$ENV{'form.recordftf'});      } elsif ($ENV{'form.markunread'}) {
   } elsif ($ENV{'form.sendmail'}) {   &statuschange($ENV{'form.markunread'},'new');
       my $sendstatus='';   &disall($r);
       if ($ENV{'form.send'}) {      } elsif ($ENV{'form.compose'}) {
   my %content=();   &compout($r,'',$ENV{'form.compose'});
   undef %content;      } elsif ($ENV{'form.recordftf'}) {
   if ($ENV{'form.forwid'}) {   &facetoface($r,$ENV{'form.recordftf'});
       my $msgid=$ENV{'form.forwid'};      } elsif ($ENV{'form.sendmail'}) {
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);   my $sendstatus='';
       %content=&unpackagemsg($message{$msgid},1);   if ($ENV{'form.send'}) {
       &statuschange($msgid,'forwarded');      my %content=();
       $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".      undef %content;
   $content{'message'};      if ($ENV{'form.forwid'}) {
   }   my $msgid=$ENV{'form.forwid'};
   my %toaddr=();   my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
   undef %toaddr;   %content=&unpackagemsg($message{$msgid},1);
   if ($ENV{'form.sendmode'} eq 'group') {   &statuschange($msgid,'forwarded');
       foreach (keys %ENV) {   $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
   if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {      $content{'message'};
       $toaddr{$1}='';      }
   }      my %toaddr=();
       }      undef %toaddr;
   } elsif ($ENV{'form.sendmode'} eq 'upload') {      if ($ENV{'form.sendmode'} eq 'group') {
       foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {   foreach (keys %ENV) {
   my ($rec,$txt)=split(/\s*\:\s*/,$_);      if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
   if ($txt) {   $toaddr{$1}='';
       $rec=~s/\@/\:/;      }
       $toaddr{$rec}.=$txt."\n";   }
   }      } elsif ($ENV{'form.sendmode'} eq 'upload') {
       }   foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
   } else {      my ($rec,$txt)=split(/\s*\:\s*/,$_);
       $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';      if ($txt) {
   }   $rec=~s/\@/\:/;
   if ($ENV{'form.additionalrec'}) {   $toaddr{$rec}.=$txt."\n";
       foreach (split(/\,/,$ENV{'form.additionalrec'})) {      }
   my ($auname,$audom)=split(/\@/,$_);   }
   $toaddr{$auname.':'.$audom}='';      } else {
       }   $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
   }      }
   foreach (keys %toaddr) {      if ($ENV{'form.additionalrec'}) {
       my ($recuname,$recdomain)=split(/\:/,$_);   foreach (split(/\,/,$ENV{'form.additionalrec'})) {
       my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});      my ($auname,$audom)=split(/\@/,$_);
       if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }          $toaddr{$auname.':'.$audom}='';
       if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&    }
   (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {      }
   $r->print(&mt('Sending critical message').' ...');      foreach (keys %toaddr) {
                   $sendstatus.=' '.&user_crit_msg($recuname,$recdomain,   my ($recuname,$recdomain)=split(/\:/,$_);
    &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),   my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
    $msgtxt,   if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
    $ENV{'form.sendbck'});   if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
       } else {      (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
   $r->print(&mt('Sending').' ...');      $r->print(&mt('Sending critical message').' ...');
                   $sendstatus.=' '.&user_normal_msg($recuname,$recdomain,      $sendstatus.=' '.&user_crit_msg($recuname,$recdomain,
                          &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),      &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
  $msgtxt,      $msgtxt,
  $content{'citation'});      $ENV{'form.sendbck'});
       }   } else {
       $r->print('<br />');      $r->print(&mt('Sending').' ...');
   }      $sendstatus.=' '.&user_normal_msg($recuname,$recdomain,
       }        &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
       if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {        $msgtxt,
   if ($ENV{'form.displayedcrit'}) {        $content{'citation'});
       &discrit($r);   }
   } else {   $r->print('<br />');
       &disall($r);      }
   }   }
       } else {   if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
   $r->print(      $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
   '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.      if ($ENV{'form.displayedcrit'}) {
   &mt('Please use the browser "Back" button and correct the recipient addresses')   &discrit($r);
     );      } else {
       }   &disall($r);
   } else {      }
       &disall($r);   } else {
   }      $r->print(
   $r->print('</body></html>');        '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
   return OK;        &mt('Please use the browser "Back" button and correct the recipient addresses')
         );
    }
       } else {
    &disall($r);
       }
       $r->print('</body></html>');
       return OK;
 }  }
 # ================================================= Main program, reset counter  # ================================================= Main program, reset counter
   

Removed from v.1.73  
changed lines
  Added in v.1.87


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