--- loncom/interface/domainprefs.pm	2007/08/26 15:31:03	1.25
+++ loncom/interface/domainprefs.pm	2007/09/19 17:36:47	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.25 2007/08/26 15:31:03 raeburn Exp $
+# $Id: domainprefs.pm,v 1.29 2007/09/19 17:36:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,8 @@ sub handler {
     }
     my %domconfig =
       &Apache::lonnet::get_dom('configuration',['login','rolecolors',
-                'quotas','autoenroll','autoupdate','directorysrch'],$dom);
+                'quotas','autoenroll','autoupdate','directorysrch',
+                'usercreation','contacts'],$dom);
     my @prefs = (
       { text => 'Default color schemes',
         help => 'Default_Color_Schemes',
@@ -113,6 +114,21 @@ sub handler {
         header => [{col1 => 'Setting',
                     col2 => 'Value',}],
         },
+      { text => 'Contact Information',
+        help => 'Domain_Contact_Information',
+        action => 'contacts',
+        header => [{col1 => 'Setting',
+                    col2 => 'Value',}],
+        },
+
+      { text => 'User creation',
+        help => 'Domain_User_Creation',
+        action => 'usercreation',
+        header => [{col1 => 'Setting',
+                    col2 => 'Value',},
+                   {col1 => 'Context',
+                    col2 => 'Assignable Authentication Types'}],
+        },
     );
     my @roles = ('student','coordinator','author','admin');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -141,9 +157,8 @@ sub handler {
         &print_header($r,$phase);
         if (keys(%domconfig) == 0) {
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
-            my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf');
-            my $hostid = $perlvarref->{'lonHostID'};
-            if ($hostid ne $primarylibserv) {
+            my @ids=&Apache::lonnet::current_machine_ids();
+            if (!grep(/^\Q$primarylibserv\E$/,@ids)) {
                 my %designhash = &Apache::loncommon::get_domainconf($dom);
                 my @loginimages = ('img','logo','domlogo');
                 my $custom_img_count = 0;
@@ -159,7 +174,14 @@ sub handler {
                 }
                 if ($custom_img_count > 0) {
                     my $switch_server = &check_switchserver($dom,$confname);
-                    $r->print(&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.&mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'<br /><br />'.&mt("Thereafter, you will be able to update settings from this screen when logged in to any server in the LON-CAPA network (with a DC role selected in the domain), although you will still need to switch to the domain's primary library server to upload new images or logos.").'<br /><br />'.$switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
+                    $r->print(
+    &mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.
+    &mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'<br /><br />'.
+    &mt("Thereafter, (with a Domain Coordinator role selected in the domain) you will be able to update settings when logged in to any server in the LON-CAPA network.").'<br />'.
+    &mt("However, you will still need to switch to the domain's primary library server to upload new images or logos.").'<br /><br />');
+                    if ($switch_server) {
+                       $r->print($switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
+                    }
                     return OK;
                 }
             }
@@ -197,6 +219,10 @@ sub process_changes {
         $output = &modify_autoupdate($dom,%domconfig);
     } elsif ($action eq 'directorysrch') {
         $output = &modify_directorysrch($dom,%domconfig);
+    } elsif ($action eq 'usercreation') {
+        $output = &modify_usercreation($dom,%domconfig);
+    } elsif ($action eq 'contacts') {
+        $output = &modify_contacts($dom,%domconfig);
     }
     return $output;
 }
@@ -212,7 +238,8 @@ sub print_config_box {
 #           <th>'.&mt($item->{text}).'&nbsp;'.
 #           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
 #          </tr>');
-    if (($action eq 'autoupdate') || ($action eq 'rolecolors')) {
+    if (($action eq 'autoupdate') || ($action eq 'rolecolors') || 
+        ($action eq 'usercreation')) {
         my $colspan = ($action eq 'rolecolors')?' colspan="2"':'';
         $r->print('
           <tr>
@@ -224,6 +251,8 @@ sub print_config_box {
              </tr>');
         if ($action eq 'autoupdate') {
             $r->print(&print_autoupdate('top',$dom,$settings));
+        } elsif ($action eq 'usercreation') {
+            $r->print(&print_usercreation('top',$dom,$settings)); 
         } else {
             $r->print(&print_rolecolors($phase,'student',$dom,$confname,$settings));
         }
@@ -240,6 +269,8 @@ sub print_config_box {
              </tr>');
         if ($action eq 'autoupdate') {
             $r->print(&print_autoupdate('bottom',$dom,$settings));
+        } elsif ($action eq 'usercreation') {
+            $r->print(&print_usercreation('bottom',$dom,$settings));
         } else {
             $r->print(&print_rolecolors($phase,'coordinator',$dom,$confname,$settings).'
            </table>
@@ -282,14 +313,16 @@ sub print_config_box {
               <td class="LC_right_item">'.$item->{'header'}->[0]->{'col2'}.'</td>
              </tr>');
         if ($action eq 'login') {
-           $r->print(&print_login($dom,$confname,$phase,$settings));
+            $r->print(&print_login($dom,$confname,$phase,$settings));
         } elsif ($action eq 'quotas') {
-           $r->print(&print_quotas($dom,$settings));
+            $r->print(&print_quotas($dom,$settings));
         } elsif ($action eq 'autoenroll') {
-           $r->print(&print_autoenroll($dom,$settings));
+            $r->print(&print_autoenroll($dom,$settings));
         } elsif ($action eq 'directorysrch') {
-           $r->print(&print_directorysrch($dom,$settings));
-        }  
+            $r->print(&print_directorysrch($dom,$settings));
+        } elsif ($action eq 'contacts') {
+            $r->print(&print_contacts($dom,$settings));
+        }
     }
     $r->print('
    </table>
@@ -745,7 +778,7 @@ sub print_quotas {
     my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
     my $typecount = 0;
     my $css_class;
-    if (@{$types} > 0) {
+    if (ref($types) eq 'ARRAY') {
         foreach my $type (@{$types}) {
             if (defined($usertypes->{$type})) {
                 $typecount ++;
@@ -768,7 +801,7 @@ sub print_quotas {
     $typecount ++;
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
-                  '<td>'.&mt($othertitle).'</td>'.
+                  '<td>'.$othertitle.'</td>'.
                   '<td class="LC_right_item"><span class="LC_nobreak">'.
                   '<input type="text" name="defaultquota" value="'.
                   $defaultquota.'" size="5" /> Mb</span></td></tr>';
@@ -878,10 +911,12 @@ sub print_autoupdate {
                             gen => 'Generation',
                       );
         my $numrows = 0;
-        if (@{$types} > 0) {
-            $datatable = 
-                &usertype_update_row($settings,$usertypes,\%fieldtitles,
-                                     \@fields,$types,\$numrows);
+        if (ref($types) eq 'ARRAY') {
+            if (@{$types} > 0) {
+                $datatable = 
+                    &usertype_update_row($settings,$usertypes,\%fieldtitles,
+                                         \@fields,$types,\$numrows);
+            }
         }
         $datatable .= 
             &usertype_update_row($settings,{'default' => $othertitle},
@@ -932,6 +967,7 @@ sub print_directorysrch {
     my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
 
     my $numinrow = 4;
+    my $cansrchrow = 0;
     my $datatable='<tr class="LC_odd_row">'.
                   '<td colspan="2">'.&mt('Directory search available?').'</td>'.
                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
@@ -947,10 +983,19 @@ sub print_directorysrch {
                   '<label><input type="radio" name="dirsrch_localonly"'.
                   $localon.' value="1" />'.&mt('No').'</label></span></td>'.
                   '</tr>';
-    $datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom,
-                                       $numinrow,$othertitle);
-    $datatable .= '<tr>'.
-                  '<td>'.&mt('Supported search methods').
+    if (ref($usertypes) eq 'HASH') {
+        if (keys(%{$usertypes}) > 0) {
+            $datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom,
+                                               $numinrow,$othertitle);
+            $cansrchrow = 1;
+        }
+    }
+    if ($cansrchrow) {
+        $datatable .= '<tr>';
+    } else {
+        $datatable .= '<tr class="LC_odd_row">';
+    }
+    $datatable .= '<td>'.&mt('Supported search methods').
                   '</td><td class="LC_left_item" colspan="2"><table><tr>';
     foreach my $title (@{$titleorder}) {
         if (defined($searchtitles->{$title})) {
@@ -967,9 +1012,14 @@ sub print_directorysrch {
                           $searchtitles->{$title}.'</label></span></td>';
         }
     }
-    $datatable .= '</tr></table></td></tr><tr class="LC_odd_row">'. 
-                  '<td>'.&mt('Search latitude').'</td>'.
-                  '<td class="LC_left_item"  colspan="2">'.
+    $datatable .= '</tr></table></td></tr>';
+    if ($cansrchrow) {
+        $datatable .= '<tr class="LC_odd_row">';
+    } else {
+        $datatable .= '<tr>';
+    }
+    $datatable .= '<td>'.&mt('Search latitude').'</td>'.   
+                  '<td class="LC_left_item" colspan="2">'.
                   '<span class="LC_nobreak"><label>'.
                   '<input type="checkbox" name="searchtypes" '.
                   $exacton.' value="exact" />'.&mt('Exact match').
@@ -983,35 +1033,274 @@ sub print_directorysrch {
     return $datatable;
 }
 
+sub print_contacts {
+    my ($dom,$settings) = @_;
+    my $datatable;
+    my @contacts = ('adminemail','supportemail');
+    my (%checked,%to,%otheremails);
+    my @mailings = ('errormail','packagesmail','helpdeskmail');
+    foreach my $type (@mailings) {
+        $otheremails{$type} = '';
+    }
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (@contacts) {
+            if (exists($settings->{$item})) {
+                $to{$item} = $settings->{$item};
+            }
+        }
+        foreach my $type (@mailings) {
+            if (exists($settings->{$type})) {
+                if (ref($settings->{$type}) eq 'HASH') {
+                    foreach my $item (@contacts) {
+                        if ($settings->{$type}{$item}) {
+                            $checked{$type}{$item} = ' checked="checked" ';
+                        }
+                    }
+                    $otheremails{$type} = $settings->{$type}{'others'};
+                }
+            }
+        }
+    } else {
+        $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
+        $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
+        $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
+        $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
+        $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; 
+    }
+    my ($titles,$short_titles) = &contact_titles();
+    my $rownum = 0;
+    my $css_class;
+    foreach my $item (@contacts) {
+        if ($rownum%2) {
+            $css_class = '';
+        } else {
+            $css_class = ' class="LC_odd_row" ';
+        }
+        $datatable .= '<tr'.$css_class.' ">'. 
+                  '<td>'.$titles->{$item}.'</td>'.
+                  '<td class="LC_right_item">'.
+                  '<input type="text" name="'.$item.'" value="'.
+                  $to{$item}.'" /></td></tr>';
+        $rownum ++;
+    }
+    foreach my $type (@mailings) {
+        if ($rownum%2) {
+            $css_class = '';
+        } else {
+            $css_class = ' class="LC_odd_row" ';
+        }
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td>'.$titles->{$type}.': </td>'.
+                      '<td class="LC_left_item">'.
+                      '<span class="LC_nobreak">';
+        foreach my $item (@contacts) {
+            $datatable .= '<label>'.
+                          '<input type="checkbox" name="'.$type.'"'.
+                          $checked{$type}{$item}.
+                          ' value="'.$item.'" />'.$short_titles->{$item}.
+                          '</label>&nbsp;';
+        }
+        $datatable .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
+                      '<input type="text" name="'.$type.'_others" '.
+                      'value="'.$otheremails{$type}.'"  />'.
+                      '</td></tr>'."\n";
+        $rownum ++;
+    }
+    return $datatable;
+}
+
+sub contact_titles {
+    my %titles = &Apache::lonlocal::texthash (
+                   'supportemail' => 'Support E-mail address',
+                   'adminemail'    => 'Default Server Admin E-mail address',
+                   'errormail'    => 'Error reports to be e-mailed to',
+                   'packagesmail' => 'Package update alerts to be e-mailed to',
+                   'helpdeskmail' => 'Helpdesk requests to be e-mailed to'
+                 );
+    my %short_titles = &Apache::lonlocal::texthash (
+                           adminemail   => 'Admin E-mail address',
+                           supportemail => 'Support E-mail',
+                       );   
+    return (\%titles,\%short_titles);
+}
+
+sub print_usercreation {
+    my ($position,$dom,$settings) = @_;
+    my $numinrow = 4;
+    my $rowcount = 0;
+    my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($dom);
+    my $datatable;
+    my %lt = &Apache::lonlocal::texthash (
+                        nondc => 'User creation other than by Domain Coordinator: ',
+                        author => 'When adding a co-author/assistant author',
+                        course => 'When adding users to a course',
+    );
+    if ($position eq 'top') {
+        my %checked;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'cancreate'}) eq 'ARRAY') {
+                foreach my $item (@{$settings->{'cancreate'}}) {
+                    $checked{$item} = ' checked="checked" ';
+                }
+            }
+        }
+        $datatable = '<tr class="LC_odd_row">'.
+                     '<td>'.$lt{'nondc'}.'</td>'.
+                     '<td class="LC_left_item"><table>';
+        foreach my $item ('author','course') {
+            $datatable .= '<tr><td><span class="LC_nobreak"><label>'.
+                          '<input type="checkbox" name="can_createuser" '.
+                          $checked{$item}.' value="'.$item.'" />'.
+                          $lt{$item}.'</label><span></td></tr>';
+        }
+        $datatable .= '</table></td></tr>';
+        $rowcount ++;
+        if (ref($rules) eq 'HASH') {
+            if (keys(%{$rules}) > 0) {
+                $datatable .= &username_formats_row($settings,$rules,
+                                                    $ruleorder,$numinrow);
+                $rowcount ++;
+            }
+        }
+    } else {
+        my @contexts = ('author','course','domain');
+        my @authtypes = ('int','krb4','krb5','loc');
+        my %checked;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'authtypes'}) eq 'HASH') {
+                foreach my $item (@contexts) {
+                    if (ref($settings->{'authtypes'}{$item}) eq 'HASH') {
+                        foreach my $auth (@authtypes) {
+                            if ($settings->{'authtypes'}{$item}{$auth}) {
+                                $checked{$item}{$auth} = ' checked="checked" ';
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        my @authtypes = ('int','krb4','krb5','loc');
+        my %title = &context_names();
+        my %authname = &authtype_names();
+        my $rownum = 0;
+        my $css_class; 
+        foreach my $item (@contexts) {
+            if ($rownum%2) {
+                $css_class = '';
+            } else {
+                $css_class = ' class="LC_odd_row" ';
+            }
+            $datatable .=   '<tr'.$css_class.'">'.
+                            '<td>'.$title{$item}.
+                            '</td><td class="LC_left_item">'.
+                            '<span class="LC_nobreak">';
+            foreach my $auth (@authtypes) {
+                $datatable .= '<label>'. 
+                              '<input type="checkbox" name="'.$item.'_auth" '.
+                              $checked{$item}{$auth}.' value="'.$auth.'" />'.
+                              $authname{$auth}.'</label>&nbsp;';
+            }
+            $datatable .= '</span></td></tr>';
+            $rownum ++;
+        }
+    }
+    return $datatable;
+}
+
+sub username_formats_row {
+    my ($settings,$rules,$ruleorder,$numinrow) = @_;
+    my $output =  '<tr>'.
+                  '<td>'.&mt('Format rules to check for new usernames: ').
+                  '</td><td class="LC_left_item" colspan="2"><table>';
+    my $rem;
+    if (ref($ruleorder) eq 'ARRAY') {
+        for (my $i=0; $i<@{$ruleorder}; $i++) {
+            if (ref($rules->{$ruleorder->[$i]}) eq 'HASH') {
+                my $rem = $i%($numinrow);
+                if ($rem == 0) {
+                    if ($i > 0) {
+                        $output .= '</tr>';
+                    }
+                    $output .= '<tr>';
+                }
+                my $check = ' ';
+                if (ref($settings->{'username_rule'}) eq 'ARRAY') {
+                    if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{'username_rule'}})) {
+                        $check = ' checked="checked" ';
+                    }
+                }
+                $output .= '<td class="LC_left_item">'.
+                           '<span class="LC_nobreak"><label>'.
+                           '<input type="checkbox" name="username_rule" '.
+                           'value="'.$ruleorder->[$i].'"'.$check.'/>'.
+                           $rules->{$ruleorder->[$i]}{'name'}.'</label></span></td>';
+            }
+        }
+        $rem = @{$ruleorder}%($numinrow);
+    }
+    my $colsleft = $numinrow - $rem;
+    if ($colsleft > 1 ) {
+        $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+                   '&nbsp;</td>';
+    } elsif ($colsleft == 1) {
+        $output .= '<td class="LC_left_item">&nbsp;</td>';
+    }
+    $output .= '</tr></table></td></tr>';
+    return $output;
+}
+
+sub authtype_names {
+    my %lt = &Apache::lonlocal::texthash(
+                      int    => 'Internal',
+                      krb4   => 'Kerberos 4',
+                      krb5   => 'Kerberos 5',
+                      loc    => 'Local',
+                  );
+    return %lt;
+}
+
+sub context_names {
+    my %context_title = &Apache::lonlocal::texthash(
+       author => 'Creating users when an Author',
+       course => 'Creating users when in a course',
+       domain => 'Creating users when a Domain Coordinator',
+    );
+    return %context_title;
+}
+
+
 sub users_cansearch_row {
     my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle) = @_;
     my $output =  '<tr class="LC_odd_row">'.
                   '<td>'.&mt('Users allowed to search').' ('.$dom.')'.
                   '</td><td class="LC_left_item" colspan="2"><table>';
-    for (my $i=0; $i<@{$types}; $i++) {
-        if (defined($usertypes->{$types->[$i]})) {
-            my $rem = $i%($numinrow);
-            if ($rem == 0) {
-                if ($i > 0) {
-                    $output .= '</tr>';
+    my $rem;
+    if (ref($types) eq 'ARRAY') {
+        for (my $i=0; $i<@{$types}; $i++) {
+            if (defined($usertypes->{$types->[$i]})) {
+                my $rem = $i%($numinrow);
+                if ($rem == 0) {
+                    if ($i > 0) {
+                        $output .= '</tr>';
+                    }
+                    $output .= '<tr>';
                 }
-                $output .= '<tr>';
-            }
-            my $check = ' ';
-            if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-                if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) {
-                    $check = ' checked="checked" ';
+                my $check = ' ';
+                if (ref($settings->{'cansearch'}) eq 'ARRAY') {
+                    if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) {
+                        $check = ' checked="checked" ';
+                    }
                 }
+                $output .= '<td class="LC_left_item">'.
+                           '<span class="LC_nobreak"><label>'.
+                           '<input type="checkbox" name="cansearch" '.
+                           'value="'.$types->[$i].'"'.$check.'/>'.
+                           $usertypes->{$types->[$i]}.'</label></span></td>';
             }
-            $output .= '<td class="LC_left_item">'.
-                       '<span class="LC_nobreak"><label>'.
-                       '<input type="checkbox" name="cansearch" '.
-                       'value="'.$types->[$i].'"'.$check.'/>'.
-                       $usertypes->{$types->[$i]}.'</label></span></td>';
         }
+       
+        $rem = @{$types}%($numinrow);
     }
-
-    my $rem = @{$types}%($numinrow);
     my $colsleft = $numinrow - $rem;
     if ($colsleft > 1) {
         $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
@@ -1020,9 +1309,9 @@ sub users_cansearch_row {
     }
     my $defcheck = ' ';
     if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-         if (grep(/^default$/,@{$settings->{'cansearch'}})) {
-              $defcheck = ' checked="checked" ';
-         }
+        if (grep(/^default$/,@{$settings->{'cansearch'}})) {
+            $defcheck = ' checked="checked" ';
+        }
     }
     $output .= '<span class="LC_nobreak"><label>'.
                '<input type="checkbox" name="cansearch" '.
@@ -1035,7 +1324,7 @@ sub users_cansearch_row {
 sub sorted_inst_types {
     my ($dom) = @_;
     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
-    my $othertitle = "All users";
+    my $othertitle = &mt('All users');
     my @types;
     if (ref($order) eq 'ARRAY') {
         @types = @{$order};
@@ -1723,8 +2012,7 @@ sub check_switchserver {
 sub modify_quotas {
     my ($dom,%domconfig) = @_;
     my ($resulttext,%changes);
-    my ($usertypes,$order) = 
-        &Apache::lonnet::retrieve_inst_usertypes($dom);
+    my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
     my %formhash;
     foreach my $key (keys(%env)) {
         if ($key =~ /^form\.quota_(.+)$/) {
@@ -1758,8 +2046,14 @@ sub modify_quotas {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
-            foreach my $item (sort(keys(%changes))) {
-                $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$usertypes->{$item},$formhash{$item}).'</li>';
+            foreach my $type (@{$types},'default') {
+                if (defined($changes{$type})) { 
+                    my $typetitle = $usertypes->{$type};
+                    if ($type eq 'default') {
+                        $typetitle = $othertitle;
+                    }
+                    $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$formhash{$type}).'</li>';
+                }
             }
             $resulttext .= '</ul>';
         } else {
@@ -1853,7 +2147,7 @@ sub modify_autoupdate {
                    run => 'Auto-update:',
                    classlists => 'Updates to user information in classlists?'
                 );
-    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
+    my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
     my %fieldtitles = &Apache::lonlocal::texthash (
                         id => 'Student/Employee ID',
                         permanentemail => 'E-mail address',
@@ -1864,7 +2158,7 @@ sub modify_autoupdate {
                       );
     my $othertitle = &mt('All users');
     if (keys(%{$usertypes}) >  0) {
-        $othertitle = "Other users";
+        $othertitle = &mt('Other users');
     }
     foreach my $key (keys(%env)) {
         if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) {
@@ -1886,14 +2180,14 @@ sub modify_autoupdate {
             }
         } elsif ($key eq 'fields') {
             if (ref($currautoupdate{$key}) eq 'HASH') {
-                foreach my $item (keys(%{$currautoupdate{$key}})) {
+                foreach my $item (@{$types},'default') {
                     if (ref($currautoupdate{$key}{$item}) eq 'ARRAY') {
                         my $change = 0;
                         foreach my $type (@{$currautoupdate{$key}{$item}}) {
                             if (!exists($fields{$item})) {
                                 $change = 1;
                             } elsif (ref($fields{$item}) eq 'ARRAY') {
-                                if (!grep/^\Q$type\E$/,@{$fields{$item}}) {
+                                if (!grep(/^\Q$type\E$/,@{$fields{$item}})) {
                                     $change = 1;
                                 }
                             }
@@ -1901,18 +2195,20 @@ sub modify_autoupdate {
                         if ($change) {
                             push(@{$changes{$key}},$item);
                         }
-                    }
+                    } 
                 }
             }
         }
     }
-    foreach my $key (keys(%fields)) {
-        if (ref($currautoupdate{'fields'}) eq 'HASH') {
-            if (!exists($currautoupdate{'fields'}{$key})) {
-                push(@{$changes{'fields'}},$key);
+    foreach my $item (@{$types},'default') {
+        if (defined($fields{$item})) {
+            if (ref($currautoupdate{'fields'}) eq 'HASH') {
+                if (!exists($currautoupdate{'fields'}{$item})) {
+                    push(@{$changes{'fields'}},$item);
+                }
+            } else {
+                push(@{$changes{'fields'}},$item);
             }
-        } else {
-            push(@{$changes{'fields'}},$key);
         }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%updatehash,
@@ -1934,9 +2230,9 @@ sub modify_autoupdate {
                             $newvaluestr = &mt('none');
                         }
                         if ($item eq 'default') {
-                            $resulttext .= '<li>'.&mt("Updates for $othertitle set to: [_1]",$newvaluestr).'</li>';
+                            $resulttext .= '<li>'.&mt("Updates for '[_1]' set to: '[_2]'",$othertitle,$newvaluestr).'</li>';
                         } else {
-                            $resulttext .= '<li>'.&mt("Updates for [_1] set to: [_2]",$usertypes->{$item},$newvaluestr).'</li>';
+                            $resulttext .= '<li>'.&mt("Updates for '[_1]' set to: '[_2]'",$usertypes->{$item},$newvaluestr).'</li>';
                         }
                     }
                 } else {
@@ -1970,7 +2266,6 @@ sub modify_directorysrch {
         }
     }
     my %title = ( available => 'Directory search available',
-                  cansearch => 'Users permitted to search',
                   localonly => 'Other domains can search',
                   searchby => 'Search types',
                   searchtypes => 'Search latitude');
@@ -1981,19 +2276,24 @@ sub modify_directorysrch {
     my @cansearch = &Apache::loncommon::get_env_multiple('form.cansearch');
     my @searchby = &Apache::loncommon::get_env_multiple('form.searchby');
 
-    if (ref($currdirsrch{'cansearch'}) eq 'ARRAY') {
-        foreach my $type (@{$currdirsrch{'cansearch'}}) {
-            if (!grep(/^\Q$type\E$/,@cansearch)) {
-                push(@{$changes{'cansearch'}},$type);
+    my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
+    if (keys(%{$usertypes}) == 0) {
+        @cansearch = ('default');
+    } else {
+        if (ref($currdirsrch{'cansearch'}) eq 'ARRAY') {
+            foreach my $type (@{$currdirsrch{'cansearch'}}) {
+                if (!grep(/^\Q$type\E$/,@cansearch)) {
+                    push(@{$changes{'cansearch'}},$type);
+                }
             }
-        }
-        foreach my $type (@cansearch) {
-            if (!grep(/^\Q$type\E$/,@{$currdirsrch{'cansearch'}})) {
-                push(@{$changes{'cansearch'}},$type);
+            foreach my $type (@cansearch) {
+                if (!grep(/^\Q$type\E$/,@{$currdirsrch{'cansearch'}})) {
+                    push(@{$changes{'cansearch'}},$type);
+                }
             }
+        } else {
+            push(@{$changes{'cansearch'}},@cansearch);
         }
-    } else {
-        push(@{$changes{'cansearch'}},@cansearch);
     }
 
     if (ref($currdirsrch{'searchby'}) eq 'ARRAY') {
@@ -2076,19 +2376,22 @@ sub modify_directorysrch {
             }
 
             if (ref($changes{'cansearch'}) eq 'ARRAY') {
-                my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
                 my $chgtext;
-                foreach my $type (@cansearch) {
-                    if (defined($usertypes->{$type})) {
-                        $chgtext .= $usertypes->{$type}.'; ';
+                if (ref($usertypes) eq 'HASH') {
+                    if (keys(%{$usertypes}) > 0) {
+                        foreach my $type (@{$types}) {
+                            if (grep(/^\Q$type\E$/,@cansearch)) {
+                                $chgtext .= $usertypes->{$type}.'; ';
+                            }
+                        }
+                        if (grep(/^default$/,@cansearch)) {
+                            $chgtext .= $othertitle;
+                        } else {
+                            $chgtext =~ s/\; $//;
+                        }
+                        $resulttext .= '<li>'.&mt("Users from domain '<span class=\"LC_cusr_emph\">[_1]</span>' permitted to search the institutional directory set to: [_2]",$dom,$chgtext).'</li>';
                     }
                 }
-                if (grep(/^default$/,@cansearch)) {
-                    $chgtext .= $othertitle;
-                } else {
-                    $chgtext =~ s/\; $//;
-                }
-                $resulttext .= '<li>'.&mt("$title{'cansearch'} ([_1]) set to: [_2]",$dom,$chgtext).'</li>';
             }
             if (ref($changes{'searchby'}) eq 'ARRAY') {
                 my ($searchtitles,$titleorder) = &sorted_searchtitles();
@@ -2122,6 +2425,258 @@ sub modify_directorysrch {
         }
     } else {
         $resulttext = '<span class="LC_error">'.
+                      &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
+sub modify_contacts {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%currsetting,%newsetting,%changes,%contacts_hash);
+    if (ref($domconfig{'contacts'}) eq 'HASH') {
+        foreach my $key (keys(%{$domconfig{'contacts'}})) {
+            $currsetting{$key} = $domconfig{'contacts'}{$key};
+        }
+    }
+    my (%others,%to);
+    my @contacts = ('supportemail','adminemail');
+    my @mailings = ('errormail','packagesmail','helpdeskmail');
+    foreach my $type (@mailings) {
+        @{$newsetting{$type}} = 
+            &Apache::loncommon::get_env_multiple('form.'.$type);
+        foreach my $item (@contacts) {
+            if (grep(/^\Q$item\E$/,@{$newsetting{$type}})) {
+                $contacts_hash{contacts}{$type}{$item} = 1;
+            } else {
+                $contacts_hash{contacts}{$type}{$item} = 0;
+            }
+        }  
+        $others{$type} = $env{'form.'.$type.'_others'};
+        $contacts_hash{contacts}{$type}{'others'} = $others{$type};
+    }
+    foreach my $item (@contacts) {
+        $to{$item} = $env{'form.'.$item};
+        $contacts_hash{'contacts'}{$item} = $to{$item};
+    }
+    if (keys(%currsetting) > 0) {
+        foreach my $item (@contacts) {
+            if ($to{$item} ne $currsetting{$item}) {
+                $changes{$item} = 1;
+            }
+        }
+        foreach my $type (@mailings) {
+            foreach my $item (@contacts) {
+                if (ref($currsetting{$type}) eq 'HASH') {
+                    if ($currsetting{$type}{$item} ne $contacts_hash{contacts}{$type}{$item}) {
+                        push(@{$changes{$type}},$item);
+                    }
+                } else {
+                    push(@{$changes{$type}},@{$newsetting{$type}});
+                }
+            }
+            if ($others{$type} ne $currsetting{$type}{'others'}) {
+                push(@{$changes{$type}},'others');
+            }
+        }
+    } else {
+        my %default;
+        $default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
+        $default{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
+        $default{'errormail'} = 'adminemail';
+        $default{'packagesmail'} = 'adminemail';
+        $default{'helpdeskmail'} = 'supportemail';
+        foreach my $item (@contacts) {
+           if ($to{$item} ne $default{$item}) {
+              $changes{$item} = 1;
+           } 
+        }
+        foreach my $type (@mailings) {
+            if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) {
+               
+                push(@{$changes{$type}},@{$newsetting{$type}});
+            }
+            if ($others{$type} ne '') {
+                push(@{$changes{$type}},'others');
+            } 
+        }
+    }
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+            my ($titles,$short_titles)  = &contact_titles();
+            $resulttext = &mt('Changes made:').'<ul>';
+            foreach my $item (@contacts) {
+                if ($changes{$item}) {
+                    $resulttext .= '<li>'.$titles->{$item}.
+                                    &mt(' set to: ').
+                                    '<span class="LC_cusr_emph">'.
+                                    $to{$item}.'</span></li>';
+                }
+            }
+            foreach my $type (@mailings) {
+                if (ref($changes{$type}) eq 'ARRAY') {
+                    $resulttext .= '<li>'.$titles->{$type}.': ';
+                    my @text;
+                    foreach my $item (@{$newsetting{$type}}) {
+                        push(@text,$short_titles->{$item});
+                    }
+                    if ($others{$type} ne '') {
+                        push(@text,$others{$type});
+                    }
+                    $resulttext .= '<span class="LC_cusr_emph">'.
+                                   join(', ',@text).'</span></li>';
+                }
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = &mt('No changes made to contact information.');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
+            &mt('An error occurred: [_1].',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
+sub modify_usercreation {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%curr_usercreation,%changes,%authallowed);
+    if (ref($domconfig{'usercreation'}) eq 'HASH') {
+        foreach my $key (keys(%{$domconfig{'usercreation'}})) {
+            $curr_usercreation{$key} = $domconfig{'usercreation'}{$key};
+        }
+    }
+    my %title = &Apache::lonlocal::texthash (
+                   author => 'adding co-authors/assistant authors',
+                   course => 'adding users to a course',
+                );
+    my @username_rule = &Apache::loncommon::get_env_multiple('form.username_rule');
+    my @cancreate = &Apache::loncommon::get_env_multiple('form.can_createuser');
+    if (ref($curr_usercreation{'cancreate'}) eq 'ARRAY') {
+        foreach my $type (@{$curr_usercreation{'cancreate'}}) {
+            if (!grep(/^\Q$type\E$/,@cancreate)) {
+                push(@{$changes{'cancreate'}},$type);
+            }
+        }
+        foreach my $type (@cancreate) {
+            if (!grep(/^\Q$type\E$/,@{$curr_usercreation{'cancreate'}})) {
+                push(@{$changes{'cancreate'}},$type);
+            }
+        }
+    } else {
+        push(@{$changes{'cancreate'}},@cancreate);
+    }
+    if (ref($curr_usercreation{'username_rule'}) eq 'ARRAY') {
+        foreach my $type (@{$curr_usercreation{'username_rule'}}) {
+            if (!grep(/^\Q$type\E$/,@username_rule)) {
+                push(@{$changes{'username_rule'}},$type);
+            }
+        }
+        foreach my $type (@username_rule) {
+            if (!grep(/^\Q$type\E$/,@{$curr_usercreation{'username_rule'}})) {
+                push(@{$changes{'username_rule'}},$type);
+            }
+        }
+    } else {
+        push(@{$changes{'username_rule'}},@username_rule);
+    }
+
+    my @contexts = ('author','course','domain');
+    my @authtypes = ('int','krb4','krb5','loc');
+    my %authhash;
+    foreach my $item (@contexts) {
+        my @authallowed =  &Apache::loncommon::get_env_multiple('form.'.$item.'_auth');
+        foreach my $auth (@authtypes) {
+            if (grep(/^\Q$auth\E$/,@authallowed)) {
+                $authhash{$item}{$auth} = 1;
+            } else {
+                $authhash{$item}{$auth} = 0;
+            }
+        }
+    }
+    if (ref($curr_usercreation{'authtypes'}) eq 'HASH') {
+        foreach my $item (@contexts) {
+            if (ref($curr_usercreation{'authtypes'}{$item}) eq 'HASH') {
+                foreach my $auth (@authtypes) {
+                    if ($authhash{$item}{$auth} ne $curr_usercreation{'authtypes'}{$item}{$auth}) {
+                        push(@{$changes{'authtypes'}},$item);
+                        last;
+                    }
+                }
+            }
+        }
+    } else {
+        foreach my $item (@contexts) {
+            push(@{$changes{'authtypes'}},$item);
+        }
+    }
+
+    my %usercreation_hash =  (
+            usercreation => {
+                              cancreate     => \@cancreate,
+                              username_rule => \@username_rule,
+                              authtypes      => \%authhash,
+                            }
+            );
+
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%usercreation_hash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+            $resulttext = &mt('Changes made:').'<ul>';
+            if (ref($changes{'cancreate'}) eq 'ARRAY') {
+                my $chgtext = '<ul>';
+                foreach my $type (@cancreate) {
+                    $chgtext .= '<li>'.$title{$type}.'</li>';
+                }
+                $chgtext .= '</ul>';
+                if (@cancreate > 0) {
+                    $resulttext .= '<li>'.&mt('Creation of new users is permitted by a Domain Coordinator, and also by other users when: ').$chgtext.'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("Creation of new users is now only allowed when the user's role is Domain Coordinator.").'</li>';
+                }
+            }
+            if (ref($changes{'username_rule'}) eq 'ARRAY') {
+                my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($dom);
+                my $chgtext = '<ul>';
+                foreach my $type (@username_rule) {
+                    if (ref($rules->{$type}) eq 'HASH') {
+                        $chgtext .= '<li>'.$rules->{$type}{'name'}.'</li>';
+                    }
+                }
+                $chgtext .= '</ul>';
+                if (@username_rule > 0) {
+                    $resulttext .= '<li>'.&mt('Usernames with the following formats are restricted to verified users in the institutional directory: ').$chgtext.'</li>';     
+                } else {
+                    $resulttext .= '<li>'.&mt('There are now no username formats restricted to verified users in the institutional directory.').'</li>'; 
+                }
+            }
+            my %authname = &authtype_names();
+            my %context_title = &context_names();
+            if (ref($changes{'authtypes'}) eq 'ARRAY') {
+                my @unchanged;
+                my $chgtext = '<ul>';
+                foreach my $type (@{$changes{'authtypes'}}) {
+                    my @allowed;
+                    $chgtext .= '<li><span class="LC_cusr_emph">'.$context_title{$type}.'</span> - '.&mt('assignable authentication types: ');
+                    foreach my $auth (@authtypes) {
+                        if ($authhash{$type}{$auth}) {
+                            push(@allowed,$authname{$auth});
+                        }
+                    }
+                    $chgtext .= join(', ',@allowed).'</li>';
+                }
+                $chgtext .= '</ul>';
+                $resulttext .= '<li>'.&mt('Authentication types available for assignment to new users').'<br />'.$chgtext;
+                $resulttext .= '</li>';
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = &mt('No changes made to user creation settings');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
             &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;