--- loncom/interface/lonfeedback.pm	2001/11/06 11:55:11	1.18
+++ loncom/interface/lonfeedback.pm	2002/01/16 15:38:38	1.23
@@ -1,6 +1,30 @@
 # The LearningOnline Network
 # Feedback
 #
+# $Id: lonfeedback.pm,v 1.23 2002/01/16 15:38:38 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,8 +39,10 @@
 # 2/13 Guy Albertelli
 # 7/25 Gerd Kortemeyer
 # 7/26 Guy Albertelli
-# 7/26,8/10,10/1,11/5,11/6 Gerd Kortemeyer
-
+# 7/26,8/10,10/1,11/5,11/6,12/27,12/29 Gerd Kortemeyer
+# YEAR=2002
+# 1/1,1/16 Gerd Kortemeyer
+#
 
 package Apache::lonfeedback;
 
@@ -171,14 +197,17 @@ 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'}.
+        ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
     $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;
 }
@@ -259,8 +288,9 @@ sub send_msg {
   my $sendsomething=0;
   map {
     if ($_) {
+      my $declutter=&Apache::lonnet::declutter($feedurl);
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
-               'Feedback '.$feedurl,$email,$citations) eq 'ok') {
+               'Feedback ['.$declutter.']',$email,$citations) eq 'ok') {
 	$status.='<br>Error sending message to '.$_.'<br>';
       } else {
 	$sendsomething++;
@@ -285,6 +315,9 @@ sub send_msg {
 sub adddiscuss {
     my ($symb,$email,$anon)=@_;
     my $status='';
+    if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
+        ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+
     my %contrib=('message'      => $email,
                  'sendername'   => $ENV{'user.name'},
                  'senderdomain' => $ENV{'user.domain'});
@@ -296,6 +329,11 @@ sub adddiscuss {
         &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+        my %storenewentry=($symb => time);
+        $status.='<br>Updating discussion time: '.
+        &Apache::lonnet::put('discussiontimes',\%storenewentry,
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     }
     my %record=&Apache::lonnet::restore('_discussion');
     my ($temp)=keys %record;
@@ -303,7 +341,11 @@ sub adddiscuss {
        my %newrecord=();
        $newrecord{'resource'}=$symb;
        $newrecord{'subnumber'}=$record{'subnumber'}+1;
-       $status.=' '.&Apache::lonnet::cstore(\%newrecord,'_discussion');
+       $status.='<br>Registering: '.
+               &Apache::lonnet::cstore(\%newrecord,'_discussion');
+    }
+    } else {
+	$status.='Failed.';
     }
     return $status.'<br>';   
 }