--- loncom/interface/domainprefs.pm	2007/07/28 21:23:53	1.24
+++ loncom/interface/domainprefs.pm	2007/09/01 21:20:14	1.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.24 2007/07/28 21:23:53 raeburn Exp $
+# $Id: domainprefs.pm,v 1.26 2007/09/01 21:20:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -745,7 +745,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 +768,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 +878,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},
@@ -895,9 +897,7 @@ sub print_directorysrch {
     my ($dom,$settings) = @_;
     my $srchon = ' ';
     my $srchoff = ' checked="checked" ';
-    my $exacton = '';
-    my $containson = ' checked="checked" ';
-    my $specifyon = '';
+    my ($exacton,$containson,$beginson);
     my $localon = ' ';
     my $localoff = ' checked="checked" ';
     if (ref($settings) eq 'HASH') {
@@ -909,19 +909,32 @@ sub print_directorysrch {
             $localon = $localoff;
             $localoff = ' ';
         }
-        if ($settings->{'searchtypes'} eq 'exact') {
-            $exacton = $containson;
-            $containson = ' ';
-        }
-        if ($settings->{'searchtypes'} eq 'specify') {
-            $specifyon = $containson;
-            $containson = ' ';
+        if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
+            foreach my $type (@{$settings->{'searchtypes'}}) {
+                if ($type eq 'exact') {
+                    $exacton = ' checked="checked" ';
+                } elsif ($type eq 'contains') {
+                    $containson = ' checked="checked" ';
+                } elsif ($type eq 'begins') {
+                    $beginson = ' checked="checked" ';
+                }
+            }
+        } else {
+            if ($settings->{'searchtypes'} eq 'exact') {
+                $exacton = ' checked="checked" ';
+            } elsif ($settings->{'searchtypes'} eq 'contains') {
+                $containson = ' checked="checked" ';
+            } elsif ($settings->{'searchtypes'} eq 'specify') {
+                $exacton = ' checked="checked" ';
+                $containson = ' checked="checked" ';
+            }
         }
     }
     my ($searchtitles,$titleorder) = &sorted_searchtitles();
     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>'.
@@ -930,69 +943,26 @@ sub print_directorysrch {
                   '<label><input type="radio" name="dirsrch_available"'.
                   $srchoff.' value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr><tr>'.
-                  '<td colspan="2">'.&mt('Search latitude').'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="searchtypes"'.
-                  $exacton.' value="exact" />'.&mt('Exact match only').'</label>&nbsp;'.
-                  '<label><input type="radio" name="searchtypes"'.
-                  $containson.' value="contains" />'.&mt('Contains is a match').'</label>'.
-                  '&nbsp;<label><input type="radio" name="searchtypes"'.
-                  $specifyon.' value="specify" />'.&mt('Specifiable type').
-                  '</label></span></td></tr>'.
-                  '<tr class="LC_odd_row">'.
-                  '<td colspan="2">'.&mt('Other domains can search').'</td>'.
+                  '<td colspan="2">'.&mt('Other domains can search?').'</td>'.
                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="dirsrch_localonly"'.
                   $localoff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="dirsrch_localonly"'.
                   $localon.' value="1" />'.&mt('No').'</label></span></td>'.
-                  '</tr><tr>'.
-                  '<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) {
-                    $datatable .= '</tr>';
-                }
-                $datatable .= '<tr>';
-            }
-            my $check = ' ';
-            if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-                if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) {
-                    $check = ' checked="checked" ';
-                }
-            }
-            $datatable .= '<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>';
+                  '</tr>';
+    if (ref($usertypes) eq 'HASH') {
+        if (keys(%{$usertypes}) > 0) {
+            $datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom,
+                                               $numinrow,$othertitle);
+            $cansrchrow = 1;
         }
     }
-
-    my $rem = @{$types}%($numinrow);
-    my $colsleft = $numinrow - $rem;
-    if ($colsleft > 1) {
-        $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+    if ($cansrchrow) {
+        $datatable .= '<tr>';
     } else {
-        $datatable .= '<td class="LC_left_item">';
+        $datatable .= '<tr class="LC_odd_row">';
     }
-    my $defcheck = ' ';
-    if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-         if (grep(/^default$/,@{$settings->{'cansearch'}})) {
-              $defcheck = ' checked="checked" ';
-         }
-    }
-    $datatable .= '<span class="LC_nobreak"><label>'.
-                  '<input type="checkbox" name="cansearch" '.
-                  'value="default"'.$defcheck.'/>'.
-                  $othertitle.'</label></span></td>'.
-                  '</tr></table></td></tr>';
-
-    $datatable .= '<tr class="LC_odd_row">'.
-                  '<td>'.&mt('Supported search methods').
+    $datatable .= '<td>'.&mt('Supported search methods').
                   '</td><td class="LC_left_item" colspan="2"><table><tr>';
     foreach my $title (@{$titleorder}) {
         if (defined($searchtitles->{$title})) {
@@ -1010,13 +980,82 @@ sub print_directorysrch {
         }
     }
     $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').
+                  '</label>&nbsp;'.
+                  '<label><input type="checkbox" name="searchtypes" '.
+                  $beginson.' value="begins" />'.&mt('Begins with').
+                  '</label>&nbsp;'.
+                  '<label><input type="checkbox" name="searchtypes" '.
+                  $containson.' value="contains" />'.&mt('Contains').
+                  '</label></span></td></tr>';
     return $datatable;
 }
 
+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>';
+    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>';
+                }
+                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>';
+            }
+        }
+       
+        $rem = @{$types}%($numinrow);
+    }
+    my $colsleft = $numinrow - $rem;
+    if ($colsleft > 1) {
+        $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+    } else {
+        $output .= '<td class="LC_left_item">';
+    }
+    my $defcheck = ' ';
+    if (ref($settings->{'cansearch'}) eq 'ARRAY') {
+        if (grep(/^default$/,@{$settings->{'cansearch'}})) {
+            $defcheck = ' checked="checked" ';
+        }
+    }
+    $output .= '<span class="LC_nobreak"><label>'.
+               '<input type="checkbox" name="cansearch" '.
+               'value="default"'.$defcheck.'/>'.
+               $othertitle.'</label></span></td>'.
+               '</tr></table></td></tr>';
+    return $output;
+}
+
 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};
@@ -1042,6 +1081,16 @@ sub sorted_searchtitles {
     return (\%searchtitles,\@titleorder);
 }
 
+sub sorted_searchtypes {
+    my %srchtypes_desc = (
+                           exact    => 'is exact match',
+                           contains => 'contains ..',
+                           begins   => 'begins with ..',
+                         );
+    my @srchtypeorder = ('exact','begins','contains');
+    return (\%srchtypes_desc,\@srchtypeorder);
+}
+
 sub usertype_update_row {
     my ($settings,$usertypes,$fieldtitles,$fields,$types,$rownums) = @_;
     my $datatable;
@@ -1694,8 +1743,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_(.+)$/) {
@@ -1729,8 +1777,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 {
@@ -1824,7 +1878,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',
@@ -1835,7 +1889,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_(.+)_([^_]+)$/) {
@@ -1857,14 +1911,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;
                                 }
                             }
@@ -1872,18 +1926,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,
@@ -1905,9 +1961,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 {
@@ -1941,29 +1997,34 @@ 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');
     my @offon = ('off','on');
     my @otherdoms = ('Yes','No');
 
+    my @searchtypes = &Apache::loncommon::get_env_multiple('form.searchtypes');  
     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') {
@@ -1980,13 +2041,39 @@ sub modify_directorysrch {
     } else {
         push(@{$changes{'searchby'}},@searchby);
     }
-    
+
+    if (ref($currdirsrch{'searchtypes'}) eq 'ARRAY') {
+        foreach my $type (@{$currdirsrch{'searchtypes'}}) {
+            if (!grep(/^\Q$type\E$/,@searchtypes)) {
+                push(@{$changes{'searchtypes'}},$type);
+            }
+        }
+        foreach my $type (@searchtypes) {
+            if (!grep(/^\Q$type\E$/,@{$currdirsrch{'searchtypes'}})) {
+                push(@{$changes{'searchtypes'}},$type);
+            }
+        }
+    } else {
+        if (exists($currdirsrch{'searchtypes'})) {
+            foreach my $type (@searchtypes) {  
+                if ($type ne $currdirsrch{'searchtypes'}) { 
+                    push(@{$changes{'searchtypes'}},$type);
+                }
+            }
+            if (!grep(/^\Q$currdirsrch{'searchtypes'}\E/,@searchtypes)) {
+                push(@{$changes{'searchtypes'}},$currdirsrch{'searchtypes'});
+            }   
+        } else {
+            push(@{$changes{'searchtypes'}},@searchtypes); 
+        }
+    }
+
     my %dirsrch_hash =  (
             directorysrch => { available => $env{'form.dirsrch_available'},
                                cansearch => \@cansearch,
                                localonly => $env{'form.dirsrch_localonly'},
                                searchby => \@searchby,
-                               searchtypes => $env{'form.searchtypes'},
+                               searchtypes => \@searchtypes,
                              }
             );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%dirsrch_hash,
@@ -2010,15 +2097,6 @@ sub modify_directorysrch {
                 $changes{'localonly'} = 1;
             }
         }
-        if (exists($currdirsrch{'searchtypes'})) {
-             if ($currdirsrch{'searchtypes'} ne $env{'form.searchtypes'}) {
-                 $changes{'searchtypes'} = 1;
-             }
-        } else {
-            if ($env{'form.searchtypes'}) {
-                $changes{'searchtypes'} = 1;
-            }
-        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'available'}) {
@@ -2029,19 +2107,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();
@@ -2056,13 +2137,18 @@ sub modify_directorysrch {
                 $chgtext =~ s/\; $//;
                 $resulttext .= '<li>'.&mt("$title{'searchby'} set to: [_1]",$chgtext).'</li>';
             }
-            if ($changes{'searchtypes'}) {
-                my %srchtypes_desc = ( 
-                                       exact => 'Exact match only',
-                                       contains => 'Contains is a match',
-                                       specify => 'Match type specifiable',
-                                     );
-                $resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"$srchtypes_desc{$env{'form.searchtypes'}}\"").'</li>';
+            if (ref($changes{'searchtypes'}) eq 'ARRAY') {
+                my ($srchtypes_desc,$srchtypeorder) = &sorted_searchtypes(); 
+                my $chgtext;
+                foreach my $type (@{$srchtypeorder}) {
+                    if (grep(/^\Q$type\E$/,@searchtypes)) {
+                        if (defined($srchtypes_desc->{$type})) {
+                            $chgtext .= $srchtypes_desc->{$type}.'; ';
+                        }
+                    }
+                }
+                $chgtext =~ s/\; $//;
+                $resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"[_1]\"",$chgtext).'</li>';
             }
             $resulttext .= '</ul>';
         } else {
@@ -2076,4 +2162,3 @@ sub modify_directorysrch {
 }
 
 1;
-