--- loncom/interface/printout.pl	2005/09/16 19:36:08	1.91
+++ loncom/interface/printout.pl	2005/10/31 21:48:07	1.92
@@ -41,19 +41,14 @@ use LONCAPA::Enrollment;
 use strict;
 
 
-#
 #   Determine if a user is operating as a student for this course/domain.
-#
-#
 #Parameters:
-#   course  - The course id.
-#   cdom    - The course domain.
-#
+#    none
 #Implicit:
 #    $env{request.role} contains the role under which this user operated this
 #                       this request.
 sub is_student {
-    return (! $env{'request.role.adv'});
+    return ($env{'request.role'}=~/^st\./);
 }
 
 #
@@ -112,7 +107,7 @@ sub send_error_mail {
 	#  The user is a student in the course:
 	#
 	
-	if (&is_student( $courseid, $coursedom)) {
+	if (&is_student()) {
 	    # build the subject and message body:
 	    # print "sending message to course coordinators.<br />";
 
@@ -182,8 +177,6 @@ END
   my $student_names = $env{'cgi.'.$identifier.'.studentnames'};
   my $backref = &Apache::lonnet::unescape($env{'cgi.'.$identifier.'.backref'});
 
-
-  my $adv = $env{'request.role.adv'};
   
   my @names_pack=();
   if ($student_names=~/_END_/) {  
@@ -204,7 +197,7 @@ END
       close $temporary_file;  
       my $noteps;
       my %prog_state;
-      if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }
+      if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }
       foreach my $not_eps (@content_of_file) {
 	  chomp($not_eps);
 	  if ($not_eps ne '') {
@@ -234,7 +227,7 @@ END
 	      $not_eps =~ s/\s+$//;
 	      $not_eps =~ s/ /\\ /g;
 	      if ( exists($done_conversion{$not_eps})) { next; }
-	      if ($adv) {
+	      if ($advanced_role) {
 		  my $prettyname=$not_eps;
 		  $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
 		  $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
@@ -254,7 +247,7 @@ END
 	      }  
 	  }
       }
-      if ($adv) { 
+      if ($advanced_role) { 
 	  &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); 
       }
       unlink($figfile);
@@ -274,7 +267,7 @@ END
 my $ind=-1;
 my %prog_state;
 print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
-if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
+if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
 print "<br />";
 my $num_files = @texfile;
 foreach $texfile (@texfile) {
@@ -318,7 +311,7 @@ foreach $texfile (@texfile) {
   }
   $name_range =~ s/'//g;	# O'Neil -> ONeil e.g.
   print "<br/>";
-  if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
+  if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
   #  This little piece of dirt puts username ranges into the original tex
   #  Tex filename from which they'll propagate into the other filenames as well.
   #
@@ -608,7 +601,7 @@ if ($number_of_files>1) {
     $zipfile=~s/\/home\/httpd//;
     print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";
 }
-if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
+if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
 
 my $done;
 sub REAPER {
@@ -621,7 +614,7 @@ sub busy_wait_command {
     $SIG{CHLD} = \&REAPER;
     $done=0;
     my $pid=open(CMD,"$command |");
-    if ($adv) {
+    if ($advanced_role) {
 	&Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
     }
     while(!$done) {
@@ -631,7 +624,7 @@ sub busy_wait_command {
 	    my $size=(stat($output_file))[7];
 	    $extra_msg=", $size bytes generated";
 	}
-	if ($adv) {
+	if ($advanced_role) {
 	    &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
 						  $message.$extra_msg);
 	}