--- loncom/interface/lonsearchcat.pm	2008/03/18 22:51:57	1.292
+++ loncom/interface/lonsearchcat.pm	2008/07/15 16:18:41	1.296
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.292 2008/03/18 22:51:57 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.296 2008/07/15 16:18:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -759,11 +759,6 @@ sub setup_basic_search {
                                        $r->dir_config('lonDefDomain')),
 				      $r->dir_config('lonDefDomain')).
                         '</label>';
-    if ($area eq 'res') {
-        $inclext= '<label>'.&mt('[_1] include external resources',
-             &Apache::lonhtmlcommon::checkbox('inclext',$env{'form.inclext'})).
-                  '</label>';
-    }
     $adv_search_link = '<a href="/adm/searchcat?'.
 	               &Apache::loncommon::inhibit_menu_check().
 		       '&phase=disp_adv'.
@@ -926,11 +921,6 @@ ENDHEADER
 	    &Apache::loncommon::domain_select('domains',
 						   $env{'form.domains'},1).
 						   '<br /><label>';
-            if ($env{'form.area'} ne 'portfolio') {
-                $scrout .= &mt('[_1] include external resources',
-                           &Apache::lonhtmlcommon::checkbox
-                           ('inclext',$env{'form.inclext'})).'</label>'
-            }
      $scrout .= '</td></tr>'.$/;
     #
     # Misc metadata
@@ -2126,6 +2116,10 @@ sub copyright_check {
         ($env{'user.domain'} ne $resdom)) {
         return 0;
     }
+    # Check for custom rights
+    if ($Metadata->{'copyright'} eq 'custom') {
+       return &Apache::lonnet::customaccess('bre',$Metadata->{'url'});
+    }
     return 1;
 }
 
@@ -2644,8 +2638,6 @@ END
                     my %Fields = &parse_raw_result($result,$server,$tabletype);
                     $Fields{'hostname'} = $server;
                     #
-                    # Skip if external and we did not want that
-                    next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//));
                     # Skip based on copyright
                     next if (! &copyright_check(\%Fields));