Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.35 and 1.36

version 1.35, 2006/06/29 13:52:19 version 1.36, 2006/06/30 02:05:22
Line 883  ENDUPLOAD Line 883  ENDUPLOAD
        my $studentsel = &discourse();         my $studentsel = &discourse();
        $r->print($studentsel);         $r->print($studentsel);
     }      }
       if ($env{'form.displayedcrit'}) {
    $r->print('<input type="hidden" name="displayedcrit" value="true" />');
       }
     $r->print('</form>'.      $r->print('</form>'.
       &Apache::lonfeedback::generate_preview_button('compemail','message').        &Apache::lonfeedback::generate_preview_button('compemail','message').
       &Apache::lonhtmlcommon::htmlareaselectactive('message'));        &Apache::lonhtmlcommon::htmlareaselectactive('message'));
Line 1896  sub handler { Line 1899  sub handler {
  &compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);   &compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
     } elsif ($env{'form.confirm'}) {      } elsif ($env{'form.confirm'}) {
  &printheader($r,'','Confirmed Receipt');   &printheader($r,'','Confirmed Receipt');
    my $replying = 0;
  foreach (keys %env) {   foreach (keys %env) {
     if ($_=~/^form\.rec\_(.*)$/) {      if ($_=~/^form\.rec\_(.*)$/) {
  $r->print('<b>'.&mt('Confirming Receipt').':</b> '.   $r->print('<b>'.&mt('Confirming Receipt').':</b> '.
Line 1906  sub handler { Line 1910  sub handler {
  $r->print('<b>'.&mt('Confirming Receipt').':</b> '.   $r->print('<b>'.&mt('Confirming Receipt').':</b> '.
   &Apache::lonmsg::user_crit_received($msgid).'<br>');    &Apache::lonmsg::user_crit_received($msgid).'<br>');
  &compout($r,'','','',$msgid);   &compout($r,'','','',$msgid);
    $replying = 1;
     }      }
  }   }
  &discrit($r);   if (!$replying) {
       &discrit($r);
    }
     } elsif ($env{'form.critical'}) {      } elsif ($env{'form.critical'}) {
  &printheader($r,'','Displaying Critical Messages');   &printheader($r,'','Displaying Critical Messages');
  &discrit($r);   &discrit($r);
Line 2002  sub handler { Line 2009  sub handler {
       $env{'form.subject'},        $env{'form.subject'},
       $env{'form.message'},'/adm/communicate','public');        $env{'form.message'},'/adm/communicate','public');
  }   }
  &disall($r,($folder?$folder:$dismode));   if (!$env{'form.displayedcrit'}) {
       &disall($r,($folder?$folder:$dismode));
    }
     } elsif ($env{'form.newfolder'}) {      } elsif ($env{'form.newfolder'}) {
  &printheader($r,'','New Folder');   &printheader($r,'','New Folder');
  &makefolder($env{'form.newfolder'});   &makefolder($env{'form.newfolder'});

Removed from v.1.35  
changed lines
  Added in v.1.36


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