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

version 1.67, 2003/11/04 03:32:55 version 1.68, 2003/11/07 16:37:23
Line 69  sub list_discussion { Line 69  sub list_discussion {
     unless ($symb) { return ''; }      unless ($symb) { return ''; }
     my $seeid=&Apache::lonnet::allowed('rin',$crs);      my $seeid=&Apache::lonnet::allowed('rin',$crs);
     my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);      my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
     my %discussionitems=();      my @discussionitems=();
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},      my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my $visible=0;      my $visible=0;
       my @depth=();
       my @original=();
       my @index=();
       my @replies=();
       my %alldiscussion=();
       my $maxdepth=0;
   
     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.';
       if ($contrib{$idx.':replyto'}) {
   # this is a follow-up message
    $original[$idx]=$original[$contrib{$idx.':replyto'}];
    $depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1;
    $origindex=$index[$contrib{$idx.':replyto'}];
    if ($depth[$idx]>$maxdepth) { $maxdepth=$depth[$idx]; }
       } else {
   # this is an original message
    $original[$idx]=0;
    $depth[$idx]=0;
       }
       if ($replies[$depth[$idx]]) {
    $replies[$depth[$idx]]++;
       } else {
    $replies[$depth[$idx]]=1;
       }
     unless ((($hidden) && (!$seeid)) || ($deleted)) {      unless ((($hidden) && (!$seeid)) || ($deleted)) {
  $visible++;   $visible++;
  my $message=$contrib{$idx.':message'};   my $message=$contrib{$idx.':message'};
Line 142  sub list_discussion { Line 166  sub list_discussion {
  $vgrlink=&Apache::loncommon::submlink('Submissions',   $vgrlink=&Apache::loncommon::submlink('Submissions',
             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);              $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
     }      }
     $discussionitems{$idx}='<p><b>'.$sender.'</b> '.$vgrlink.' ('.  #figure out at what position this needs to print
       my $thisindex=$idx;
   #    if ($ENV{'request.discussions.threaded'}) {
       if (1) {
    $thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);
       }
       $alldiscussion{$thisindex}=$idx;
       $index[$idx]=$thisindex;
       $discussionitems[$idx]='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
  localtime($contrib{$idx.':timestamp'}).   localtime($contrib{$idx.':timestamp'}).
  '):<blockquote>'.$message.   '):<blockquote>'.$message.
  '</blockquote></p>';   '</blockquote></p>';
Line 153  sub list_discussion { Line 185  sub list_discussion {
     my $discussion='';      my $discussion='';
     if ($visible) {      if ($visible) {
  $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';   $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
  foreach (sort { $a <=> $b } keys %discussionitems) {   foreach (sort { $a <=> $b } keys %alldiscussion) {
     $discussion.="\n<tr bgcolor='#CCCCCC'><td>".$discussionitems{$_}.      $discussion.="\n<tr bgcolor='#CCCCCC'><td>".$discussionitems[$alldiscussion{$_}].
  "</td></tr>";   "</td></tr>";
  }   }
         $discussion.='</table>';          $discussion.='</table>';
Line 241  $bodytag Line 273  $bodytag
 <form action="/adm/feedback" method="post" name="mailform"  <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">  enctype="multipart/form-data">
 <input type="hidden" name="postdata" value="$feedurl" />  <input type="hidden" name="postdata" value="$feedurl" />
   <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 />
 <p>My question/comment/feedback:</p>  <p>My question/comment/feedback:</p>

Removed from v.1.67  
changed lines
  Added in v.1.68


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