--- loncom/homework/inputtags.pm	2011/10/10 17:47:58	1.271.2.9
+++ loncom/homework/inputtags.pm	2013/04/30 21:45:47	1.271.2.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.271.2.9 2011/10/10 17:47:58 raeburn Exp $
+# $Id: inputtags.pm,v 1.271.2.10 2013/04/30 21:45:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -185,7 +185,16 @@ sub start_textfield {
             }
         }
         unless ($newvariation) {
-	    $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
+            if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+                (($env{'form.grade_username'} eq $env{'user.name'}) &&
+                 ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+                $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+            } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+                    ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) {
+                $oldresponse = '* '.&mt('only shown to submitter').' *';
+            } else {
+                $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+            }
         }
 	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
 	    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
@@ -200,7 +209,7 @@ sub start_textfield {
             my $textareaclass = 'class="LC_richDetectHtml"';
 	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
 		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'.
-                      $oldresponse;
+                      &HTML::Entities::encode($oldresponse,'<>&"');
 	    if ($oldresponse ne '') {
 
 		#get rid of any startup text if the user has already responded
@@ -352,9 +361,19 @@ sub start_textline {
                 }
             }
             unless ($newvariation) {
-	        $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+                if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+                    (($env{'form.grade_username'} eq $env{'user.name'}) &&
+                     ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+                    $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+                } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+                        ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') ||
+                        ($Apache::lonhomework::type eq 'anonsurvey') ||
+                        ($Apache::lonhomework::type eq 'anonsurveycred')) {
+                        $oldresponse = '* '.&mt('only shown to submitter').' *';
+                } else {
+                    $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+                }
 	        &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
-
 	        if (ref($oldresponse) eq 'ARRAY') {
 		    $oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
 	        }