--- loncom/interface/lonfeedback.pm	2001/08/10 18:39:58	1.15
+++ loncom/interface/lonfeedback.pm	2001/12/27 18:37:32	1.20
@@ -1,6 +1,30 @@
 # The LearningOnline Network
 # Feedback
 #
+# $Id: lonfeedback.pm,v 1.20 2001/12/27 18:37:32 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Internal Server Error Handler
 #
 # (Login Screen
@@ -15,7 +39,7 @@
 # 2/13 Guy Albertelli
 # 7/25 Gerd Kortemeyer
 # 7/26 Guy Albertelli
-# 7/26,8/10 Gerd Kortemeyer
+# 7/26,8/10,10/1,11/5,11/6,12/27 Gerd Kortemeyer
 
 
 package Apache::lonfeedback;
@@ -83,7 +107,7 @@ sub mail_screen {
 Please check at least one of the following feedback types:
 $options<hr>
 My question/comment/feedback:<p>
-<textarea name=comment cols=60 rows=10>
+<textarea name=comment cols=60 rows=10 wrap=hard>
 </textarea><p>
 <input type=hidden name=sendit value=1>
 <input type=button value="Send Feedback" onClick='gosubmit();'></input>
@@ -171,14 +195,15 @@ sub screen_header {
       '<br><input type=checkbox name=policy> '.
 	'Question/Comment/Feedback about course policy';
   }
+
   if ($ENV{'request.course.id'}) {
+      if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'})) {
     $options.='<br><input type=checkbox name=discuss> '.
 	'<b>Contribution to course discussion of resource</b>';
-  }
-  if ($ENV{'request.course.id'}) {
     $options.='<br><input type=checkbox name=anondiscuss> '.
 	'<b>Anonymous contribution to course discussion of resource</b>'.
         ' (name only visible to course faculty)';
+      }
   }
   return $options;
 }
@@ -263,17 +288,30 @@ sub send_msg {
                'Feedback '.$feedurl,$email,$citations) eq 'ok') {
 	$status.='<br>Error sending message to '.$_.'<br>';
       } else {
-	#$status.='<br>Message sent to '.$_.'<br>';
 	$sendsomething++;
       }
     }
-  } keys %to;       
+  } keys %to;
+
+    my %record=&Apache::lonnet::restore('_feedback');
+    my ($temp)=keys %record;
+    unless ($temp=~/^error\:/) {
+       my %newrecord=();
+       $newrecord{'resource'}=$feedurl;
+       $newrecord{'subnumber'}=$record{'subnumber'}+1;
+       unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
+	   $status.='<br>Not registered<br>';
+       }
+    }
+       
   return ($status,$sendsomething);
 }
 
 sub adddiscuss {
     my ($symb,$email,$anon)=@_;
     my $status='';
+    if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'})) {
+
     my %contrib=('message'      => $email,
                  'sendername'   => $ENV{'user.name'},
                  'senderdomain' => $ENV{'user.domain'});
@@ -284,10 +322,20 @@ sub adddiscuss {
        $status='Adding to class discussion'.($anon?' (anonymous)':'').': '.
         &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.num'}).
-        '<br>';
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    }
+    my %record=&Apache::lonnet::restore('_discussion');
+    my ($temp)=keys %record;
+    unless ($temp=~/^error\:/) {
+       my %newrecord=();
+       $newrecord{'resource'}=$symb;
+       $newrecord{'subnumber'}=$record{'subnumber'}+1;
+       $status.=' '.&Apache::lonnet::cstore(\%newrecord,'_discussion');
+    }
+    } else {
+	$status.='Failed.';
     }
-    return $status;   
+    return $status.'<br>';   
 }
 
 sub handler {