--- loncom/interface/domainprefs.pm	2008/05/01 00:01:16	1.47
+++ loncom/interface/domainprefs.pm	2008/06/24 15:01:23	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.47 2008/05/01 00:01:16 raeburn Exp $
+# $Id: domainprefs.pm,v 1.56 2008/06/24 15:01:23 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
-use LONCAPA();
+use LONCAPA;
 use LONCAPA::Enrollment;
 use File::Copy;
 use Locale::Language;
@@ -70,11 +70,12 @@ sub handler {
     my %domconfig =
       &Apache::lonnet::get_dom('configuration',['login','rolecolors',
                 'quotas','autoenroll','autoupdate','directorysrch',
-                'usercreation','usermodification','contacts','defaults','scantron'],
-                $dom);
+                'usercreation','usermodification','contacts','defaults',
+                'scantron','coursecategories'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','directorysrch','contacts',
-                       'usercreation','usermodification','scantron');
+                       'usercreation','usermodification','scantron',
+                       'coursecategories');
     my %prefs = (
         'rolecolors' =>
                    { text => 'Default color schemes',
@@ -95,7 +96,7 @@ sub handler {
                                   col2 => '',}],
                     },
         'defaults' => 
-                    { text => 'Default authentication/language',
+                    { text => 'Default authentication/language/timezone',
                       help => '',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'}],
@@ -158,6 +159,13 @@ sub handler {
                                  col2 => '',
                               }],
                   },
+        'coursecategories' => 
+                  { text => 'Cataloging of courses',
+                    help => 'Domain_Course_Catalog',
+                    header => [  {col1 => 'Categories',
+                                  col2 => '',
+                              }],
+                  }
     );
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
@@ -292,10 +300,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); 
@@ -306,7 +314,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");
@@ -316,9 +324,9 @@ sub handler {
         $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;'.
-                  '<input type="radio" name="numcols" value="2">'.
+                  '<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>');
@@ -352,7 +360,9 @@ sub process_changes {
     } elsif ($action eq 'defaults') {
         $output = &modify_defaults($dom,$r);
     } elsif ($action eq 'scantron') {
-        $output = &modify_scantron($r,$dom,$confname,\%domconfig);
+        $output = &modify_scantron($r,$dom,$confname,%domconfig);
+    } elsif ($action eq 'coursecategories') {
+        $output = &modify_coursecategories($dom,%domconfig);
     }
     return $output;
 }
@@ -360,7 +370,11 @@ sub process_changes {
 sub print_config_box {
     my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_;
     my $rowtotal = 0;
-    my $output = 
+    my $output;
+    if ($action eq 'coursecategories') {
+        $output = &coursecategories_javascript($settings);
+    }  
+    $output .= 
          '<table class="LC_nested_outer">
           <tr>
            <th align="left"><span class="LC_nobreak">'.&mt($item->{text}).
@@ -460,10 +474,11 @@ sub print_config_box {
             $output .= '
               <td class="LC_left_item">'.$item->{'header'}->[0]->{'col1'}.'</td>';
         }
+        my $colspan = ($action eq 'coursecategories')?' colspan="2"':'';
         $output .= '
-              <td class="LC_right_item">'.$item->{'header'}->[0]->{'col2'}.'</td>
+              <td class="LC_right_item"'.$colspan.'>'.$item->{'header'}->[0]->{'col2'}.'</td>
              </tr>';
-        $rowtotal ++;      
+        $rowtotal ++;
         if ($action eq 'login') {
             $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'quotas') {
@@ -478,6 +493,8 @@ 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 .= '
@@ -498,7 +515,7 @@ function changePage(formname,newphase) {
     numchecked = 0;
     if (formname == document.pickactions) {
         if (formname.actions.length > 0) {
-            for (var i = 0; i <formname.actions.length; i++) {
+            for (var i = 0; i<formname.actions.length; i++) {
                 if (formname.actions[i].checked) {
                     numchecked ++;
                 }
@@ -1526,11 +1543,21 @@ sub print_usercreation {
             &Apache::lonnet::inst_userrules($dom,'username');
         my %lt = &usercreation_types();
         my %checked;
+        my @selfcreate; 
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'cancreate'}) eq 'HASH') {
                 foreach my $item (@creators) {
                     $checked{$item} = $settings->{'cancreate'}{$item};
                 }
+                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'});
+                    }
+                }
             } elsif (ref($settings->{'cancreate'}) eq 'ARRAY') {
                 foreach my $item (@creators) {
                     if (grep(/^\Q$item\E$/,@{$settings->{'cancreate'}})) {
@@ -1542,10 +1569,8 @@ sub print_usercreation {
         my $rownum = 0;
         foreach my $item (@creators) {
             $rownum ++;
-            if ($checked{$item} eq '') {
-                if ($item eq 'selfcreate') {
-                    $checked{$item} = 'none';
-                } else {
+            if ($item ne 'selfcreate') {  
+                if ($checked{$item} eq '') {
                     $checked{$item} = 'any';
                 }
             }
@@ -1558,24 +1583,33 @@ sub print_usercreation {
             $datatable .= '<tr'.$css_class.'>'.
                          '<td><span class="LC_nobreak">'.$lt{$item}.
                          '</span></td><td align="right">';
-            my @options = ('any');
+            my @options;
             if ($item eq 'selfcreate') {
                 push(@options,('email','login','sso'));
             } else {
+                @options = ('any');
                 if (ref($rules) eq 'HASH') {
                     if (keys(%{$rules}) > 0) {
                         push(@options,('official','unofficial'));
                     }
                 }
+                push(@options,'none');
             }
-            push(@options,'none');
             foreach my $option (@options) {
+                my $type = 'radio';
                 my $check = ' ';
-                if ($checked{$item} eq $option) {
-                    $check = ' checked="checked" ';
+                if ($item eq 'selfcreate') {
+                    $type = 'checkbox';
+                    if (grep(/^\Q$option\E$/,@selfcreate)) {
+                        $check = ' checked="checked" ';
+                    }
+                } else {
+                    if ($checked{$item} eq $option) {
+                        $check = ' checked="checked" ';
+                    }
                 } 
                 $datatable .= '<span class="LC_nobreak"><label>'.
-                              '<input type="radio" name="can_createuser_'.
+                              '<input type="'.$type.'" name="can_createuser_'.
                               $item.'" value="'.$option.'"'.$check.'/>&nbsp;'.
                               $lt{$option}.'</label>&nbsp;&nbsp;</span>';
             }
@@ -1699,7 +1733,7 @@ sub usercreation_types {
                     none       => 'None',
     );
     return %lt;
-} 
+}
 
 sub authtype_names {
     my %lt = &Apache::lonlocal::texthash(
@@ -1748,7 +1782,7 @@ sub print_usermodification {
 
 sub print_defaults {
     my ($dom,$rowtotal) = @_;
-    my @items = ('auth_def','auth_arg_def','lang_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def');
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my $titles = &defaults_titles();
     my $rownum = 0;
@@ -1780,6 +1814,9 @@ sub print_defaults {
                               '" value="'.$auth.'"'.$checked.'/>'.
                               $authnames{$shortauth{$auth}}.'</label>&nbsp;&nbsp;';
             }
+        } elsif ($item eq 'timezone_def') {
+            my $includeempty = 1;
+            $datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty);
         } else {
             $datatable .= '<input type="text" name="'.$item.'" value="'.
                           $domdefaults{$item}.'" />';
@@ -1796,6 +1833,7 @@ sub defaults_titles {
                    'auth_def'      => 'Default authentication type',
                    'auth_arg_def'  => 'Default authentication argument',
                    'lang_def'      => 'Default language',
+                   'timezone_def'  => 'Default timezone',
                  );
     return (\%titles);
 }
@@ -1922,6 +1960,304 @@ sub legacy_scantronformat {
     return ($url,$error);
 }
 
+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];
+                    $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 $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" ';
+                        }
+                        $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>';
+                }
+            }
+        } else {
+            $datatable .= &initialize_categories($itemcount);
+        }
+    } else {
+        $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>'
+                      .&initialize_categories($itemcount);
+    }
+    $$rowtotal += $itemcount;
+    return $datatable;
+}
+
+sub coursecategories_javascript {
+    my ($settings) = @_;
+    my ($output,$jstext);
+    if (ref($settings) eq 'HASH') {
+        my (@cats,@jsarray,%idx);
+        &Apache::loncommon::gather_categories($settings,\@cats,\%idx,\@jsarray);
+        if (@jsarray > 0) {
+            $jstext = '    var categories = Array('.scalar(@jsarray).');'."\n";
+            for (my $i=0; $i<@jsarray; $i++) {
+                if (ref($jsarray[$i]) eq 'ARRAY') {
+                    my $catstr = join('","',@{$jsarray[$i]});
+                    $jstext .= '    categories['.$i.'] = Array("'.$catstr.'");'."\n";
+                }
+            }
+        }
+    } else {
+        $jstext  = '    var categories = Array(1);'."\n".
+                   '    categories[0] = Array("instcode_pos");'."\n"; 
+    }
+    $output = <<"ENDSCRIPT";
+<script type="text/javascript">
+function reorderCats(form,parent,item,idx) {
+    var changedVal;
+$jstext
+    var newpos = 'addcategory_pos';
+    var current = new Array;
+    if (parent == '') {
+        var has_instcode = 0;
+        var maxtop = categories[idx].length;
+        for (var j=0; j<maxtop; j++) {
+            if (categories[idx][j] == 'instcode::0') {
+                has_instcode == 1;
+            }
+        }
+        if (has_instcode == 0) {
+            categories[idx][maxtop] = 'instcode_pos';
+        }
+    } else {
+        newpos += '_'+parent;
+    }
+    var maxh = 1 + categories[idx].length;
+    var current = new Array;
+    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+    if (item == newpos) {
+        changedVal = newitemVal;
+    } else {
+        changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
+        current[newitemVal] = newpos;
+    }
+    for (var i=0; i<categories[idx].length; i++) {
+        var elementName = categories[idx][i];
+        if (elementName != item) {
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
+            }
+        }
+    }
+    var oldVal;
+    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
+    return $output;
+}
+
+sub initialize_categories {
+    my ($itemcount) = @_;
+    my $datatable;
+    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','0'".');"';
+
+    $datatable = '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                 .'<select name="instcode_pos"><option value="0" selected="selected">1</option>'
+                 .'<option value="1">2</option></select>&nbsp;'
+                 .&mt('Official courses (with institutional codes)')
+                 .'</span></td><td><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></tr>';
+    $itemcount ++;
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','addcategory_pos','0'".');"';
+    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                  .'<select name="addcategory_pos"'.$chgstr.'><option value="0">1</option>'
+                  .'<option value="1" selected="selected">2</option></select>&nbsp;'
+                  .&mt('Add category').'</td><td>'.&mt('Name:')
+                  .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></td></tr>';
+    return $datatable;
+}
+
+sub build_category_rows {
+    my ($itemcount,$cats,$depth,$parent,$path,$idx) = @_;
+    my ($text,$name,$item,$chgstr);
+    if (ref($cats) eq 'ARRAY') {
+        my $maxdepth = scalar(@{$cats});
+        if (ref($cats->[$depth]) eq 'HASH') {
+            if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
+                my $numchildren = @{$cats->[$depth]{$parent}};
+                my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                $text .= '<td><table class="LC_datatable">';
+                my ($idxnum,$parent_name,$parent_item);
+                my $higher = $depth - 1;
+                if ($higher == 0) {
+                    $parent_name = &escape($parent).'::'.$higher;
+                } else {
+                    if (ref($path) eq 'ARRAY') {
+                        $parent_name = &escape($parent).':'.&escape($path->[-2]).':'.$higher;
+                    }
+                }
+                $parent_item = 'addcategory_pos_'.$parent_name;
+                for (my $j=0; $j<=$numchildren; $j++) {
+                    if ($j < $numchildren) {
+                        $name = $cats->[$depth]{$parent}[$j];
+                        $item = &escape($name).':'.&escape($parent).':'.$depth;
+                        $idxnum = $idx->{$item};
+                    } else {
+                        $name = $parent_name;
+                        $item = $parent_item;
+                    }
+                    $chgstr = ' onchange="javascript:reorderCats(this.form,'."'$parent_name','$item','$idxnum'".');"';
+                    $text .= '<tr '.$css_class.'><td><span class="LC_nobreak"><select name="'.$item.'"'.$chgstr.'>';
+                    for (my $i=0; $i<=$numchildren; $i++) {
+                        my $vpos = $i+1;
+                        my $selstr;
+                        if ($j == $i) {
+                            $selstr = ' selected="selected" ';
+                        }
+                        $text .= '<option value="'.$i.'"'.$selstr.'>'.$vpos.'</option>';
+                    }
+                    $text .= '</select>&nbsp;';
+                    if ($j < $numchildren) {
+                        my $deeper = $depth+1;
+                        $text .= $name.'&nbsp;'
+                                 .'<label><input type="checkbox" name="deletecategory" value="'
+                                 .$item.'" />'.&mt('Delete').'</label></span></td><td>';
+                        if(ref($path) eq 'ARRAY') {
+                            push(@{$path},$name);
+                            $text .= &build_category_rows($itemcount,$cats,$deeper,$name,$path,$idx);
+                            pop(@{$path});
+                        }
+                    } else {
+                        $text .= &mt('New:').'&nbsp;</span><input type="textbox" size="20" name="addcategory_name_';
+                        if ($j == $numchildren) {
+                            $text .= $name;
+                        } else {
+                            $text .= $item;
+                        }
+                        $text .= '" value="" />';
+                    }
+                    $text .= '</td></tr>';
+                }
+                $text .= '</table></td>';
+            } else {
+                my $higher = $depth-1;
+                if ($higher == 0) {
+                    $name = &escape($parent).'::'.$higher;
+                } else {
+                    if (ref($path) eq 'ARRAY') {
+                        $name = &escape($parent).':'.&escape($path->[-2]).':'.$higher;
+                    }
+                }
+                my $colspan;
+                if ($parent ne 'instcode') {
+                    $colspan = $maxdepth - $depth - 1;
+                    $text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="textbox" size="20" name="subcat_'.$name.'" value="" /></td>';
+                }
+            }
+        }
+    }
+    return $text;
+}
+
 sub modifiable_userdata_row {
     my ($context,$role,$settings,$numinrow,$rowcount) = @_;
     my $rolename;
@@ -2138,34 +2474,36 @@ sub modify_login {
                     'adminmail'     => 'off',
                     'newuser'       => 'off',
         );
-        foreach my $item (@toggles) {
-            if ($defaultchecked{$item} eq 'on') { 
-                if (($domconfig{'login'}{$item} eq '0') &&
-                    ($env{'form.'.$item} eq '1')) {
-                    $changes{$item} = 1;
-                } elsif (($domconfig{'login'}{$item} eq '' ||
-                          $domconfig{'login'}{$item} eq '1') &&
-                         ($env{'form.'.$item} eq '0')) {
-                    $changes{$item} = 1;
-                }
-            } elsif ($defaultchecked{$item} eq 'off') {
-                if (($domconfig{'login'}{$item} eq '1') &&
-                    ($env{'form.'.$item} eq '0')) {
-                    $changes{$item} = 1;
-                } elsif (($domconfig{'login'}{$item} eq '' ||
-                          $domconfig{'login'}{$item} eq '0') &&
-                         ($env{'form.'.$item} eq '1')) {
-                    $changes{$item} = 1;
+        if (ref($domconfig{'login'}) eq 'HASH') {
+            foreach my $item (@toggles) {
+                if ($defaultchecked{$item} eq 'on') { 
+                    if (($domconfig{'login'}{$item} eq '0') &&
+                        ($env{'form.'.$item} eq '1')) {
+                        $changes{$item} = 1;
+                    } elsif (($domconfig{'login'}{$item} eq '' ||
+                              $domconfig{'login'}{$item} eq '1') &&
+                             ($env{'form.'.$item} eq '0')) {
+                        $changes{$item} = 1;
+                    }
+                } elsif ($defaultchecked{$item} eq 'off') {
+                    if (($domconfig{'login'}{$item} eq '1') &&
+                        ($env{'form.'.$item} eq '0')) {
+                        $changes{$item} = 1;
+                    } elsif (($domconfig{'login'}{$item} eq '' ||
+                              $domconfig{'login'}{$item} eq '0') &&
+                             ($env{'form.'.$item} eq '1')) {
+                        $changes{$item} = 1;
+                    }
                 }
             }
-        }
-        if (($domconfig{'login'}{'loginheader'} eq 'text') && 
-            ($env{'form.loginheader'} eq 'image')) {
-            $changes{'loginheader'} = 1;
-        } elsif (($domconfig{'login'}{'loginheader'} eq '' ||
-                  $domconfig{'login'}{'loginheader'} eq 'image') &&
-                 ($env{'form.loginheader'} eq 'text')) {
-            $changes{'loginheader'} = 1;
+            if (($domconfig{'login'}{'loginheader'} eq 'text') && 
+                ($env{'form.loginheader'} eq 'image')) {
+                $changes{'loginheader'} = 1;
+            } elsif (($domconfig{'login'}{'loginheader'} eq '' ||
+                      $domconfig{'login'}{'loginheader'} eq 'image') &&
+                     ($env{'form.loginheader'} eq 'text')) {
+                $changes{'loginheader'} = 1;
+            }
         }
         if (keys(%changes) > 0 || $colchgtext) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
@@ -2198,6 +2536,7 @@ sub color_font_choices {
             img => "Header",
             bgs => "Background colors",
             links => "Link colors",
+            images => "Images",
             font => "Font color",
             pgbg => "Page",
             tabbg => "Header",
@@ -2213,6 +2552,11 @@ sub modify_rolecolors {
     my ($r,$dom,$confname,$roles,%domconfig) = @_;
     my ($resulttext,%rolehash);
     $rolehash{'rolecolors'} = {};
+    if (ref($domconfig{'rolecolors'}) ne 'HASH') {
+        if ($domconfig{'rolecolors'} eq '') {
+            $domconfig{'rolecolors'} = {};
+        }
+    }
     my ($errors,%changes) = &modify_colors($r,$dom,$confname,$roles,
                          $domconfig{'rolecolors'},$rolehash{'rolecolors'});
     my $putresult = &Apache::lonnet::put_dom('configuration',\%rolehash,
@@ -2239,7 +2583,7 @@ sub modify_rolecolors {
 sub modify_colors {
     my ($r,$dom,$confname,$roles,$domconfig,$confhash) = @_;
     my (%changes,%choices);
-    my @bgs = ('pgbg','mainbg','sidebg');
+    my @bgs;
     my @links = ('link','alink','vlink');
     my @logintext;
     my @images;
@@ -2254,8 +2598,10 @@ sub modify_colors {
         }
         if ($role eq 'login') {
             @images = ('img','logo','domlogo','login');
+            @bgs = ('pgbg','mainbg','sidebg');
         } else {
             @images = ('img');
+            @bgs = ('pgbg','tabbg','sidebg'); 
         }
         $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
         foreach my $item (@bgs,@links,@logintext) {
@@ -2438,7 +2784,7 @@ sub default_change_checker {
     if ($confhash->{$role}{'font'}) {
         $changes->{$role}{'font'} = 1;
     }
-} 
+}
 
 sub display_colorchgs {
     my ($dom,$changes,$roles,$confhash) = @_;
@@ -2806,7 +3152,11 @@ sub modify_quotas {
     }
     foreach my $key (keys(%formhash)) {
         if ($formhash{$key} ne '') {
-            if (!exists($domconfig{'quotas'}{$key})) {
+            if (ref($domconfig{'quotas'}) eq 'HASH') {
+                if (!exists($domconfig{'quotas'}{$key})) {
+                    $changes{$key} = 1;
+                }
+            } else {
                 $changes{$key} = 1;
             }
         }
@@ -3326,21 +3676,81 @@ sub modify_usercreation {
     my @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule');
     my @contexts = ('author','course','selfcreate');
     foreach my $item(@contexts) {
-        $cancreate{$item} = $env{'form.can_createuser_'.$item};
         if ($item eq 'selfcreate') {
+            @{$cancreate{$item}} = &Apache::loncommon::get_env_multiple('form.can_createuser_'.$item);
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
             if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth'))) {
-                if (($cancreate{$item} eq 'any') || ($cancreate{$item} eq 'login')) {
-                    $warningmsg = &mt('Although account creation has been set to be available for institutional logins, currently default authentication in this domain has not been set to support this.').' '.&mt('You need to set the default authentication type to Kerberos 4 or 5 (with a Kerberos domain specified), or to Local authentication, if the localauth module has been customized in your domain to authenticate institutional logins.');   
+                if (ref($cancreate{$item}) eq 'ARRAY') { 
+                    if (grep(/^login$/,@{$cancreate{$item}})) {
+                        $warningmsg = &mt('Although account creation has been set to be available for institutional logins, currently default authentication in this domain has not been set to support this.').' '.&mt('You need to set the default authentication type to Kerberos 4 or 5 (with a Kerberos domain specified), or to Local authentication, if the localauth module has been customized in your domain to authenticate institutional logins.');   
+                    }
                 }
             }
+        } else {
+            $cancreate{$item} = $env{'form.can_createuser_'.$item};
         }
     }
     if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
         foreach my $item (@contexts) {
-            if ($curr_usercreation{'cancreate'}{$item} ne $cancreate{$item}) {
-                push(@{$changes{'cancreate'}},$item);
-            } 
+            if ($item eq 'selfcreate') {
+                if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { 
+                    foreach my $curr (@{$curr_usercreation{'cancreate'}{$item}}) {
+                        if (!grep(/^$curr$/,@{$cancreate{$item}})) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
+                    }
+                } else {
+                    if ($curr_usercreation{'cancreate'}{$item} eq '') {
+                        if (@{$cancreate{$item}} > 0) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
+                    } else {
+                        if ($curr_usercreation{'cancreate'}{$item} eq 'any') {
+                            if (@{$cancreate{$item}} < 3) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        } elsif ($curr_usercreation{'cancreate'}{$item} eq 'none') {
+                            if (@{$cancreate{$item}} > 0) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        } elsif (!grep(/^$curr_usercreation{'cancreate'}{$item}$/,@{$cancreate{$item}})) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
+                    }
+                }
+                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                    foreach my $type (@{$cancreate{$item}}) {
+                        if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
+                            if (!grep(/^$type$/,@{$curr_usercreation{'cancreate'}{$item}})) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        } elsif (($curr_usercreation{'cancreate'}{$item} ne 'any') &&
+                                 ($curr_usercreation{'cancreate'}{$item} ne 'none')) {
+                            if ($curr_usercreation{'cancreate'}{$item} ne $type) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        }
+                    }
+                }
+            } else {
+                if ($curr_usercreation{'cancreate'}{$item} ne $cancreate{$item}) {
+                    push(@{$changes{'cancreate'}},$item);
+                }
+            }
         }
     } elsif (ref($curr_usercreation{'cancreate'}) eq 'ARRAY') {
         foreach my $item (@contexts) {
@@ -3447,6 +3857,12 @@ sub modify_usercreation {
 
     my $putresult = &Apache::lonnet::put_dom('configuration',\%usercreation_hash,
                                              $dom);
+
+    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 the username',
+                          );
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
@@ -3455,16 +3871,14 @@ sub modify_usercreation {
                 foreach my $type (@{$changes{'cancreate'}}) {
                     my $chgtext =  $lt{$type}.', ';
                     if ($type eq 'selfcreate') {
-                        if ($cancreate{$type} eq 'none') {
+                        if (@{$cancreate{$type}} == 0) {
                             $chgtext .= &mt('creation of a new user account is not permitted.');
-                        } elsif ($cancreate{$type} eq 'any') {
-                            $chgtext .= &mt('creation of a new account is permitted for users authenticated by institutional log-in and SSO, and also for e-mail addresses used as usernames.');
-                        } elsif ($cancreate{$type} eq 'login') {
-                            $chgtext .= &mt('creation of a new account is only permitted for users authenticated by institutional log-in.');
-                        } elsif ($cancreate{$type} eq 'sso') {
-                            $chgtext .= &mt('creation of a new account is only permitted for users authenticated by institutional single sign on.');
-                        } elsif ($cancreate{$type} eq 'email') {
-                            $chgtext .= &mt('creation of a new account is only permitted for users who provide a valid e-mail address for use as the username.');
+                        } else {
+                            $chgtext .= &mt('creation of a new account is permitted for:<ul>');
+                            foreach my $case (@{$cancreate{$type}}) {
+                                $chgtext .= '<li>'.$selfcreatetypes{$case}.'</li>';
+                            }
+                            $chgtext .= '</ul>';
                         }
                     } else {
                         if ($cancreate{$type} eq 'none') {
@@ -3669,7 +4083,7 @@ sub modify_defaults {
     my ($dom,$r) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my @items = ('auth_def','auth_arg_def','lang_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
@@ -3690,6 +4104,13 @@ sub modify_defaults {
                     push(@errors,$item);
                 }
             }
+        } elsif ($item eq 'timezone_def') {
+            if ($newvalues{$item} ne '') {
+                my @timezones = &DateTime::TimeZone->all_names;
+                if (!grep(/^\Q$newvalues{$item}\E/,@timezones)) {
+                    push(@errors,$item);   
+                }
+            }
         }
         if (grep(/^\Q$item\E$/,@errors)) {
             $newvalues{$item} = $domdefaults{$item};
@@ -3701,6 +4122,7 @@ sub modify_defaults {
                          defaults => { auth_def => $newvalues{'auth_def'},
                                        auth_arg_def => $newvalues{'auth_arg_def'},
                                        lang_def => $newvalues{'lang_def'},
+                                       timezone_def => $newvalues{'timezone_def'},
                                      }
                        );
     my $title = &defaults_titles();
@@ -3733,10 +4155,12 @@ sub modify_defaults {
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,
                                           $defaults_hash{'defaults'},$cachetime);
-            my $sysmail = $r->dir_config('lonSysEMail');
-            &Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext);
+            if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'}) {
+                my $sysmail = $r->dir_config('lonSysEMail');
+                &Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext);
+            }
         } else {
-            $resulttext = &mt('No changes made to default authentication/language settings');
+            $resulttext = &mt('No changes made to default authentication/language/timezone settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -3753,7 +4177,7 @@ sub modify_defaults {
 }
 
 sub modify_scantron {
-    my ($r,$dom,$confname,$domconfig) = @_;
+    my ($r,$dom,$confname,%domconfig) = @_;
     my ($resulttext,%confhash,%changes,$errors);
     my $custom = 'custom.tab';
     my $default = 'default.tab';
@@ -3772,7 +4196,7 @@ sub modify_scantron {
                                      $confname,'scantron','','',$custom);
                     if ($result eq 'ok') {
                         $confhash{'scantron'}{'scantronformat'} = $scantronurl;
-                        $changes{'scantron'}{'scantronformat'} = 1;
+                        $changes{'scantronformat'} = 1;
                     } else {
                         $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$custom,$result);
                     }
@@ -3788,13 +4212,11 @@ sub modify_scantron {
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
-    if (ref($domconfig) eq 'HASH') {
-        if (ref($domconfig->{'scantron'}) eq 'HASH') {
-            if ($domconfig->{'scantron'}{'scantronformat'} ne '') {
-                if ($env{'form.scantronformat_del'}) {
-                    $confhash{'scantron'}{'scantronformat'} = '';
-                    $changes{'scantron'}{'scantronformat'} = 1;
-                }
+    if (ref($domconfig{'scantron'}) eq 'HASH') {
+        if ($domconfig{'scantron'}{'scantronformat'} ne '') {
+            if ($env{'form.scantronformat_del'}) {
+                $confhash{'scantron'}{'scantronformat'} = '';
+                $changes{'scantronformat'} = 1;
             }
         }
     }
@@ -3803,15 +4225,16 @@ sub modify_scantron {
                                                  $dom);
         if ($putresult eq 'ok') {
             if (keys(%changes) > 0) {
-                $resulttext = &mt('Changes made:').'<ul>';
-                if (ref($changes{'scantron'}) eq 'HASH') {
-                    if ($changes{'scantron'}{'scantronformat'}) { 
-                        if ($confhash{'scantron'}{'scantronformat'} eq '') {
-                            $resulttext .= '<li>'.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
-                        }
+                if (ref($confhash{'scantron'}) eq 'HASH') {
+                    $resulttext = &mt('Changes made:').'<ul>';
+                    if ($confhash{'scantron'}{'scantronformat'} eq '') {
+                        $resulttext .= '<li>'.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
                     }
+                    $resulttext .= '</ul>';
+                } else {
+                    $resulttext = &mt('Changes made to scantron format file.');
                 }
                 $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
@@ -3832,4 +4255,186 @@ sub modify_scantron {
     return $resulttext;
 }
 
+sub modify_coursecategories {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%deletions,%reorderings,%needreordering,%adds,$errors);
+    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)) {
+            push (@deletecategory,'instcode::0');
+        }
+    }
+    my (@predelcats,@predeltrails,%predelallitems);
+    if (ref($domconfig{'coursecategories'}) 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);
+            foreach my $item (@deletecategory) {
+                if ($domconfig{'coursecategories'}{$item} ne '') {
+                    delete($domconfig{'coursecategories'}{$item});
+                    $deletions{$item} = 1;
+                    &recurse_cat_deletes($item,$domconfig{'coursecategories'},
+                                         \%deletions);
+                }
+            }
+        }
+        foreach my $item (keys(%{$domconfig{'coursecategories'}})) {
+            my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$item);
+            if ($domconfig{'coursecategories'}{$item} ne $env{'form.'.$item}) {
+                $reorderings{$item} = 1;
+                $domconfig{'coursecategories'}{$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};
+                $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;
+                $adds{$newitem} = 1;
+            }
+        }
+    }
+    if ($env{'form.instcode'} eq '1') {
+        if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+            my $newitem = 'instcode::0';
+            if ($domconfig{'coursecategories'}{$newitem} eq '') {  
+                $domconfig{'coursecategories'}{$newitem} = $env{'form.instcode_pos'};
+                $adds{$newitem} = 1;
+            }
+        } else {
+            my $newitem = 'instcode::0';
+            $domconfig{'coursecategories'}{$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'};
+        $adds{$newitem} = 1;
+    }
+    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 '') {
+                    $sort_by_deltrail{$predelallitems{$key}} = $predeltrails[$predelallitems{$key}];
+                }
+            }
+        }
+        my (@chkcats,@chktrails,%chkallitems);
+        &Apache::loncommon::extract_categories($domconfig{'coursecategories'},\@chkcats,\@chktrails,\%chkallitems);
+        if (ref($chkcats[0]) eq 'ARRAY') {
+            my $depth = 0;
+            my $chg = 0;
+            for (my $i=0; $i<@{$chkcats[0]}; $i++) {
+                my $name = $chkcats[0][$i];
+                my $item;
+                if ($name eq '') {
+                    $chg ++;
+                } else {
+                    $item = &escape($name).'::0';
+                    if ($chg) {
+                        $domconfig{'coursecategories'}{$item} -= $chg;
+                    }
+                    $depth ++; 
+                    &recurse_check(\@chkcats,$domconfig{'coursecategories'},$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 ($putresult eq 'ok') {
+            $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 (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 (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>';
+        } else {
+            $resulttext = '<span class="LC_error">'.
+                &mt('An error occurred: [_1]',$putresult).'</span>';
+        }
+    } else {
+        $resulttext = &mt('No changes made to course categories');
+    }
+    return $resulttext;
+}
+
+sub recurse_check {
+    my ($chkcats,$categories,$depth,$name) = @_;
+    if (ref($chkcats->[$depth]{$name}) eq 'ARRAY') {
+        my $chg = 0;
+        for (my $j=0; $j<@{$chkcats->[$depth]{$name}}; $j++) {
+            my $category = $chkcats->[$depth]{$name}[$j];
+            my $item;
+            if ($category eq '') {
+                $chg ++;
+            } else {
+                my $deeper = $depth + 1;
+                $item = &escape($category).':'.&escape($name).':'.$depth;
+                if ($chg) {
+                    $categories->{$item} -= $chg;
+                }
+                &recurse_check($chkcats,$categories,$deeper,$category);
+                $deeper --;
+            }
+        }
+    }
+    return;
+}
+
+sub recurse_cat_deletes {
+    my ($item,$coursecategories,$deletions) = @_;
+    my ($deleted,$container,$depth) = map { &unescape($_); } split(/:/,$item);
+    my $subdepth = $depth + 1;
+    if (ref($coursecategories) eq 'HASH') {
+        foreach my $subitem (keys(%{$coursecategories})) {
+            my ($child,$parent,$itemdepth) = map { &unescape($_); } split(/:/,$subitem);
+            if (($parent eq $deleted) && ($itemdepth == $subdepth)) {
+                delete($coursecategories->{$subitem});
+                $deletions->{$subitem} = 1;
+                &recurse_cat_deletes($subitem,$coursecategories,$deletions);
+            }  
+        }
+    }
+    return;
+}
+
 1;