--- loncom/interface/domainprefs.pm	2008/12/26 22:24:43	1.84
+++ loncom/interface/domainprefs.pm	2009/03/31 16:59:01	1.91
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.84 2008/12/26 22:24:43 raeburn Exp $
+# $Id: domainprefs.pm,v 1.91 2009/03/31 16:59:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
+use Apache::lonconfigsettings;
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
@@ -53,6 +54,7 @@ sub handler {
         return OK;
     }
 
+    my $context = 'domain';
     my $dom = $env{'request.role.domain'};
     my $domdesc = &Apache::lonnet::domain($dom,'description');
     if (&Apache::lonnet::allowed('mau',$dom)) {
@@ -74,11 +76,12 @@ sub handler {
       &Apache::lonnet::get_dom('configuration',['login','rolecolors',
                 'quotas','autoenroll','autoupdate','directorysrch',
                 'usercreation','usermodification','contacts','defaults',
-                'scantron','coursecategories','serverstatuses'],$dom);
+                'scantron','coursecategories','serverstatuses',
+                'requestcourses'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'coursecategories','serverstatuses');
+                       'requestcourses','coursecategories','serverstatuses');
     my %prefs = (
         'rolecolors' =>
                    { text => 'Default color schemes',
@@ -105,7 +108,7 @@ sub handler {
                                   col2 => 'Value'}],
                     },
         'quotas' => 
-                    { text => 'User blogs, home pages and portfolios',
+                    { text => 'User blogs, personal information pages and portfolios',
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
@@ -165,6 +168,12 @@ sub handler {
                                  col2 => '',
                               }],
                   },
+        'requestcourses' => 
+                 {text => 'Request creation of courses',
+                  help => 'Domain_Configuration_Request_Courses',
+                  header => [{col1 => 'User affiliation',
+                              col2 => 'Requestable course types',}],
+                 },
         'coursecategories' =>
                   { text => 'Cataloging of courses',
                     help => 'Domain_Configuration_Cataloging_Courses',
@@ -190,99 +199,12 @@ sub handler {
       text=>"Pick functionality"});
     my $confname = $dom.'-domainconfig';
     if ($phase eq 'process') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-          ({href=>"javascript:changePage(document.$phase,'display')",
-            text=>"Domain Configuration"},
-           {href=>"javascript:changePage(document.$phase,'$phase')",
-            text=>"Updated"});
-        &print_header($r,$phase);
-        foreach my $item (@prefs_order) {
-            if (grep(/^\Q$item\E$/,@actions)) {
-                $r->print('<h3>'.&mt($prefs{$item}{'text'}).'</h3>'.
-                          &process_changes($r,$dom,$confname,$item,
-                          \@roles,%domconfig));
-            }
-        }
-        $r->print('<p>');
-        &print_footer($r,$phase,'display','Back to configuration display',
-                      \@actions);
-        $r->print('</p>');
+        &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
     } elsif ($phase eq 'display') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>"javascript:changePage(document.$phase,'display')",
-              text=>"Domain Configuration"});
-        &print_header($r,$phase);
-        if (@actions > 0) {
-            my $rowsum = 0;
-            my (%output,%rowtotal,@items);
-            my $halfway = @actions/2;
-            foreach my $item (@prefs_order) {
-                if (grep(/^\Q$item\E$/,@actions)) {
-                    push(@items,$item);
-                    ($output{$item},$rowtotal{$item}) = 
-                        &print_config_box($r,$dom,$confname,$phase,
-                                          $item,$prefs{$item},
-                                          $domconfig{$item});
-                    $rowsum += $rowtotal{$item};
-                }
-            }
-            my $colend;
-            my $halfway = $rowsum/2;
-            my $aggregate = 0;
-            my $sumleft = 0;
-            my $sumright = 0;
-            my $crossover;
-            for (my $i=0; $i<@items; $i++) {
-                $aggregate += $rowtotal{$items[$i]};
-                if ($aggregate > $halfway) {
-                    $crossover = $i;
-                    last;
-                }
-            }
-            for (my $i=0; $i<$crossover; $i++) {
-                $sumleft += $rowtotal{$items[$i]}; 
-            }
-            for (my $i=$crossover+1; $i<@items; $i++) {
-                $sumright += $rowtotal{$items[$i]};
-            }
-            if ((@items > 1) && ($env{'form.numcols'} == 2)) {
-                my $sumdiff = $sumright - $sumleft;
-                if ($sumdiff > 0) {
-                    $colend = $crossover + 1;
-                } else {
-                    $colend = $crossover;
-                }
-            } else {
-                $colend = @items;
-            }
-            $r->print('<p><table class="LC_double_column"><tr><td class="LC_left_col">');
-            for (my $i=0; $i<$colend; $i++) {
-                $r->print($output{$items[$i]});
-            }
-            $r->print('</td><td></td><td class="LC_right_col">');
-            if ($colend < @items) {
-                for (my $i=$colend; $i<@items; $i++) { 
-                    $r->print($output{$items[$i]});
-                }
-            }
-            $r->print('</td></tr></table></p>');
-            $r->print(&print_footer($r,$phase,'process','Save',\@actions));
-        } else {
-            $r->print('<input type="hidden" name="phase" value="" />'.
-                      '<input type="hidden" name="numcols" value="'.
-                      $env{'form.numcols'}.'" />'."\n".
-                      '<span class="LC_error">'.&mt('No settings chosen').
-                      '</span>');
-        }
-        $r->print('</form>');
-        $r->print(&Apache::loncommon::end_page());
+        &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname);
     } else {
-        if ($phase eq '') {
-            $phase = 'pickactions';
-        }
-        my %helphash;
-        &print_header($r,$phase);
         if (keys(%domconfig) == 0) {
+            &Apache::lonconfigsettings::print_header($r,$phase,$context);
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
             my @ids=&Apache::lonnet::current_machine_ids();
             if (!grep(/^\Q$primarylibserv\E$/,@ids)) {
@@ -309,47 +231,12 @@ sub handler {
                     if ($switch_server) {
                         $r->print($switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
                     }
+                    $r->print(&Apache::loncommon::end_page());
                     return OK;
                 }
             }
         }
-        $r->print('<h3>'.&mt('Functionality to display/modify').'</h3>');
-        $r->print('<script type="text/javascript">'."\n".
-              &Apache::loncommon::check_uncheck_jscript()."\n".
-              '</script>'."\n".'<p><input type="button" value="'.&mt('check all').'" '.
-              'onclick="javascript:checkAll(document.pickactions.actions)"'.
-              ' />&nbsp;&nbsp;'.
-              '<input type="button" value="'.&mt('uncheck all').'" '.
-              'onclick="javascript:uncheckAll(document.pickactions.actions)"'.
-              ' /></p><div class="LC_left_float">');
-        my ($numitems,$midpoint,$seconddiv,$count); 
-        $numitems = @prefs_order;
-        $midpoint = int($numitems/2);
-        if ($numitems%2) {
-            $midpoint ++;
-        }
-        $count = 0;
-        foreach my $item (@prefs_order) {
-            $r->print('<h4>'.
-                      &Apache::loncommon::help_open_topic($prefs{$item}->{'help'}).
-                      '<label><input type="checkbox" name="actions" value="'.$item.
-                      '" />&nbsp;'.&mt($prefs{$item}->{'text'}).'</label></h4>');
-            $count ++;
-            if ((!$seconddiv) && ($count >= $midpoint)) {
-                $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
-                $seconddiv = 1;
-            }
-        }
-        $r->print('</div><div class="LC_clear_float_footer"></div><h3>'.
-                  &mt('Display options').'</h3>'."\n".
-                  '<p><span class="LC_nobreak">'.&mt('Display using: ')."\n".
-                  '<label><input type="radio" name="numcols" value="1" />'.
-                  &mt('one column').'</label>&nbsp;&nbsp;<label>'.
-                  '<input type="radio" name="numcols" value="2" />'.
-                  &mt('two columns').'</label></span></p>');
-        $r->print(&print_footer($r,$phase,'display','Go'));
-        $r->print('</form>');
-        $r->print(&Apache::loncommon::end_page());
+        &Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs);
     }
     return OK;
 }
@@ -363,7 +250,7 @@ sub process_changes {
         $output = &modify_rolecolors($r,$dom,$confname,$roles,
                                      %domconfig);
     } elsif ($action eq 'quotas') {
-        $output = &modify_quotas($dom,%domconfig);
+        $output = &modify_quotas($dom,$action,%domconfig);
     } elsif ($action eq 'autoenroll') {
         $output = &modify_autoenroll($dom,%domconfig);
     } elsif ($action eq 'autoupdate') {
@@ -384,6 +271,8 @@ sub process_changes {
         $output = &modify_coursecategories($dom,%domconfig);
     } elsif ($action eq 'serverstatuses') {
         $output = &modify_serverstatuses($dom,%domconfig);
+    } elsif ($action eq 'requestcourses') {
+        $output = &modify_quotas($dom,$action,%domconfig);
     }
     return $output;
 }
@@ -394,7 +283,7 @@ sub print_config_box {
     my $output;
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
-    }  
+    }
     $output .= 
          '<table class="LC_nested_outer">
           <tr>
@@ -544,7 +433,7 @@ sub print_config_box {
         if ($action eq 'login') {
             $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'quotas') {
-            $output .= &print_quotas($dom,$settings,\$rowtotal);
+            $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'autoenroll') {
             $output .= &print_autoenroll($dom,$settings,\$rowtotal);
         } elsif ($action eq 'directorysrch') {
@@ -557,6 +446,8 @@ sub print_config_box {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
             $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
+        } elsif ($action eq 'requestcourses') {
+            $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         }
     }
     $output .= '
@@ -567,107 +458,6 @@ sub print_config_box {
     return ($output,$rowtotal);
 }
 
-sub print_header {
-    my ($r,$phase) = @_;
-    my $alert = &mt('You must select at least one functionality type to display.'); 
-    my $js = '
-<script type="text/javascript">
-function changePage(formname,newphase) {
-    formname.phase.value = newphase;
-    numchecked = 0;
-    if (formname == document.pickactions) {
-        if (formname.actions.length > 0) {
-            for (var i = 0; i<formname.actions.length; i++) {
-                if (formname.actions[i].checked) {
-                    numchecked ++;
-                }
-            }
-        } else {
-            if (formname.actions.checked) {
-                numchecked ++;
-            }
-        }
-        if (numchecked > 0) {
-            formname.submit();
-        } else {
-            alert("'.$alert.'");
-            return;
-        }
-    }
-    formname.submit();
-}'."\n";
-    if ($phase eq 'pickactions') {
-        $js .= 
-            &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox',numcols => 'radio',})."\n".
-            &javascript_set_colnums();
-    } elsif ($phase eq 'display') {
-        $js .= &color_pick_js()."\n";
-    }
-    $js .= &Apache::loncommon::viewport_size_js().'
-</script>
-';
-    my $additem;
-    if ($phase eq 'pickactions') {
-        my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);setDisplayColumns();setFormElements(document.pickactions);",
-                        );
-        $additem = {'add_entries' => \%loaditems,};
-    } else {
-        my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);",
-                        );
-        $additem = {'add_entries' => \%loaditems,};
-    }
-    $r->print(&Apache::loncommon::start_page('View/Modify Domain Settings',
-                                           $js,$additem));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings'));
-    $r->print('
-<form name="parmform" action="">
-<input type="hidden" name="pres_marker" />
-<input type="hidden" name="pres_type" />
-<input type="hidden" name="pres_value" />
-</form>
-');
-    $r->print('<form method="post" name="'.$phase.'" action="/adm/domainprefs"'.
-              ' enctype="multipart/form-data">');
-    return;
-}
-
-sub print_footer {
-    my ($r,$phase,$newphase,$button_text,$actions) = @_;
-    $button_text = &mt($button_text);
-    $r->print('<input type="hidden" name="phase" value="" />'.
-              '<input type="hidden" name="width" value="'.
-              $env{'form.width'}.'" />'.
-              '<input type="hidden" name="height" value="'.
-              $env{'form.height'}.'" />');
-    if (($phase eq 'display') || ($phase eq 'process')) {
-        if (ref($actions) eq 'ARRAY') {
-            foreach my $item (@{$actions}) {
-                $r->print('<input type="hidden" name="actions" value="'.$item.'" />')."\n";
-            }
-        }
-        $r->print('<input type="hidden" name="numcols" value="'.$env{'form.numcols'}.'" />');
-    }
-    my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
-    if ($phase eq 'process') {
-        $r->print('<p><a href='.$dest.'>'.$button_text.'</a></p>');
-    } else {
-        my $onclick;
-        if ($phase eq 'display') {
-            $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
-        } else {
-            $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
-        } 
-        $r->print('<p><input type="button" name="store" value="'.
-                  $button_text.'" onclick='.$onclick.' /></p>');
-    }
-    if ($phase eq 'process') {
-        $r->print('</form>'.&Apache::loncommon::end_page());
-    }
-    return;
-}
-
 sub print_login {
     my ($dom,$confname,$phase,$settings,$rowtotal) = @_;
     my %choices = &login_choices();
@@ -1189,68 +979,34 @@ sub color_pick {
     return $link;
 }
 
-sub color_pick_js {
-    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
-    my $output = <<"ENDCOL";
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms","height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
-    $pjump_def
-
-    function psub() {
-        pclose();
-        if (document.parmform.pres_marker.value!='') {
-            if (document.parmform.pres_type.value!='') {
-                eval('document.display.'+
-                     document.parmform.pres_marker.value+
-                     '.value=document.parmform.pres_value.value;');
-            }
-        } else {
-            document.parmform.pres_value.value='';
-            document.parmform.pres_marker.value='';
-        }
-    }
-
-    function get_id (span_id) {
-	if (document.getElementById) {
-            return document.getElementById(span_id);
-        }
-	if (document.all) {
-            return document.all[span_id];
-        } 
-	return false;
-    }
-
-    function colchg_span (span_id_str,new_color_item) {
-	var span_ref = get_id(span_id_str);
-	if (span_ref.style) { span_ref = span_ref.style; }
-	span_ref.background = new_color_item.value;
-	span_ref.backgroundColor = new_color_item.value;
-	span_ref.bgColor = new_color_item.value;
-    }
-
-ENDCOL
-    return $output;
-}
-
 sub print_quotas {
-    my ($dom,$settings,$rowtotal) = @_;
-    my $datatable;
+    my ($dom,$settings,$rowtotal,$action) = @_;
+    my $context;
+    if ($action eq 'quotas') {
+        $context = 'tools';
+    } else {
+        $context = $action;
+    }
+    my ($datatable,$defaultquota,@usertools);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     my $typecount = 0;
     my $css_class;
-    my @usertools = ('aboutme','blog','portfolio');
+    if ($context eq 'requestcourses') {
+        @usertools = ('official','unofficial');
+    } else {
+        @usertools = ('aboutme','blog','portfolio');
+    }
     my %titles = &tool_titles();
     if (ref($types) eq 'ARRAY') {
         foreach my $type (@{$types}) {
             my $currdefquota;
-            if (ref($settings) eq 'HASH') {
-                if (ref($settings->{defaultquota}) eq 'HASH') {
-                    $currdefquota = $settings->{defaultquota}->{$type}; 
-                } else {
-                    $currdefquota = $settings->{$type};
+            unless ($context eq 'requestcourses') {
+                if (ref($settings) eq 'HASH') {
+                    if (ref($settings->{defaultquota}) eq 'HASH') {
+                        $currdefquota = $settings->{defaultquota}->{$type}; 
+                    } else {
+                        $currdefquota = $settings->{$type};
+                    }
                 }
             }
             if (defined($usertypes->{$type})) {
@@ -1260,32 +1016,44 @@ sub print_quotas {
                               '<td>'.$usertypes->{$type}.'</td>'.
                               '<td class="LC_left_item">';
                 foreach my $item (@usertools) {
-                    my $checked = 'checked="checked" ';
+                    my $checked;
+                    unless ($context eq 'requestcourses') {
+                        $checked = 'checked="checked" ';
+                    }
                     if (ref($settings) eq 'HASH') {
                         if (ref($settings->{$item}) eq 'HASH') {
                             if ($settings->{$item}->{$type} == 0) {
                                 $checked = '';
+                            } elsif ($settings->{$item}->{$type} == 1) {
+                                $checked =  'checked="checked" ';
                             }
                         }
                     }
                     $datatable .= '<span class="LC_nobreak"><label>'.
-                                  '<input type="checkbox" name="tools_'.$item.
+                                  '<input type="checkbox" name="'.$context.'_'.$item.
                                   '" value="'.$type.'" '.$checked.'/>'.$titles{$item}.
                                   '</label></span>&nbsp; ';
                 }
-                $datatable .= '</td><td class="LC_right_item"><span class="LC_nobreak">'.
+                $datatable .= '</td>';
+                unless ($context eq 'requestcourses') {
+                    $datatable .= 
+                              '<td class="LC_right_item"><span class="LC_nobreak">'.
                               '<input type="text" name="quota_'.$type.
                               '" value="'.$currdefquota.
-                              '" size="5" /> Mb</span></td></tr>';
+                              '" size="5" /> Mb</span></td>';
+                }
+                $datatable .= '</tr>';
             }
         }
     }
-    my $defaultquota = '20';
-    if (ref($settings) eq 'HASH') {
-        if (ref($settings->{'defaultquota'}) eq 'HASH') {
-            $defaultquota = $settings->{'defaultquota'}->{'default'};
-        } elsif (defined($settings->{'default'})) {
-            $defaultquota = $settings->{'default'};
+    unless ($context eq 'requestcourses') {
+        $defaultquota = '20';
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'defaultquota'}) eq 'HASH') {
+                $defaultquota = $settings->{'defaultquota'}->{'default'};
+            } elsif (defined($settings->{'default'})) {
+                $defaultquota = $settings->{'default'};
+            }
         }
     }
     $typecount ++;
@@ -1294,38 +1062,52 @@ sub print_quotas {
                   '<td>'.$othertitle.'</td>'.
                   '<td class="LC_left_item">';
     foreach my $item (@usertools) {
-        my $checked = 'checked="checked" ';
+        my $checked;
+        unless ($context eq 'requestcourses') {
+            $checked = 'checked="checked" ';
+        }
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{$item}) eq 'HASH') {
                 if ($settings->{$item}->{'default'} == 0) {
                     $checked = '';
+                } elsif ($settings->{$item}->{'default'} == 1) {
+                    $checked = 'checked="checked" ';
                 }
             }
         }
         $datatable .= '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="tools_'.$item.
+                      '<input type="checkbox" name="'.$context.'_'.$item.
                       '" value="default" '.$checked.'/>'.$titles{$item}.
                       '</label></span>&nbsp; ';
     }
-    $datatable .= '</td><td class="LC_right_item"><span class="LC_nobreak">'.
-                  '<input type="text" name="defaultquota" value="'.
-                  $defaultquota.'" size="5" /> Mb</span></td></tr>';
+    $datatable .= '</td>';
+    unless ($context eq 'requestcourses') {
+        $datatable .= '<td class="LC_right_item"><span class="LC_nobreak">'.
+                      '<input type="text" name="defaultquota" value="'.
+                      $defaultquota.'" size="5" /> Mb</span></td>';
+    }
+    $datatable .= '</tr>';
     $typecount ++;
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
                   '<td><br/>'.&mt('LON-CAPA Advanced Users').'</td>'.
                   '<td class="LC_left_item" colspan="2"><br />';
     foreach my $item (@usertools) {
-        my $checked = 'checked="checked" ';
+        my $checked;
+        unless ($context eq 'requestcourses') {
+            $checked = 'checked="checked" ';
+        }
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{$item}) eq 'HASH') {
                 if ($settings->{$item}->{'_LC_adv'} == 0) {
                     $checked = '';
+                } elsif ($settings->{$item}->{'_LC_adv'} == 1) {
+                    $checked = 'checked="checked" ';
                 }
             }
         }
         $datatable .= '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="tools_'.$item.
+                      '<input type="checkbox" name="'.$context.'_'.$item.
                       '" value="_LC_adv" '.$checked.'/>'.$titles{$item}.
                       '</label></span>&nbsp; ';
     }
@@ -1571,7 +1353,7 @@ sub print_contacts {
     my $datatable;
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails);
-    my @mailings = ('errormail','packagesmail','helpdeskmail');
+    my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail');
     foreach my $type (@mailings) {
         $otheremails{$type} = '';
     }
@@ -1591,6 +1373,8 @@ sub print_contacts {
                     }
                     $otheremails{$type} = $settings->{$type}{'others'};
                 }
+            } elsif ($type eq 'lonstatusmail') {
+                $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
             }
         }
     } else {
@@ -1598,7 +1382,8 @@ sub print_contacts {
         $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
         $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
         $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; 
+        $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
+        $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; 
     }
     my ($titles,$short_titles) = &contact_titles();
     my $rownum = 0;
@@ -1642,7 +1427,8 @@ sub contact_titles {
                    'adminemail'   => 'Default Server Admin E-mail address',
                    'errormail'    => 'Error reports to be e-mailed to',
                    'packagesmail' => 'Package update alerts to be e-mailed to',
-                   'helpdeskmail' => 'Helpdesk requests to be e-mailed to'
+                   'helpdeskmail' => 'Helpdesk requests to be e-mailed to',
+                   'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
                  );
     my %short_titles = &Apache::lonlocal::texthash (
                            adminemail   => 'Admin E-mail address',
@@ -1653,10 +1439,12 @@ sub contact_titles {
 
 sub tool_titles {
     my %titles = &Apache::lonlocal::texthash (
-                                              aboutme   => 'Personal Home Page',
-                                              blog      => 'Blog',
-                                              portfolio => 'Portfolio',
-                                             );
+                     aboutme    => 'Personal Information Page',
+                     blog       => 'Blog',
+                     portfolio  => 'Portfolio',
+                     official   => 'Official courses (with institutional codes)',
+                     unofficial => 'Unofficial courses',
+                 );
     return %titles;
 }
 
@@ -1894,7 +1682,7 @@ sub usercreation_types {
                     any        => 'Any',
                     official   => 'Institutional only ',
                     unofficial => 'Non-institutional only',
-                    email      => 'Email address',
+                    email      => 'E-mail address',
                     login      => 'Institutional Login',
                     sso        => 'SSO', 
                     none       => 'None',
@@ -3491,34 +3279,37 @@ sub check_switchserver {
     return $switchserver;
 }
 
-sub javascript_set_colnums {
-    return <<END;
-function setDisplayColumns() {
-    if (document.pickactions.width.value > 1100) {
-        document.pickactions.numcols[1].checked = true;
+sub modify_quotas {
+    my ($dom,$action,%domconfig) = @_;
+    my ($context,@usertools);
+    if ($action eq 'quotas') {
+        $context = 'tools'; 
+    } else { 
+        $context = $action;
+    }
+    if ($context eq 'requestcourses') {
+        @usertools = ('official','unofficial');
     } else {
-        document.pickactions.numcols[0].checked = true;
+        @usertools = ('aboutme','blog','portfolio');
     }
-}
-END
-}
-
-sub modify_quotas {
-    my ($dom,%domconfig) = @_;
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my ($resulttext,%changes);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    my @usertools = ('aboutme','blog','portfolio');
     my %titles = &tool_titles();
     my (%confhash,%toolshash);
     foreach my $key (keys(%env)) {
-        if ($key =~ /^form\.quota_(.+)$/) {
-            $confhash{'defaultquota'}{$1} = $env{$key};
-        } elsif ($key =~ /^form\.tools_(.+)$/) {
+        unless ($context eq 'requestcourses') {
+            if ($key =~ /^form\.quota_(.+)$/) {
+                $confhash{'defaultquota'}{$1} = $env{$key};
+            }
+        }
+        if ($key =~ /^form\.\Q$context\E_(.+)$/) {
             @{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key);
         }
     }
-    $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
+    unless ($context eq 'requestcourses') {
+        $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
+    }
     foreach my $item (@usertools) {
         foreach my $type (@{$types},'default','_LC_adv') {
             if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) {
@@ -3526,60 +3317,74 @@ sub modify_quotas {
             } else {
                 $confhash{$item}{$type} = 0;
             }
-            if (ref($domconfig{'quotas'}) eq 'HASH') {
-                if (ref($domconfig{'quotas'}{$item}) eq 'HASH') {
-                    if ($domconfig{'quotas'}{$item}{$type} ne $confhash{$item}{$type}) {
+            if (ref($domconfig{$action}) eq 'HASH') {
+                if (ref($domconfig{$action}{$item}) eq 'HASH') {
+                    if ($domconfig{$action}{$item}{$type} ne $confhash{$item}{$type}) {
                         $changes{$item}{$type} = 1;
                     }
                 } else {
-                    if (!$confhash{$item}{$type}) {
-                        $changes{$item}{$type} = 1;
+                    if ($context eq 'requestcourses') {
+                        if ($confhash{$item}{$type}) {
+                            $changes{$item}{$type} = 1;
+                        }
+                    } else {
+                        if (!$confhash{$item}{$type}) {
+                            $changes{$item}{$type} = 1;
+                        }
                     }
                 }
             } else {
-                if (!$confhash{$item}{$type}) {
-                    $changes{$item}{$type} = 1;
+                if ($context eq 'requestcourses') {
+                    if ($confhash{$item}{$type}) {
+                        $changes{$item}{$type} = 1;
+                    }
+                } else {
+                    if (!$confhash{$item}{$type}) {
+                        $changes{$item}{$type} = 1;
+                    }
                 }
             }
         }
     }
-    if (ref($domconfig{'quotas'}) eq 'HASH') {
-        if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
-            foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {
-                if (exists($confhash{'defaultquota'}{$key})) {
-                    if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{'defaultquota'}{$key}) {
-                        $changes{'defaultquota'}{$key} = 1;
+    unless ($context eq 'requestcourses') {
+        if (ref($domconfig{'quotas'}) eq 'HASH') {
+            if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
+                foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {
+                    if (exists($confhash{'defaultquota'}{$key})) {
+                        if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{'defaultquota'}{$key}) {
+                            $changes{'defaultquota'}{$key} = 1;
+                        }
+                    } else {
+                        $confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{'defaultquota'}{$key};
                     }
-                } else {
-                    $confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{'defaultquota'}{$key};
                 }
-            }
-        } else {
-            foreach my $key (keys(%{$domconfig{'quotas'}})) {
-                if (exists($confhash{'defaultquota'}{$key})) {
-                    if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{$key}) {
-                        $changes{'defaultquota'}{$key} = 1;
+            } else {
+                foreach my $key (keys(%{$domconfig{'quotas'}})) {
+                    if (exists($confhash{'defaultquota'}{$key})) {
+                        if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{$key}) {
+                            $changes{'defaultquota'}{$key} = 1;
+                        }
+                    } else {
+                        $confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{$key};
                     }
-                } else {
-                    $confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{$key};
                 }
             }
         }
-    }
-    if (ref($confhash{'defaultquota'}) eq 'HASH') {
-        foreach my $key (keys(%{$confhash{'defaultquota'}})) {
-            if (ref($domconfig{'quotas'}) eq 'HASH') {
-                if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
-                    if (!exists($domconfig{'quotas'}{'defaultquota'}{$key})) {
-                        $changes{'defaultquota'}{$key} = 1;
+        if (ref($confhash{'defaultquota'}) eq 'HASH') {
+            foreach my $key (keys(%{$confhash{'defaultquota'}})) {
+                if (ref($domconfig{'quotas'}) eq 'HASH') {
+                    if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
+                        if (!exists($domconfig{'quotas'}{'defaultquota'}{$key})) {
+                            $changes{'defaultquota'}{$key} = 1;
+                        }
+                    } else {
+                        if (!exists($domconfig{'quotas'}{$key})) {
+                            $changes{'defaultquota'}{$key} = 1;
+                        }
                     }
                 } else {
-                    if (!exists($domconfig{'quotas'}{$key})) {
-                        $changes{'defaultquota'}{$key} = 1;
-                    }
+                    $changes{'defaultquota'}{$key} = 1;
                 }
-            } else {
-                $changes{'defaultquota'}{$key} = 1;
             }
         }
     }
@@ -3589,7 +3394,7 @@ sub modify_quotas {
     }
    
     my %quotahash = (
-                      quotas => { %confhash }
+                      $action => { %confhash }
                     );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%quotahash,
                                              $dom);
@@ -3599,18 +3404,20 @@ sub modify_quotas {
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
 
             $resulttext = &mt('Changes made:').'<ul>';
-            if (ref($changes{'defaultquota'}) eq 'HASH') {
-                $resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
-                foreach my $type (@{$types},'default') {
-                    if (defined($changes{'defaultquota'}{$type})) {
-                        my $typetitle = $usertypes->{$type};
-                        if ($type eq 'default') {
-                            $typetitle = $othertitle;
+            unless ($context eq 'requestcourses') {
+                if (ref($changes{'defaultquota'}) eq 'HASH') {
+                    $resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
+                    foreach my $type (@{$types},'default') {
+                        if (defined($changes{'defaultquota'}{$type})) {
+                            my $typetitle = $usertypes->{$type};
+                            if ($type eq 'default') {
+                                $typetitle = $othertitle;
+                            }
+                            $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
                         }
-                        $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
                     }
+                    $resulttext .= '</ul></li>';
                 }
-                $resulttext .= '</ul></li>';
             }
             my %newenv;
             foreach my $item (@usertools) {
@@ -3618,9 +3425,15 @@ sub modify_quotas {
                     my $newacc = 
                         &Apache::lonnet::usertools_access($env{'user.name'},
                                                           $env{'user.domain'},
-                                                          $item,'reload');
-                    if ($env{'environment.availabletools.'.$item} ne $newacc) { 
-                        $newenv{'environment.availabletools.'.$item} = $newacc;
+                                                          $item,'reload',$context);
+                    if ($context eq 'requestcourses') {
+                        if ($env{'environment.canrequest.'.$item} ne $newacc) {
+                            $newenv{'environment.canrequest.'.$item} = $newacc;
+                        }
+                    } else {
+                        if ($env{'environment.availabletools.'.$item} ne $newacc) { 
+                            $newenv{'environment.availabletools.'.$item} = $newacc;
+                        }
                     }
                     $resulttext .= '<li>'.$titles{$item}.'<ul>';
                     foreach my $type (@{$types},'default','_LC_adv') {
@@ -3646,7 +3459,11 @@ sub modify_quotas {
                 &Apache::lonnet::appenv(\%newenv);
             }
         } else {
-            $resulttext = &mt('No changes made to availability of home pages, blogs, portfolios or default quotas');
+            if ($context eq 'requestcourses') {
+                $resulttext = &mt('No changes made to rights to request creation of courses.');
+            } else {
+                $resulttext = &mt('No changes made to availability of personal information pages, blogs, portfolios or default quotas');
+            }
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -4029,7 +3846,7 @@ sub modify_contacts {
     }
     my (%others,%to);
     my @contacts = ('supportemail','adminemail');
-    my @mailings = ('errormail','packagesmail','helpdeskmail');
+    my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail');
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
             &Apache::loncommon::get_env_multiple('form.'.$type);
@@ -4074,6 +3891,7 @@ sub modify_contacts {
         $default{'errormail'} = 'adminemail';
         $default{'packagesmail'} = 'adminemail';
         $default{'helpdeskmail'} = 'supportemail';
+        $default{'lonstatusmail'} = 'adminemail';
         foreach my $item (@contacts) {
            if ($to{$item} ne $default{$item}) {
               $changes{$item} = 1;
@@ -4761,8 +4579,10 @@ sub modify_coursecategories {
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
-        $domconfig{'coursecategories'}{'togglecats'} = $env{'form.togglecats'};
-        $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};
+        $domconfig{'coursecategories'} = {
+                                             togglecats => $env{'form.togglecats'},
+                                             categorize => $env{'form.categorize'},
+                                         };
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {