--- loncom/interface/courseprefs.pm	2010/03/11 04:20:15	1.8.2.9
+++ loncom/interface/courseprefs.pm	2010/05/22 16:42:10	1.8.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.8.2.9 2010/03/11 04:20:15 raeburn Exp $
+# $Id: courseprefs.pm,v 1.8.2.12 2010/05/22 16:42:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -418,13 +418,13 @@ sub handler {
                      ordered => ['default_enrollment_start_date',
                                  'default_enrollment_end_date',
                                  'nothideprivileged','student_classlist_view',
-                                 'student_opt_in','student_classlist_portfiles'],
+                                 'student_classlist_opt_in','student_classlist_portfiles'],
                      itemtext => {
                          default_enrollment_start_date => 'Start date',
                          default_enrollment_end_date   => 'End date',
                          nothideprivileged             => $lt{'priv'},
                          student_classlist_view        => $lt{'stuv'},
-                         student_opt_in                => $lt{'stul'},
+                         student_classlist_opt_in      => $lt{'stul'},
                          student_classlist_portfiles   => 'Include link to accessible portfolio files',
                                   },
                    },
@@ -1767,7 +1767,6 @@ sub print_courseinfo {
                 if (@entries > 0) {
                     foreach my $entry (@entries) {
                         my ($uname,$udom) = split(/:/,$entry);
-                        my ($uname,$udom) = split(/:/,$entry);
                         if ($udom =~ /^$match_domain$/) {
                             unless (&Apache::lonnet::domain($udom)) {
                                 next;
@@ -2630,7 +2629,8 @@ sub print_classlists {
         @ordered = ('nothideprivileged');
     } else {
         @ordered = ('student_classlist_view',
-                    'student_opt_in','student_classlist_portfiles');
+                    'student_classlist_opt_in',
+                    'student_classlist_portfiles');
     }
     my %lt;
 
@@ -2669,8 +2669,8 @@ sub print_classlists {
                    options => \%lt,
                    order => ['disabled','all','section'],
                  },
-        'student_opt_in' => {
-                   text => '<b>'.&mt($itemtext->{'student_opt_in'}).'</b>',
+        'student_classlist_opt_in' => {
+                   text => '<b>'.&mt($itemtext->{'student_classlist_opt_in'}).'</b>',
                    input => 'radio',
                  },
 
@@ -3298,7 +3298,7 @@ sub substitution_selector {
                     a => 'assignment note',
              );
     my $output .= &mt('Substitution').'<br />'.
-                  '<select name=""printfmthdr_sub__'.$num.'">';
+                  '<select name=""printfmthdr_sub_'.$num.'">';
     if ($subst eq '') {
         $output .= '<option value="" selected="selected"> </option>';
     }