--- loncom/interface/domainprefs.pm	2007/05/27 21:21:26	1.16
+++ 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.16 2007/05/27 21:21:26 raeburn Exp $
+# $Id: domainprefs.pm,v 1.26 2007/09/01 21:20:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,7 @@ sub handler {
     }
     my %domconfig =
       &Apache::lonnet::get_dom('configuration',['login','rolecolors',
-                               'quotas','autoenroll','autoupdate'],$dom);
+                'quotas','autoenroll','autoupdate','directorysrch'],$dom);
     my @prefs = (
       { text => 'Default color schemes',
         help => 'Default_Color_Schemes',
@@ -106,7 +106,13 @@ sub handler {
                     col2 => 'Value',},
                    {col1 => 'User Population',
                     col2 => 'Updataeable user data'}],
-      },
+        },
+      { text => 'Institutional directory searches',
+        help => 'Domain_Directory_Search',
+        action => 'directorysrch',
+        header => [{col1 => 'Setting',
+                    col2 => 'Value',}],
+        },
     );
     my @roles = ('student','coordinator','author','admin');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -133,6 +139,31 @@ sub handler {
         my %helphash;   
         my $numprefs = @prefs;
         &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 %designhash = &Apache::loncommon::get_domainconf($dom);
+                my @loginimages = ('img','logo','domlogo');
+                my $custom_img_count = 0;
+                foreach my $img (@loginimages) {
+                    if ($designhash{$dom.'.login.'.$img} ne '') {
+                        $custom_img_count ++;
+                    }
+                }
+                foreach my $role (@roles) {
+                    if ($designhash{$dom.'.'.$role.'.img'} ne '') {
+                        $custom_img_count ++;
+                    }
+                }
+                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));
+                    return OK;
+                }
+            }
+        }
         $r->print('<table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
         foreach my $item (@prefs) {
             if ($item->{'action'} eq 'login') {
@@ -164,6 +195,8 @@ sub process_changes {
         $output = &modify_autoenroll($dom,%domconfig);
     } elsif ($action eq 'autoupdate') {
         $output = &modify_autoupdate($dom,%domconfig);
+    } elsif ($action eq 'directorysrch') {
+        $output = &modify_directorysrch($dom,%domconfig);
     }
     return $output;
 }
@@ -173,9 +206,12 @@ sub print_config_box {
     $r->print('
          <table class="LC_nested_outer">
           <tr>
-           <th>'.&mt($item->{text}).'&nbsp;'.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
-          </tr>');
+           <th>'.&mt($item->{text}).'&nbsp;</th></tr>');
+# 
+# FIXME - put the help link back in when the help files exist
+#           <th>'.&mt($item->{text}).'&nbsp;'.
+#           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
+#          </tr>');
     if (($action eq 'autoupdate') || ($action eq 'rolecolors')) {
         my $colspan = ($action eq 'rolecolors')?' colspan="2"':'';
         $r->print('
@@ -235,7 +271,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">');
-        if ($action eq 'login') {
+        if (($action eq 'login') || ($action eq 'directorysrch')) {
             $r->print('  
               <td class="LC_left_item" colspan="2">'.$item->{'header'}->[0]->{'col1'}.'</td>');
         } else {
@@ -251,6 +287,8 @@ sub print_config_box {
            $r->print(&print_quotas($dom,$settings));
         } elsif ($action eq 'autoenroll') {
            $r->print(&print_autoenroll($dom,$settings));
+        } elsif ($action eq 'directorysrch') {
+           $r->print(&print_directorysrch($dom,$settings));
         }  
     }
     $r->print('
@@ -522,13 +560,14 @@ sub display_color_options {
                   '</span></td></tr>';
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
-        $itemcount ++;
+	$itemcount ++;
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{$img}.'</td>';
-        my $imgfile;
+        my ($imgfile, $img_import);
         if ($designs->{$img} ne '') {
             $imgfile = $designs->{$img};
+	    $img_import = ($imgfile =~ m{^/adm/});
         } else {
             $imgfile = $defaults->{$img};
         }
@@ -578,6 +617,9 @@ sub display_color_options {
                 if (!$is_custom->{$img}) {
                     $datatable .= &mt('Default in use:').'<br />';
                 }
+		if ($img_import) {
+		    $datatable.= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
+		}
                 $datatable.= '<a href="'.$fullsize.'" target="_blank"><img src="'.
                              $showfile.'" alt="'.$alt_text->{$img}.
                              '" border="0" /></a></td>';
@@ -700,21 +742,11 @@ ENDCOL
 sub print_quotas {
     my ($dom,$settings) = @_;
     my $datatable;
-    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
-    my $othertitle = "All users";
-    my @types;
-    if (ref($order) eq 'ARRAY') {
-        @types = @{$order};
-    }
-    if (@types == 0) {
-        if (ref($usertypes) eq 'HASH') {
-            @types = sort(keys(%{$usertypes}));
-        }
-    }
+    my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
     my $typecount = 0;
     my $css_class;
-    if (@types > 0) {
-        foreach my $type (@types) {
+    if (ref($types) eq 'ARRAY') {
+        foreach my $type (@{$types}) {
             if (defined($usertypes->{$type})) {
                 $typecount ++;
                 $css_class = $typecount%2?' class="LC_odd_row"':'';
@@ -726,7 +758,6 @@ sub print_quotas {
                               '" size="5" /> Mb</span></td></tr>';
             }
         }
-        $othertitle = "Other users";
     }
     my $defaultquota = '20';
     if (ref($settings) eq 'HASH') {
@@ -737,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>';
@@ -746,9 +777,8 @@ sub print_quotas {
 
 sub print_autoenroll {
     my ($dom,$settings) = @_;
-    my $defdom = $dom;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($runon,$runoff);
+    my ($defdom,$runon,$runoff);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -836,34 +866,24 @@ sub print_autoupdate {
                   $classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr>';
     } else {
-        my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
-        my @types;
-        if (ref($order) eq 'ARRAY') {
-            @types = @{$order};
-        }
-        if (@types == 0) {
-            if (ref($usertypes) eq 'HASH') {
-                @types = sort(keys(%{$usertypes}));
-            }
-        }
-        my $othertitle = &mt('All users');
-        if (keys(%{$usertypes}) > 0) {
-            $othertitle = &mt('Other users');
-        }
-        my @fields = ('lastname','firstname','middlename','gen','email','id');
+        my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
+        my @fields = ('lastname','firstname','middlename','gen',
+                      'permanentemail','id');
         my %fieldtitles = &Apache::lonlocal::texthash (
                             id => 'Student/Employee ID',
-                            email => 'E-mail address',
+                            permanentemail => 'E-mail address',
                             lastname => 'Last Name',
                             firstname => 'First Name',
                             middlename => 'Middle Name',
                             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},
@@ -873,6 +893,204 @@ sub print_autoupdate {
     return $datatable;
 }
 
+sub print_directorysrch {
+    my ($dom,$settings) = @_;
+    my $srchon = ' ';
+    my $srchoff = ' checked="checked" ';
+    my ($exacton,$containson,$beginson);
+    my $localon = ' ';
+    my $localoff = ' checked="checked" ';
+    if (ref($settings) eq 'HASH') {
+        if ($settings->{'available'} eq '1') {
+            $srchon = $srchoff;
+            $srchoff = ' ';
+        }
+        if ($settings->{'localonly'} eq '1') {
+            $localon = $localoff;
+            $localoff = ' ';
+        }
+        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>'.
+                  '<input type="radio" name="dirsrch_available"'.
+                  $srchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="dirsrch_available"'.
+                  $srchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<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>';
+    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})) {
+            my $check = ' ';
+            if (ref($settings->{'searchby'}) eq 'ARRAY') {
+                if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
+                    $check = ' checked="checked" ';
+                }
+            }
+            $datatable .= '<td class="LC_left_item">'.
+                          '<span class="LC_nobreak"><label>'.
+                          '<input type="checkbox" name="searchby" '.
+                          'value="'.$title.'"'.$check.'/>'.
+                          $searchtitles->{$title}.'</label></span></td>';
+        }
+    }
+    $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 = &mt('All users');
+    my @types;
+    if (ref($order) eq 'ARRAY') {
+        @types = @{$order};
+    }
+    if (@types == 0) {
+        if (ref($usertypes) eq 'HASH') {
+            @types = sort(keys(%{$usertypes}));
+        }
+    }
+    if (keys(%{$usertypes}) > 0) {
+        $othertitle = &mt('Other users');
+    }
+    return ($othertitle,$usertypes,\@types);
+}
+
+sub sorted_searchtitles {
+    my %searchtitles = &Apache::lonlocal::texthash(
+                         'uname' => 'username',
+                         'lastname' => 'last name',
+                         'lastfirst' => 'last name, first name',
+                     );
+    my @titleorder = ('uname','lastname','lastfirst');
+    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;
@@ -1053,6 +1271,15 @@ sub modify_colors {
         }
         my ($width,$height) = &thumb_dimensions();
         foreach my $img (@images) {
+	    if ( ! $env{'form.'.$role.'_'.$img.'.filename'} 
+		 && !defined($domconfig->{$role}{$img})
+		 && !$env{'form.'.$role.'_del_'.$img}
+		 && $env{'form.'.$role.'_import_'.$img}) {
+		# import the old configured image from the .tab setting
+		# if they haven't provided a new one 
+		$domconfig->{$role}{$img} = 
+		    $env{'form.'.$role.'_import_'.$img};
+	    }
             if ($env{'form.'.$role.'_'.$img.'.filename'} ne '') {
                 my $error;
                 if ($configuserok eq 'ok') {
@@ -1092,6 +1319,7 @@ sub modify_colors {
                                             $dom,$confname,$img,$width,$height);
                                 if ($result eq 'ok') {
                                     $confhash->{$role}{$img} = $logourl;
+				    $changes{$role}{'images'}{$img} = 1;
                                 }
                             }
                         }
@@ -1254,7 +1482,7 @@ sub check_dimensions {
             }
             chomp($imageinfo);
             my ($fullsize) = 
-                ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)\s+/);
+                ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)/);
             if ($fullsize) {
                 ($fullwidth,$fullheight) = split(/x/,$fullsize);
             }
@@ -1515,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_(.+)$/) {
@@ -1550,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 {
@@ -1577,10 +1810,17 @@ sub modify_autoenroll {
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages');
     my @offon = ('off','on');
+    my $sender_uname = $env{'form.sender_uname'};
+    my $sender_domain = $env{'form.sender_domain'};
+    if ($sender_domain eq '') {
+        $sender_uname = '';
+    } elsif ($sender_uname eq '') {
+        $sender_domain = '';
+    }
     my %autoenrollhash =  (
                        autoenroll => { run => $env{'form.autoenroll_run'},
-                                       sender_uname => $env{'form.sender_uname'},
-                                       sender_domain => $env{'form.sender_domain'},
+                                       sender_uname => $sender_uname,
+                                       sender_domain => $sender_domain,
 
                                 }
                      );
@@ -1593,21 +1833,13 @@ sub modify_autoenroll {
              }
         } elsif ($autorun) {
             if ($env{'form.autoenroll_run'} ne '1') {
-                $changes{'run'} = 1;
+                 $changes{'run'} = 1;
             }
         }
-        if (exists($currautoenroll{sender_uname})) {
-            if ($currautoenroll{'sender_uname'} ne $env{'form.sender_uname'}) {
-                $changes{'sender'} = 1;
-            }
-        } else {
+        if ($currautoenroll{'sender_uname'} ne $sender_uname) {
             $changes{'sender'} = 1;
         }
-        if (exists($currautoenroll{sender_domain})) {
-            if ($currautoenroll{'sender_domain'} ne $env{'form.sender_domain'}) {
-                $changes{'sender'} = 1;
-            }
-        } else {
+        if ($currautoenroll{'sender_domain'} ne $sender_domain) {
             $changes{'sender'} = 1;
         }
         if (keys(%changes) > 0) {
@@ -1616,7 +1848,11 @@ sub modify_autoenroll {
                 $resulttext .= '<li>'.&mt("$title{'run'} set to $offon[$env{'form.autoenroll_run'}]").'</li>';
             }
             if ($changes{'sender'}) {
-                $resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$env{'form.sender_uname'}.':'.$env{'form.sender_domain'}).'</li>';
+                if ($sender_uname eq '' || $sender_domain eq '') {
+                    $resulttext .= '<li>'.&mt("$title{'sender'} set to default (course owner).").'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>';
+                }
             }
             $resulttext .= '</ul>';
         } else {
@@ -1642,10 +1878,10 @@ 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',
-                        email => 'E-mail address',
+                        permanentemail => 'E-mail address',
                         lastname => 'Last Name',
                         firstname => 'First Name',
                         middlename => 'Middle Name',
@@ -1653,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_(.+)_([^_]+)$/) {
@@ -1675,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;
                                 }
                             }
@@ -1690,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,
@@ -1723,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 {
@@ -1749,5 +1987,178 @@ sub modify_autoupdate {
     return $resulttext;
 }
 
-1;
+sub modify_directorysrch {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%changes);
+    my %currdirsrch;
+    if (ref($domconfig{'directorysrch'}) eq 'HASH') {
+        foreach my $key (keys(%{$domconfig{'directorysrch'}})) {
+            $currdirsrch{$key} = $domconfig{'directorysrch'}{$key};
+        }
+    }
+    my %title = ( available => 'Directory search available',
+                  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');
+
+    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);
+                }
+            }
+        } else {
+            push(@{$changes{'cansearch'}},@cansearch);
+        }
+    }
+
+    if (ref($currdirsrch{'searchby'}) eq 'ARRAY') {
+        foreach my $by (@{$currdirsrch{'searchby'}}) {
+            if (!grep(/^\Q$by\E$/,@searchby)) {
+                push(@{$changes{'searchby'}},$by);
+            }
+        }
+        foreach my $by (@searchby) {
+            if (!grep(/^\Q$by\E$/,@{$currdirsrch{'searchby'}})) {
+                push(@{$changes{'searchby'}},$by);
+            }
+        }
+    } 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 => \@searchtypes,
+                             }
+            );
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%dirsrch_hash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        if (exists($currdirsrch{'available'})) {
+             if ($currdirsrch{'available'} ne $env{'form.dirsrch_available'}) {
+                 $changes{'available'} = 1;
+             }
+        } else {
+            if ($env{'form.dirsrch_available'} eq '1') {
+                $changes{'available'} = 1;
+            }
+        }
+        if (exists($currdirsrch{'localonly'})) {
+             if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) {
+                 $changes{'localonly'} = 1;
+             }
+        } else {
+            if ($env{'form.dirsrch_localonly'} eq '1') {
+                $changes{'localonly'} = 1;
+            }
+        }
+        if (keys(%changes) > 0) {
+            $resulttext = &mt('Changes made:').'<ul>';
+            if ($changes{'available'}) {
+                $resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>';
+            }
+            if ($changes{'localonly'}) {
+                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>';
+            }
+
+            if (ref($changes{'cansearch'}) eq 'ARRAY') {
+                my $chgtext;
+                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 (ref($changes{'searchby'}) eq 'ARRAY') {
+                my ($searchtitles,$titleorder) = &sorted_searchtitles();
+                my $chgtext;
+                foreach my $type (@{$titleorder}) {
+                    if (grep(/^\Q$type\E$/,@searchby)) {
+                        if (defined($searchtitles->{$type})) {
+                            $chgtext .= $searchtitles->{$type}.'; ';
+                        }
+                    }
+                }
+                $chgtext =~ s/\; $//;
+                $resulttext .= '<li>'.&mt("$title{'searchby'} set to: [_1]",$chgtext).'</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 {
+            $resulttext = &mt('No changes made to institution directory search settings');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
+            &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
+1;