--- loncom/interface/courseprefs.pm	2010/04/02 21:39:12	1.27
+++ loncom/interface/courseprefs.pm	2010/09/17 23:53:01	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.27 2010/04/02 21:39:12 raeburn Exp $
+# $Id: courseprefs.pm,v 1.31 2010/09/17 23:53:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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',
                                   },
@@ -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;
                                     }
@@ -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) {
@@ -3301,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>';
     }