--- loncom/interface/loncommon.pm	2016/08/25 22:33:02	1.1251
+++ loncom/interface/loncommon.pm	2016/10/10 03:02:47	1.1255
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1251 2016/08/25 22:33:02 raeburn Exp $
+# $Id: loncommon.pm,v 1.1255 2016/10/10 03:02:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2548,12 +2548,15 @@ sub multiple_select_form {
 
 =pod
 
-=item * &select_form($defdom,$name,$hashref,$onchange)
+=item * &select_form($defdom,$name,$hashref,$onchange,$readonly)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select options from a ref to a hash containing:
 option_name => displayed text. An optional $onchange can include
-a javascript onchange item, e.g., onchange="this.form.submit();"  
+a javascript onchange item, e.g., onchange="this.form.submit();".
+An optional arg -- $readonly -- if true will cause the select form
+to be disabled, e.g., for the case where an instructor has a section-
+specific role, and is viewing/modifying parameters. 
 
 See lonrights.pm for an example invocation and use.
 
@@ -5306,7 +5309,7 @@ sub check_ip_acc {
         return 1;
     }
     my $allowed;
-    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip;
+    my $ip=$ENV{'REMOTE_ADDR'} || $clientip || $env{'request.host'};
 
     my $name;
     my %access = (
@@ -9957,8 +9960,24 @@ sub get_secgrprole_info {
 }
 
 sub user_picker {
-    my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;
+    my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context,$fixeddom) = @_;
     my $currdom = $dom;
+    my @alldoms = &Apache::lonnet::all_domains();
+    if (@alldoms == 1) {
+        my %domsrch = &Apache::lonnet::get_dom('configuration',
+                                               ['directorysrch'],$alldoms[0]);
+        my $domdesc = &Apache::lonnet::domain($alldoms[0],'description');
+        my $showdom = $domdesc;
+        if ($showdom eq '') {
+            $showdom = $dom;
+        }
+        if (ref($domsrch{'directorysrch'}) eq 'HASH') {
+            if ((!$domsrch{'directorysrch'}{'available'}) &&
+                ($domsrch{'directorysrch'}{'lcavailable'} eq '0')) {
+                return (&mt('LON-CAPA directory search is not available in domain: [_1]',$showdom),0);
+            }
+        }
+    }
     my %curr_selected = (
                         srchin => 'dom',
                         srchby => 'lastname',
@@ -10005,7 +10024,12 @@ sub user_picker {
                                        );
     &html_escape(\%html_lt);
     &js_escape(\%js_lt);
-    my $domform = &select_dom_form($currdom,'srchdomain',1,1);
+    my $domform;
+    if ($fixeddom) {
+        $domform = &select_dom_form($currdom,'srchdomain',1,1,undef,[$currdom]);
+    } else {
+        $domform = &select_dom_form($currdom,'srchdomain',1,1);
+    }
     my $srchinsel = ' <select name="srchin">';
 
     my @srchins = ('crs','dom','alc','instd');
@@ -10199,7 +10223,7 @@ END_BLOCK
                &Apache::lonhtmlcommon::row_closure(1). 
                &Apache::lonhtmlcommon::end_pick_box().
                '<br />';
-    return $output;
+    return ($output,1);
 }
 
 sub user_rule_check {