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

Diff for /loncom/interface/lonfeedback.pm between versions 1.68 and 1.69

version 1.68, 2003/11/07 16:37:23 version 1.69, 2003/11/07 21:21:17
Line 81  sub list_discussion { Line 81  sub list_discussion {
     my %alldiscussion=();      my %alldiscussion=();
     my $maxdepth=0;      my $maxdepth=0;
   
       my $target='';
       unless ($ENV{'browser.interface'} eq 'textual' ||
       $ENV{'environment.remote'} eq 'off' ) {
    $target='target="LONcom"';
       }
     if ($contrib{'version'}) {      if ($contrib{'version'}) {
  for (my $id=1;$id<=$contrib{'version'};$id++) {   for (my $id=1;$id<=$contrib{'version'};$id++) {
     my $idx=$id;      my $idx=$id;
     my $hidden=($contrib{'hidden'}=~/\.$idx\./);      my $hidden=($contrib{'hidden'}=~/\.$idx\./);
     my $deleted=($contrib{'deleted'}=~/\.$idx\./);      my $deleted=($contrib{'deleted'}=~/\.$idx\./);
     my $origindex='0.';      my $origindex='0.';
     if ($contrib{$idx.':replyto'}) {      if (($contrib{$idx.':replyto'}) && ($ENV{'environment.threadeddiscussion'})) {
 # this is a follow-up message  # this is a follow-up message
  $original[$idx]=$original[$contrib{$idx.':replyto'}];   $original[$idx]=$original[$contrib{$idx.':replyto'}];
  $depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1;   $depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1;
Line 154  sub list_discussion { Line 159  sub list_discussion {
    $ENV{'request.course.id'}.     $ENV{'request.course.id'}.
  ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {   ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
     $sender.=' <a href="/adm/feedback?replydisc='.      $sender.=' <a href="/adm/feedback?replydisc='.
  $symb.':::'.$idx.'">'.&mt('Reply').'</a>';   $symb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
  }   }
     } else {      } else {
  if ($screenname) {   if ($screenname) {
Line 168  sub list_discussion { Line 173  sub list_discussion {
     }      }
 #figure out at what position this needs to print  #figure out at what position this needs to print
     my $thisindex=$idx;      my $thisindex=$idx;
 #    if ($ENV{'request.discussions.threaded'}) {      if ($ENV{'environment.threadeddiscussion'}) {
     if (1) {  
  $thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);   $thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);
     }      }
     $alldiscussion{$thisindex}=$idx;      $alldiscussion{$thisindex}=$idx;
Line 184  sub list_discussion { Line 188  sub list_discussion {
     }      }
     my $discussion='';      my $discussion='';
     if ($visible) {      if ($visible) {
   # Print a the discusssion
  $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';   $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
    if ($visible>2) {
       my $colspan=$maxdepth+1;
       $discussion.='<tr><td bgcolor="DDDDBB" colspan="'.$colspan.'">'.
     '<a href="/adm/feedback?threadedon='.$symb.'">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
     '<a href="/adm/feedback?threadedoff='.$symb.'">'.&mt('Chronological View').'</a>'.
     '</td></tr>';
    }
   
  foreach (sort { $a <=> $b } keys %alldiscussion) {   foreach (sort { $a <=> $b } keys %alldiscussion) {
     $discussion.="\n<tr bgcolor='#CCCCCC'><td>".$discussionitems[$alldiscussion{$_}].      $discussion.="\n<tr>";
       my $thisdepth=$depth[$alldiscussion{$_}];
       for (1..$thisdepth) {
    $discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
       }
       my $colspan=$maxdepth-$thisdepth+1;
               $discussion.="<td  bgcolor='#CCCCCC' colspan='".$colspan."'>".$discussionitems[$alldiscussion{$_}].
  "</td></tr>";   "</td></tr>";
  }   }
         $discussion.='</table>';          $discussion.='</table>';
Line 218  sub mail_screen { Line 237  sub mail_screen {
                                           '','onLoad="window.focus();"');                                            '','onLoad="window.focus();"');
   my $title=&Apache::lonnet::gettitle($feedurl);    my $title=&Apache::lonnet::gettitle($feedurl);
   if (!$title) { $title = $feedurl; }    if (!$title) { $title = $feedurl; }
     my $quote='';
     if ($ENV{'form.replydisc'}) {
         my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
         my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
      $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
         unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) { 
     my $message=$contrib{$idx.':message'};
     $message=~s/\n/\<br \/\>/g;
     $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
         }
     }
   my $latexHelp = Apache::loncommon::helpLatexCheatsheet();    my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
   $r->print(<<ENDDOCUMENT);    $r->print(<<ENDDOCUMENT);
 <html>  <html>
Line 276  enctype="multipart/form-data"> Line 307  enctype="multipart/form-data">
 <input type="hidden" name="replydisc" value="$ENV{'form.replydisc'}" />  <input type="hidden" name="replydisc" value="$ENV{'form.replydisc'}" />
 Please check at least one of the following feedback types:  Please check at least one of the following feedback types:
 $options<hr />  $options<hr />
   $quote
 <p>My question/comment/feedback:</p>  <p>My question/comment/feedback:</p>
 <p>  <p>
 $latexHelp  $latexHelp
Line 627  sub handler { Line 659  sub handler {
 # --------------------------- 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'},
          ['hide','unhide','deldisc','postdata','preview','replydisc']);           ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
   
   if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {    if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide  # ----------------------------------------------------------------- Hide/unhide
Line 659  sub handler { Line 691  sub handler {
   
     &redirect_back($r,&Apache::lonnet::clutter($url),      &redirect_back($r,&Apache::lonnet::clutter($url),
        &mt('Changed discussion status').'<br />','0','0');         &mt('Changed discussion status').'<br />','0','0');
     } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {
         if ($ENV{'form.threadedon'}) {
     &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
     &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
         } else {
      &Apache::lonnet::del('environment',['threadeddiscussion']);
     &Apache::lonnet::delenv('environment\.threadeddiscussion');
        }
         my $symb=$ENV{'form.threadedon'}?$ENV{'form.threadedon'}:$ENV{'form.threadedoff'};
         my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
         &redirect_back($r,&Apache::lonnet::clutter($url),
        &mt('Changed discussion view mode').'<br />','0','0');
   } elsif ($ENV{'form.deldisc'}) {    } elsif ($ENV{'form.deldisc'}) {
 # --------------------------------------------------------------- Hide for good  # --------------------------------------------------------------- Hide for good
     $r->content_type('text/html');      $r->content_type('text/html');
Removed from v.1.68  
changed lines
  Added in v.1.69

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