[WWcvs] webwork-modperl: Fixed bug #781 and #783.

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
Fixed bug #781 and #783.  Mostly involves editing the message
given instructors on the Grades.pm page.

Modified Files:
--------------
    webwork-modperl/lib/WeBWorK/ContentGenerator:
        Grades.pm

Revision Data
-------------
Index: Grades.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Grades.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -Llib/WeBWorK/ContentGenerator/Grades.pm -Llib/WeBWorK/ContentGenerator/Grades.pm -u -r1.13 -r1.14
--- lib/WeBWorK/ContentGenerator/Grades.pm
+++ lib/WeBWorK/ContentGenerator/Grades.pm
@@ -127,6 +127,7 @@
 	my $ce = $r->ce;
 	
 	my $userName          = $r->param('effectiveUser') || $r->param('user');
+	my $userID              = $r->param('user');
     my $ur                = $db->getUser($userName);
 	my $emailDirectory    = $ce->{courseDirs}->{email};
 	my $filePath          = "$emailDirectory/report_grades.msg";
@@ -173,7 +174,7 @@
  	$msg =~ s/\$EMAIL/$EMAIL/ge;
  	$msg =~ s/\$LOGIN/$LOGIN/ge;
 	if (defined($COL[1])) {		# prevents extraneous error messages.  
-		$msg =~ s/\$COL\[(\-?\d+)\]/$COL[$1]/ge
+		$msg =~ s/\$COL\[(\-?\d+)\]/$COL[$1] if defined($COL[$1])/ge
 	}
 	else {						# prevents extraneous $COL's in email message 
 		$msg =~ s/\$COL\[(\-?\d+)\]//g
@@ -192,10 +193,12 @@
 #  	$msg =~ s/(\$COL\[.*?\])/eval($1)/ge;
  	
  	$msg =~ s/\r//g;
+ 	$msg = "<pre>$msg</pre>";
+ 	$msg = qq!More scoring information goes here in [TMPL]/email/report_grades.msg. It
+		is merged with the file [Scoring]/report_grades_data.csv. <br>These files can be edited 
+		using the "Email" link and the "Scoring Tools" link in the left margin.<p>!.$msg if ($r->authz->hasPermissions($userID, "access_instructor_tools"));
 	return CGI::div(
-		{style =>"background-color:#DDDDDD"}, "More scoring information goes here in \$emailDirectory/report_grades.msg. It
-		is merged with the file \$scoringDirectory/report_grades_data.csv. <p>
-		<pre>$msg</pre>"
+		{style =>"background-color:#DDDDDD"}, $msg
 	);
 }