--- loncom/interface/domainprefs.pm	2008/06/03 17:02:12	1.55
+++ loncom/interface/domainprefs.pm	2008/07/19 02:28:44	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.55 2008/06/03 17:02:12 raeburn Exp $
+# $Id: domainprefs.pm,v 1.64 2008/07/19 02:28:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,7 @@ use LONCAPA;
 use LONCAPA::Enrollment;
 use File::Copy;
 use Locale::Language;
+use DateTime::TimeZone;
 
 sub handler {
     my $r=shift;
@@ -62,7 +63,7 @@ sub handler {
     }
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['phase']);
+                                            ['phase','actions']);
     my $phase = 'pickactions';
     if ( exists($env{'form.phase'}) ) {
         $phase = $env{'form.phase'};
@@ -150,7 +151,9 @@ sub handler {
                     header => [{col1 => 'Target user has role',
                                 col2 => 'User information updateable in author context'},
                                {col1 => 'Target user has role',
-                                col2 => 'User information updateable in course context'}],
+                                col2 => 'User information updateable in course context'},
+                               {col1 => "Status of user",
+                                col2 => 'Information settable when self-creating account (if directory data blank)'}],
                   },
         'scantron' => 
                   { text => 'Scantron format file',
@@ -162,9 +165,11 @@ sub handler {
         'coursecategories' => 
                   { text => 'Cataloging of courses',
                     help => 'Domain_Course_Catalog',
-                    header => [  {col1 => 'Categories',
-                                  col2 => '',
-                              }],
+                    header => [{col1 => 'Category settings',  
+                                col2 => '',},
+                               {col1 => 'Categories',
+                                col2 => '',
+                               }],
                   }
     );
     my @roles = ('student','coordinator','author','admin');
@@ -300,10 +305,10 @@ sub handler {
         $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="check all" '.
+              '</script>'."\n".'<p><input type="button" value="'.&mt('check all').'" '.
               'onclick="javascript:checkAll(document.pickactions.actions)"'.
               ' />&nbsp;&nbsp;'.
-              '<input type="button" value="uncheck all" '.
+              '<input type="button" value="'.&mt('uncheck all').'" '.
               'onclick="javascript:uncheckAll(document.pickactions.actions)"'.
               ' /></p><div class="LC_left_float">');
         my ($numitems,$midpoint,$seconddiv,$count); 
@@ -314,7 +319,7 @@ sub handler {
         }
         $count = 0;
         foreach my $item (@prefs_order) {
-            $r->print('<h4><label><input type="checkbox" name="actions" value="'.$item.'" />&nbsp;'.$prefs{$item}->{'text'}.'</label></h4>');
+            $r->print('<h4><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");
@@ -386,15 +391,19 @@ sub print_config_box {
 #          </tr>');
     $rowtotal ++;
     if (($action eq 'autoupdate') || ($action eq 'rolecolors') || 
-        ($action eq 'usercreation') || ($action eq 'usermodification')) {
-        my $colspan = ($action eq 'rolecolors')?' colspan="2"':'';
+        ($action eq 'usercreation') || ($action eq 'usermodification') ||
+        ($action eq 'coursecategories')) {
+        my $colspan = '';
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories')) {
+            $colspan = ' colspan="2"';
+        }
         $output .= '
           <tr>
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.$item->{'header'}->[0]->{'col1'}.'</td>
-              <td class="LC_right_item">'.$item->{'header'}->[0]->{'col2'}.'</td>
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
              </tr>';
              $rowtotal ++;
         if ($action eq 'autoupdate') {
@@ -403,6 +412,8 @@ sub print_config_box {
             $output .= &print_usercreation('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'usermodification') {
             $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'coursecategories') {
+            $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal);
         } else {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
         }
@@ -414,8 +425,9 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.$item->{'header'}->[1]->{'col1'}.'</td>
-              <td class="LC_right_item">'.$item->{'header'}->[1]->{'col2'}.'</td>
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
+        $output .= '
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col2'}).'</td>
              </tr>';
             $rowtotal ++;
         if ($action eq 'autoupdate') {
@@ -429,12 +441,26 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.$item->{'header'}->[2]->{'col1'}.'</td>
-              <td class="LC_right_item">'.$item->{'header'}->[2]->{'col2'}.'</td>             </tr>'.
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>             </tr>'.
             &print_usercreation('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
         } elsif ($action eq 'usermodification') {
-            $output .= &print_usermodification('bottom',$dom,$settings,\$rowtotal);
+            $output .= &print_usermodification('middle',$dom,$settings,\$rowtotal).'
+           </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+
+                       &print_usermodification('bottom',$dom,$settings,\$rowtotal);
+            $rowtotal ++;
+        } elsif ($action eq 'coursecategories') {
+            $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
         } else {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -444,8 +470,8 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.$item->{'header'}->[2]->{'col1'}.'</td>
-              <td class="LC_right_item">'.$item->{'header'}->[2]->{'col2'}.'</td>
+              <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_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -455,8 +481,8 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.$item->{'header'}->[3]->{'col1'}.'</td>
-              <td class="LC_right_item">'.$item->{'header'}->[3]->{'col2'}.'</td>
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
              </tr>'.
             &print_rolecolors($phase,'admin',$dom,$confname,$settings,\$rowtotal);
             $rowtotal += 2;
@@ -469,14 +495,13 @@ sub print_config_box {
              <tr class="LC_info_row">';
         if (($action eq 'login') || ($action eq 'directorysrch')) {
             $output .= '  
-              <td class="LC_left_item" colspan="2">'.$item->{'header'}->[0]->{'col1'}.'</td>';
+              <td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         } else {
             $output .= '
-              <td class="LC_left_item">'.$item->{'header'}->[0]->{'col1'}.'</td>';
+              <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         }
-        my $colspan = ($action eq 'coursecategories')?' colspan="2"':'';
         $output .= '
-              <td class="LC_right_item"'.$colspan.'>'.$item->{'header'}->[0]->{'col2'}.'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
              </tr>';
         $rowtotal ++;
         if ($action eq 'login') {
@@ -493,8 +518,6 @@ sub print_config_box {
             $output .= &print_defaults($dom,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
-        } elsif ($action eq 'coursecategories'){
-            $output .= &print_coursecategories($dom,$item,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -1676,10 +1699,14 @@ sub user_formats_row {
                );
     my $css_class = $rowcount%2?' class="LC_odd_row"':'';
     $output = '<tr '.$css_class.'>'.
-              '<td><span class="LC_nobreak">'.
-              &mt("Format rules to check for $text{$type}: ").
-              '</span></td>'.
-              '<td class="LC_left_item" colspan="2"><table>';
+              '<td><span class="LC_nobreak">';
+    if ($type eq 'email') {
+        $output .= &mt("Formats disallowed for $text{$type}: ");
+    } else {
+        $output .= &mt("Format rules to check for $text{$type}: ");
+    }
+    $output .= '</span></td>'.
+               '<td class="LC_left_item" colspan="2"><table>';
     my $rem;
     if (ref($ruleorder) eq 'ARRAY') {
         for (my $i=0; $i<@{$ruleorder}; $i++) {
@@ -1767,7 +1794,7 @@ sub print_usermodification {
             $$rowtotal ++;
             $rowcount ++;
         }
-    } else {
+    } elsif ($position eq 'middle') {
         $context = 'course';
         $rowcount = 0;
         foreach my $role ('st','ep','ta','in','cr') {
@@ -1776,6 +1803,20 @@ sub print_usermodification {
             $$rowtotal ++;
             $rowcount ++;
         }
+    } elsif ($position eq 'bottom') {
+        $context = 'selfcreate';
+        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}) {
+                $datatable .= &modifiable_userdata_row($context,$status,$settings,
+                                                       $numinrow,$rowcount,$usertypes);
+                $$rowtotal ++;
+                $rowcount ++;
+            }
+        }
     }
     return $datatable;
 }
@@ -1841,7 +1882,8 @@ sub defaults_titles {
 sub print_scantronformat {
     my ($r,$dom,$confname,$settings,$rowtotal) = @_;
     my $itemcount = 1;
-    my ($datatable,$css_class,$scantronurl,$is_custom,%error,%scantronurls);
+    my ($datatable,$css_class,$scantronurl,$is_custom,%error,%scantronurls,
+        %confhash);
     my $switchserver = &check_switchserver($dom,$confname);
     my %lt = &Apache::lonlocal::texthash (
                 default => 'Default scantron format file error',
@@ -1868,23 +1910,52 @@ sub print_scantronformat {
                     );
                     my %md5chk;
                     foreach my $type (keys(%legacyfile)) {
-                        $md5chk{$type} = split(/ /,`md5sum $legacyfile{$type}`);
-                        chop($md5chk{$type});
+                        ($md5chk{$type}) = split(/ /,`md5sum $legacyfile{$type}`);
+                        chomp($md5chk{$type});
                     }
                     if ($md5chk{'default'} ne $md5chk{'custom'}) {
                         foreach my $type (keys(%legacyfile)) {
-                            ($scantronurls{$type},$error{$type}) = 
+                            ($scantronurls{$type},my $error) = 
                                 &legacy_scantronformat($r,$dom,$confname,
                                                  $type,$legacyfile{$type},
                                                  $scantronurls{$type},
                                                  $scantronfiles{$type});
+                            if ($error ne '') {
+                                $error{$type} = $error;
+                            }
+                        }
+                        if (keys(%error) == 0) {
+                            $is_custom = 1;
+                            $confhash{'scantron'}{'scantronformat'} = 
+                                $scantronurls{'custom'};
+                            my $putresult = 
+                                &Apache::lonnet::put_dom('configuration',
+                                                         \%confhash,$dom);
+                            if ($putresult ne 'ok') {
+                                $error{'custom'} = 
+                                    '<span class="LC_error">'.
+                                    &mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>';
+                            }
                         }
                     } else {
-                        ($scantronurls{'default'},$error{'default'}) =
+                        ($scantronurls{'default'},my $error) =
                             &legacy_scantronformat($r,$dom,$confname,
                                           'default',$legacyfile{'default'},
                                           $scantronurls{'default'},
                                           $scantronfiles{'default'});
+                        if ($error eq '') {
+                            $confhash{'scantron'}{'scantronformat'} = ''; 
+                            my $putresult =
+                                &Apache::lonnet::put_dom('configuration',
+                                                         \%confhash,$dom);
+                            if ($putresult ne 'ok') {
+                                $error{'default'} =
+                                    '<span class="LC_error">'.
+                                    &mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>';
+                            }
+                        } else {
+                            $error{'default'} = $error;
+                        }
                     }
                 }
             }
@@ -1905,7 +1976,11 @@ sub print_scantronformat {
             $scantronurl = $scantronurls{'default'};
         }
     } else {
-        $scantronurl = $scantronurls{'default'};
+        if ($is_custom) {
+            $scantronurl = $scantronurls{'custom'};
+        } else {
+            $scantronurl = $scantronurls{'default'};
+        }
     }
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>';
@@ -1917,16 +1992,29 @@ sub print_scantronformat {
         } else {
             $datatable = &mt('File unavailable for display');
         }
-        $datatable .= '</td><td valign="bottom">'.&mt('Upload:').'<br />';
+        $datatable .= '</td>';
+        if (keys(%error) == 0) { 
+            $datatable .= '<td valign="bottom">';
+            if (!$switchserver) {
+                $datatable .= &mt('Upload:').'<br />';
+            }
+        } else {
+            my $errorstr;
+            foreach my $key (sort(keys(%error))) {
+                $errorstr .= $lt{$key}.': '.$error{$key}.'<br />';
+            }
+            $datatable .= '<td>'.$errorstr;
+        }
     } else {
         if (keys(%error) > 0) {
             my $errorstr;
             foreach my $key (sort(keys(%error))) {
                 $errorstr .= $lt{$key}.': '.$error{$key}.'<br />';
             } 
-            $datatable .= '<td>'.$errorstr.'</td><td>';
+            $datatable .= '<td>'.$errorstr.'</td><td>&nbsp;';
         } elsif ($scantronurl) {
-            $datatable .= '<td><a href="'.$scantronurl.'" target="_blank">'                          .&mt('Custom scantron format file').'</a>'
+            $datatable .= '<td><a href="'.$scantronurl.'" target="_blank">'
+                          .&mt('Custom scantron format file').'</a>'
                           .'<span class="LC_nobreak"><label>'
                           .'<input type="checkbox" name="scantronformat_del"'
                           .'" value="1" />'.&mt('Delete?').'</label></td>'
@@ -1961,118 +2049,167 @@ sub legacy_scantronformat {
 }
 
 sub print_coursecategories {
-    my ($dom,$hdritem,$settings,$rowtotal) = @_;
-    my ($datatable,$css_class);
-    my $itemcount = 1;
-    if (ref($settings) eq 'HASH') {
-        my (@cats,@trails,%allitems,%idx,@jsarray);
-        &Apache::loncommon::extract_categories($settings,\@cats,\@trails,
-                                               \%allitems,\%idx,\@jsarray);
-        my $maxdepth = scalar(@cats);
-        my $colattrib = '';
-        if ($maxdepth > 2) {
-            $colattrib = ' colspan="2" ';
-        }
-        my @path;
-        if (@cats > 0) {
-            if (ref($cats[0]) eq 'ARRAY') {
-                my $numtop = @{$cats[0]};
-                my $maxnum = $numtop;
-                if ((!grep(/^instcode$/,@{$cats[0]})) || ($settings->{'instcode::0'} eq '')) {
-                    $maxnum ++;
-                }
-                my $lastidx;
-                for (my $i=0; $i<$numtop; $i++) {
-                    my $parent = $cats[0][$i];
+    my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
+    my $datatable;
+    if ($position eq 'top') {
+        my $toggle_cats_crs = ' ';
+        my $toggle_cats_dom = ' checked="checked" ';
+        my $can_cat_crs = ' ';
+        my $can_cat_dom = ' checked="checked" ';
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'togglecats'} eq 'crs') {
+                $toggle_cats_crs = $toggle_cats_dom;
+                $toggle_cats_dom = ' ';
+            }
+            if ($settings->{'categorize'} eq 'crs') {
+                $can_cat_crs = $can_cat_dom;
+                $can_cat_dom = ' ';
+            }
+        }
+        my %title = &Apache::lonlocal::texthash (
+                     togglecats => 'Show/Hide a course in the catalog',
+                     categorize    => 'Assign a category to a course',
+                    );
+        my %level = &Apache::lonlocal::texthash (
+                     dom => 'Set in "Modify Course" (Domain)',
+                     crs => 'Set in "Modify Parameters" (Course)',   
+                    );
+        $datatable = '<tr class="LC_odd_row">'.
+                  '<td>'.$title{'togglecats'}.'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="togglecats"'.
+                  $toggle_cats_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="togglecats"'.
+                  $toggle_cats_crs.' value="crs" />'.$level{'crs'}.'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<td>'.$title{'categorize'}.'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<label><input type="radio" name="categorize"'.
+                  $can_cat_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="categorize"'.
+                  $can_cat_crs.'value="crs" />'.$level{'crs'}.'</label></span></td>'.
+                  '</tr>';
+        $$rowtotal += 2;
+    } else {
+        my $css_class;
+        my $itemcount = 1;
+        my $cathash; 
+        if (ref($settings) eq 'HASH') {
+            $cathash = $settings->{'cats'};
+        }
+        if (ref($cathash) eq 'HASH') {
+            my (@cats,@trails,%allitems,%idx,@jsarray);
+            &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,
+                                                   \%allitems,\%idx,\@jsarray);
+            my $maxdepth = scalar(@cats);
+            my $colattrib = '';
+            if ($maxdepth > 2) {
+                $colattrib = ' colspan="2" ';
+            }
+            my @path;
+            if (@cats > 0) {
+                if (ref($cats[0]) eq 'ARRAY') {
+                    my $numtop = @{$cats[0]};
+                    my $maxnum = $numtop;
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
+                        $maxnum ++;
+                    }
+                    my $lastidx;
+                    for (my $i=0; $i<$numtop; $i++) {
+                        my $parent = $cats[0][$i];
+                        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                        my $item = &escape($parent).'::0';
+                        my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$item','$idx{$item}'".');"';
+                        $lastidx = $idx{$item};
+                        $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                                      .'<select name="'.$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>';
+                        }
+                        $datatable .= '</select></td><td>';
+                        if ($parent eq 'instcode') {
+                            $datatable .=  '<span class="LC_nobreak">'.&mt('Official courses')
+                                           .'</span><br /><span class="LC_nobreak">('
+                                           .&mt('with institutional codes').')</span></td>'
+                                           .'<td'.$colattrib.'><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" checked="checked" />'
+                                            .&mt('Display').'</label>&nbsp;'
+                                            .'<label><input type="radio" name="instcode" value="0" />'
+                                            .&mt('Do not display').'</label></span></td>';
+                        } else {
+                            $datatable .= $parent
+                                          .'&nbsp;<label><input type="checkbox" name="deletecategory" '
+                                          .'value="'.$item.'" />'.&mt('Delete').'</label></span></td>';
+                        }
+                        my $depth = 1;
+                        push(@path,$parent);
+                        $datatable .= &build_category_rows($itemcount,\@cats,$depth,$parent,\@path,\%idx);
+                        pop(@path);
+                        $datatable .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                        $itemcount ++;
+                    }
                     $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                    my $item = &escape($parent).'::0';
-                    my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$item','$idx{$item}'".');"';
-                    $lastidx = $idx{$item};
-                    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                                  .'<select name="'.$item.'"'.$chgstr.'>';
+                    my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','addcategory_pos','$lastidx'".');"';
+                    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak"><select name="addcategory_pos"'.$chgstr.'>';
                     for (my $k=0; $k<=$maxnum; $k++) {
                         my $vpos = $k+1;
                         my $selstr;
-                        if ($k == $i) {
+                        if ($k == $numtop) {
                             $selstr = ' selected="selected" ';
                         }
                         $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                     }
-                    $datatable .= '</select></td><td>';
-                    if ($parent eq 'instcode') {
-                        $datatable .=  '<span class="LC_nobreak">'.&mt('Official courses')
-                                       .'</span><br /><span class="LC_nobreak">('
-                                       .&mt('with institutional codes').')</span></td>'
-                                       .'<td'.$colattrib.'><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" checked="checked" />'
-                                        .&mt('Display').'</label>&nbsp;'
-                                        .'<label><input type="radio" name="instcode" value="0" />'
-                                        .&mt('Do not display').'</label></span></td>';
-                    } else {
-                        $datatable .= $parent
-                                      .'&nbsp;<label><input type="checkbox" name="deletecategory" '
-                                      .'value="'.$item.'" />'.&mt('Delete').'</label></span></td>';
-                    }
-                    my $depth = 1;
-                    push(@path,$parent);
-                    $datatable .= &build_category_rows($itemcount,\@cats,$depth,$parent,\@path,\%idx);
-                    pop(@path);
-                    $datatable .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                    $datatable .= '</select></span></td><td colspan="2">'.&mt('Add category:').'&nbsp;'
+                                  .'<input type="text" size="20" name="addcategory_name" value="" /></td>'
+                                  .'</tr>'."\n";
                     $itemcount ++;
-                }
-                $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','addcategory_pos','$lastidx'".');"';
-                $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak"><select name="addcategory_pos"'.$chgstr.'>';
-                for (my $k=0; $k<=$maxnum; $k++) {
-                    my $vpos = $k+1;
-                    my $selstr;
-                    if ($k == $numtop) {
-                        $selstr = ' selected="selected" ';
-                    }
-                    $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-                }
-                $datatable .= '</select></span></td><td colspan="2">'.&mt('New:').'&nbsp;'
-                              .'<input type="text" size="20" name="addcategory_name" value="" /></td>'
-                              .'</tr>'."\n";
-                $itemcount ++;
-                if ((!grep(/^instcode$/,@{$cats[0]})) || ($settings->{'instcode::0'} eq '')) {
-                    $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                    my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','$lastidx'".');"';
-                    $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
-                                  '<span class="LC_nobreak"><select name="instcode_pos"'.$chgstr.'>';
-                    for (my $k=0; $k<=$maxnum; $k++) {
-                        my $vpos = $k+1;
-                        my $selstr;
-                        if ($k == $maxnum) {
-                            $selstr = ' selected="selected" ';
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
+                        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                        my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','$lastidx'".');"';
+                        $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
+                                      '<span class="LC_nobreak"><select name="instcode_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 .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                        $datatable .= '</select></span></td><td><span class="LC_nobreak">'
+                                      .&mt('Official courses').'</span>'.'<br /><span class="LC_nobreak">('
+                                      .&mt('with institutional codes').')</span></td>'
+                                      .'<td><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" />'
+                                      .&mt('Display').'</label>&nbsp;'
+                                      .'<label><input type="radio" name="instcode" value="0" checked="checked"/>'
+                                      .&mt('Do not display').'</label></span></td></tr>';
                     }
-                    $datatable .= '</select></span></td><td><span class="LC_nobreak">'
-                                  .&mt('Official courses').'</span>'.'<br /><span class="LC_nobreak">('
-                                  .&mt('with institutional codes').')</span></td>'
-                                  .'<td><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" />'
-                                  .&mt('Display').'</label>&nbsp;'
-                                  .'<label><input type="radio" name="instcode" value="0" checked="checked"/>'
-                                  .&mt('Do not display').'</label></span></td></tr>';
                 }
+            } else {
+                $datatable .= &initialize_categories($itemcount);
             }
         } else {
-            $datatable .= &initialize_categories($itemcount);
+            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>'
+                          .&initialize_categories($itemcount);
         }
-    } else {
-        $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>'
-                      .&initialize_categories($itemcount);
+        $$rowtotal += $itemcount;
     }
-    $$rowtotal += $itemcount;
     return $datatable;
 }
 
 sub coursecategories_javascript {
     my ($settings) = @_;
-    my ($output,$jstext);
+    my ($output,$jstext,$cathash);
     if (ref($settings) eq 'HASH') {
+        $cathash = $settings->{'cats'};
+    }
+    if (ref($cathash) eq 'HASH') {
         my (@cats,@jsarray,%idx);
-        &Apache::loncommon::gather_categories($settings,\@cats,\%idx,\@jsarray);
+        &Apache::loncommon::gather_categories($cathash,\@cats,\%idx,\@jsarray);
         if (@jsarray > 0) {
             $jstext = '    var categories = Array('.scalar(@jsarray).');'."\n";
             for (my $i=0; $i<@jsarray; $i++) {
@@ -2227,7 +2364,7 @@ sub build_category_rows {
                             pop(@{$path});
                         }
                     } else {
-                        $text .= &mt('New:').'&nbsp;</span><input type="textbox" size="20" name="addcategory_name_';
+                        $text .= &mt('Add subcategory:').'&nbsp;</span><input type="textbox" size="20" name="addcategory_name_';
                         if ($j == $numchildren) {
                             $text .= $name;
                         } else {
@@ -2259,12 +2396,20 @@ sub build_category_rows {
 }
 
 sub modifiable_userdata_row {
-    my ($context,$role,$settings,$numinrow,$rowcount) = @_;
+    my ($context,$role,$settings,$numinrow,$rowcount,$usertypes) = @_;
     my $rolename;
-    if ($role eq 'cr') {
-        $rolename = &mt('Custom role');
+    if ($context eq 'selfcreate') {
+        if (ref($usertypes) eq 'HASH') {
+            $rolename = $usertypes->{$role};
+        } else {
+            $rolename = $role;
+        }
     } else {
-        $rolename = &Apache::lonnet::plaintext($role);
+        if ($role eq 'cr') {
+            $rolename = &mt('Custom role');
+        } else {
+            $rolename = &Apache::lonnet::plaintext($role);
+        }
     }
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
@@ -3987,10 +4132,11 @@ sub modify_usermodification {
             $curr_usermodification{$key} = $domconfig{'usermodification'}{$key};
         }
     }
-    my @contexts = ('author','course');
+    my @contexts = ('author','course','selfcreate');
     my %context_title = (
                            author => 'In author context',
                            course => 'In course context',
+                           selfcreate => 'When self creating account', 
                         );
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
@@ -3998,6 +4144,12 @@ sub modify_usermodification {
                   author => ['ca','aa'],
                   course => ['st','ep','ta','in','cr'],
                 );
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+    if (ref($types) eq 'ARRAY') {
+        push(@{$types},'default');
+        $usertypes->{'default'} = $othertitle;
+    }
+    $roles{'selfcreate'} = $types;  
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
     my %modifyhash;
     foreach my $context (@contexts) {
@@ -4045,13 +4197,26 @@ sub modify_usermodification {
                     if (ref($changes{$context}) eq 'ARRAY') {
                         foreach my $role (@{$changes{$context}}) {
                             my $rolename;
-                            if ($role eq 'cr') {
-                                $rolename = &mt('Custom');
+                            if ($context eq 'selfcreate') {
+                                $rolename = $role;
+                                if (ref($usertypes) eq 'HASH') {
+                                    if ($usertypes->{$role} ne '') {
+                                        $rolename = $usertypes->{$role};
+                                    }
+                                }
                             } else {
-                                $rolename = &Apache::lonnet::plaintext($role);
+                                if ($role eq 'cr') {
+                                    $rolename = &mt('Custom');
+                                } else {
+                                    $rolename = &Apache::lonnet::plaintext($role);
+                                }
                             }
                             my @modifiable;
-                            $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: ');
+                            if ($context eq 'selfcreate') {
+                                $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1]  ',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): ');
+                            } else {
+                                $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: ');
+                            }
                             foreach my $field (@fields) {
                                 if ($modifyhash{$context}{$role}{$field}) {
                                     push(@modifiable,$fieldtitles{$field});
@@ -4106,8 +4271,7 @@ sub modify_defaults {
             }
         } elsif ($item eq 'timezone_def') {
             if ($newvalues{$item} ne '') {
-                my @timezones = &DateTime::TimeZone->all_names;
-                if (!grep(/^\Q$newvalues{$item}\E/,@timezones)) {
+                if (!DateTime::TimeZone->is_valid_name($newvalues{$item})) {
                     push(@errors,$item);   
                 }
             }
@@ -4257,69 +4421,85 @@ sub modify_scantron {
 
 sub modify_coursecategories {
     my ($dom,%domconfig) = @_;
-    my ($resulttext,%deletions,%reorderings,%needreordering,%adds,$errors);
+    my ($resulttext,%deletions,%reorderings,%needreordering,%adds,%changes,$errors,
+        $cathash);
     my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory');
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
-        if (($domconfig{'coursecategories'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
+        $cathash = $domconfig{'coursecategories'}{'cats'};
+        if ($domconfig{'coursecategories'}{'togglecats'} ne $env{'form.togglecats'}) {
+            $changes{'togglecats'} = 1;
+            $domconfig{'coursecategories'}{'togglecats'} = $env{'form.togglecats'};
+        }
+        if ($domconfig{'coursecategories'}{'categorize'} ne $env{'form.categorize'}) {
+            $changes{'categorize'} = 1;
+            $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};
+        }
+    } else {
+        $changes{'togglecats'} = 1;
+        $changes{'categorize'} = 1;
+        $domconfig{'coursecategories'}{'togglecats'} = $env{'form.togglecats'};
+        $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};
+    }
+    if (ref($cathash) eq 'HASH') {
+        if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
             push (@deletecategory,'instcode::0');
         }
     }
-    my (@predelcats,@predeltrails,%predelallitems);
-    if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+    my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail);
+    if (ref($cathash) eq 'HASH') {
         if (@deletecategory > 0) {
             #FIXME Need to remove category from all courses using a deleted category 
-            &Apache::loncommon::extract_categories($domconfig{'coursecategories'},\@predelcats,\@predeltrails,\%predelallitems);
+            &Apache::loncommon::extract_categories($cathash,\@predelcats,\@predeltrails,\%predelallitems);
             foreach my $item (@deletecategory) {
-                if ($domconfig{'coursecategories'}{$item} ne '') {
-                    delete($domconfig{'coursecategories'}{$item});
+                if ($domconfig{'coursecategories'}{'cats'}{$item} ne '') {
+                    delete($domconfig{'coursecategories'}{'cats'}{$item});
                     $deletions{$item} = 1;
-                    &recurse_cat_deletes($item,$domconfig{'coursecategories'},
-                                         \%deletions);
+                    &recurse_cat_deletes($item,$cathash,\%deletions);
                 }
             }
         }
-        foreach my $item (keys(%{$domconfig{'coursecategories'}})) {
+        foreach my $item (keys(%{$cathash})) {
             my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$item);
-            if ($domconfig{'coursecategories'}{$item} ne $env{'form.'.$item}) {
+            if ($cathash->{$item} ne $env{'form.'.$item}) {
                 $reorderings{$item} = 1;
-                $domconfig{'coursecategories'}{$item} = $env{'form.'.$item};
+                $domconfig{'coursecategories'}{'cats'}{$item} = $env{'form.'.$item};
             }
             if ($env{'form.addcategory_name_'.$item} ne '') {
                 my $newcat = $env{'form.addcategory_name_'.$item};
                 my $newdepth = $depth+1;
                 my $newitem = &escape($newcat).':'.&escape($cat).':'.$newdepth;
-                $domconfig{'coursecategories'}{$newitem} = $env{'form.addcategory_pos_'.$item};
+                $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos_'.$item};
                 $adds{$newitem} = 1; 
             }
             if ($env{'form.subcat_'.$item} ne '') {
                 my $newcat = $env{'form.subcat_'.$item};
                 my $newdepth = $depth+1;
                 my $newitem = &escape($newcat).':'.&escape($cat).':'.$newdepth;
-                $domconfig{'coursecategories'}{$newitem} = 0;
+                $domconfig{'coursecategories'}{'cats'}{$newitem} = 0;
                 $adds{$newitem} = 1;
             }
         }
     }
     if ($env{'form.instcode'} eq '1') {
-        if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+        if (ref($cathash) eq 'HASH') {
             my $newitem = 'instcode::0';
-            if ($domconfig{'coursecategories'}{$newitem} eq '') {  
-                $domconfig{'coursecategories'}{$newitem} = $env{'form.instcode_pos'};
+            if ($cathash->{$newitem} eq '') {  
+                $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.instcode_pos'};
                 $adds{$newitem} = 1;
             }
         } else {
             my $newitem = 'instcode::0';
-            $domconfig{'coursecategories'}{$newitem} = $env{'form.instcode_pos'};
+            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.instcode_pos'};
             $adds{$newitem} = 1;
         }
     }
     if ($env{'form.addcategory_name'} ne '') {
         my $newitem = &escape($env{'form.addcategory_name'}).'::0';
-        $domconfig{'coursecategories'}{$newitem} = $env{'form.addcategory_pos'};
+        $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
         $adds{$newitem} = 1;
     }
+    my $putresult;
     if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
-        my %sort_by_deltrail;
         if (keys(%deletions) > 0) {
             foreach my $key (keys(%deletions)) {
                 if ($predelallitems{$key} ne '') {
@@ -4328,7 +4508,7 @@ sub modify_coursecategories {
             }
         }
         my (@chkcats,@chktrails,%chkallitems);
-        &Apache::loncommon::extract_categories($domconfig{'coursecategories'},\@chkcats,\@chktrails,\%chkallitems);
+        &Apache::loncommon::extract_categories($domconfig{'coursecategories'}{'cats'},\@chkcats,\@chktrails,\%chkallitems);
         if (ref($chkcats[0]) eq 'ARRAY') {
             my $depth = 0;
             my $chg = 0;
@@ -4340,56 +4520,80 @@ sub modify_coursecategories {
                 } else {
                     $item = &escape($name).'::0';
                     if ($chg) {
-                        $domconfig{'coursecategories'}{$item} -= $chg;
+                        $domconfig{'coursecategories'}{'cats'}{$item} -= $chg;
                     }
                     $depth ++; 
-                    &recurse_check(\@chkcats,$domconfig{'coursecategories'},$depth,$name);
+                    &recurse_check(\@chkcats,$domconfig{'coursecategories'}{'cats'},$depth,$name);
                     $depth --;
                 }
             }
         }
-        my $putresult = &Apache::lonnet::put_dom('configuration',\%domconfig,$dom);
-        my (@cats,@trails,%allitems);
-        &Apache::loncommon::extract_categories($domconfig{'coursecategories'},\@cats,\@trails,\%allitems);
+    }
+    if ((keys(%changes) > 0) || (keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
+        $putresult = &Apache::lonnet::put_dom('configuration',\%domconfig,$dom);
         if ($putresult eq 'ok') {
+            my %title = (
+                         togglecats  => 'Show/Hide a course in the catalog',
+                         categorize     => 'Category assigned to course',
+                        );
+            my %level = (
+                         dom => 'set from "Modify Course" (Domain)',
+                         crs => 'set from "Parameters" (Course)',
+                        );
             $resulttext = &mt('Changes made:').'<ul>';
-            if (keys(%deletions) > 0) {
-                $resulttext .= '<li>'.&mt('Deleted categories:').'<ul>';
-                foreach my $predeltrail (sort {$a <=> $b } (keys(%sort_by_deltrail))) { 
-                    $resulttext .= '<li>'.$predeltrails[$predeltrail].'</li>';
-                }
-                $resulttext .= '</ul></li>';
+            if ($changes{'togglecats'}) {
+                $resulttext .= '<li>'.&mt("$title{'togglecats'} $level{$env{'form.togglecats'}}").'</li>'; 
             }
-            if (keys(%reorderings) > 0) {
-                my %sort_by_trail;
-                $resulttext .= '<li>'.&mt('Reordered categories:').'<ul>';
-                foreach my $key (keys(%reorderings)) {
-                    if ($allitems{$key} ne '') {
-                        $sort_by_trail{$allitems{$key}} = $trails[$allitems{$key}];
-                    }
-                }
-                foreach my $trail (sort {$a <=> $b } (keys(%sort_by_trail))) {
-                    $resulttext .= '<li>'.$trails[$trail].'</li>';
-                }
-                $resulttext .= '</ul></li>';
+            if ($changes{'categorize'}) {
+                $resulttext .= '<li>'.&mt("$title{'categorize'} $level{$env{'form.categorize'}}").'</li>';
             }
-            if (keys(%adds) > 0) {
-                my %sort_by_trail;
-                $resulttext .= '<li>'.&mt('Added categories:').'<ul>';
-                foreach my $key (keys(%adds)) {
-                    if ($allitems{$key} ne '') {
-                        $sort_by_trail{$allitems{$key}} = $trails[$allitems{$key}];
+            if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
+                my $cathash;
+                if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+                    $cathash = $domconfig{'coursecategories'}{'cats'};
+                } else {
+                    $cathash = {};
+                } 
+                my (@cats,@trails,%allitems);
+                    &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems);
+                if (keys(%deletions) > 0) {
+                    $resulttext .= '<li>'.&mt('Deleted categories:').'<ul>';
+                    foreach my $predeltrail (sort {$a <=> $b } (keys(%sort_by_deltrail))) { 
+                        $resulttext .= '<li>'.$predeltrails[$predeltrail].'</li>';
+                    }
+                    $resulttext .= '</ul></li>';
+                }
+                if (keys(%reorderings) > 0) {
+                    my %sort_by_trail;
+                    $resulttext .= '<li>'.&mt('Reordered categories:').'<ul>';
+                    foreach my $key (keys(%reorderings)) {
+                        if ($allitems{$key} ne '') {
+                            $sort_by_trail{$allitems{$key}} = $trails[$allitems{$key}];
+                        }
+                    }
+                    foreach my $trail (sort {$a <=> $b } (keys(%sort_by_trail))) {
+                        $resulttext .= '<li>'.$trails[$trail].'</li>';
                     }
+                    $resulttext .= '</ul></li>';
                 }
-                foreach my $trail (sort {$a <=> $b } (keys(%sort_by_trail))) {
-                    $resulttext .= '<li>'.$trails[$trail].'</li>';
+                if (keys(%adds) > 0) {
+                    my %sort_by_trail;
+                    $resulttext .= '<li>'.&mt('Added categories:').'<ul>';
+                    foreach my $key (keys(%adds)) {
+                        if ($allitems{$key} ne '') {
+                            $sort_by_trail{$allitems{$key}} = $trails[$allitems{$key}];
+                        }
+                    }
+                    foreach my $trail (sort {$a <=> $b } (keys(%sort_by_trail))) {
+                        $resulttext .= '<li>'.$trails[$trail].'</li>';
+                    }
+                    $resulttext .= '</ul></li>';
                 }
-                $resulttext .= '</ul></li>';
             }
             $resulttext .= '</ul>';
         } else {
             $resulttext = '<span class="LC_error">'.
-                &mt('An error occurred: [_1]',$putresult).'</span>';
+                          &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
         $resulttext = &mt('No changes made to course categories');