--- loncom/interface/domainprefs.pm	2014/03/18 02:41:29	1.160.6.36
+++ loncom/interface/domainprefs.pm	2014/04/05 23:22:19	1.160.6.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.36 2014/03/18 02:41:29 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.37 2014/04/05 23:22:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,6 +164,7 @@ use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
 use Apache::lonconfigsettings;
+use Apache::lonuserutils();
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
@@ -212,12 +213,14 @@ sub handler {
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
                 'serverstatuses','requestcourses','coursedefaults',
-                'usersessions','loadbalancing','requestauthor'],$dom);
+                'usersessions','loadbalancing',requestauthor',
+                'selfenrollment'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','selfcreation','usermodification','scantron',
                        'requestcourses','requestauthor','coursecategories',
-                       'serverstatuses','coursedefaults','usersessions');
+                       'serverstatuses','coursedefaults','selfenrollment',
+                       'usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -237,6 +240,8 @@ sub handler {
                                  col2 => '',},
                                 {col1 => 'Administrator Settings',
                                  col2 => '',}],
+                      print => \&print_rolecolors,
+                      modify => \&modify_rolecolors,
                     },
         'login' =>
                     { text => 'Log-in page options',
@@ -245,12 +250,16 @@ sub handler {
                                   col2 => '',},
                                  {col1 => 'Log-in Help',
                                   col2 => 'Value'}],
+                      print => \&print_login,
+                      modify => \&modify_login,
                     },
         'defaults' => 
                     { text => 'Default authentication/language/timezone/portal',
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'}],
+                      print => \&print_defaults,
+                      modify => \&modify_defaults,
                     },
         'quotas' => 
                     { text => 'Blogs, personal web pages, webDAV/quotas, portfolios',
@@ -258,12 +267,16 @@ sub handler {
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
                                   col3 => 'Quotas, MB; (Authoring requires role)',}],
+                      print => \&print_quotas,
+                      modify => \&modify_quotas,
                     },
         'autoenroll' =>
                    { text => 'Auto-enrollment settings',
                      help => 'Domain_Configuration_Auto_Enrollment',
                      header => [{col1 => 'Configuration setting',
                                  col2 => 'Value(s)'}],
+                     print => \&print_autoenroll,
+                     modify => \&modify_autoenroll,
                    },
         'autoupdate' => 
                    { text => 'Auto-update settings',
@@ -274,24 +287,32 @@ sub handler {
                                  col2 => 'Affiliation'},
                                 {col1 => 'User population',
                                  col2 => 'Updatable user data'}],
+                     print => \&print_autoupdate,
+                     modify => \&modify_autoupdate,
                   },
         'autocreate' => 
                   { text => 'Auto-course creation settings',
                      help => 'Domain_Configuration_Auto_Creation',
                      header => [{col1 => 'Configuration Setting',
                                  col2 => 'Value',}],
+                     print => \&print_autocreate,
+                     modify => \&modify_autocreate,
                   },
         'directorysrch' => 
                   { text => 'Institutional directory searches',
                     help => 'Domain_Configuration_InstDirectory_Search',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
+                    print => \&print_directorysrch,
+                    modify => \&modify_directorysrch,
                   },
         'contacts' =>
                   { text => 'Contact Information',
                     help => 'Domain_Configuration_Contact_Info',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
+                    print => \&print_contacts,
+                    modify => \&modify_contacts,
                   },
         'usercreation' => 
                   { text => 'User creation',
@@ -302,6 +323,8 @@ sub handler {
                                 col2 => 'Usernames which may be created',},
                                {col1 => 'Context',
                                 col2 => 'Assignable authentication types'}],
+                    print => \&print_usercreation,
+                    modify => \&modify_usercreation,
                   },
         'selfcreation' => 
                   { text => 'Users self-creating accounts',
@@ -312,6 +335,8 @@ sub handler {
                                 col2 => 'Information user can enter'},
                                {col1 => 'Self-creation with e-mail as username',
                                 col2 => 'Settings'}],
+                    print => \&print_selfcreation,
+                    modify => \&modify_selfcreation,
                   },
         'usermodification' =>
                   { text => 'User modification',
@@ -320,6 +345,8 @@ sub handler {
                                 col2 => 'User information updatable in author context'},
                                {col1 => 'Target user has role',
                                 col2 => 'User information updatable in course context'}],
+                    print => \&print_usermodification,
+                    modify => \&modify_usermodification,
                   },
         'scantron' =>
                   { text => 'Bubblesheet format file',
@@ -327,6 +354,8 @@ sub handler {
                     header => [ {col1 => 'Item',
                                  col2 => '',
                               }],
+                    print => \&print_scantron,
+                    modify => \&modify_scantron,
                   },
         'requestcourses' => 
                  {text => 'Request creation of courses',
@@ -337,6 +366,8 @@ sub handler {
                               col2 => 'Value'},
                              {col1 => 'Available textbooks',
                               col2 => ''}],
+                  print => \&print_quotas,
+                  modify => \&modify_quotas,
                  },
         'requestauthor' =>
                  {text => 'Request Authoring Space',
@@ -345,6 +376,8 @@ sub handler {
                               col2 => 'Availability/Processing of requests',},
                              {col1 => 'Setting',
                               col2 => 'Value'}],
+                  print => \&print_quotas,
+                  modify => \&modify_quotas,
                  },
         'coursecategories' =>
                   { text => 'Cataloging of courses/communities',
@@ -354,6 +387,8 @@ sub handler {
                                {col1 => 'Categories',
                                 col2 => '',
                                }],
+                    print => \&print_coursecategories,
+                    modify => \&modify_coursecategories,
                   },
         'serverstatuses' =>
                  {text   => 'Access to server status pages',
@@ -362,12 +397,30 @@ sub handler {
                               col2 => 'Other named users',
                               col3 => 'Specific IPs',
                             }],
+                  print => \&print_serverstatuses,
+                  modify => \&modify_serverstatuses,
                  },
         'coursedefaults' =>
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
-                  header => [{col1 => 'Defaults which can be overridden for each course by a DC',
+                  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',},],
+                  print => \&print_coursedefaults,
+                  modify => \&modify_coursedefaults,
+                 },
+        'selfenrollment' =>
+                 {text   => 'Self-enrollment in Course/Community',
+                  help   => 'Domain_Configuration_Selfenrollment',
+                  header => [{col1 => 'Configuration Rights',
+                              col2 => 'Configured by Course Personnel or Domain Coordinator?'},
+                             {col1 => 'Defaults',
+                              col2 => 'Value'},
+                             {col1 => 'Self-enrollment validation (optional)',
+                              col2 => 'Value'},],
+                  print => \&print_selfenrollment,
+                  modify => \&modify_selfenrollment,
                  },
         'usersessions' =>
                  {text  => 'User session hosting/offloading',
@@ -378,6 +431,8 @@ sub handler {
                               col2 => 'Rules'},
                              {col1 => "Hosting domain's own users elsewhere",
                               col2 => 'Rules'}],
+                  print => \&print_usersessions,
+                  modify => \&modify_usersessions,
                  },
          'loadbalancing' =>
                  {text  => 'Dedicated Load Balancer(s)',
@@ -387,6 +442,8 @@ sub handler {
                               col3 => 'User affiliation',
                               col4 => 'Overrides'},
                             ],
+                  print => \&print_loadbalancing,
+                  modify => \&modify_loadbalancing,
                  },
     );
     if (keys(%servers) > 1) {
@@ -398,6 +455,8 @@ sub handler {
                                         col2 => ''},
                                        {col1 => 'Log-in Help',
                                         col2 => 'Value'}],
+                            print => \&print_login,
+                            modify => \&modify_login,
                            };
     }
 
@@ -549,6 +608,8 @@ sub process_changes {
         $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'coursedefaults') {
         $output = &modify_coursedefaults($dom,$lastactref,%domconfig);
+    } elsif ($action eq 'selfenrollment') {
+        $output = &modify_selfenrollment($dom,$lastactref,%domconfig)
     } elsif ($action eq 'usersessions') {
         $output = &modify_usersessions($dom,$lastactref,%domconfig);
     } elsif ($action eq 'loadbalancing') {
@@ -595,16 +656,12 @@ sub print_config_box {
               <td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
              </tr>';
         $rowtotal ++;
-        if ($action eq 'autoupdate') {
-            $output .= &print_autoupdate('top',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'usercreation') {
-            $output .= &print_usercreation('top',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'selfcreation') {
-            $output .= &print_selfcreation('top',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'usermodification') {
-            $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
+        if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
+            ($action eq 'usermodification') || ($action eq 'selfenrollment') ||
+            ($action eq 'usersessions')) {
+            $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
-            $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal);
+            $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
             if ($numheaders == 3) {
                 $colspan = ' colspan="2"';
@@ -612,12 +669,8 @@ sub print_config_box {
             } else {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal);
             }
-        } elsif ($action eq 'requestcourses') {
+        } elsif (($action eq 'requestcourses') || ($action eq 'requestauthor')) {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } elsif ($action eq 'requestauthor') {
-            $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } elsif ($action eq 'usersessions') {
-            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
         }
@@ -629,39 +682,14 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
-        $output .= '
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col1'}).'</td>
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col2'}).'</td>
              </tr>';
             $rowtotal ++;
-        if ($action eq 'autoupdate') {
-            $output .= &print_autoupdate('middle',$dom,$settings,\$rowtotal).'
-           </table>
-          </td>
-         </tr>
-         <tr>
-           <td>
-            <table class="LC_nested">
-             <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
-            &print_autoupdate('bottom',$dom,$settings,\$rowtotal);
-            $rowtotal ++;
-        } elsif ($action eq 'usercreation') {
-            $output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).'
-           </table>
-          </td>
-         </tr>
-         <tr>
-           <td>
-            <table class="LC_nested">
-             <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>             </tr>'.
-            &print_usercreation('bottom',$dom,$settings,\$rowtotal);
-            $rowtotal ++;
-        } elsif ($action eq 'selfcreation') {
-            $output .= &print_selfcreation('middle',$dom,$settings,\$rowtotal).'
+        if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
+            ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
+            ($action eq 'usersessions')) {
+            $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -671,11 +699,11 @@ sub print_config_box {
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
               <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
-             </tr>'.
-            &print_selfcreation('bottom',$dom,$settings,\$rowtotal);
+             </tr>'."\n".
+            $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
-        } elsif ($action eq 'usermodification') {
-            $output .= &print_usermodification('middle',$dom,$settings,\$rowtotal);
+        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) {
+            $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
@@ -710,19 +738,6 @@ sub print_config_box {
                        &print_textbookcourses($dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
-        } elsif ($action eq 'usersessions') {
-            $output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).'
-           </table>
-          </td>
-         </tr>
-         <tr>
-           <td>
-            <table class="LC_nested">
-             <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
-                       &print_usersessions('bottom',$dom,$settings,\$rowtotal);
-            $rowtotal ++;
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -801,26 +816,14 @@ sub print_config_box {
         $rowtotal ++;
         if ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } elsif ($action eq 'autoenroll') {
-            $output .= &print_autoenroll($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'autocreate') {
-            $output .= &print_autocreate($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'directorysrch') {
-            $output .= &print_directorysrch($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'contacts') {
-            $output .= &print_contacts($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'defaults') {
-            $output .= &print_defaults($dom,$settings,\$rowtotal);
+        } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
+                 ($action eq 'contacts') || ($action eq 'defaults') || ($action eq 'serverstatuses') ||
+                 ($action eq 'loadbalancing')) {
+            $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
-        } elsif ($action eq 'serverstatuses') {
-            $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
-        } elsif ($action eq 'loadbalancing') {
-            $output .= &print_loadbalancing($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'coursedefaults') {
-            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -2762,19 +2765,21 @@ sub print_coursedefaults {
                 '<td class="LC_right_item"><span class="LC_nobreak">'.
                 '<input type="text" name="anonsurvey_threshold"'.
                 ' value="'.$currdefresponder.'" size="5" /></span>'.
-                '</td></tr>'."\n".
-                '<tr><td><span class="LC_nobreak">'.
-                $choices{'uploadquota'}.
-                '</span></td>'.
-                '<td align="right" class="LC_right_item">'.
-                '<table><tr>';
+                '</td></tr>'."\n";
+        $itemcount ++;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'uploadquota'}.
+                      '</span></td>'.
+                      '<td align="right" class="LC_right_item">'.
+                      '<table><tr>';
         foreach my $type (@types) {
             $datatable .= '<td align="center">'.&mt($type).'<br />'.
                            '<input type="text" name="uploadquota_'.$type.'"'.
                            ' value="'.$curruploadquota{$type}.'" size="5" /></td>';
         }
         $datatable .= '</tr></table></td></tr>'."\n";
-        $itemcount += 2;
+        $itemcount ++;
         my $onclick = 'toggleCredits(this.form);';
         my $display = 'none';
         if ($currusecredits) {
@@ -2805,6 +2810,192 @@ sub print_coursedefaults {
             &radiobutton_prefs($current,\@toggles,\%defaultchecked,
                                \%choices,$itemcount,$onclick,$additional);
         $datatable .= $table;
+        $itemcount ++;
+    }
+    $$rowtotal += $itemcount;
+    return $datatable;
+}
+
+sub print_selfenrollment {
+    my ($position,$dom,$settings,$rowtotal) = @_;
+    my ($css_class,$datatable);
+    my $itemcount = 1;
+    my @types = ('official','unofficial','community','textbook');
+    if (($position eq 'top') || ($position eq 'middle')) {
+        my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
+        my %descs = &Apache::lonuserutils::selfenroll_default_descs();
+        my @rows;
+        my $key;
+        if ($position eq 'top') {
+            $key = 'admin'; 
+            if (ref($rowsref) eq 'ARRAY') {
+                @rows = @{$rowsref};
+            }
+        } elsif ($position eq 'middle') {
+            $key = 'default';
+            @rows = ('types','registered','approval','limit');
+        }
+        foreach my $row (@rows) {
+            if (defined($titlesref->{$row})) {
+                $itemcount ++;
+                $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                $datatable .= '<tr'.$css_class.'>'.
+                              '<td>'.$titlesref->{$row}.'</td>'.
+                              '<td class="LC_left_item">'.
+                              '<table><tr>';
+                my (%current,%currentcap);
+                if (ref($settings) eq 'HASH') {
+                    if (ref($settings->{$key}) eq 'HASH') {
+                        foreach my $type (@types) {
+                            if (ref($settings->{$key}->{$type}) eq 'HASH') {
+                                $current{$type} = $settings->{$key}->{$type}->{$row};
+                            }
+                            if (($row eq 'limit') && ($key eq 'default')) {
+                                if (ref($settings->{$key}->{$type}) eq 'HASH') {
+                                    $currentcap{$type} = $settings->{$key}->{$type}->{'cap'};
+                                }
+                            }
+                        }
+                    }
+                }
+                my %roles = (
+                             '0' => &Apache::lonnet::plaintext('dc'),
+                            ); 
+            
+                foreach my $type (@types) {
+                    unless (($row eq 'registered') && ($key eq 'default')) {
+                        $datatable .= '<th>'.&mt($type).'</th>';
+                    }
+                }
+                unless (($row eq 'registered') && ($key eq 'default')) {
+                    $datatable .= '</tr><tr>';
+                }
+                foreach my $type (@types) {
+                    if ($type eq 'community') {
+                        $roles{'1'} = &mt('Community personnel');
+                    } else {
+                        $roles{'1'} = &mt('Course personnel');
+                    }
+                    $datatable .= '<td style="vertical-align: top">';
+                    if ($position eq 'top') {
+                        my %checked;
+                        if ($current{$type} eq '0') {
+                            $checked{'0'} = ' checked="checked"';
+                        } else {
+                            $checked{'1'} = ' checked="checked"';
+                        }
+                        foreach my $role ('1','0') {
+                            $datatable .= '<span class="LC_nobreak"><label>'.
+                                          '<input type="radio" name="selfenrolladmin_'.$row.'_'.$type.'" '.
+                                          'value="'.$role.'"'.$checked{$role}.' />'.
+                                          $roles{$role}.'</label></span> ';
+                        }
+                    } else {
+                        if ($row eq 'types') {
+                            my %checked;
+                            if ($current{$type} =~ /^(all|dom)$/) {
+                                $checked{$1} = ' checked="checked"';
+                            } else {
+                                $checked{''} = ' checked="checked"';
+                            }
+                            foreach my $val ('','dom','all') {
+                                $datatable .= '<span class="LC_nobreak"><label>'.
+                                              '<input type ="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
+                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
+                            }
+                        } elsif ($row eq 'registered') {
+                            my %checked;
+                            if ($current{$type} eq '1') {
+                                $checked{'1'} = ' checked="checked"';
+                            } else {
+                                $checked{'0'} = ' checked="checked"';
+                            }
+                            foreach my $val ('0','1') {
+                                $datatable .= '<span class="LC_nobreak"><label>'.
+                                              '<input type ="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
+                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
+                            }
+                        } elsif ($row eq 'approval') {
+                            my %checked;
+                            if ($current{$type} =~ /^([12])$/) {
+                                $checked{$1} = ' checked="checked"';
+                            } else {
+                                $checked{'0'} = ' checked="checked"';
+                            }
+                            for my $val (0..2) {
+                                $datatable .= '<span class="LC_nobreak"><label>'.
+                                              '<input type="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
+                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
+                            }
+                        } elsif ($row eq 'limit') {
+                            my %checked;
+                            if ($current{$type} =~ /^(allstudents|selfenrolled)$/) {
+                                $checked{$1} = ' checked="checked"';
+                            } else {
+                                $checked{'none'} = ' checked="checked"';
+                            }
+                            my $cap;
+                            if ($currentcap{$type} =~ /^\d+$/) {
+                                $cap = $currentcap{$type};
+                            }
+                            foreach my $val ('none','allstudents','selfenrolled') {
+                                $datatable .= '<span class="LC_nobreak"><label>'.
+                                              '<input type="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
+                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
+                            }
+                            $datatable .= '<br />'.
+                                          '<span class="LC_nobreak">'.&mt('Maximum allowed: ').
+                                          '<input type="text" name="selfenrolldefault_cap_'.$type.'" size = "5" value="'.$cap.'" />'.
+                                          '</span>'; 
+                        }
+                    }
+                    $datatable .= '</td>';
+                }
+                $datatable .= '</tr>';
+            }
+            $datatable .= '</table></td></tr>';
+        }
+    } elsif ($position eq 'bottom') {
+        my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
+        my %currvalidation;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'validation'}) eq 'HASH') {
+                %currvalidation = %{$settings->{'validation'}}; 
+            }
+        }
+        foreach my $item (@{$itemsref}) {
+            $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+            $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                          $namesref->{$item}.
+                          '</span></td>'.
+                          '<td class="LC_left_item">';
+            if (($item eq 'url') || ($item eq 'button')) {
+                $datatable .= '<span class="LC_nobreak">'.
+                              '<input type="text" name="selfenroll_validation_'.$item.'"'.
+                              ' value="'.$currvalidation{$item}.'" size="50" /></span>';
+            } elsif ($item eq 'fields') {
+                my @currfields;
+                if (ref($currvalidation{$item}) eq 'ARRAY') {
+                    @currfields = @{$currvalidation{$item}};
+                }
+                foreach my $field (@{$fieldsref}) {
+                    my $check = '';
+                    if (grep(/^\Q$field\E$/,@currfields)) {
+                        $check = ' checked="checked"';
+                    }
+                    $datatable .= '<span class="LC_nobreak"><label>'.
+                                  '<input type="checkbox" name="selfenroll_validation_fields"'.
+                                  ' value="'.$field.'"'.$check.' />'.$field.
+                                  '</label></span> ';
+                }
+            } elsif ($item eq 'markup') {
+                $datatable .= '<textarea name="selfenroll_validation_markup" cols="50" rows="5" wrap="soft">'.
+                              $currvalidation{$item}. 
+                              '</textarea>';
+            }
+            $datatable .= '</td></tr>'."\n";
+            $itemcount ++;
+        }
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -4051,7 +4242,7 @@ sub print_usermodification {
             $$rowtotal ++;
             $rowcount ++;
         }
-    } elsif ($position eq 'middle') {
+    } elsif ($position eq 'bottom') {
         $context = 'course';
         $rowcount = 0;
         foreach my $role ('st','ep','ta','in','cr') {
@@ -7768,7 +7959,7 @@ sub modify_selfcreation {
 # value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc.
 #
     if (($env{'form.cancreate_email'} eq 'email') || ($env{'form.cancreate_email'} eq 'emailapproval')) {
-        push(@contexts,'emailusername'); 
+        push(@contexts,'emailusername');
         if (ref($types) eq 'ARRAY') {
             foreach my $type (@{$types}) {
                 if (ref($infofields) eq 'ARRAY') {
@@ -9036,6 +9227,7 @@ sub modify_coursedefaults {
                 }
             }
         }
+
         my $officialcreds = $env{'form.official_credits'};
         $officialcreds =~ s/[^\d.]+//g;
         my $unofficialcreds = $env{'form.unofficial_credits'};
@@ -9063,7 +9255,8 @@ sub modify_coursedefaults {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-            if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) {
+            if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || 
+                ($changes{'uploadquota'})) { 
                 if ($changes{'canuse_pdfforms'}) {
                     $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
                 }
@@ -9138,6 +9331,245 @@ sub modify_coursedefaults {
         }
     } else {
         $resulttext = '<span class="LC_error">'.
+            &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
+sub modify_selfenrollment {
+    my ($dom,$lastactref,%domconfig) = @_;
+    my ($resulttext,$errors,%changes,%selfenrollhash,%ordered);
+    my @types = ('official','unofficial','community','textbook');
+    my %titles = &tool_titles();
+    my %descs = &Apache::lonuserutils::selfenroll_default_descs();
+    ($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
+    $ordered{'default'} = ['types','registered','approval','limit'];
+
+    my (%roles,%shown,%toplevel);
+    $roles{'0'} = &Apache::lonnet::plaintext('dc');
+
+    if (ref($domconfig{'selfenrollment'}) ne 'HASH') {
+        if ($domconfig{'selfenrollment'} eq '') {
+            $domconfig{'selfenrollment'} = {};
+        }
+    }
+    %toplevel = (
+                  admin      => 'Configuration Rights',
+                  default    => 'Default settings',
+                  validation => 'Validation of self-enrollment requests',
+                );
+    my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
+
+    if (ref($ordered{'admin'}) eq 'ARRAY') {
+        foreach my $item (@{$ordered{'admin'}}) {
+            foreach my $type (@types) {
+                if ($env{'form.selfenrolladmin_'.$item.'_'.$type}) {
+                    $selfenrollhash{'admin'}{$type}{$item} = 1;
+                } else {
+                    $selfenrollhash{'admin'}{$type}{$item} = 0;
+                }
+                if (ref($domconfig{'selfenrollment'}{'admin'}) eq 'HASH') {
+                    if (ref($domconfig{'selfenrollment'}{'admin'}{$type}) eq 'HASH') {
+                        if ($selfenrollhash{'admin'}{$type}{$item} ne
+                            $domconfig{'selfenrollment'}{'admin'}{$type}{$item})  {
+                            push(@{$changes{'admin'}{$type}},$item);
+                        }
+                    } else {
+                        if (!$selfenrollhash{'admin'}{$type}{$item}) {
+                            push(@{$changes{'admin'}{$type}},$item);
+                        }
+                    }
+                } elsif (!$selfenrollhash{'admin'}{$type}{$item}) {
+                    push(@{$changes{'admin'}{$type}},$item);
+                }
+            }
+        }
+    }
+
+    foreach my $item (@{$ordered{'default'}}) {
+        foreach my $type (@types) {
+            my $value = $env{'form.selfenrolldefault_'.$item.'_'.$type};
+            if ($item eq 'types') {
+                unless (($value eq 'all') || ($value eq 'dom')) {
+                    $value = '';
+                }
+            } elsif ($item eq 'registered') {
+                unless ($value eq '1') {
+                    $value = 0;
+                }
+            } elsif ($item eq 'approval') {
+                unless ($value =~ /^[012]$/) {
+                    $value = 0;
+                }
+            } else {
+                unless (($value eq 'allstudents') || ($value eq 'selfenrolled')) {
+                    $value = 'none';
+                }
+            }
+            $selfenrollhash{'default'}{$type}{$item} = $value;
+            if (ref($domconfig{'selfenrollment'}{'default'}) eq 'HASH') {
+                if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
+                    if ($selfenrollhash{'default'}{$type}{$item} ne
+                         $domconfig{'selfenrollment'}{'default'}{$type}{$item})  {
+                         push(@{$changes{'default'}{$type}},$item);
+                    }
+                } else {
+                    push(@{$changes{'default'}{$type}},$item);
+                }
+            } else {
+                push(@{$changes{'default'}{$type}},$item);
+            }
+            if ($item eq 'limit') {
+                if (($value eq 'allstudents') || ($value eq 'selfenrolled')) {
+                    $env{'form.selfenrolldefault_cap_'.$type} =~ s/\D//g;
+                    if ($env{'form.selfenrolldefault_cap_'.$type} ne '') {
+                        $selfenrollhash{'default'}{$type}{'cap'} = $env{'form.selfenrolldefault_cap_'.$type};
+                    }
+                } else {
+                    $selfenrollhash{'default'}{$type}{'cap'} = '';
+                }
+                if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
+                    if ($selfenrollhash{'default'}{$type}{'cap'} ne
+                         $domconfig{'selfenrollment'}{'admin'}{$type}{'cap'})  {
+                         push(@{$changes{'default'}{$type}},'cap');
+                    }
+                } elsif ($selfenrollhash{'default'}{$type}{'cap'} ne '') {
+                    push(@{$changes{'default'}{$type}},'cap');
+                }
+            }
+        }
+    }
+
+    foreach my $item (@{$itemsref}) {
+        if ($item eq 'fields') {
+            my @changed;
+            @{$selfenrollhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.selfenroll_validation_'.$item);
+            if (@{$selfenrollhash{'validation'}{$item}} > 0) {
+                @{$selfenrollhash{'validation'}{$item}} = sort(@{$selfenrollhash{'validation'}{$item}});
+            }
+            if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') {
+                if (ref($domconfig{'selfenrollment'}{'validation'}{$item}) eq 'ARRAY') {
+                    @changed = &Apache::loncommon::compare_arrays($selfenrollhash{'validation'}{$item},
+                                                                  $domconfig{'selfenrollment'}{'validation'}{$item});
+                } else {
+                    @changed = @{$selfenrollhash{'validation'}{$item}};
+                }
+            } else {
+                @changed = @{$selfenrollhash{'validation'}{$item}};
+            }
+            if (@changed) {
+                if ($selfenrollhash{'validation'}{$item}) { 
+                    $changes{'validation'}{$item} = join(', ',@{$selfenrollhash{'validation'}{$item}});
+                } else {
+                    $changes{'validation'}{$item} = &mt('None');
+                }
+            }
+        } else {
+            $selfenrollhash{'validation'}{$item} = $env{'form.selfenroll_validation_'.$item};
+            if ($item eq 'markup') {
+               if ($env{'form.selfenroll_validation_'.$item}) {
+                   $env{'form.selfenroll_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
+               }
+            }
+            if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') {
+                if ($domconfig{'selfenrollment'}{'validation'}{$item} ne $selfenrollhash{'validation'}{$item}) {
+                    $changes{'validation'}{$item} = $selfenrollhash{'validation'}{$item};
+                }
+            }
+        }
+    }
+
+    my $putresult = &Apache::lonnet::put_dom('configuration',{'selfenrollment' => \%selfenrollhash},
+                                             $dom);
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+            $resulttext = &mt('Changes made:').'<ul>';
+            foreach my $key ('admin','default','validation') {
+                if (ref($changes{$key}) eq 'HASH') {
+                    $resulttext .= '<li>'.$toplevel{$key}.'<ul>';
+                    if ($key eq 'validation') {
+                        foreach my $item (@{$itemsref}) {
+                            if (exists($changes{$key}{$item})) {
+                                if ($item eq 'markup') {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$namesref->{$item},
+                                                              '<br /><pre>'.$changes{$key}{$item}.'</pre>').'</li>';
+                                } else {  
+                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$namesref->{$item},
+                                                              '<b>'.$changes{$key}{$item}.'</b>').'</li>';
+                                }
+                            }
+                        }
+                    } else {
+                        foreach my $type (@types) {
+                            if ($type eq 'community') {
+                                $roles{'1'} = &mt('Community personnel');
+                            } else {
+                                $roles{'1'} = &mt('Course personnel');
+                            }
+                            if (ref($changes{$key}{$type}) eq 'ARRAY') {
+                                if (ref($selfenrollhash{$key}{$type}) eq 'HASH') {
+                                    if ($key eq 'admin') {
+                                        my @mgrdc = ();
+                                        if (ref($ordered{$key}) eq 'ARRAY') {
+                                            foreach my $item (@{$ordered{'admin'}}) {
+                                                if (ref($selfenrollhash{$key}{$type}) eq 'HASH') { 
+                                                    if ($selfenrollhash{$key}{$type}{$item} eq '0') {
+                                                        push(@mgrdc,$item);
+                                                    }
+                                                }
+                                            }
+                                            if (@mgrdc) {
+                                                $domdefaults{$type.'selfenrolladmdc'} = join(',',@mgrdc);
+                                            } else {
+                                                delete($domdefaults{$type.'selfenrolladmdc'});
+                                            }
+                                        }
+                                    } else {
+                                        if (ref($ordered{$key}) eq 'ARRAY') {
+                                            foreach my $item (@{$ordered{$key}}) {
+                                                if (grep(/^\Q$item\E$/,@{$changes{$key}{$type}})) {
+                                                    $domdefaults{$type.'selfenroll'.$item} =
+                                                        $selfenrollhash{$key}{$type}{$item};
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                $resulttext .= '<li>'.$titles{$type}.'<ul>';
+                                foreach my $item (@{$ordered{$key}}) {
+                                    if (grep(/^\Q$item\E$/,@{$changes{$key}{$type}})) {
+                                        $resulttext .= '<li>';
+                                        if ($key eq 'admin') {
+                                            $resulttext .= &mt('[_1] -- management by: [_2]',$titlesref->{$item},
+                                                               '<b>'.$roles{$selfenrollhash{'admin'}{$type}{$item}}.'</b>');
+                                        } else {
+                                            $resulttext .= &mt('[_1] set to: [_2]',$titlesref->{$item},
+                                                               '<b>'.$descs{$item}{$selfenrollhash{'default'}{$type}{$item}}.'</b>');
+                                        }
+                                        $resulttext .= '</li>';
+                                    }
+                                }
+                                $resulttext .= '</ul></li>';
+                            }
+                        }
+                        $resulttext .= '</ul></li>'; 
+                    }
+                }
+                if ((exists($changes{'admin'})) || (exists($changes{'default'}))) {
+                    my $cachetime = 24*60*60;
+                    &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+                    if (ref($lastactref) eq 'HASH') {
+                        $lastactref->{'domdefaults'} = 1;
+                    }
+                }
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = &mt('No changes made to self-enrollment settings');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
             &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;