--- loncom/interface/domainprefs.pm	2010/12/25 00:52:58	1.138.2.5
+++ loncom/interface/domainprefs.pm	2011/07/29 14:25:36	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.138.2.5 2010/12/25 00:52:58 raeburn Exp $
+# $Id: domainprefs.pm,v 1.144 2011/07/29 14:25:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -140,7 +140,7 @@ autolimit
 
 =over
  
-- course requests will be processed autoatically up to a limit of
+- course requests will be processed automatically up to a limit of
 N requests for the course type for the particular requestor.
 If N is undefined, there is no limit to the number of course requests
 which a course owner may submit and have processed automatically. 
@@ -202,12 +202,12 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','coursedefaults',
-                'usersessions'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults','usersessions'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses',
+                       'requestcourses','coursecategories','serverstatuses','helpsettings',
                        'coursedefaults','usersessions');
     my %prefs = (
         'rolecolors' =>
@@ -337,11 +337,13 @@ sub handler {
                              {col1 => 'Unauthenticated Help Settings',
                               col2 => ''}],
                  },
-        'coursedefaults' =>
+        'coursedefaults' => 
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
-                  header => [{col1 => 'Defaults which can be overridden for each course by a DC',
-                              col2 => 'Value',}],
+                  header => [{col1 => 'Defaults which can be overridden in each course by a CC',
+                              col2 => 'Value',},
+                             {col1 => 'Defaults which can be overridden for each course by a DC',
+                              col2 => 'Value',},],
                  },
         'privacy' => 
                  {text   => 'User Privacy',
@@ -349,7 +351,7 @@ sub handler {
                   header => [{col1 => 'Setting',
                               col2 => 'Value',}],
                  },
-         'usersessions' =>
+        'usersessions' =>
                  {text  => 'User session hosting',
                   help  => 'Domain_Configuration_User_Sessions',
                   header => [{col1 => 'Hosting of users from other domains',
@@ -455,6 +457,8 @@ sub process_changes {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($dom,$action,%domconfig);
+    } elsif ($action eq 'helpsettings') {
+        $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursedefaults') {
         $output = &modify_coursedefaults($dom,%domconfig);
     } elsif ($action eq 'usersessions') {
@@ -512,9 +516,11 @@ sub print_config_box {
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
-            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal);
+            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal);
         }
         $output .= '
            </table>
@@ -578,6 +584,8 @@ sub print_config_box {
             $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
             $output .= &print_usersessions('bottom',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -664,8 +672,8 @@ sub print_config_box {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
             $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'coursedefaults') {
-            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -859,7 +867,6 @@ sub print_login {
                                                   domlogo => 'Domain Logo',
                                                   login => 'Login box');
     my $itemcount = 1;
-    my ($css_class,$datatable);
     foreach my $item (@toggles) {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .=  
@@ -1879,24 +1886,23 @@ sub print_autocreate {
                   '<input type="radio" name="autocreate_xml"'.
                   $createon{'xml'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autocreate_xml"'.
-                  $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>';
+                  $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>'.
+                  '</td></tr><tr>'.
+                  '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="autocreate_req"'.
+                  $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autocreate_req"'.
+                  $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc);
     if ($numdc > 1) {
-        $datatable .= '</td><tr><td>'.
-                      &mt('XML files processed as: (choose Dom. Coord.)'). 
-                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>'.
-                      '<tr class="LC_odd_row">';
+        $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
+                      &mt('Course creation processed as: (choose Dom. Coord.)').
+                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
         $$rowtotal ++ ;
     } else {
-        $datatable .= '</td></tr><tr>';
+        $datatable .= $dctable.'</td></tr>';
     }
-    $datatable .= '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="autocreate_req"'.
-                  $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="autocreate_req"'.
-                  $createoff{'req'}.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
     return $datatable;
 }
 
@@ -2856,6 +2862,7 @@ sub print_defaults {
             my $includeempty = 1;
             $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
         } else {
+            my $size;
             if ($item eq 'portal_def') {
                 $size = ' size="25"';
             }
@@ -4654,12 +4661,12 @@ sub modify_quotas {
                     $changes{'notify'}{'approval'} = 1;
                 }
             } else {
-                if ($domconfig{$action}{'notify'}{'approval'}) {
+                if ($confhash{'notify'}{'approval'}) {
                     $changes{'notify'}{'approval'} = 1;
                 }
             }
         } else {
-            if ($domconfig{$action}{'notify'}{'approval'}) {
+            if ($confhash{'notify'}{'approval'}) {
                 $changes{'notify'}{'approval'} = 1;
             }
         }
@@ -4980,7 +4987,7 @@ sub modify_autoupdate {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                       );
-    my $othertitle = &mt('All users');
+    $othertitle = &mt('All users');
     if (keys(%{$usertypes}) >  0) {
         $othertitle = &mt('Other users');
     }
@@ -6482,7 +6489,6 @@ sub modify_serverstatuses {
     my %serverstatushash =  (
                                 serverstatuses => \%newserverstatus,
                             );
-    my %changes;
     foreach my $type (@pages) {
         foreach my $setting ('namedusers','machines') {
             my (@current,@new);
@@ -6683,7 +6689,7 @@ sub modify_coursedefaults {
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = ('canuse_pdfforms' => 'off');
     my @offon = ('off','on');
-    my @toggles = ();
+    my @toggles = ('canuse_pdfforms');
 
     $defaultshash{'coursedefaults'} = {};