--- loncom/interface/domainprefs.pm	2014/04/05 23:22:19	1.160.6.37
+++ loncom/interface/domainprefs.pm	2014/04/23 12:09:10	1.160.6.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.37 2014/04/05 23:22:19 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.41 2014/04/23 12:09:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,6 +165,7 @@ use Apache::lonlocal;
 use Apache::lonmsg();
 use Apache::lonconfigsettings;
 use Apache::lonuserutils();
+use Apache::loncoursequeueadmin();
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
@@ -213,8 +214,8 @@ sub handler {
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
                 'serverstatuses','requestcourses','coursedefaults',
-                'usersessions','loadbalancing',requestauthor',
-                'selfenrollment'],$dom);
+                'usersessions','loadbalancing','requestauthor',
+                'selfenrollment','inststatus'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','selfcreation','usermodification','scantron',
@@ -254,10 +255,12 @@ sub handler {
                       modify => \&modify_login,
                     },
         'defaults' => 
-                    { text => 'Default authentication/language/timezone/portal',
+                    { text => 'Default authentication/language/timezone/portal/types',
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
-                                  col2 => 'Value'}],
+                                  col2 => 'Value'},
+                                 {col1 => 'Institutional user types',
+                                  col2 => 'Assignable to e-mail usernames'}],
                       print => \&print_defaults,
                       modify => \&modify_defaults,
                     },
@@ -365,7 +368,9 @@ sub handler {
                              {col1 => 'Setting',
                               col2 => 'Value'},
                              {col1 => 'Available textbooks',
-                              col2 => ''}],
+                              col2 => ''},
+                             {col1 => 'Validation (not official courses)',
+                              col2 => 'Value'},],
                   print => \&print_quotas,
                   modify => \&modify_quotas,
                  },
@@ -400,7 +405,7 @@ sub handler {
                   print => \&print_serverstatuses,
                   modify => \&modify_serverstatuses,
                  },
-        'coursedefaults' =>
+        'coursedefaults' => 
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
                   header => [{col1 => 'Defaults which can be overridden in each course by a CC',
@@ -410,7 +415,7 @@ sub handler {
                   print => \&print_coursedefaults,
                   modify => \&modify_coursedefaults,
                  },
-        'selfenrollment' =>
+        'selfenrollment' => 
                  {text   => 'Self-enrollment in Course/Community',
                   help   => 'Domain_Configuration_Selfenrollment',
                   header => [{col1 => 'Configuration Rights',
@@ -476,7 +481,7 @@ sub handler {
         }
     } elsif ($phase eq 'display') {
         my $js = &recaptcha_js().
-                 &credits_js();
+                 &toggle_display_js();
         if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
             my ($othertitle,$usertypes,$types) =
                 &Apache::loncommon::sorted_inst_types($dom);
@@ -624,8 +629,10 @@ sub print_config_box {
     my $output;
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
+    } elsif ($action eq 'defaults') {
+        $output = &defaults_javascript($settings); 
     }
-    $output .= 
+    $output .=
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak">'.
@@ -640,7 +647,7 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'coursecategories') ||
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'defaults') ||
             (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
@@ -657,8 +664,8 @@ sub print_config_box {
              </tr>';
         $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
-            ($action eq 'usermodification') || ($action eq 'selfenrollment') ||
-            ($action eq 'usersessions')) {
+            ($action eq 'usermodification') || ($action eq 'defaults') ||
+            ($action eq 'selfenrollment') || ($action eq 'usersessions')) {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
@@ -702,7 +709,8 @@ sub print_config_box {
              </tr>'."\n".
             $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
-        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) {
+        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
+                  ($action eq 'defaults')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
@@ -735,7 +743,18 @@ 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_textbookcourses($dom,$settings,\$rowtotal);
+                       &print_textbookcourses($dom,$settings,\$rowtotal).'
+            </table>
+           </td>
+          </tr>
+          <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
+             </tr>'.
+            &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
         } elsif ($action eq 'rolecolors') {
@@ -817,8 +836,7 @@ sub print_config_box {
         if ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
-                 ($action eq 'contacts') || ($action eq 'defaults') || ($action eq 'serverstatuses') ||
-                 ($action eq 'loadbalancing')) {
+                 ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
@@ -1454,7 +1472,7 @@ sub display_color_options {
     $datatable .= '<td class="LC_right_item">'.
                   '<table border="0"><tr>';
     foreach my $item (@{$links}) {
-	my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
+	my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};
         $datatable .= '<td align="center">'.$choices->{$item}."\n";
         if ($designs->{'links'}{$item}) {
             $datatable.='&nbsp;';
@@ -2067,7 +2085,7 @@ sub print_textbookcourses {
     }
     my $confname = $dom.'-domainconfig';
     my $switchserver = &check_switchserver($dom,$confname);
-    my $maxnum = scalar(keys(%ordered));
+    $maxnum = scalar(keys(%ordered));
     my $datatable = &textbookcourses_javascript(\%ordered);
     if (keys(%ordered)) {
         my @items = sort { $a <=> $b } keys(%ordered);
@@ -2186,7 +2204,6 @@ $jstext
     var newpos = 'addbook_pos';
     var current = new Array;
     var maxh = 1 + $num;
-    var current = new Array;
     var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
     if (item == newpos) {
         changedVal = newitemVal;
@@ -2780,7 +2797,7 @@ sub print_coursedefaults {
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
-        my $onclick = 'toggleCredits(this.form);';
+        my $onclick = "toggleDisplay(this.form,'credits');";
         my $display = 'none';
         if ($currusecredits) {
             $display = 'block';
@@ -2956,48 +2973,85 @@ sub print_selfenrollment {
             $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'}}; 
-            }
+        $datatable .= &print_validation_rows('selfenroll',$dom,$settings,\$itemcount);
+    }
+    $$rowtotal += $itemcount;
+    return $datatable;
+}
+
+sub print_validation_rows {
+    my ($caller,$dom,$settings,$rowtotal) = @_;
+    my ($itemsref,$namesref,$fieldsref);
+    if ($caller eq 'selfenroll') { 
+        ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
+    } elsif ($caller eq 'requestcourses') {
+        ($itemsref,$namesref,$fieldsref) = &Apache::loncoursequeueadmin::requestcourses_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}. 
+    }
+    my $datatable;
+    my $itemcount = 0;
+    foreach my $item (@{$itemsref}) {
+        my $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="'.$caller.'_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="'.$caller.'_validation_fields"'.
+                              ' value="'.$field.'"'.$check.' />'.$field.
+                              '</label></span> ';
+            }
+        } elsif ($item eq 'markup') {
+            $datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'.
+                           $currvalidation{$item}.
                               '</textarea>';
-            }
-            $datatable .= '</td></tr>'."\n";
+        }
+        $datatable .= '</td></tr>'."\n";
+        if (ref($rowtotal)) {
             $itemcount ++;
         }
     }
-    $$rowtotal += $itemcount;
+    if ($caller eq 'requestcourses') {
+        my %currhash;
+        if (ref($settings->{'validation'}) eq 'HASH') {
+            if ($settings->{'validation'}{'dc'} ne '') {
+                $currhash{$settings->{'validation'}{'dc'}} = 1;
+            }
+        }
+        my $numinrow = 2;
+        my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
+                                                       'validationdc',%currhash);
+        if ($numdc > 1) {
+            $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>';
+        } else {
+            $datatable .= $dctable.'</td></tr>';
+        }
+        $itemcount ++;
+    }
+    if (ref($rowtotal)) {
+        $$rowtotal += $itemcount;
+    }
     return $datatable;
 }
 
@@ -3951,17 +4005,22 @@ sub print_usercreation {
 
 sub print_selfcreation {
     my ($position,$dom,$settings,$rowtotal) = @_;
-    my (@selfcreate,$createsettings,$datatable);
+    my (@selfcreate,$createsettings,$processing,$datatable);
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'cancreate'}) eq 'HASH') {
             $createsettings = $settings->{'cancreate'};
-            if (ref($settings->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
-                @selfcreate = @{$settings->{'cancreate'}{'selfcreate'}};
-            } elsif ($settings->{'cancreate'}{'selfcreate'} ne '') {
-                if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
-                    @selfcreate = ('email','login','sso');
-                } elsif ($settings->{'cancreate'}{'selfcreate'} ne 'none') {
-                    @selfcreate = ($settings->{'cancreate'}{'selfcreate'});
+            if (ref($createsettings) eq 'HASH') {
+                if (ref($createsettings->{'selfcreate'}) eq 'ARRAY') {
+                    @selfcreate = @{$createsettings->{'selfcreate'}};
+                } elsif ($createsettings->{'selfcreate'} ne '') {
+                    if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
+                        @selfcreate = ('email','login','sso');
+                    } elsif ($createsettings->{'selfcreate'} ne 'none') {
+                        @selfcreate = ($createsettings->{'selfcreate'});
+                    }
+                }
+                if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
+                    $processing = $createsettings->{'selfcreateprocessing'};
                 }
             }
         }
@@ -3983,7 +4042,7 @@ sub print_selfcreation {
         ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
                                                      \%choices,$itemcount,$onclick);
         $$rowtotal += $itemcount;
-
+        
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
 
         if (ref($usertypes) eq 'HASH') {
@@ -4004,53 +4063,60 @@ sub print_selfcreation {
             foreach my $status (@{$types}) {
                 $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
                                                        $numinrow,$$rowtotal,$usertypes);
-                $$rowtotal ++;
+            $$rowtotal ++;
             }
         }
     } else {
-        my $css_class = $$rowtotal%2?' class="LC_odd_row"':'';
-        my %choices =
-            &Apache::lonlocal::texthash(
-                                          email         => 'Approved automatically',
-                                          emailapproval => 'Queued for approval by DC',
-                                          off           => 'Not enabled',
-                                       );
-        $datatable .= '<tr'.$css_class.'>'.
-                      '<td>'.&mt('E-mail address as username').
-                      '</td><td class="LC_left_item">'.
-                      '<span class="LC_nobreak">';
-        foreach my $option ('email','emailapproval','off') {
-            my $checked;
-            if ($option eq 'email') {
-                if ($radiohash{'cancreate_email'}) {
-                    $checked = 'checked="checked"';
-                }
-            } elsif ($option eq 'emailapproval') {
-                if ($radiohash{'cancreate_emailapproval'}) {
-                    $checked = 'checked="checked"';
+        my %choices = &Apache::lonlocal::texthash (
+                                                      cancreate_email => 'E-mail address as username',
+                                                  );
+        my @toggles = sort(keys(%choices));
+        my %defaultchecked = (
+                               'cancreate_email' => 'off',
+                             );
+        my $itemcount = 0;
+        my $display = 'none';
+        if (grep(/^\Qemail\E$/,@selfcreate)) {
+            $display = 'block';
+        }
+        my $onclick = "toggleDisplay(this.form,'emailoptions');";
+        my $additional = '<div id="emailoptions" style="display: '.$display.'">';
+        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+        my $usertypes = {};
+        my $order = [];
+        if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) {
+            $usertypes = $domdefaults{'inststatustypes'};
+            $order = $domdefaults{'inststatusguest'};
+        }
+        if (ref($order) eq 'ARRAY') {
+            push(@{$order},'default');
+            if (@{$order} > 1) {
+                $usertypes->{'default'} = &mt('Other users');
+                $additional .= '<table><tr>';
+                foreach my $status (@{$order}) {
+                    $additional .= '<th>'.$usertypes->{$status}.'</th>';
+                }
+                $additional .= '</tr><tr>';
+                foreach my $status (@{$order}) {
+                    $additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>';
                 }
+                $additional .= '</tr></table>';
             } else {
-                if ((!$radiohash{'cancreate_email'}) && (!$radiohash{'cancreate_emailapproval'})) {
-                    $checked = 'checked="checked"';  
-                }
+                $usertypes->{'default'} = &mt('All users');
+                $additional .= &email_as_username($rowtotal,$processing);
             }
-            $datatable .= '<label>'.
-                          '<input type="radio" name="cancreate_email" '.
-                          $checked.' value="'.$option.'" />'.
-                          $choices{$option}.'</label>&nbsp;';
         }
-        $$rowtotal ++;
-        $datatable .= '</span></td></tr>'.
-                      &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
+        $additional .= '</div>'."\n";
+
+        ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
+                                                     \%choices,$itemcount,$onclick,$additional);
+        $$rowtotal += $itemcount;
+        $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
         $$rowtotal ++;
         my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
         $numinrow = 1;
-        my ($othertitle,$usertypes,$types) =  &Apache::loncommon::sorted_inst_types($dom);
-        $usertypes->{'default'} = $othertitle;
-        if (ref($types) eq 'ARRAY') {
-            push(@{$types},'default');
-            $usertypes->{'default'} = $othertitle;
-            foreach my $status (@{$types}) {
+        if (ref($order) eq 'ARRAY') {
+            foreach my $status (@{$order}) {
                 $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
                                                        $numinrow,$$rowtotal,$usertypes,$infofields,$infotitles);
                 $$rowtotal ++;
@@ -4070,6 +4136,59 @@ sub print_selfcreation {
     return $datatable;
 }
 
+sub email_as_username {
+    my ($rowtotal,$processing,$type) = @_;
+    my %choices =
+        &Apache::lonlocal::texthash (
+                                      automatic => 'Automatic approval',
+                                      approval  => 'Queued for approval',
+                                    );
+    my $output;
+    foreach my $option ('automatic','approval') {
+        my $checked;
+        if (ref($processing) eq 'HASH') {
+            if ($type eq '') {   
+                if (!exists($processing->{'default'})) {
+                    if ($option eq 'automatic') {
+                        $checked = ' checked="checked"';
+                    }
+                } else {
+                    if ($processing->{'default'} eq $option) {
+                        $checked = ' checked="checked"';
+                    }
+                }
+            } else {
+                if (!exists($processing->{$type})) {
+                    if ($option eq 'automatic') {
+                        $checked = ' checked="checked"';
+                    }
+                } else {
+                    if ($processing->{$type} eq $option) {
+                        $checked = ' checked="checked"';
+                    }
+                }
+            }
+        } elsif ($option eq 'automatic') {
+            $checked = ' checked="checked"'; 
+        }
+        my $name = 'cancreate_emailprocess';
+        if (($type ne '') && ($type ne 'default')) {
+            $name .= '_'.$type;
+        }
+        $output .= '<span class="LC_nobreak"><label>'.
+                   '<input type="radio" name="'.$name.'"'.
+                   $checked.' value="'.$option.'" />'.
+                   $choices{$option}.'</label></span>';
+        if ($type eq '') {
+            $output .= '&nbsp;';
+        } else {
+            $output .= '<br />';
+        }
+    }
+    $$rowtotal ++;
+    return $output;
+}
+
 sub captcha_choice {
     my ($context,$settings,$itemcount) = @_;
     my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
@@ -4256,70 +4375,143 @@ sub print_usermodification {
 }
 
 sub print_defaults {
-    my ($dom,$settings,$rowtotal) = @_;
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
-                 'datelocale_def','portal_def');
-    my %defaults;
-    if (ref($settings) eq 'HASH') {
-        %defaults = %{$settings};
-    } else {
-        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-        foreach my $item (@items) {
-            $defaults{$item} = $domdefaults{$item};
-        }
-    }
-    my $titles = &defaults_titles($dom);
+    my ($position,$dom,$settings,$rowtotal) = @_;
     my $rownum = 0;
     my ($datatable,$css_class);
-    foreach my $item (@items) {
-        if ($rownum%2) {
-            $css_class = '';
+    if ($position eq 'top') {
+        my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
+                     'datelocale_def','portal_def');
+        my %defaults;
+        if (ref($settings) eq 'HASH') {
+            %defaults = %{$settings};
         } else {
-            $css_class = ' class="LC_odd_row" ';
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+            foreach my $item (@items) {
+                $defaults{$item} = $domdefaults{$item};
+            }
         }
-        $datatable .= '<tr'.$css_class.'>'.
-                  '<td><span class="LC_nobreak">'.$titles->{$item}.
-                  '</span></td><td class="LC_right_item">';
-        if ($item eq 'auth_def') {
-            my @authtypes = ('internal','krb4','krb5','localauth');
-            my %shortauth = (
-                             internal => 'int',
-                             krb4 => 'krb4',
-                             krb5 => 'krb5',
-                             localauth  => 'loc'
-                           );
-            my %authnames = &authtype_names();
-            foreach my $auth (@authtypes) {
-                my $checked = ' ';
-                if ($defaults{$item} eq $auth) {
-                    $checked = ' checked="checked" ';
-                }
-                $datatable .= '<label><input type="radio" name="'.$item.
-                              '" value="'.$auth.'"'.$checked.'/>'.
-                              $authnames{$shortauth{$auth}}.'</label>&nbsp;&nbsp;';
+        my $titles = &defaults_titles($dom);
+        foreach my $item (@items) {
+            if ($rownum%2) {
+                $css_class = '';
+            } else {
+                $css_class = ' class="LC_odd_row" ';
             }
-        } elsif ($item eq 'timezone_def') {
-            my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
-        } elsif ($item eq 'datelocale_def') {
-            my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
-        } elsif ($item eq 'lang_def') {
-            my %langchoices = &get_languages_hash();
-            $langchoices{''} = 'No language preference';
-            %langchoices = &Apache::lonlocal::texthash(%langchoices);
-            $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
-                                                          \%langchoices);
-        } else {
-            my $size;
-            if ($item eq 'portal_def') {
-                $size = ' size="25"';
+            $datatable .= '<tr'.$css_class.'>'.
+                          '<td><span class="LC_nobreak">'.$titles->{$item}.
+                          '</span></td><td class="LC_right_item" colspan="3">';
+            if ($item eq 'auth_def') {
+                my @authtypes = ('internal','krb4','krb5','localauth');
+                my %shortauth = (
+                                 internal => 'int',
+                                 krb4 => 'krb4',
+                                 krb5 => 'krb5',
+                                 localauth  => 'loc'
+                                );
+                my %authnames = &authtype_names();
+                foreach my $auth (@authtypes) {
+                    my $checked = ' ';
+                    if ($defaults{$item} eq $auth) {
+                        $checked = ' checked="checked" ';
+                    }
+                    $datatable .= '<label><input type="radio" name="'.$item.
+                                  '" value="'.$auth.'"'.$checked.'/>'.
+                                  $authnames{$shortauth{$auth}}.'</label>&nbsp;&nbsp;';
+                }
+            } elsif ($item eq 'timezone_def') {
+                my $includeempty = 1;
+                $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
+            } elsif ($item eq 'datelocale_def') {
+                my $includeempty = 1;
+                $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
+            } elsif ($item eq 'lang_def') {
+                my %langchoices = &get_languages_hash();
+                $langchoices{''} = 'No language preference';
+                %langchoices = &Apache::lonlocal::texthash(%langchoices);
+                $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
+                                                              \%langchoices);
+            } else {
+                my $size;
+                if ($item eq 'portal_def') {
+                    $size = ' size="25"';
+                }
+                $datatable .= '<input type="text" name="'.$item.'" value="'.
+                              $defaults{$item}.'"'.$size.' />';
+            }
+            $datatable .= '</td></tr>';
+            $rownum ++;
+        }
+    } else {
+        my (%defaults);
+        if (ref($settings) eq 'HASH') {
+            if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') &&
+                (ref($settings->{'inststatusguest'}) eq 'ARRAY')) {
+                my $maxnum = @{$settings->{'inststatusorder'}};
+                for (my $i=0; $i<$maxnum; $i++) {
+                    $css_class = $rownum%2?' class="LC_odd_row"':'';
+                    my $item = $settings->{'inststatusorder'}->[$i];
+                    my $title = $settings->{'inststatustypes'}->{$item};
+                    my $guestok;
+                    if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) {
+                        $guestok = 1;
+                    }
+                    my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"';
+                    $datatable .= '<tr'.$css_class.'>'.
+                                  '<td><span class="LC_nobreak">'.
+                                  '<select name="inststatus_pos_'.$item.'"'.$chgstr.'>';
+                    for (my $k=0; $k<=$maxnum; $k++) {
+                        my $vpos = $k+1;
+                        my $selstr;
+                        if ($k == $i) {
+                            $selstr = ' selected="selected" ';
+                        }
+                        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                    }
+                    my ($checkedon,$checkedoff);
+                    $checkedoff = ' checked="checked"';
+                    if ($guestok) {
+                        $checkedon = $checkedoff;
+                        $checkedoff = ''; 
+                    }
+                    $datatable .= '</select>&nbsp;'.&mt('Internal ID:').'&nbsp;<b>'.$item.'</b>&nbsp;'.
+                                  '<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'.
+                                  &mt('delete').'</span></td>'.
+                                  '<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed:').
+                                  '<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'.
+                                  '</span></td>'.
+                                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                                  '<label><input type="radio" value="1" name="inststatus_guest_'.$item.'"'.$checkedon.' />'.
+                                  &mt('Yes').'</label>'.('&nbsp;'x2).
+                                  '<label><input type="radio" value="0" name="inststatus_guest_'.$item.'"'.$checkedoff.' />'.
+                                  &mt('No').'</label></span></td></tr>';
+                }
+                $css_class = $rownum%2?' class="LC_odd_row"':'';
+                my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"';
+                $datatable .= '<tr '.$css_class.'>'.
+                              '<td><span class="LC_nobreak"><select name="addinststatus_pos"'.$chgstr.'>';
+                for (my $k=0; $k<=$maxnum; $k++) {
+                    my $vpos = $k+1;
+                    my $selstr;
+                    if ($k == $maxnum) {
+                        $selstr = ' selected="selected" ';
+                    }
+                    $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                }
+                $datatable .= '</select>&nbsp;'.&mt('Internal ID:').
+                              '<input type="text" size="10" name="addinststatus" value="" /></span>'.
+                              '&nbsp;'.&mt('(new)').
+                              '</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
+                              &mt('Name displayed:').
+                              '<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'.
+                              '<td class="LC_right_item"><span class="LC_nobreak">'.
+                              '<label><input type="radio" value="1" name="addinststatus_guest" />'.
+                              &mt('Yes').'</label>'.('&nbsp;'x2).
+                              '<label><input type="radio" value="0" name="addinststatus_guest" />'.
+                              &mt('No').'</label></span></td></tr>';
+                              '</tr>'."\n";
+                $rownum ++;
             }
-            $datatable .= '<input type="text" name="'.$item.'" value="'.
-                          $defaults{$item}.'"'.$size.' />';
         }
-        $datatable .= '</td></tr>';
-        $rownum ++;
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -4803,6 +4995,69 @@ sub serverstatus_pages {
             'uniquecodes','diskusage');
 }
 
+sub defaults_javascript {
+    my ($settings) = @_;
+    my ($output,$jstext); 
+    if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
+        my $maxnum = scalar(@{$settings->{'inststatusorder'}});
+        if ($maxnum eq '') {
+            $maxnum = 0;
+        }
+        $maxnum ++;
+        $jstext = '    var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';  
+        return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function reorderTypes(form,caller) {
+    var changedVal;
+$jstext 
+    var newpos = 'addinststatus_pos';
+    var current = new Array;
+    var maxh = $maxnum;
+    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+    var oldVal;
+    if (caller == newpos) {
+        changedVal = newitemVal;
+    } else {
+        var curritem = 'inststatus_pos_'+caller;
+        changedVal = form.elements[curritem].options[form.elements[curritem].selectedIndex].value;
+        current[newitemVal] = newpos;
+    }
+    for (var i=0; i<inststatuses.length; i++) {
+        if (inststatuses[i] != caller) {
+            var elementName = 'inststatus_pos_'+inststatuses[i];
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
+            }
+        }
+    }
+    for (var j=0; j<maxh; j++) {
+        if (current[j] == undefined) {
+            oldVal = j;
+        }
+    }
+    if (oldVal < changedVal) {
+        for (var k=oldVal+1; k<=changedVal ; k++) {
+           var elementName = current[k];
+           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
+        }
+    } else {
+        for (var k=changedVal; k<oldVal; k++) {
+            var elementName = current[k];
+            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+ENDSCRIPT
+    }
+}
+
 sub coursecategories_javascript {
     my ($settings) = @_;
     my ($output,$jstext,$cathash);
@@ -4835,7 +5090,6 @@ function reorderCats(form,parent,item,id
     var changedVal;
 $jstext
     var newpos = 'addcategory_pos';
-    var current = new Array;
     if (parent == '') {
         var has_instcode = 0;
         var maxtop = categories[idx].length;
@@ -5086,7 +5340,7 @@ sub modifiable_userdata_row {
                     if ($statustype) {
                         if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
                             $hashref = $settings->{$context}->{$role}->{$statustype};
-                            if (ref($hashref) eq 'HASH') {
+                            if (ref($hashref) eq 'HASH') { 
                                 foreach my $field (@fields) {
                                     if ($hashref->{$field}) {
                                         $checks{$field} = $hashref->{$field};
@@ -5107,7 +5361,7 @@ sub modifiable_userdata_row {
             }
         }
     }
-
+     
     for (my $i=0; $i<@fields; $i++) {
         my $rem = $i%($numinrow);
         if ($rem == 0) {
@@ -5123,7 +5377,7 @@ sub modifiable_userdata_row {
             } else {
                 if ($role eq 'st') {
                     if (ref($settings) ne 'HASH') {
-                        $check = ' checked="checked" ';
+                        $check = ' checked="checked" '; 
                     }
                 }
             }
@@ -5751,22 +6005,38 @@ sub modify_colors {
         }
         if ($role eq 'login') {
             foreach my $item (@logintext) {
-                unless ($env{'form.'.$role.'_'.$item} eq  $defaults{'logintext'}{$item}) {
+                $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
+                if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
+                    $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
+                }
+                unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'logintext'}{$item})) {
                     $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
                 }
             }
         } else {
-            unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) {
+            $env{'form.'.$role.'_fontmenu'} = lc($env{'form.'.$role.'_fontmenu'});
+            if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
+                $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
+            }
+            unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
                 $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
             }
         }
         foreach my $item (@bgs) {
-            unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) {
+            $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
+            if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
+                $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
+            }
+            unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'bgs'}{$item})) {
                 $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
             }
         }
         foreach my $item (@links) {
-            unless ($env{'form.'.$role.'_'.$item} eq  $defaults{'links'}{$item}) {
+            $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
+            if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
+                $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
+            }
+            unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'links'}{$item})) {
                 $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
             }
         }
@@ -6388,7 +6658,8 @@ sub modify_quotas {
     my ($r,$dom,$action,$lastactref,%domconfig) = @_;
     my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash,
         %limithash,$toolregexp,%conditions,$resulttext,%changes,$confname,$configuserok,
-        $author_ok,$switchserver,$errors);
+        $author_ok,$switchserver,$errors,$validationitemsref,$validationnamesref,
+        $validationfieldsref);
     if ($action eq 'quotas') {
         $context = 'tools'; 
     } else {
@@ -6404,6 +6675,8 @@ sub modify_quotas {
         $confname = $dom.'-domainconfig';
         my $servadm = $r->dir_config('lonAdmEMail');
         ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+        ($validationitemsref,$validationnamesref,$validationfieldsref) = 
+            &Apache::loncoursequeueadmin::requestcourses_validation_types();
     } elsif ($context eq 'requestauthor') {
         @usertools = ('author');
         %titles = &authorrequest_titles();
@@ -6471,6 +6744,7 @@ sub modify_quotas {
                                '</span></li>';
                 }
             }
+
         }
         if (ref($domconfig{$action}) eq 'HASH') {
             if (ref($domconfig{$action}{'notify'}) eq 'HASH') {
@@ -6577,7 +6851,7 @@ sub modify_quotas {
                 }
                 if ($env{'form.addbook_image.filename'} ne '') {
                     my ($cdom,$cnum) = split(/_/,$newbook);
-                    my ($imageurl,$error) = 
+                    my ($imageurl,$error) =
                         &process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok,
                                                 $switchserver,$author_ok);
                     if ($imageurl) {
@@ -6607,6 +6881,78 @@ sub modify_quotas {
                     }
                 }
             }
+            if (ref($validationitemsref) eq 'ARRAY') {
+                foreach my $item (@{$validationitemsref}) {
+                    if ($item eq 'fields') {
+                        my @changed;
+                        @{$confhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.requestcourses_validation_'.$item);
+                        if (@{$confhash{'validation'}{$item}} > 0) {
+                            @{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}});
+                        }
+                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
+                                @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
+                                                                              $domconfig{'requestcourses'}{'validation'}{$item});
+                            } else {
+                                @changed = @{$confhash{'validation'}{$item}};
+                            }
+                        } else {
+                            @changed = @{$confhash{'validation'}{$item}};
+                        }
+                        if (@changed) {
+                            if ($confhash{'validation'}{$item}) {
+                                $changes{'validation'}{$item} = join(', ',@{$confhash{'validation'}{$item}});
+                            } else {
+                                $changes{'validation'}{$item} = &mt('None');
+                            }
+                        }
+                    } else {
+                        $confhash{'validation'}{$item} = $env{'form.requestcourses_validation_'.$item};
+                        if ($item eq 'markup') {
+                            if ($env{'form.requestcourses_validation_'.$item}) {
+                                $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
+                            }
+                        }
+                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                            if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
+                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                            }
+                        } else {
+                            if ($confhash{'validation'}{$item} ne '') {
+                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                            }
+                        }
+                    }
+                }
+            }
+            if ($env{'form.validationdc'}) {
+                my $newval = $env{'form.validationdc'};
+                my %domcoords = &get_active_dcs($dom);
+                if (exists($domcoords{$newval})) {
+                    $confhash{'validation'}{'dc'} = $newval;
+                }
+            }
+            if (ref($confhash{'validation'}) eq 'HASH') {
+                if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                    if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                        unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            if ($confhash{'validation'}{'dc'} eq '') {
+                                $changes{'validation'}{'dc'} = &mt('None');
+                            } else {
+                                $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                            }
+                        }
+                    } elsif ($confhash{'validation'}{'dc'} ne '') {
+                        $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                    }
+                } elsif ($confhash{'validation'}{'dc'} ne '') {
+                    $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                }
+            } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                    $changes{'validation'}{'dc'} = &mt('None');
+                }
+            }
         }
     } else {
         $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
@@ -6922,6 +7268,26 @@ sub modify_quotas {
                     }
                     $resulttext .= '</ul></li>';
                 }
+                if (ref($changes{'validation'}) eq 'HASH') {
+                    if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) {
+                        $resulttext .= '<li>'.&mt('Validation of courses/communities updated').'<ul>';
+                        foreach my $item (@{$validationitemsref}) {
+                            if (exists($changes{'validation'}{$item})) {
+                                if ($item eq 'markup') {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item},
+                                                              '<br /><pre>'.$changes{'validation'}{$item}.'</pre>').'</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item},
+                                                              '<b>'.$changes{'validation'}{$item}.'</b>').'</li>';
+                                }
+                            }
+                        }
+                        if (exists($changes{'validation'}{'dc'})) {
+                            $resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]',
+                                                     '<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>';
+                        }
+                    }
+                }
             }
             $resulttext .= '</ul>';
             if (keys(%newenv)) {
@@ -7898,7 +8264,8 @@ sub modify_selfcreation {
                     foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
                             ($item eq 'captcha') || ($item eq 'recaptchakeys') || 
-                            ($item eq 'emailusername') || ($item eq 'notify')) {
+                            ($item eq 'emailusername') || ($item eq 'notify') ||
+                            ($item eq 'selfcreateprocessing')) {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -7929,22 +8296,37 @@ sub modify_selfcreation {
     @{$cancreate{'selfcreate'}} = ();
     %{$cancreate{'emailusername'}} = ();
     @{$cancreate{'statustocreate'}} = ();
+    %{$cancreate{'selfcreateprocessing'}} = ();
     my %selfcreatetypes = (
                              sso   => 'users authenticated by institutional single sign on',
                              login => 'users authenticated by institutional log-in',
-                             email => 'users who provide a valid e-mail address for use as username (automatic creation)',
-                             emailapproval => 'users who provide a valid e-mail address for use as username (queued for Domain Coordinator review)',
+                             email => 'users who provide a valid e-mail address for use as username',
                           );
 #
 # Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts
 # is permitted.
 #
+
+    my @statuses;
+    if (ref($domconfig{'inststatus'}) eq 'HASH') {
+        if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') {
+            @statuses = @{$domconfig{'inststatus'}{'inststatusguest'}};
+        }
+    }
+    push(@statuses,'default');
+
     foreach my $item ('login','sso','email') {
         if ($item eq 'email') {
-            if ($env{'form.cancreate_email'} eq 'email') {
+            if ($env{'form.cancreate_email'}) {
                 push(@{$cancreate{'selfcreate'}},'email');
-            } elsif ($env{'form.cancreate_email'} eq 'emailapproval') {
-                push(@{$cancreate{'selfcreate'}},'emailapproval');
+                push(@contexts,'selfcreateprocessing');
+                foreach my $type (@statuses) {
+                    if ($type eq 'default') {
+                        $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess'};
+                    } else { 
+                        $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type};
+                    }
+                }
             }
         } else {
             if ($env{'form.cancreate_'.$item}) {
@@ -7958,7 +8340,8 @@ sub modify_selfcreation {
 # Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data
 # 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')) {
+
+    if ($env{'form.cancreate_email'} eq 'email') {
         push(@contexts,'emailusername');
         if (ref($types) eq 'ARRAY') {
             foreach my $type (@{$types}) {
@@ -8018,7 +8401,7 @@ sub modify_selfcreation {
         }
     }
 #  
-# Check if domain default is set appropriately, if selef-creation of accounts is to be available for
+# Check if domain default is set appropriately, if self-creation of accounts is to be available for
 # institutional log-in.
 #
     if (grep(/^login$/,@{$cancreate{'selfcreate'}})) {
@@ -8107,6 +8490,12 @@ sub modify_selfcreation {
                                 }
                             }
                         }
+                    } elsif ($item eq 'selfcreateprocessing') {
+                        if ($cancreate{$item}{$curr} ne $curr_usercreation{'cancreate'}{$item}{$curr}) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
                     } else {
                         if (!$cancreate{$item}{$curr}) {
                             if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -8130,6 +8519,12 @@ sub modify_selfcreation {
                                 }
                             }
                         }
+                    } elsif ($item eq 'selfcreateprocessing') {
+                        if ($cancreate{$item}{$field} ne $curr_usercreation{'cancreate'}{$item}{$field}) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
                     } else {
                         if (!$curr_usercreation{'cancreate'}{$item}{$field}) {
                             if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -8179,6 +8574,9 @@ sub modify_selfcreation {
     if (ref($cancreate{'notify'}) eq 'HASH') {
         $save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
     }
+    if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') {
+        $save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'};
+    }
     if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
         $save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'};
     }
@@ -8265,6 +8663,26 @@ sub modify_selfcreation {
                                 }
                             }
                         }
+                    } elsif ($type eq 'selfcreateprocessing') {
+                        my %choices = &Apache::lonlocal::texthash (
+                                                                    automatic => 'Automatic approval',
+                                                                    approval  => 'Queued for approval',
+                                                                  );
+                        if (@statuses > 1) {
+                            $chgtext .= &mt('Processing of requests to create account with e-mail address as username set as follows:'). 
+                                        '<ul>';
+                           foreach my $type (@statuses) {
+                               if ($type eq 'default') {
+                                   $chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
+                               } else {
+                                   $chgtext .= '<li>'.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
+                               }
+                           }
+                           $chgtext .= '</ul>';
+                        } else {
+                           $chgtext .= &mt('Processing of requests to create account with e-mail address as username set to: "[_1]"',
+                                         $choices{$cancreate{'selfcreateprocessing'}{'default'}});
+                        }
                     } elsif ($type eq 'captcha') {
                         if ($savecaptcha{$type} eq 'notused') {
                             $chgtext .= &mt('No CAPTCHA validation in use for self-creation screen.');
@@ -8608,6 +9026,103 @@ sub modify_defaults {
                          defaults => \%newvalues,
                         );
     my $title = &defaults_titles();
+
+    my $currinststatus;
+    if (ref($domconfig{'inststatus'}) eq 'HASH') {
+        $currinststatus = $domconfig{'inststatus'};
+    } else {
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        $currinststatus = {
+                             inststatustypes => $usertypes,
+                             inststatusorder => $types,
+                             inststatusguest => [],
+                          };
+    }
+    my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete');
+    my @allpos;
+    my %guests;
+    my %alltypes;
+    my ($currtitles,$currguests,$currorder);
+    if (ref($currinststatus) eq 'HASH') {
+        if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') {
+            foreach my $type (@{$currinststatus->{'inststatusorder'}}) {
+                if (ref($currinststatus->{inststatustypes}) eq 'HASH') {
+                    if ($currinststatus->{inststatustypes}->{$type} ne '') {
+                        $currtitles .= $currinststatus->{inststatustypes}->{$type}.',';
+                    }
+                }
+                unless (grep(/^\Q$type\E$/,@todelete)) { 
+                    my $position = $env{'form.inststatus_pos_'.$type};
+                    $position =~ s/\D+//g;
+                    $allpos[$position] = $type;
+                    $alltypes{$type} = $env{'form.inststatus_title_'.$type};
+                    $alltypes{$type} =~ s/`//g;
+                    if ($env{'form.inststatus_guest_'.$type}) {
+                        $guests{$type} = 1;
+                    }
+                }
+            }
+            if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
+                $currguests = join(',',@{$currinststatus->{'inststatusguest'}});
+            }
+            $currorder = join(',',@{$currinststatus->{'inststatusorder'}});
+            $currtitles =~ s/,$//;
+        }
+    }
+    if ($env{'form.addinststatus'}) {
+        my $newtype = $env{'form.addinststatus'};
+        $newtype =~ s/\W//g;
+        unless (exists($alltypes{$newtype})) {
+            if ($env{'form.addinststatus_guest'}) {
+                $guests{$newtype} = 1;
+            }
+            $alltypes{$newtype} = $env{'form.addinststatus_title'};
+            $alltypes{$newtype} =~ s/`//g; 
+            my $position = $env{'form.addinststatus_pos'};
+            $position =~ s/\D+//g;
+            if ($position ne '') {
+                $allpos[$position] = $newtype;
+            }
+        }
+    }
+    my (@orderedstatus,@orderedguests);
+    foreach my $type (@allpos) {
+        unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) {
+            push(@orderedstatus,$type);
+            if ($guests{$type}) {
+                push(@orderedguests,$type);
+            }
+        }
+    }
+    foreach my $type (keys(%alltypes)) {
+        unless (grep(/^\Q$type\E$/,@orderedstatus)) {
+            delete($alltypes{$type});
+        }
+    }
+    $defaults_hash{'inststatus'} = {
+                                     inststatustypes => \%alltypes,
+                                     inststatusorder => \@orderedstatus,
+                                     inststatusguest => \@orderedguests,
+                                   };
+    if (ref($defaults_hash{'inststatus'}) eq 'HASH') {
+        foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
+            $domdefaults{$item} = $defaults_hash{'inststatus'}{$item};
+        }
+    }
+    if ($currorder ne join(',',@orderedstatus)) {
+        $changes{'inststatus'}{'inststatusorder'} = 1;
+    }
+    if ($currguests ne join(',',@orderedguests)) {
+        $changes{'inststatus'}{'inststatusguest'} = 1;
+    }
+    my $newtitles;
+    foreach my $item (@orderedstatus) {
+        $newtitles .= $alltypes{$item}.',';
+    }
+    $newtitles =~ s/,$//;
+    if ($currtitles ne $newtitles) {
+        $changes{'inststatus'}{'inststatustypes'} = 1;
+    }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaults_hash,
                                              $dom);
     if ($putresult eq 'ok') {
@@ -8616,21 +9131,47 @@ sub modify_defaults {
             my $version = &Apache::lonnet::get_server_loncaparev($dom);
             my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";
             foreach my $item (sort(keys(%changes))) {
-                my $value = $env{'form.'.$item};
-                if ($value eq '') {
-                    $value = &mt('none');
-                } elsif ($item eq 'auth_def') {
-                    my %authnames = &authtype_names();
-                    my %shortauth = (
-                             internal => 'int',
-                             krb4 => 'krb4',
-                             krb5 => 'krb5',
-                             localauth  => 'loc',
-                    );
-                    $value = $authnames{$shortauth{$value}};
+                if ($item eq 'inststatus') {
+                    if (ref($changes{'inststatus'}) eq 'HASH') {
+                        if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) {
+                            $resulttext .= '<li>'.&mt('Institutional user status types set to:').' ';
+                            foreach my $type (@orderedstatus) { 
+                                $resulttext .= $alltypes{$type}.', ';
+                            }
+                            $resulttext =~ s/, $//;
+                            $resulttext .= '</li>';
+                        }
+                        if ($changes{'inststatus'}{'inststatusguest'}) {
+                            $resulttext .= '<li>'; 
+                            if (@orderedguests) {
+                                $resulttext .= &mt('Types assignable to "non-institutional" usernames set to:').' ';
+                                foreach my $type (@orderedguests) {
+                                    $resulttext .= $alltypes{$type}.', ';
+                                }
+                                $resulttext =~ s/, $//;
+                            } else {
+                                $resulttext .= &mt('Types assignable to "non-institutional" usernames set to none.');
+                            }
+                            $resulttext .= '</li>';
+                        }
+                    }
+                } else {
+                    my $value = $env{'form.'.$item};
+                    if ($value eq '') {
+                        $value = &mt('none');
+                    } elsif ($item eq 'auth_def') {
+                        my %authnames = &authtype_names();
+                        my %shortauth = (
+                                          internal   => 'int',
+                                          krb4       => 'krb4',
+                                          krb5       => 'krb5',
+                                          localauth  => 'loc',
+                        );
+                        $value = $authnames{$shortauth{$value}};
+                    }
+                    $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
+                    $mailmsgtext .= "$title->{$item} set to $value\n";  
                 }
-                $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
-                $mailmsgtext .= "$title->{$item} set to $value\n";  
             }
             $resulttext .= '</ul>';
             $mailmsgtext .= "\n";
@@ -10107,7 +10648,7 @@ sub get_active_dcs {
 
 sub active_dc_picker {
     my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
-    my %domcoords = &get_active_dcs($dom); 
+    my %domcoords = &get_active_dcs($dom);
     my @domcoord = keys(%domcoords);
     if (keys(%currhash)) {
         foreach my $dc (keys(%currhash)) {
@@ -10716,27 +11257,30 @@ END
 
 }
 
-sub credits_js {
+sub toggle_display_js {
     return <<"END";
 
 <script type="text/javascript">
 // <![CDATA[
 
-function toggleCredits(domForm) {
-    if (document.getElementById('credits')) {
-        creditsitem = document.getElementById('credits');
-        var creditsLength = domForm.coursecredits.length;
-        if (creditsLength) {
+function toggleDisplay(domForm,caller) {
+    if (document.getElementById(caller)) {
+        var divitem = document.getElementById(caller);
+        var optionsElement = domForm.coursecredits;
+        if (caller == 'emailoptions') {
+            optionsElement = domForm.cancreate_email; 
+        }
+        if (optionsElement.length) {
             var currval;
-            for (var i=0; i<creditsLength; i++) {
-                if (domForm.coursecredits[i].checked) {
-                   currval = domForm.coursecredits[i].value;
+            for (var i=0; i<optionsElement.length; i++) {
+                if (optionsElement[i].checked) {
+                   currval = optionsElement[i].value;
                 }
             }
             if (currval == 1) {
-                creditsitem.style.display = 'block';
+                divitem.style.display = 'block';
             } else {
-                creditsitem.style.display = 'none';
+                divitem.style.display = 'none';
             }
         }
     }