--- loncom/interface/courseprefs.pm	2010/03/08 14:41:01	1.25
+++ loncom/interface/courseprefs.pm	2010/11/19 12:44:40	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.25 2010/03/08 14:41:01 raeburn Exp $
+# $Id: courseprefs.pm,v 1.32 2010/11/19 12:44:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -361,7 +361,7 @@ sub handler {
                                  },
                     },
         'localization' =>
-                    { text => 'Language & Time Localization',
+                    { text => 'Language and Time Localization',
                       help => 'Course_Environment',
                       ordered => ['languages','timezone','datelocale'],
                       itemtext => {
@@ -385,15 +385,15 @@ sub handler {
         'discussion' =>
                     { text => 'Discussion and Chat',
                       help => 'Course_Environment',
-                      ordered => ['plc.roles.denied','plc.users.denied',
-                                  'pch.roles.denied','pch.users.denied',
+                      ordered => ['pch.roles.denied','pch.users.denied',
+                                  'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
                                   'allow_discussion_post_editing'],
                       itemtext => {
-                         'plc.roles.denied'             => 'No Resource Discussion',
-                         'plc.users.denied'             => 'No Resource Discussion',
-                         'pch.roles.denied'             => 'No Chat room use',
-                         'pch.users.denied'             => 'No Chat room use',
+                         'pch.roles.denied'             => 'No Resource Discussion',
+                         'pch.users.denied'             => 'No Resource Discussion',
+                         'plc.roles.denied'             => 'No Chat room use',
+                         'plc.users.denied'             => 'No Chat room use',
                          allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
                          allow_discussion_post_editing  => 'Users can edit/delete own discussion posts',
                                   },
@@ -410,13 +410,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',
                                   },
                    },
@@ -1000,8 +1000,8 @@ sub process_changes {
                                                 $hdr .= $env{'form.printfmthdr_limit_'.$i};
                                             }
                                             $hdr .= $env{'form.printfmthdr_sub_'.$i};
-                                        } elsif ($env{'form.printfmthdr_sub_'.$i} ne '') {
-                                            $hdr = $env{'form.printfmthdr_sub_'.$i};
+                                        } elsif ($env{'form.printfmthdr_text_'.$i} ne '') {
+                                            $hdr = $env{'form.printfmthdr_text_'.$i};
                                         }
                                         $newhdr[$env{'form.printfmthdr_pos_'.$i}] = $hdr;
                                     }
@@ -1296,7 +1296,7 @@ sub store_changes {
                                         if ($key eq 'url') {
                                             my $bkuptime=time;
                                             $output .= (' 'x2).&mt('(Previous URL backed up)').': '.
-                                            $storehash{'top level map backup '.$bkuptime} => $values->{$key};
+                                            $storehash{'top level map backup '.$bkuptime} = $values->{$key};
                                         }
                                         $output .= '</li>';
                                     }
@@ -2556,7 +2556,7 @@ sub role_checkboxes {
                 $output .= '<tr>';
             }
         }
-        $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name='.
+        $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name="'.
                    $item.'" value="'.$role.'"'.$checked.'/>&nbsp;'.
                    $plrole.'</label></span></td>';
         if ($showsections) {
@@ -2588,7 +2588,7 @@ sub role_checkboxes {
                     $output .= '<tr>';
                 }
             }
-            $output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name='.
+            $output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
                        $item.'" value="'.$value.'"'.$checked.' />&nbsp;'.$rolename.
                        '</label></span></td>';
             if ($showsections) {
@@ -2624,7 +2624,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;
 
@@ -2663,8 +2664,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',
                  },
 
@@ -3300,7 +3301,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>';
     }