--- loncom/interface/lonsearchcourse.pm	2011/12/25 20:41:53	1.4
+++ loncom/interface/lonsearchcourse.pm	2020/09/22 12:19:15	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Course
 #
-# $Id: lonsearchcourse.pm,v 1.4 2011/12/25 20:41:53 raeburn Exp $
+# $Id: lonsearchcourse.pm,v 1.6 2020/09/22 12:19:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -311,6 +311,14 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['phase']);
     $r->print(&Apache::loncommon::start_page("$crstype Search"));
     &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($env{'request.course.id'} eq '') {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs("$crstype Search"));
+        $r->print(&Apache::loncommon::end_page());
+        my $requrl = $r->uri;
+        $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
+        $env{'user.reinit'} = 1;
+        return HTTP_NOT_ACCEPTABLE;
+    }
     &Apache::lonhtmlcommon::add_breadcrumb(
             {   href => '/adm/searchcourse',
                 text => "$crstype Search"});
@@ -321,10 +329,26 @@ sub handler {
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs("$crstype Search"));
     &Apache::lonnavdisplay::startContentScreen($r,'coursesearch');
-    if ($env{'form.phase'} eq 'results') {
-       &course_search($r);
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('search',$cnum,$cdom);
+    if ($blocked) {
+        my $checkrole = "cm./$cdom/$cnum";
+        if ($env{'request.course.sec'} ne '') {
+            $checkrole .= "/$env{'request.course.sec'}";
+        }
+        if ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
+            ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
+            undef($blocked);
+        }
+    }
+    if ($blocked) {
+        $r->print($blocktext);
+    } elsif ($env{'form.phase'} eq 'results') {
+        &course_search($r);
     } else {
-       $r->print(&menu());
+        $r->print(&menu());
     }
     &Apache::lonnavdisplay::endContentScreen($r);
     $r->print(&Apache::loncommon::end_page());