--- loncom/interface/domainprefs.pm	2007/08/26 15:31:03	1.25
+++ loncom/interface/domainprefs.pm	2007/09/12 12:01:04	1.27
@@ -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.27 2007/09/12 12:01:04 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'],$dom);
     my @prefs = (
       { text => 'Default color schemes',
         help => 'Default_Color_Schemes',
@@ -113,6 +114,12 @@ sub handler {
         header => [{col1 => 'Setting',
                     col2 => 'Value',}],
         },
+      { text => 'User creation',
+        help => 'Domain_User_Creation',
+        action => 'usercreation',
+        header => [{col1 => 'Setting',
+                    col2 => 'Value',}],
+        },
     );
     my @roles = ('student','coordinator','author','admin');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -197,6 +204,8 @@ sub process_changes {
         $output = &modify_autoupdate($dom,%domconfig);
     } elsif ($action eq 'directorysrch') {
         $output = &modify_directorysrch($dom,%domconfig);
+    } elsif ($action eq 'usercreation') {
+        $output = &modify_user_creation($dom,%domconfig);
     }
     return $output;
 }
@@ -289,7 +298,9 @@ sub print_config_box {
            $r->print(&print_autoenroll($dom,$settings));
         } elsif ($action eq 'directorysrch') {
            $r->print(&print_directorysrch($dom,$settings));
-        }  
+        } elsif ($action eq 'usercreation') {
+           $r->print(&print_usercreation($dom,$settings));
+        }
     }
     $r->print('
    </table>
@@ -745,7 +756,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 +779,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 +889,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 +945,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 +961,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 +990,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 +1011,114 @@ sub print_directorysrch {
     return $datatable;
 }
 
+sub print_usercreation {
+    my ($dom,$settings) = @_;
+    my $numinrow = 4;
+    my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($dom);
+    my %checked;
+    if (ref($settings) eq 'HASH') {
+        if (ref($settings->{'cancreate'}) eq 'ARRAY') {
+            foreach my $item (@{$settings->{'cancreate'}}) { 
+                $checked{$item} = ' checked="checked" ';
+            }
+        }
+    }
+    my $datatable = '<td>'.&mt('User creation other than by DC: ').'</td>'.
+                    '<td class="LC_left_item"><table><tr><td>'.
+                    '<span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="can_createuser" '.
+                    $checked{'author'}.' value="author" />'.
+                    &mt('When adding a co-author/assistant author').
+	            '</label><span></td></tr>'.
+                    '<tr><td>'.
+                    '<span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="can_createuser" '.
+                    $checked{'course'}.' value="course" />'.
+                    &mt('When adding users to a course').
+                    '</label><span></td></tr></table></td></tr>';
+    if (ref($rules) eq 'HASH') {
+        if (keys(%{$rules}) > 0) {
+            $datatable .= &username_formats_row($settings,$rules,$ruleorder,
+                                                $numinrow);
+        }
+    }
+    return $datatable;
+}
+
+sub username_formats_row {
+    my ($settings,$rules,$ruleorder,$numinrow) = @_;
+    my $output =  '<tr class="LC_odd_row">'.
+                  '<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 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 +1127,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 +1142,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 +1830,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 +1864,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 +1965,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 +1976,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 +1998,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 +2013,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 +2048,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 +2084,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 +2094,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 +2194,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 +2243,100 @@ sub modify_directorysrch {
         }
     } else {
         $resulttext = '<span class="LC_error">'.
+                      &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
+sub modify_user_creation {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%curr_usercreation,%changes);
+    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 %usercreation_hash =  (
+            usercreation => { 
+                              cancreate     => \@cancreate,
+                              username_rule => \@username_rule,
+                            }
+            );
+
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%usercreation_hash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+            $resulttext = &mt('Changes made:').'<ul>';
+            my $chgtext;
+            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 currenty restricted to verified users in the institutional directory.').'</li>'; 
+                }
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = &mt('No changes made to log-in page settings');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
             &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;