--- loncom/interface/lonfeedback.pm	2003/03/29 22:50:22	1.42
+++ loncom/interface/lonfeedback.pm	2003/09/15 13:38:19	1.55
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.42 2003/03/29 22:50:22 www Exp $
+# $Id: lonfeedback.pm,v 1.55 2003/09/15 13:38:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,10 +52,128 @@ use Apache::lonmsg();
 use Apache::loncommon();
 use Apache::lontexconvert();
 
+sub list_discussion {
+    my ($discussiononly,$symb)=@_;
+    unless ($ENV{'request.course.id'}) { return ''; }
+    my $crs='/'.$ENV{'request.course.id'};
+    if ($ENV{'request.course.sec'}) {
+	$crs.='_'.$ENV{'request.course.sec'};
+    }                 
+    $crs=~s/\_/\//g;
+    unless ($symb) {
+	$symb=&Apache::lonnet::symbread();
+    }
+    unless ($symb) { return ''; }
+    my $seeid=&Apache::lonnet::allowed('rin',$crs);
+    my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
+    my $discussion='';
+    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    if ($contrib{'version'}) {
+	unless ($discussiononly) {
+	    $discussion.=
+		'<address><hr />';
+	}
+	my $idx;
+	for ($idx=1;$idx<=$contrib{'version'};$idx++) {
+	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
+		my $message=$contrib{$idx.':message'};
+		$message=~s/\n/\<br \/\>/g;
+		$message=&Apache::lontexconvert::msgtexconverted($message);
+		if ($contrib{$idx.':attachmenturl'}) {
+		    my ($fname,$ft)
+                        =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+		    $message.='<p>Attachment: <a href="'.
+			&Apache::lonnet::tokenwrapper(
+                                             $contrib{$idx.':attachmenturl'}).
+			'"><tt>'.$fname.'.'.$ft.'</tt></a>';
+		}
+		if ($message) {
+		    if ($hidden) {
+			$message='<font color="#888888">'.$message.'</font>';
+		    }
+		    my $screenname=&Apache::loncommon::screenname(
+					    $contrib{$idx.':sendername'},
+					    $contrib{$idx.':senderdomain'});
+		    my $plainname=&Apache::loncommon::nickname(
+					    $contrib{$idx.':sendername'},
+					    $contrib{$idx.':senderdomain'});
+		    
+		    my $sender='Anonymous';
+		    if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+			$sender=&Apache::loncommon::aboutmewrapper(
+					 $plainname,
+					 $contrib{$idx.':sendername'},
+					 $contrib{$idx.':senderdomain'}).' ('.
+					 $contrib{$idx.':sendername'}.' at '.
+					 $contrib{$idx.':senderdomain'}.')';
+			if ($contrib{$idx.':anonymous'}) {
+			    $sender.=' [anonymous] '.
+				$screenname;
+			}
+			if ($seeid) {
+			    if ($hidden) {
+				$sender.=' <a href="/adm/feedback?unhide='.
+				    $symb.':::'.$idx.'">Make Visible</a>';
+			    } else {
+				$sender.=' <a href="/adm/feedback?hide='.
+				    $symb.':::'.$idx.'">Hide</a>';
+			    }                     
+			    $sender.=' <a href="/adm/feedback?deldisc='.
+				$symb.':::'.$idx.'">Delete</a>';
+			}
+		    } else {
+			if ($screenname) {
+			    $sender='<i>'.$screenname.'</i>';
+			}
+		    }
+		    my $vgrlink;
+		    if ($viewgrades) {
+			$vgrlink=&Apache::loncommon::submlink('Submissions',
+            $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
+		    }
+		    $discussion.='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
+			localtime($contrib{$idx.':timestamp'}).
+			'):<blockquote>'.$message.
+			'</blockquote></p>';
+	        }
+	    } 
+	}
+	unless ($discussiononly) {
+	    $discussion.='</address>';
+	}
+    }
+    if ($discussiononly) {
+	$discussion.=(<<ENDDISCUSS);
+<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
+<input type="submit" name="discuss" value="Post Discussion" />
+<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="sendit" value="true" />
+<br />
+<font size="1">Note: in anonymous discussion, your name is visible only to
+course faculty</font><br />
+<textarea name=comment cols=60 rows=10 wrap=hard></textarea>
+<p>
+Attachment (128 KB max size): <input type="file" name="attachment" />
+</p>
+</form>
+ENDDISCUSS
+      $discussion.=&generate_preview_button();
+   }
+   return $discussion;
+}
+
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
   my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
                                           '','onLoad="window.focus();"');
+  my $title=&Apache::lonnet::gettitle($feedurl);
+  if (!$title) { $title = $feedurl; }
+  my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
   $r->print(<<ENDDOCUMENT);
 <html>
 <head>
@@ -104,12 +222,14 @@ sub mail_screen {
 </script>
 </head>
 $bodytag
-<h2><tt>$feedurl</tt></h2>
-<form action="/adm/feedback" method=post name=mailform>
+<h2><tt>$title</tt></h2>
+<form action="/adm/feedback" method="post" name="mailform"
+enctype="multipart/form-data">
 <input type=hidden name=postdata value="$feedurl">
 Please check at least one of the following feedback types:
 $options<hr>
 My question/comment/feedback:<p>
+$latexHelp
 <textarea name=comment cols=60 rows=10 wrap=hard>
 </textarea><p>
 Attachment (128 KB max size): <input type="file" name="attachment" />
@@ -148,11 +268,13 @@ sub redirect_back {
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>
 <html>
-<body bgcolor="#FFFFFF">
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color=red>$status</font>
+<form name="reldt" action="$feedurl" target="loncapaclient">
+</form>
 </body>
 </html>
 ENDREDIR
@@ -172,7 +294,7 @@ ENDNOREDIR
   $r->print (<<ENDNOREDIRTWO);
 </head>
 <html>
-<body bgcolor="#FFFFFF">
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 <b>Sorry, no feedback possible on this resource  ...</b>
 </body>
@@ -182,22 +304,23 @@ ENDNOREDIRTWO
 
 sub screen_header {
   my ($feedurl) = @_;
-  my $options='';
+  my $msgoptions='';
+  my $discussoptions='';
   if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
-    $options= 
+    $msgoptions= 
       '<p><input type=checkbox name=author> Feedback to resource author';
   }
   if (&feedback_available(1)) {
-    $options.=
+    $msgoptions.=
     '<br><input type=checkbox name=question> Question about resource content';
   }
   if (&feedback_available(0,1)) {
-    $options.=
+    $msgoptions.=
       '<br><input type=checkbox name=course> '.
 	'Question/Comment/Feedback about course content';
   }
   if (&feedback_available(0,0,1)) {
-    $options.=
+    $msgoptions.=
       '<br><input type=checkbox name=policy> '.
 	'Question/Comment/Feedback about course policy';
   }
@@ -206,19 +329,22 @@ sub screen_header {
       if (&Apache::lonnet::allowed('pch',
         $ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-    $options.='<br><input type=checkbox name=discuss> '.
-	'<b>Contribution to course discussion of resource</b>';
-    $options.='<br><input type=checkbox name=anondiscuss> '.
-	'<b>Anonymous contribution to course discussion of resource</b>'.
-        ' (name only visible to course faculty)';
+    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;"> '.
+	'Contribution to course discussion of resource';
+    $discussoptions.='<br><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;"> '.
+	'Anonymous contribution to course discussion of resource'.
+        ' <i>(name only visible to course faculty)</i>';
       }
   }
-  return $options;
+  if ($msgoptions) { $msgoptions='<h2>Sending Messages</h2>'.$msgoptions; }
+  if ($discussoptions) { 
+     $discussoptions='<h2>Discussion Contributions</h2>'.$discussoptions; }
+  return $msgoptions.$discussoptions;
 }
 
 sub resource_output {
   my ($feedurl) = @_;
-  my $usersaw=&Apache::lonnet::ssi($feedurl);
+  my $usersaw=&Apache::lonnet::ssi_body($feedurl);
   $usersaw=~s/\<body[^\>]*\>//gi;
   $usersaw=~s/\<\/body\>//gi;
   $usersaw=~s/\<html\>//gi;
@@ -240,9 +366,9 @@ sub clear_out_html {
 		BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1);
 
       $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
-	  {($html{uc($2)}&(length($1)<1000))?"\<$1":"\&lt;$1"}/ge;
+	  {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\&lt;$1"}/ge;
       $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
-	  {($html{uc($2)}&(length($1)<1000))?"$1\>":"$1\&gt;"}/ge;
+	  {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\&gt;"}/ge;
   } else {
       $message=~s/\<\/*m\s*\>//g;
       $message=~s/\</\&lt\;/g;
@@ -339,14 +465,15 @@ sub feedback_available {
 }
 
 sub send_msg {
-  my ($feedurl,$email,$citations,%to)=@_;
+  my ($feedurl,$email,$citations,$attachmenturl,%to)=@_;
   my $status='';
   my $sendsomething=0;
   foreach (keys %to) {
     if ($_) {
       my $declutter=&Apache::lonnet::declutter($feedurl);
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
-               'Feedback ['.$declutter.']',$email,$citations,$feedurl)=~/ok/) {
+               'Feedback ['.$declutter.']',$email,$citations,$feedurl,
+                $attachmenturl)=~/ok/) {
 	$status.='<br>Error sending message to '.$_.'<br>';
       } else {
 	$sendsomething++;
@@ -382,7 +509,7 @@ sub adddiscuss {
 		                   $ENV{'environment.middlename'}.' '.
                                    $ENV{'environment.lastname'}.' '.
                                    $ENV{'enrironment.generation'},
-                 'attachment'   => $attachmenturl);
+                 'attachmenturl'=> $attachmenturl);
     if ($anon) {
 	$contrib{'anonymous'}='true';
     }
@@ -453,7 +580,7 @@ sub handler {
     my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
 
     my ($symb,$idx)=split(/\:\:\:/,$entry);
-    my ($map,$ind,$url)=split(/\_\_\_/,$symb);
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
 
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -483,7 +610,7 @@ sub handler {
     my $entry=$ENV{'form.deldisc'};
 
     my ($symb,$idx)=split(/\:\:\:/,$entry);
-    my ($map,$ind,$url)=split(/\_\_\_/,$symb);
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
 
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -516,7 +643,7 @@ sub handler {
   unless ($symb) {
       $symb=$ENV{'form.symb'};
       if ($symb) {
-	  my ($map,$id,$url)=split(/\_\_\_/,$symb);
+	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
           $feedurl=&Apache::lonnet::clutter($url);
       }
   }
@@ -557,15 +684,17 @@ sub handler {
 # Get output from resource
       my $usersaw=&resource_output($feedurl);
 
-# Get resource answer
+# Get resource answer (need to allow student to view grades for this to work)
+      &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
       my $useranswer=&Apache::loncommon::get_student_answers(
                        $symb,$ENV{'user.name'},$ENV{'user.domain'},
 		       $ENV{'request.course.id'});
+      &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large
       my $attachmenturl='';
       if ($ENV{'form.attachment.filename'}) {
 	  unless (length($ENV{'form.attachment'})>131072) {
-	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',1);
+	      $attachmenturl=&Apache::lonnet::userfileupload('attachment');
 	  }
       }
 # Filter HTML out of message (could be nasty)
@@ -579,7 +708,8 @@ sub handler {
       my ($typestyle,%to) = &decide_receiver($feedurl);
 
 # Actually send mail
-      my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
+      my ($status,$numsent)=&send_msg($feedurl,$email,$citations,
+          $attachmenturl,%to);
 
 # Discussion? Store that.
 
@@ -605,7 +735,10 @@ sub handler {
    }
   } else {
 # Ambiguous Problem Resource
-    $r->internal_redirect('/adm/ambiguous');
+      if ( Apache::exists_config_define("MODPERL2") ) {
+	  &Apache::lonnet::cleanenv();
+      }
+      $r->internal_redirect('/adm/ambiguous');
   }
 }
   return OK;