--- loncom/lond	2017/03/13 18:30:02	1.533
+++ loncom/lond	2017/03/20 13:53:22	1.535
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.533 2017/03/13 18:30:02 raeburn Exp $
+# $Id: lond,v 1.535 2017/03/20 13:53:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.533 $'; #' stupid emacs
+my $VERSION='$Revision: 1.535 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -265,6 +265,17 @@ my %trust = (
                putstore => {remote => 1, enroll => 1},
                queryreply => {anywhere => 1},
                querysend => {anywhere => 1},
+               querysend_activitylog => {remote => 1},
+               querysend_allusers => {remote => 1, domroles => 1},
+               querysend_courselog => {remote => 1},
+               querysend_fetchenrollment => {remote => 1},
+               querysend_getinstuser => {remote => 1},
+               querysend_getmultinstusers => {remote => 1},
+               querysend_instdirsearch => {remote => 1, domroles => 1, coaurem => 1},
+               querysend_institutionalphotos => {remote => 1},
+               querysend_portfolio_metadata => {remote => 1, content => 1},
+               querysend_userlog => {remote => 1, domroles => 1},
+               querysend_usersearch => {remote => 1, enroll => 1, coaurem => 1},
                quit => {anywhere => 1},
                readlonnetglobal => {institutiononly => 1},
                reinit => {manageronly => 1}, #not used currently
@@ -3954,7 +3965,7 @@ sub retrieve_chat_handler {
 #  serviced.
 #
 #  Parameters:
-#     $cmd       - COmmand keyword that initiated the request.
+#     $cmd       - Command keyword that initiated the request.
 #     $tail      - Remainder of the command after the keyword.
 #                  For this function, this consists of a query and
 #                  3 arguments that are self-documentingly labelled
@@ -3968,11 +3979,41 @@ sub retrieve_chat_handler {
 sub send_query_handler {
     my ($cmd, $tail, $client) = @_;
 
-
     my $userinput = "$cmd:$tail";
 
     my ($query,$arg1,$arg2,$arg3)=split(/\:/,$tail);
     $query=~s/\n*$//g;
+    if (($query eq 'usersearch') || ($query eq 'instdirsearch')) {
+        my $usersearchconf = &get_usersearch_config($currentdomainid,'directorysrch');
+        my $earlyout;
+        if (ref($usersearchconf) eq 'HASH') {
+            if ($currentdomainid eq $clienthomedom) {
+                if ($query eq 'usersearch') {
+                    if ($usersearchconf->{'lcavailable'} eq '0') {
+                        $earlyout = 1;
+                    }
+                } else {
+                    if ($usersearchconf->{'available'} eq '0') {
+                        $earlyout = 1;
+                    }
+                }
+            } else {
+                if ($query eq 'usersearch') {
+                    if ($usersearchconf->{'lclocalonly'}) {
+                        $earlyout = 1;
+                    }
+                } else {
+                    if ($usersearchconf->{'localonly'}) {
+                        $earlyout = 1;
+                    }
+                }
+            }
+        }
+        if ($earlyout) {
+            &Reply($client, "query_not_authorized\n");
+            return 1;
+        }
+    }
     &Reply($client, "". &sql_reply("$clientname\&$query".
 				"\&$arg1"."\&$arg2"."\&$arg3")."\n",
 	  $userinput);
@@ -6511,6 +6552,18 @@ sub process_request {
 	    $ok = 0;
 	}
         if ($ok) {
+            my $realcommand = $command;
+            if ($command eq 'querysend') {
+                my ($query,$rest)=split(/\:/,$tail,2);
+                $query=~s/\n*$//g;
+                my @possqueries = 
+                    qw(userlog courselog fetchenrollment institutionalphotos usersearch instdirsearch getinstuser getmultinstusers);
+                if (grep(/^\Q$query\E$/,@possqueries)) {
+                    $command .= '_'.$query;
+                } elsif ($query eq 'prepare activity log') {
+                    $command .= '_activitylog';
+                }
+            }
             if (ref($trust{$command}) eq 'HASH') {
                 my $donechecks;
                 if ($trust{$command}{'anywhere'}) {
@@ -6552,6 +6605,7 @@ sub process_request {
                     }
                 }
             }
+            $command = $realcommand;
         }
 
 	if($ok) {
@@ -8266,6 +8320,19 @@ sub get_usersession_config {
     }
     return;
 }
+
+sub get_usersearch_config {
+    my ($dom,$name) = @_;
+    my ($usersearchconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
+    if (defined($cached)) {
+        return $usersearchconf;
+    } else {
+        my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$dom);
+        &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'directorysrch'},600);
+        return $domconfig{'directorysrch'};
+    }
+    return;
+}
 
 sub get_prohibited {
     my ($dom) = @_;