--- loncom/interface/coursecatalog.pm	2013/11/20 18:40:09	1.75
+++ loncom/interface/coursecatalog.pm	2019/08/02 00:24:02	1.88.2.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.75 2013/11/20 18:40:09 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.88.2.7 2019/08/02 00:24:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonlocal;
 use Apache::courseclassifier;
 use Apache::lonacc;
 use LONCAPA;
+use LONCAPA::lonauthcgi;
 
 sub handler {
     my ($r) = @_;
@@ -76,26 +77,168 @@ sub handler {
     my $domdesc = &Apache::lonnet::domain($codedom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
-    if ($env{'form.catalog_maxdepth'} ne '') {
-        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
+    my $crscats = &Apache::lonnet::get_dom_cats($codedom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($codedom);
+    my $knownuser = &user_is_known();
+    my $canviewall = &canview_all($knownuser,$codedom);
+    
+    my ($cathash,$cattype);
+    if (ref($crscats) eq 'HASH') {
+        %{$cathash} = %{$crscats};
+    } else {
+        $cathash = {};
+    }
+    if ($knownuser || $canviewall) {
+        $cattype = $domdefaults{'catauth'};
+    } else {
+        $cattype = $domdefaults{'catunauth'};
+    }
+    if ($cattype eq '') {
+        $cattype = 'std';
+    }
+    if ($cattype eq 'none') {
+        $r->print(&Apache::loncommon::start_page('Course/Community Catalog'));
+        &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/coursecatalog",
+          text=>"Course/Community Catalog"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+        if ($knownuser || $canviewall) {
+            $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
+        } else {
+            if ($domdefaults{'catauth'} eq 'none') {
+                $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
+            } else {
+                $r->print('<div>'.&mt('The catalog of LON-CAPA courses/communities provided for: "[_1]" is only available to users who are logged in.',$domdesc).'</div>');
+            }
+        }      
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
     }
 
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
-    my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
-    if (ref($domconfig{'coursecategories'}) eq 'HASH') {
-        $cathash = $domconfig{'coursecategories'}{'cats'};
+    my $cnum;
+    if ($cattype eq 'codesrch') {
+        my ($uniquecode,$codemsg,$brtext);
+        if ($env{'form.uniquecode'}) {
+            $uniquecode = $env{'form.uniquecode'};
+            $uniquecode =~ s/^\s+|\s+$//g;
+        }
+        my $js = '<script type="text/javascript">'."\n".
+                 '// <![CDATA['."\n".
+                 &courselink_javascript($r)."\n".
+                 '// ]]>'."\n".
+                 '</script>'."\n";
+        $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
+        if ($uniquecode =~ /^\w{6}$/) {
+            &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/coursecatalog",
+              text=>"Course/Community Catalog"});
+            $brtext = 'Search Result';
+        } else {
+            $brtext = 'Course/Community Catalog';
+        }
+        &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/coursecatalog",
+          text=>"$brtext"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+        $r->print(&coursesearch($codedom,$domdesc,$uniquecode));
+        if ($uniquecode =~ /^\w{6}$/) {
+            $r->print('<hr />');
+            my $confname = $codedom.'-domainconfig';
+            my %codes = &Apache::lonnet::get('uniquecodes',[$uniquecode],$codedom,$confname);
+            if ($codes{$uniquecode}) {
+                $cnum = $codes{$uniquecode};
+                my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.',
+                                                            $cnum,undef,undef,'.',1);
+                if (keys(%courses)) {
+                    $env{'form.coursenum'} = $cnum;
+                    my %courseinfo = &build_courseinfo_hash(\%courses,$knownuser,$codedom,$canviewall);
+                    undef($env{'form.coursenum'});
+                    if (ref($courseinfo{$codedom.'_'.$cnum}) eq 'HASH') {
+                        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+                        my @cols = ('title','ownerlastnames','seclist','access');
+                        my %lt = &Apache::lonlocal::texthash(
+                                     title          => 'Title',
+                                     ownerlastnames => 'Owner & Co-owner(s)',
+                                     seclist        => 'Sections',
+                                     access         => 'Default Access Dates for Students',
+                                 );
+                        my @shown;
+                        foreach my $item (@cols) {
+                            if ($courseinfo{$codedom.'_'.$cnum}{$item}) {
+                                push(@shown,$item);
+                            }
+                        }
+                        my $num = 0;
+                        foreach my $item (@shown) {
+                            $num ++;
+                            $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}).
+                                      $courseinfo{$codedom.'_'.$cnum}{$item});
+                            if ($item eq 'title') {
+                                if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) {
+                                    my $usehttp = 0;
+                                    if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) {
+                                        unless (&Apache::lonnet::uses_sts()) {
+                                            $usehttp = 1;
+                                        }
+                                    }
+                                    $r->print('&nbsp;<font size="-2">'.
+                                              '<a href="javascript:ToSyllabus('."'$codedom','$cnum','$usehttp'".')">'.
+                                              &mt('Syllabus').'</a></font>');
+                                }
+                            }
+                            my $arg = ( $num == scalar(@shown) ? 1 : '' );
+                            $r->print(&Apache::lonhtmlcommon::row_closure($arg));
+                        }
+                        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+                        my $selfenroll = &selfenroll_status($courseinfo{$codedom.'_'.$cnum},$codedom.'_'.$cnum);
+                        if ($selfenroll) {
+                            $r->print('<br />'.$selfenroll);
+                        }
+                        $r->print('<form name="linklaunch" method="post" action="">'."\n".
+                                  '<input type="hidden" name="backto" value="coursecatalog" />'."\n".
+                                  '<input type="hidden" name="courseid" value="" />'."\n".
+                                  '</form>'."\n");
+
+                    } else {
+                        $codemsg = &mt('Code matched, but course ID to which this mapped is invalid.');
+                    }
+                } else {
+                    $codemsg = &mt('Code matched, but course ID to which this mapped is invalid.');              
+                } 
+            } else {
+                $codemsg = &mt('No match');
+            }
+        }
+        $r->print('<br />'.&Apache::loncommon::end_page());
+        return OK;
     } else {
-        $cathash = {};
+        if ($env{'form.coursenum'} ne '') {
+            if ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) {
+                $cnum = $env{'form.coursenum'};
+            } else {
+                delete($env{'form.coursenum'});
+            }
+        }
     }
-    my $subcats;
+
+    my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats,%maxd,
+        $toplevelstr,$maxdepthstr);
     if ($env{'form.withsubcats'}) {
         $subcats = \%subcathash;
     }
     &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,
-                                           \%idx,\@jsarray,$subcats);
+                                           \%idx,\@jsarray,$subcats,\%maxd);
+    if (ref($cats[0]) eq 'ARRAY') {
+        foreach my $item (@{$cats[0]}) {
+            $toplevelstr .= "'".&js_escape($item)."::0',";
+            $maxdepthstr .= "'$maxd{$item}',";
+        }
+        $toplevelstr =~ s/,$//;
+        $maxdepthstr =~ s/,$//;
+    }
+    &validate_input($codedom,\@cats,\%maxd,$cathash);
     my ($numtitles,@codetitles);
-    if ($env{'form.coursenum'} ne '' && &user_is_known()) {
+    if (($env{'form.coursenum'} ne '') && ($knownuser)) {
         &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
@@ -103,9 +246,29 @@ sub handler {
         my $catjs = <<"ENDSCRIPT";
 
 function setCatDepth(depth) {
-    document.coursecats.catalog_maxdepth.value = depth;
-    if (depth == '') {
+    var depth = parseInt(depth);
+    if (depth !== NaN) {
+        if (depth > 0) {
+            var possmaxd = 0;
+            var toplevel = new Array($toplevelstr);
+            var maxdepths = new Array($maxdepthstr);
+            if (toplevel.length) {
+                for (var i=0; i<toplevel.length; i++) {
+                    var item = unescape(toplevel[i]);
+                    if (item == document.coursecats.currcat_0.value) {
+                        possmaxd = maxdepths[i];
+                        break;
+                    }
+                }
+            }
+            if (depth > possmaxd) {
+                depth = possmaxd;
+            }
+        }
+        document.coursecats.catalog_maxdepth.value = depth;
+    } else {
         document.coursecats.currcat_0.value = '';
+        document.coursecats.catalog_maxdepth.value = '';
     }
     document.coursecats.submit();
     return;
@@ -122,8 +285,8 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript();
-        if (&user_is_dc($codedom)) {
+        $catjs .= &courselink_javascript($r);
+        if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
 function toggleStatuses() {
@@ -154,10 +317,10 @@ ENDTOGGJS
         }
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   $catlinks,$catjs,\@codetitles);
+                                                   $catlinks,$catjs,\@codetitles,$cattype,$canviewall);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles));
+                                                \@codetitles,$canviewall));
             }
         } else {
             my (%add_entries);
@@ -167,6 +330,7 @@ ENDTOGGJS
                 if (!$deeper) {
                     $alert = &mt('Choose a category to display');
                 }
+                &js_escape(\$alert);
                 $catjs .= <<ENDJS;
 function check_selected() {
     if (document.coursecats.$selitem.options[document.coursecats.$selitem.selectedIndex].value == "") {
@@ -177,11 +341,11 @@ function check_selected() {
 ENDJS
             }
             $catjs = '<script type="text/javascript">'."\n".$catjs."\n".'</script>';
-            &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks);
+            &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks,undef,$cattype);
             if ($env{'form.currcat_0'} ne '') {
                 $r->print('<form name="'.$formname.
                           '" method="post" action="/adm/coursecatalog">'.
-                          &additional_filters($codedom,$has_subcats)."\n");
+                          &additional_filters($codedom,$has_subcats,$canviewall)."\n");
                 $r->print('<input type="hidden" name="catalog_maxdepth" value="'.
                           $deeper.'" />'."\n");
                 for (my $i=0; $i<$deeper; $i++) {
@@ -202,7 +366,8 @@ ENDJS
                           $display_button.'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles));
+                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles,
+                                                $canviewall));
             }
         }
     }
@@ -210,13 +375,280 @@ ENDJS
     return OK;
 }
 
+sub validate_input {
+    my ($codedom,$cats,$maxd,$crscatsref) = @_;
+    my $currcat = '';
+    my $depth = 0;
+    if ($env{'form.catalog_maxdepth'} ne '') {
+        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
+    }
+    if ((ref($cats) eq 'ARRAY') && (ref($maxd) eq 'HASH')) {
+        if (ref($cats->[0]) eq 'ARRAY') {
+            if (@{$cats->[0]} == 1) {
+                if ($cats->[0][0] eq 'instcode') {
+                    $currcat = 'instcode::0';
+                } elsif ($cats->[0][0] eq 'communities') {
+                    $currcat = 'communities::0';
+                } elsif ($cats->[0][0] eq 'placement') {
+                    $currcat = 'placement::0';
+                } else {
+                    my $name = $cats->[0][0];
+                    $currcat = &escape($name).'::0';
+                }
+                if (exists($maxd->{$cats->[0][0]})) {
+                    if ($env{'form.catalog_maxdepth'} <= $maxd->{$cats->[0][0]}) {
+                        $depth = $env{'form.catalog_maxdepth'};
+                    } else {
+                        $depth = $maxd->{$cats->[0][0]};
+                    }
+                }
+            } elsif ((@{$cats->[0]} > 1) && ($env{'form.currcat_0'} ne '')) {
+                my ($escname) = ($env{'form.currcat_0'} =~ /^([^:]+)\:\:0$/);
+                if ($escname =~ /^instcode|communities|placement$/) {
+                    $currcat = $env{'form.currcat_0'};
+                    if (exists($maxd->{$escname})) {
+                        if ($env{'form.catalog_maxdepth'} <= $maxd->{$escname}) {
+                            $depth = $env{'form.catalog_maxdepth'};
+                        } else {
+                            $depth = $maxd->{$escname};
+                        }
+                    } else {
+                        $depth = 1;
+                    }
+                } elsif ($escname ne '') {
+                    my $name = &unescape($escname);
+                    if (grep(/^\Q$name\E$/,@{$cats->[0]})) {
+                        $currcat = $env{'form.currcat_0'};
+                        if (exists($maxd->{$name})) {
+                            if ($env{'form.catalog_maxdepth'} <= $maxd->{$name}) {
+                                $depth = $env{'form.catalog_maxdepth'};
+                            } else {
+                                $depth = $maxd->{$name};
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    $env{'form.currcat_0'} = $currcat;
+    $env{'form.catalog_maxdepth'} = $depth;
+
+    my %possibles = (
+        backto => 1,
+        catalogfilter => 1,
+        catalog_maxdepth => 1,
+        courseid => 1,
+        coursenum => 1,
+        currcat_0 => 1,
+        numtitles => 1,
+        Year => 1,
+        Semester => 1,
+        Department => 1,
+        Number => 1,
+        showdom => 1,
+        sortby => 1,
+        showcounts => 1,
+        showdetails => 1,
+        showhidden => 1,
+        showselfenroll => 1,
+        state => 1,
+        uniquecode => 1,
+        wasactive => 1,
+        wasactiveon_day => 1,
+        wasactiveon_month => 1,
+        wasactiveon_year => 1,
+        withsubcats => 1,
+    );
+    my %currcats;
+    if ($env{'form.catalog_maxdepth'} > 0) {
+        for (my $i=1; $i<=$env{'form.catalog_maxdepth'}; $i++) {
+            $currcats{'currcat_'.$i} = 1;
+            $possibles{'currcat_'.$i} = 1;
+        }
+    }
+
+    foreach my $key (sort(keys(%env))) {
+        if ($key =~ /^form\.(.+)$/) {
+            unless ($possibles{$1}) {
+                delete($env{$key});
+            }
+        }
+    }
+    if (exists($env{'form.backto'})) {
+        unless ($env{'form.backto'} eq 'coursecatalog') {
+            delete($env{'form.backto'});
+        }
+    }
+    if (exists($env{'form.catalogfilter'})) {
+        unless (($env{'form.catalogfilter'} eq &mt('Display courses')) ||
+                ($env{'form.catalogfilter'} eq &mt('Display communities')) ||
+                ($env{'form.catalogfilter'} eq &mt('Display placement tests'))) {
+            delete($env{'form.catalogfilter'});
+        }
+    }
+    if (exists($env{'form.courseid'})) {
+        if ($env{'form.courseid'} ne '') {
+            unless ($env{'form.courseid'} =~ /^\Q$codedom\E_$LONCAPA::match_courseid$/) {
+                $env{'form.courseid'} = '';
+            }
+        }
+    }
+    if (exists($env{'form.coursenum'})) {
+        unless ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) {
+            $env{'form.coursenum'} = '';
+        }
+    }
+    if (exists($env{'form.currcat_0'})) {
+        unless ($env{'form.currcat_0'} =~ /^(instcode|communities|placement)\Q::0\E$/) {
+            if ($env{'form.currcat_0'} =~ /^.+\Q::0\E$/) {
+                if (ref($crscatsref) eq 'HASH') {
+                    unless (exists($crscatsref->{$env{'form.currcat_0'}})) {
+                        delete($env{'form.currcat_0'});
+                    }
+                } else {
+                    delete($env{'form.currcat_0'});
+                }
+            } else {
+                delete($env{'form.currcat_0'});
+            }
+        }
+    }
+    if (exists($env{'form.numtitles'})) {
+        unless ($env{'form.numtitles'} =~ /^\d+$/) {
+            delete($env{'form.numtitles'});
+        }
+    }
+    my ($gotcodes,%possvals);
+    foreach my $item ('Year','Semester','Department','Number') {
+        if (exists($env{'form.'.$item})) {
+            unless ($env{'form.'.$item} eq '0') {
+                unless ($gotcodes) {
+                    $gotcodes = &get_instcode_allowable($codedom,\%possvals);
+                }
+                if (ref($possvals{$item}) eq 'HASH') {
+                    unless (exists($possvals{$item}{$env{'form.'.$item}})) {
+                        delete($env{'form.'.$item});
+                    }
+                } else {
+                    delete($env{'form.'.$item});
+                }
+            }
+        }
+    }
+    if (exists($env{'form.showdom'})) {
+        unless ($env{'form.showdom'} =~ /^$LONCAPA::match_domain$/) {
+            delete($env{'form.showdom'});
+        }
+    }
+    if (exists($env{'form.sortby'})) {
+        unless ($env{'form.sortby'} =~ /^(title|code|owner|cats)$/) {
+            delete($env{'form.sortby'});
+        }
+    }
+    if (exists($env{'form.showcounts'})) {
+        if (ref($env{'form.showcounts'}) eq 'ARRAY') {
+            foreach my $item (@{$env{'form.showcounts'}}) {
+                unless ($item =~ /^(Active|Future|Previous)$/) {
+                    delete($env{'form.showcounts'});
+                    last;
+                }
+            }
+        } else {
+            unless ($env{'form.showcounts'} =~ /^(Active|Future|Previous)$/) {
+                delete($env{'form.showcounts'});
+            }
+        }
+    }
+    foreach my $item ('showhidden','showdetails','showselfenroll','withsubcats') {
+        if (exists($env{'form.'.$item})) {
+            unless ($env{'form.'.$item} eq '1') {
+                delete($env{'form.'.$item});
+            }
+        }
+    }
+    if (exists($env{'form.state'})) {
+        unless ($env{'form.state'} eq 'listing') {
+            delete($env{'form.state'});
+        }
+    }
+    if (exists($env{'form.uniquecode'})) {
+        unless ($env{'form.uniquecode'} =~ /^\w{6}$/) {
+            delete($env{'form.uniquecode'});
+        }
+    }
+    if (exists($env{'form.wasactive'})) {
+        unless (($env{'form.wasactive'} eq 'accessend') || ($env{'form.wasactive'} eq 'enrollend')) {
+            delete($env{'form.wasactive'});
+        }
+    }
+    if (exists($env{'form.wasactiveon_day'})) {
+        my $tmpday = $env{'form.wasactiveon_day'};
+        unless (($tmpday =~ /^\d+$/) && ($tmpday > 0) && ($tmpday < 32)) {
+            delete($env{'form.wasactiveon_day'});
+        }
+    }
+    if (exists($env{'form.wasactiveon_month'})) {
+        my $tmpmonth = $env{'form.wasactiveon_month'};
+        unless (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) {
+            delete($env{'form.wasactiveon_month'});
+        }
+    }
+    if (exists($env{'form.wasactiveon_year'})) {
+        my $tmpyear = $env{'form.wasactiveon_year'};
+        unless (($tmpyear =~ /^\d+$/) && ($tmpyear >= 1970)) {
+            delete($env{'form.wasactiveon_year'});
+        }
+    }
+    if (keys(%currcats)) {
+        foreach my $key (keys(%currcats)) {
+            if ($env{'form.'.$key} eq '') {
+                delete($env{'form.'.$key});
+            } elsif (ref($crscatsref) eq 'HASH') {
+                unless (exists($crscatsref->{$env{'form.'.$key}})) {
+                    delete($env{'form.'.$key});
+                }
+            } else {
+                delete($env{'form.'.$key});
+            }
+        }
+    }
+    return;
+}
+
+sub get_instcode_allowable {
+    my ($codedom,$possvalref) = @_;
+    return 1 unless (ref($possvalref) eq 'HASH');
+    my $instcats = &Apache::lonnet::get_dom_instcats($codedom);
+    if (ref($instcats) eq 'HASH') {
+        if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH')) {
+            my %codes = %{$instcats->{'codes'}};
+            my @codetitles = @{$instcats->{'codetitles'}};
+            my @standardnames = &Apache::loncommon::get_standard_codeitems();
+            my %local_to_standard;
+            for (my $i=0; $i<@codetitles; $i++) {
+                $local_to_standard{$codetitles[$i]} = $standardnames[$i];
+                $possvalref->{$standardnames[$i]} = {};
+            }
+            foreach my $cid (sort(keys(%codes))) {
+                if (ref($codes{$cid}) eq 'HASH') {
+                    foreach my $item (keys(%{$codes{$cid}})) {
+                        $possvalref->{$local_to_standard{$item}}{$codes{$cid}{$item}} = 1;
+                    }
+                }
+            }
+        }
+    }
+    return 1;
+}
+
 sub course_details {
     my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_;
     my $output;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
     my $js = '<script type="text/javascript">'."\n".
-             &courselink_javascript().'</script>'."\n";
+             &courselink_javascript($r).'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        {'add_entries' => \%add_entries, });
@@ -236,33 +668,54 @@ sub course_details {
              ({href=>"javascript:document.$formname.submit()",
               text=>$brtextone},
              {text=>$brtexttwo});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-    $r->print('<br />');
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $r->print(&mt('Detailed community information:'));
-    } else {
-        $r->print(&mt('Detailed course information:'));
-    }
-    $r->print('<br /><br />'.
-              &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
-              '<br /><br />');
-    $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
-              '<a href = "javascript:document.coursecatalog.submit()">');
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $r->print(&mt('Back to community listing'));
-    } else {
-        $r->print(&mt('Back to course listing'));
-    }
-    $r->print('</a>'.
-              &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
-                                                       'showdetails','courseid']).'</form>');
+    $r->print(
+        &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog').
+        '<h2>'.
+        (($env{'form.currcat_0'} eq 'communities::0') ?
+            &mt('Detailed community information:') :
+            &mt('Detailed course information:')).
+        '</h2>'.
+        &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
+        '<br />'.
+        '<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
+        &Apache::lonhtmlcommon::actionbox([
+            '<a href = "javascript:document.coursecatalog.submit()">'.
+            (($env{'form.currcat_0'} eq 'communities::0') ?
+                &mt('Back to community listing') : &mt('Back to course listing')).
+            '</a>'
+        ]).
+        &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
+                                                 'showdetails','courseid']).
+        '</form>');
     return;
 }
 
+sub coursesearch {
+    my ($codedom,$domdesc,$uniquecode) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                                           crlk => 'Course look-up',  
+                                           code => 'Code',
+                                           ifyo => 'Enter the course code (six letters and numbers)',
+                                           srch => 'Find course',
+                                         );
+    return <<"END";
+<h3>$lt{'crlk'} ($domdesc)</h3>
+$lt{'ifyo'}
+<form name="searchbycode" method="post" action="">
+<span class="LC_nobreak">
+<input type="text" value="$uniquecode" size="6" name="uniquecode" />&nbsp;
+<br />
+<input type="submit" value="$lt{'srch'}" name="srch" /></span>
+</form>
+END
+}
+
 sub courselink_javascript {
+    my ($r) = @_;
+    my $hostname = $r->hostname();    
     return <<"END";
 
-function ToSyllabus(cdom,cnum) {
+function ToSyllabus(cdom,cnum,usehttp) {
     if (cdom == '' || cdom == null) {
         return;
     }
@@ -270,6 +723,13 @@ function ToSyllabus(cdom,cnum) {
         return;
     }
     document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus";
+    if (usehttp == 1) {
+        var hostname = '$hostname';
+        if (hostname != '') {
+            document.linklaunch.action = 'http://'+hostname+document.linklaunch.action;
+        }
+        document.linklaunch.action += '?usehttp=1';
+    }
     document.linklaunch.submit();
 }
 
@@ -286,35 +746,34 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_;
-    my %coursecodes = ();
-    my %codes = ();
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_;
     my %cat_titles = ();
     my %cat_order = ();
-    my %cat_items;
-    my $caller = 'global';
-    my $format_reply;
+    my %cat_items = ();
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
     my ($jscript,$totcodes,$numtitles,$lasttitle) = 
         &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
                            \%cat_items,$codetitles,\%cat_titles,\%cat_order);
-    my $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n".
-              '</script>';
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             "$jscript\n$catjs\n".
+             '// ]]>'."\n".
+             '</script>';
     if ($totcodes) {
         if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
-            $add_entries{'onLoad'} = 'setElements();';
+            $add_entries{'onload'} = 'setElements();';
         }
-        if (&user_is_dc($codedom)) {
-            $add_entries{'onLoad'} .= ' toggleStatuses();toggleWasActive();'
+        if (&user_is_dc($codedom) || $canviewall) {
+            $add_entries{'onload'} .= ' toggleStatuses();toggleWasActive();'
         }
-        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
+        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};
         $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
                   '<input type="hidden" name="catalog_maxdepth" value="'.$cat_maxdepth.'" />'."\n".
                   '<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'."\n".
                   '<input type="hidden" name="currcat_0" value="instcode::0" />'.
-                  &additional_filters($codedom));
+                  &additional_filters($codedom,undef,$canviewall));
         if ($numtitles > 0) {
             $r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'.
                       &Apache::courseclassifier::build_instcode_selectors($numtitles,
@@ -328,8 +787,12 @@ sub instcode_course_selector {
                   '<input type="hidden" name="numtitles" value="'.$numtitles.
                   '" /></form><br /><br />');
     } else {
-        $js = '<script type"text/javascript">'."\n$catjs\n".'</script>';
-        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
+        $js = '<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
+              "$catjs\n".
+              '// ]]>'."\n".
+              '</script>';
+        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};
         $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
                   '<input type="hidden" name="catalog_maxdepth" value="'.$cat_maxdepth.'" />'.
@@ -341,7 +804,7 @@ sub instcode_course_selector {
 }
 
 sub cat_header {
-    my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
+    my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles,$cattype) = @_;
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        { 'add_entries' => $add_entries, });
@@ -366,15 +829,17 @@ sub cat_header {
           text=>"Course/Community Catalog"});
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-    my $onchange = 'this.form.submit()';
-    $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
-              '<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
-              &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
-    if (!$onchange) {
+    if ($cattype eq 'std') {
+        my $onchange = 'this.form.submit()';
+        $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
+                  '<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
+                  &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
+        if (!$onchange) {
 	   $r->print('&nbsp;<input type="submit" name="godom" value="'.&mt('Change').'" />');
+        }
+        $r->print('</td></tr></table></form>');
     }
-    $r->print('</td></tr></table></form>'.
-	      '<form name="coursecats" method="post" action="/adm/coursecatalog"'.
+    $r->print('<form name="coursecats" method="post" action="/adm/coursecatalog"'.
               ' onsubmit="return check_selected();">'.
               '<table border="0"><tr>'.$catlinks.'</tr></table></form>');
     return;
@@ -529,10 +994,10 @@ sub get_depth_values {
 }
 
 sub additional_filters {
-    my ($codedom,$has_subcats) = @_;
+    my ($codedom,$has_subcats,$canviewall) = @_;
     my $is_dc = &user_is_dc($codedom);
     my $output = '<div class="LC_left_float">';
-    if ($is_dc) {
+    if ($is_dc || $canviewall) {
         $output .= '<fieldset><legend>'.&mt('Options').'</legend>';
     }
     $output .= '<table><tr><td valign="top">';
@@ -573,7 +1038,7 @@ sub additional_filters {
                '<label><input type="checkbox" name="showselfenroll" value="1" '.
                $show_selfenroll_status.'/>'.$selfenroll_text.
                '</label></span><br />';
-    if ($is_dc) {
+    if ($is_dc || $canviewall) {
         my ($titlesref,$orderref) = &get_statustitles('filters');
         my $showdetails_status;
         if ($env{'form.showdetails'}) {
@@ -584,7 +1049,6 @@ sub additional_filters {
             $showhidden_status = 'checked="checked" ';
         }
         my @currstatuses = &Apache::loncommon::get_env_multiple('form.showcounts');
-        my $dc_title = &Apache::lonnet::plaintext('dc');
         my ($details_text,$hidden_text,$statusdisplay,$cellborder);
         my $wasactivedisplay = 'none';
         if ($env{'form.showdetails'}) {
@@ -598,17 +1062,19 @@ sub additional_filters {
             $cellborder = 'border-left: 0px';
         }
         if ($env{'form.currcat_0'} eq 'communities::0') {
-            $details_text = &mt('Show full details for each community ([_1] only)',$dc_title);
-            $hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title);
+            $details_text = &mt('Show full details for each community (domain staff only)');
+            $hidden_text = &mt('Include communities set to be hidden from catalog (domain staff only)');
         } else {
-            $details_text = &mt('Show full details for each course ([_1] only)',$dc_title);
-            $hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title);
+            $details_text = &mt('Show full details for each course (domain staff only)');
+            $hidden_text = &mt('Include courses set to be hidden from catalog (domain staff only)');
+        }
+        if ($is_dc) {
+            $output .= '<span class="LC_nobreak">'.
+                       '<label><input type="checkbox" name="showhidden" value="1" '.
+                       $showhidden_status.'/>'.$hidden_text.
+                       '</label></span><br />'."\n";
         }
         $output .= '<span class="LC_nobreak">'.
-                   '<label><input type="checkbox" name="showhidden" value="1" '.
-                   $showhidden_status.'/>'.$hidden_text.
-                   '</label></span><br />'."\n".
-                   '<span class="LC_nobreak">'.
                    '<label><input type="checkbox" name="showdetails" value="1" '.
                    $showdetails_status.'onclick="toggleStatuses();" />'.
                    $details_text.'</label></span></td>'."\n".
@@ -643,7 +1109,7 @@ sub additional_filters {
                             date      => 'immediately prior to specific date:',
                         );
                         my @statuses = &Apache::loncommon::get_env_multiple('form.showcounts');
-                        $output .= '<span id="choosewasacctext">';
+                        $output .= '<span id="choosewasacctext" class="LC_nobreak">';
                         if ($checked) {
                             $output .= &get_wasactive_text();
                         }
@@ -714,6 +1180,22 @@ sub user_is_dc {
     return;
 }
 
+sub canview_all {
+    my ($knownuser,$codedom) = @_;
+    my $canviewall = 0;
+    my $page = 'coursecatalog';
+    if (&LONCAPA::lonauthcgi::can_view($page)) {
+        $canviewall = 1;
+    } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
+        $canviewall= 1;
+    } elsif (($knownuser) && ($codedom ne '')) {
+        if (&Apache::lonnet::allowed('dcd',$codedom)) {
+            $canviewall = 1;
+        }
+    }
+    return $canviewall;
+}
+
 sub get_statustitles {
     my ($caller) = @_;
     my @status_order = ('Active','Future','Previous');
@@ -807,12 +1289,13 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
+    my $canviewall = &canview_all();
     my $details = $env{'form.coursenum'};
-    if (&user_is_dc($domain)) {
+    if (&user_is_dc($domain) || $canviewall) {
         if ($env{'form.showdetails'}) {
             $details = 1;
         }
@@ -822,11 +1305,13 @@ sub print_course_listing {
                                                  $env{'form.coursenum'},
                                                  undef,undef,'.',1);
         if (keys(%courses) == 0) {
+            $output = '<p class="LC_error">';
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= &mt('The courseID provided does not match a community in this domain.');
             } else { 
                 $output .= &mt('The courseID provided does not match a course in this domain.');
             }
+            $output .= '</p>';
             return $output;
         }
     } else {
@@ -836,30 +1321,24 @@ sub print_course_listing {
             %courses = &search_courselist($domain,$subcats);
         }
         if (keys(%courses) == 0) {
+            $output = '<p class="LC_info">';
             if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output =
-                    '<p class="LC_info">'
-                   .&mt('No communities match the criteria you selected.')
-                   .'</p>';
+                $output .= &mt('No communities match the criteria you selected.');
             } else {
-                $output =
-                    '<p class="LC_info">'
-                   .&mt('No courses match the criteria you selected.')
-                   .'</p>';
+                $output .= &mt('No courses match the criteria you selected.');
             }
+            $output .= '</p>';
             return $output;
         }
-        if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) {
+        if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain)) && (!$canviewall)) {
             $output = '<b>'.&mt('Note for students:').'</b> '
                      .&mt('If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.')
                      .'<br /><br />';
         }
     }
     my $now = time;
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,\%domconfig,$trails,$allitems);
+                                     $now,$trails,$allitems,$canviewall);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -868,8 +1347,7 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$domain,$courses,$details,$usersections,$now,$domconfig,
-        $trails,$allitems) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -901,7 +1379,7 @@ sub construct_data_table {
         $output .= '</th>';
     }
     my (@fields,%fieldtitles,$wasactiveon);
-    if ($knownuser) {
+    if ($knownuser || ($canviewall && $details)) {
         if ($details) {
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= '<th>'.&mt('Default Access Dates for Members').'</th>'.
@@ -914,7 +1392,7 @@ sub construct_data_table {
             }
             my ($titlesref,$orderref) = &get_statustitles();
             my @statuses;
-            if (&user_is_dc($domain)) {
+            if (&user_is_dc($domain) || $canviewall) {
                 @statuses = &Apache::loncommon::get_env_multiple('form.showcounts');
                 if (grep(/^Previous$/,@statuses)) {
                     if ($env{'form.wasactive'} eq 'date') { 
@@ -951,19 +1429,20 @@ sub construct_data_table {
     $output .= '<th>'.&mt('Self-enroll (if permitted)').'</th>';
     &Apache::loncommon::end_data_table_header_row();
     my (%numbers,%creditsum);
-    my ($showcredits,$defofficial,$defunofficial);
+    my ($showcredits,$defofficial,$defunofficial,$deftextbook);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
     unless ($env{'form.currcat_0'} eq 'communities::0') {
-        if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
+        if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
             $showcredits = 1;
             $defofficial = $domdefaults{'officialcredits'};
-            $defunofficial = $domdefaults{'unofficialcredits'}; 
+            $defunofficial = $domdefaults{'unofficialcredits'};
+            $deftextbook = $domdefaults{'textbookcredits'};
         }
     }
-    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$details,
+    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$canviewall,$details,
                                             $usersections,\@fields,\%fieldtitles,
                                             $wasactiveon,\%numbers,\%creditsum,
-                                            $showcredits,$defofficial,$defunofficial);
+                                            $showcredits,$defofficial,$defunofficial,$deftextbook);
     my %Sortby;
     foreach my $course (sort(keys(%{$courses}))) {
         if ($env{'form.sortby'} eq 'code') {
@@ -994,12 +1473,12 @@ sub construct_data_table {
         foreach my $course (@{$Sortby{$item}}) {
             $output.=&Apache::loncommon::start_data_table_row(); 
             $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,
-                                     \$count,$now,$course,$trails,$allitems,\%numbers);
+                                     \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
-    if (($knownuser) && ($count > 1) && $env{'form.showdetails'}) {
-        if (&user_is_dc($domain)) {
+    if (($knownuser || $canviewall) && ($count > 1) && $env{'form.showdetails'}) {
+        if (&user_is_dc($domain) || $canviewall) {
             my %lt = &Apache::lonlocal::texthash (
                                                      'Active'   => 'Total current students',
                                                      'Future'   => 'Total future students',
@@ -1058,12 +1537,12 @@ sub construct_data_table {
 }
 
 sub build_courseinfo_hash {
-    my ($courses,$knownuser,$domain,$details,$usersections,$fields,$fieldtitles,
+    my ($courses,$knownuser,$domain,$canviewall,$details,$usersections,$fields,$fieldtitles,
         $wasactiveon,$numbers,$creditsum,$showcredits,$defofficial,$defunofficial) = @_;
     my %courseinfo;
     my $now = time;
     my $gettotals;
-    if ((keys(%{$courses}) > 0) && (&user_is_dc($domain)) && ($details)) {
+    if ((keys(%{$courses}) > 0) && (&user_is_dc($domain) || $canviewall) && ($details)) {
         $gettotals = 1;
     }
     my (%uniquecodes,$nocodes,$defcreds);
@@ -1076,7 +1555,7 @@ sub build_courseinfo_hash {
         $cleandesc=~s/'/\\'/g;
         $cleandesc =~ s/^\s+//;
         my ($cdom,$cnum)=split(/\_/,$course);
-        my ($instcode,$singleowner,$ttype,$selfenroll_types,
+        my ($instcode,$singleowner,$ttype,$selfenroll_types,$extsyllplain,
             $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories);
         if (ref($courses->{$course}) eq 'HASH') {
             $descr = $courses->{$course}{'description'};
@@ -1087,6 +1566,7 @@ sub build_courseinfo_hash {
             $selfenroll_start = $courses->{$course}{'selfenroll_start_date'};
             $selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
             $categories = $courses->{$course}{'categories'};
+            $extsyllplain = $courses->{$course}{'extsyllplain'};
             push(@owners,$singleowner);
             if ($courses->{$course}{'co-owners'} ne '') {
                 foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) {
@@ -1130,6 +1610,7 @@ sub build_courseinfo_hash {
         $courseinfo{$course}{'selfenroll_start'} = $selfenroll_start;
         $courseinfo{$course}{'selfenroll_end'} = $selfenroll_end;
         $courseinfo{$course}{'categories'} = $categories;
+        $courseinfo{$course}{'extsyllplain'} = $extsyllplain;
 
         my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
         my @classids;
@@ -1159,7 +1640,7 @@ sub build_courseinfo_hash {
             $defcreds = $courseinfo{$course}{'defaultcredits'};
         }
         if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) ||
-            ($knownuser && ($details == 1))) {
+            (($knownuser || $canviewall) && ($details == 1))) {
             my $milestone;
             if ($wasactiveon eq 'accessend') {
                 if ($coursehash{'default_enrollment_end_date'}) {
@@ -1312,9 +1793,10 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers) = @_;
+    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_;
     my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
-        $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories);
+        $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories,
+        $extsyllplain);
     if (ref($info) eq 'HASH') {
         $cdom = $info->{'cdom'};
         $cnum = $info->{'cnum'};
@@ -1328,6 +1810,7 @@ sub courseinfo_row {
         $counts = $info->{'counts'};
         $autoenrollment = $info->{'autoenrollment'};
         $showsyllabus = $info->{'showsyllabus'};
+        $extsyllplain = $info->{'extsyllplain'};
         $categories = $info->{'categories'};
     } else {
         $output = '<td colspan="8">'.&mt('No information available for [_1].',
@@ -1355,13 +1838,19 @@ sub courseinfo_row {
                '<td>'.$xlist_items.'</td>'.
                '<td>'.$title.'&nbsp;<font size="-2">';
     if ($showsyllabus) {
-        $output .= '<a href="javascript:ToSyllabus('."'$cdom','$cnum'".')">'.&mt('Syllabus').'</a>';
+        my $usehttp = 0;
+        if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) {
+            unless (&Apache::lonnet::uses_sts()) {
+                $usehttp = 1;
+            }
+        }
+        $output .= '<a href="javascript:ToSyllabus('."'$cdom','$cnum','$usehttp'".')">'.&mt('Syllabus').'</a>';
     } else {
         $output .= '&nbsp;';
     }
     $output .= '</font></td>'.
                '<td>'.$ownerlast.'</td>';
-    if ($knownuser) {
+    if (($knownuser) || ($canviewall && $details)) {
         if ($details) {
             $output .=
                 '<td>'.$accessdates.'</td>'.
@@ -1373,29 +1862,39 @@ sub courseinfo_row {
             $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
         }
     }
-    my $selfenroll;
-    if ($info->{'selfenroll_types'}) {
-        my $showstart = &Apache::lonlocal::locallocaltime($info->{'selfenroll_start'});
-        my $showend = &Apache::lonlocal::locallocaltime($info->{'selfenroll_end'});
-        if (($info->{'selfenroll_end'} > 0) && ($info->{'selfenroll_end'} > $now)) {
-            if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
-                $output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';
-            } else { 
-                $output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a><br />';
-                if ($info->{'selfenroll_end'} == 0) {
-                    $output .= &mt('Available permanently');
-                } elsif ($info->{'selfenroll_end'} > $now) {
-                    $output .= &mt('Self-enrollment ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
+    my $selfenroll = &selfenroll_status($info,$course);
+    if ($selfenroll) {
+        $output .= '<td>'.$selfenroll.'</td>';
+    } else {
+        $output .= '<td>&nbsp;</td>';
+    }
+    $$countref ++;
+    return $output;
+}
+
+sub selfenroll_status {
+    my ($info,$course) = @_;
+    my $now = time;
+    my $output;
+    if (ref($info) eq 'HASH') {
+        if ($info->{'selfenroll_types'}) {
+            my $showstart = &Apache::lonlocal::locallocaltime($info->{'selfenroll_start'});
+            my $showend = &Apache::lonlocal::locallocaltime($info->{'selfenroll_end'});
+            if (($info->{'selfenroll_end'} > 0) && ($info->{'selfenroll_end'} > $now)) {
+                if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
+                    $output = &mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
+                } else {
+                    $output = '<a href="javascript:ToSelfenroll('."'$course'".')">'.
+                              &mt('Enroll in course').'</a><br />';
+                    if ($info->{'selfenroll_end'} == 0) {
+                        $output .= &mt('Available permanently');
+                    } elsif ($info->{'selfenroll_end'} > $now) {
+                        $output .= &mt('Self-enrollment ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
+                    }
                 }
-                $output .= '</td>';
             }
-            $selfenroll = 1;
         }
     }
-    if (!$selfenroll) {
-        $output .= '<td>&nbsp;</td>';
-    }
-    $$countref ++;
     return $output;
 }
 
@@ -1425,27 +1924,32 @@ sub identify_sections {
 sub get_valid_classes {
     my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
     my $response;
-    my %validations;
+    my (@sections,@xlists,%possclasses,%okclasses,%validations);
     @{$validations{'sections'}} = ();
     @{$validations{'xlists'}} = ();
     my $totalitems = 0;
     if ($seclist) {
-        foreach my $sec (split(/, /,$seclist)) {
-            my $class = $crscode.$sec;
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
-							 $class) eq 'ok') {
+        @sections = split(/,\s+/,$seclist);
+        map { $possclasses{$crscode.$_} = 1; } @sections;
+    }
+    if ($xlist_items) {
+        @xlists = split(/,\s+/,$xlist_items);
+        map { $possclasses{$_} = 1; } @xlists;
+    }
+    my %okclasses = &Apache::lonnet::auto_validate_instclasses($cdom,$cnum,$owners,
+                                                               \%possclasses);
+    if (keys(%okclasses)) {
+        foreach my $sec (@sections) {
+            if ($okclasses{$crscode.$sec}) {
                 if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) {
                     push(@{$validations{'sections'}},$sec);
                     $totalitems ++;
                 }
             }
         }
-    }
-    if ($xlist_items) {
-        foreach my $item (split(/, /,$xlist_items)) {
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
-							 $item) eq 'ok') {
-                if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) {
+        foreach my $item (@xlists) {
+            if ($okclasses{$item}) {
+                if (!grep(/^\Q$item\E$/,@{$validations{'xlists'}})) {
                     push(@{$validations{'xlists'}},$item);
                     $totalitems ++;
                 }