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

Diff for /loncom/interface/lonfeedback.pm between versions 1.163 and 1.168

version 1.163, 2005/05/20 17:04:30 version 1.168, 2005/09/20 07:52:03
Line 97  sub list_discussion { Line 97  sub list_discussion {
     $ressymb=&wrap_symb($ressymb);      $ressymb=&wrap_symb($ressymb);
     my $encsymb=&Apache::lonenc::check_encrypt($ressymb);      my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)      my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
   && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form)$/));    && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
           
     my %usernamesort = ();      my %usernamesort = ();
     my %namesort =();      my %namesort =();
Line 858  sub build_posting_display { Line 858  sub build_posting_display {
  $contrib{$idx.':sendername'}.' at '.   $contrib{$idx.':sendername'}.' at '.
  $contrib{$idx.':senderdomain'}.')';   $contrib{$idx.':senderdomain'}.')';
     if ($contrib{$idx.':anonymous'}) {      if ($contrib{$idx.':anonymous'}) {
         $sender.=' ['.&mt('anonymous').'] '.          $sender.=' <font color="red"><b>['.&mt('anonymous').']</b></font> '.
     $screenname;      $screenname;
     }      }
   
Line 1205  sub get_post_contents { Line 1205  sub get_post_contents {
         my ($timesent,$attachmsg);          my ($timesent,$attachmsg);
         my %currattach = ();          my %currattach = ();
         $timesent = &Apache::lonlocal::locallocaltime($postversions[$i]);          $timesent = &Apache::lonlocal::locallocaltime($postversions[$i]);
         $$messages{$i}=~s/\n/\<br \/\>/g;   &newline_to_br(\$messages->{$i});
         $$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i});          $$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i});
         $$subjects{$i}=~s/\n/\<br \/\>/g;          $$subjects{$i}=~s/\n/\<br \/\>/g;
         $$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i});          $$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i});
Line 1375  END Line 1375  END
                   &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);                    &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
                   $message = $msgversions{$numoldver};                    $message = $msgversions{$numoldver};
               }                }
       $message=~s/\n/\<br \/\>/g;        &newline_to_br(\$message);
       $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';        $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
               if ($idx > 0) {                if ($idx > 0) {
                   my %subversions = ();                    my %subversions = ();
Line 2259  sub screen_header { Line 2259  sub screen_header {
     my $msgoptions='';      my $msgoptions='';
     my $discussoptions='';      my $discussoptions='';
     unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {      unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
  if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {   if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
     $msgoptions=       $msgoptions= 
  '<p><label><input type="checkbox" name="author" /> '.   '<p><label><input type="checkbox" name="author" /> '.
  &mt('Feedback to resource author').'</label></p>';   &mt('Feedback to resource author').'</label></p>';
Line 2603  sub show_preview { Line 2603  sub show_preview {
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     my $message=&clear_out_html($env{'form.comment'});      my $message=&clear_out_html($env{'form.comment'});
     $message=~s/\n/\<br \/\>/g;      &newline_to_br(\$message);
     $message=&Apache::lonspeller::markeduptext($message);      $message=&Apache::lonspeller::markeduptext($message);
     $message=&Apache::lontexconvert::msgtexconverted($message);      $message=&Apache::lontexconvert::msgtexconverted($message);
     my $subject=&clear_out_html($env{'form.subject'});      my $subject=&clear_out_html($env{'form.subject'});
Line 2616  sub show_preview { Line 2616  sub show_preview {
       $message.'</td></tr></table></body></html>');        $message.'</td></tr></table></body></html>');
 }  }
   
   
   sub newline_to_br {
       my ($message)=@_;
       my $newmessage;
       my $parser=HTML::LCParser->new($message);
       while (my $token=$parser->get_token()) {
    if ($token->[0] eq 'T') {
       my $text=$token->[1];
       $text=~s/\n/\<br \/\>/g;
       $newmessage.=$text;
    } elsif ($token->[0] eq 'D' || $token->[0] eq 'C') {
       $newmessage.=$token->[1];
    } elsif ($token->[0] eq 'PI' || $token->[0] eq 'E') {
       $newmessage.=$token->[2];
    } elsif ($token->[0] eq 'S') {
       $newmessage.=$token->[4];
    }
       
       }
       $$message=$newmessage;
   }
   
 sub generate_preview_button {  sub generate_preview_button {
     my $pre=&mt("Show Preview and Check Spelling");      my $pre=&mt("Show Preview and Check Spelling");
     return(<<ENDPREVIEW);      return(<<ENDPREVIEW);
Line 2762  this.form.submit();" /> Line 2784  this.form.submit();" />
 <input type="hidden" name="timestamp" value="$now" />  <input type="hidden" name="timestamp" value="$now" />
 <input type="hidden" name="subject" />  <input type="hidden" name="subject" />
 <input type="hidden" name="comment" />  <input type="hidden" name="comment" />
 <input type="hidden" name="anondiscuss" value = "0";  <input type="hidden" name="anondiscuss" value = "0" />
 <input type="hidden" name="discuss" value = "0";  <input type="hidden" name="discuss" value = "0" />
 <input type="hidden" name="numoldver" value="$numoldver" />  <input type="hidden" name="numoldver" value="$numoldver" />
 ENDATTACH  ENDATTACH
     if (defined($deloldattach)) {      if (defined($deloldattach)) {
Line 3235  ENDREDIR Line 3257  ENDREDIR
       my $mode='board';        my $mode='board';
       my $status='OPEN';        my $status='OPEN';
       my $previous=$env{'form.previous'};        my $previous=$env{'form.previous'};
       if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library)$/) {        if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
           $mode='problem';            $mode='problem';
           $status=$Apache::inputtags::status[-1];            $status=$Apache::inputtags::status[-1];
       }        }
Line 3274  ENDREDIR Line 3296  ENDREDIR
       }        }
       &Apache::lonenc::check_decrypt(\$symb);        &Apache::lonenc::check_decrypt(\$symb);
       my $goahead=1;        my $goahead=1;
       if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {        if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
   unless ($symb) { $goahead=0; }    unless ($symb) { $goahead=0; }
       }        }
       # backward compatibility (bulletin boards used to be 'wrapped')        # backward compatibility (bulletin boards used to be 'wrapped')
Removed from v.1.163  
changed lines
  Added in v.1.168

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