--- loncom/interface/coursecatalog.pm	2014/05/17 23:14:41	1.85
+++ loncom/interface/coursecatalog.pm	2025/02/24 23:20:17	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.85 2014/05/17 23:14:41 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.108 2025/02/24 23:20:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,9 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::courseclassifier;
 use Apache::lonacc;
+use HTML::Entities();
 use LONCAPA;
+use LONCAPA::lonauthcgi;
 
 sub handler {
     my ($r) = @_;
@@ -56,7 +58,9 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['sortby','showdom']);
 
-    my $codedom = &Apache::lonnet::default_login_domain();
+    my $serverdefdom = &Apache::lonnet::default_login_domain();
+    my $codedom = $serverdefdom;
+    my $hostname = $r->hostname();
 
     if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { 
         $codedom = $env{'user.domain'};
@@ -73,26 +77,39 @@ sub handler {
             $env{'form.showdom'} = '';
         }
     }
-    my $domdesc = &Apache::lonnet::domain($codedom,'description');
+    my $domdesc = &Apache::lonnet::domain($serverdefdom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
+    
+    unless (($serverdefdom eq $codedom) ||
+            (&Apache::lonnet::will_trust('catalog',$serverdefdom,$codedom))) {
+        my $serverdomdesc = &Apache::lonnet::domain($serverdefdom,'description');
+        $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'));
+        $r->print('<div role="main">'.&mt('Access to catalog LON-CAPA courses/communities unavailable for: "[_1]" on servers run by: "[_2]".',
+                  $domdesc,$serverdomdesc).'</div>');
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+    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($domconfig{'coursecategories'}) eq 'HASH') {
-        $cathash = $domconfig{'coursecategories'}{'cats'};
-        if ($knownuser) {
-            $cattype = $domconfig{'coursecategories'}{'auth'};
-        } else {
-            $cattype = $domconfig{'coursecategories'}{'unauth'};
-        }
-        if ($cattype eq '') {
-            $cattype = 'std';
-        }
+    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') {
@@ -101,20 +118,32 @@ sub handler {
         ({href=>"/adm/coursecatalog",
           text=>"Course/Community Catalog"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-        if ($knownuser) {
-            $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
+        if ($knownuser || $canviewall) {
+            $r->print('<div role="main">'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
         } else {
-            if ($domconfig{'coursecategories'}{'auth'} eq 'none') {
-                $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
+            if ($domdefaults{'catauth'} eq 'none') {
+                $r->print('<div role="main">'.&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('<div role="main">'.&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 $cnum; 
+    for (my $i=0; $i<=$env{'form.catalog_maxdepth'}; $i++) {
+        if ($env{'form.currcat_'.$i} eq '-1') {
+            $env{'form.currcat_'.$i} = '';
+        }
+        if (exists($env{'form.initialcurrcat_'.$i})) {
+            if ($env{'form.currcat_'.$i} ne $env{'form.initialcurrcat_'.$i}) {
+                $env{'form.catalog_maxdepth'} = $i;
+                last;
+            }
+        }
+    }
+
+    my $cnum;
     if ($cattype eq 'codesrch') {
         my ($uniquecode,$codemsg,$brtext);
         if ($env{'form.uniquecode'}) {
@@ -123,7 +152,7 @@ sub handler {
         }
         my $js = '<script type="text/javascript">'."\n".
                  '// <![CDATA['."\n".
-                 &courselink_javascript()."\n".
+                 &courselink_javascript($hostname)."\n".
                  '// ]]>'."\n".
                  '</script>'."\n";
         $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
@@ -149,8 +178,8 @@ sub handler {
                 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);
+                    $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());
@@ -174,8 +203,15 @@ sub handler {
                                       $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()) ||
+                                                (&Apache::lonnet::waf_allssl($hostname))) {
+                                            $usehttp = 1;
+                                        }
+                                    }
                                     $r->print('&nbsp;<font size="-2">'.
-                                              '<a href="javascript:ToSyllabus('."'$codedom','$cnum'".')">'.
+                                              '<a href="javascript:ToSyllabus('."'$codedom','$cnum','$usehttp'".')">'.
                                               &mt('Syllabus').'</a></font>');
                                 }
                             }
@@ -205,38 +241,46 @@ sub handler {
         $r->print('<br />'.&Apache::loncommon::end_page());
         return OK;
     } else {
-        if ($env{'form.coursenum'}) {
-            $cnum = $env{'form.coursenum'};
+        if ($env{'form.coursenum'} ne '') {
+            if ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) {
+                $cnum = $env{'form.coursenum'};
+            } else {
+                delete($env{'form.coursenum'});
+            }
         }
     }
 
-    if ($env{'form.catalog_maxdepth'} ne '') {
-        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
-    }
-
-    my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$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 '') && ($knownuser)) {
-        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
+        &course_details($r,$codedom,$formname,$domdesc,$hostname,\@trails,
+                        \%allitems,\@codetitles);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
         my $wasacctext = &get_wasactive_text();
+        my %js_lt = &Apache::lonlocal::texthash(
+                                                 'noch' => 'No changes made in drop-down lists',
+                                                 'chsu' => 'Choose a subcategory to display',
+                                                 'chca' => 'Choose a category to display',
+        );
+        &js_escape(\%js_lt);
         my $catjs = <<"ENDSCRIPT";
 
-function setCatDepth(depth) {
-    document.coursecats.catalog_maxdepth.value = depth;
-    if (depth == '') {
-        document.coursecats.currcat_0.value = '';
-    }
-    document.coursecats.submit();
-    return;
-}
-
 function changeSort(caller) {
     document.$formname.sortby.value = caller;
     document.$formname.submit();
@@ -248,8 +292,8 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript();
-        if (&user_is_dc($codedom)) {
+        $catjs .= &courselink_javascript($hostname);
+        if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
 function toggleStatuses() {
@@ -280,34 +324,57 @@ ENDTOGGJS
         }
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   $catlinks,$catjs,\@codetitles,$cattype);
+                                                   $catlinks,$catjs,\@codetitles,$cattype,$canviewall);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles));
+                                                \@codetitles,$canviewall,$hostname));
             }
         } else {
             my (%add_entries);
             my ($currdepth,$deeper) = &get_depth_values();
-            if ($selitem) {
-                my $alert = &mt('Choose a subcategory to display');
-                if (!$deeper) {
-                    $alert = &mt('Choose a category to display');
-                }
-                $catjs .= <<ENDJS;
+            my $alert = $js_lt{'chsu'};
+            if (!$deeper) {
+                $alert = $js_lt{'chca'};
+            }
+            $catjs .= <<"ENDJS";
 function check_selected() {
-    if (document.coursecats.$selitem.options[document.coursecats.$selitem.selectedIndex].value == "") {
-        alert('$alert');
+    var currdepth = parseInt('$currdepth');
+    var countchanged = 0;
+    for (var i=0; i<=currdepth; i++) {
+        var selidx = document.coursecats.elements['currcat_'+i].selectedIndex;
+        var selvalue = document.coursecats.elements['currcat_'+i].options[selidx].value;
+        if (i<currdepth) {
+            var initialvalue = document.coursecats.elements['initialcurrcat_'+i].value;
+            if (selvalue != initialvalue) {
+                countchanged ++;
+            }
+        } else {
+            if (countchanged == 0) {
+                if (selvalue == "") {
+                    alert('$alert');
+                    return false;
+                } else {
+                    countchanged ++;
+                }
+            }
+        }
+    }
+    if (countchanged == 0) {
+        alert("$js_lt{'noch'}");
         return false;
     }
 }
 ENDJS
-            }
-            $catjs = '<script type="text/javascript">'."\n".$catjs."\n".'</script>';
-            &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks,undef,$cattype);
+            my $js = '<script type="text/javascript">'."\n".
+                     '// <![CDATA['."\n".
+                     "$catjs\n".
+                     '// ]]>'."\n".
+                     '</script>';
+            &cat_header($r,$codedom,$js,\%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++) {
@@ -316,6 +383,8 @@ ENDJS
                 my $display_button;
                 if ($env{'form.currcat_0'} eq 'communities::0') {
                     $display_button = &mt('Display communities');
+                } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+                    $display_button = &mt('Display placement tests');
                 } else {
                     $display_button = &mt('Display courses');
                 }
@@ -328,21 +397,290 @@ 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,$hostname));
             }
         }
+        $r->print('</div>');
     }
-    $r->print('<br />'.&Apache::loncommon::end_page());
+    $r->print(&Apache::loncommon::end_page());
     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\.currcat_(.+)$/) {
+            unless ($possibles{'currcat_'.$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 ($r,$codedom,$formname,$domdesc,$hostname,$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($hostname).'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        {'add_entries' => \%add_entries, });
@@ -354,9 +692,18 @@ sub course_details {
     }
     my $brtextone = 'Course listing';
     my $brtexttwo = 'Course details';
+    my $textthree = &mt('Detailed course information:');
+    my $textfour = &mt('Back to course listing');
     if ($env{'form.currcat_0'} eq 'communities::0') {
         $brtextone = 'Community listing';
         $brtexttwo = 'Community details';
+        $textthree = &mt('Detailed community information:');
+        $textfour = &mt('Back to community listing');
+    } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+        $brtextone = 'Placement test listing';
+        $brtexttwo = 'Placement test details';
+        $textthree = &mt('Detailed placement test information:');
+        $textfour = &mt('Back to placement test listing');
     }
     &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"javascript:document.$formname.submit()",
@@ -364,23 +711,16 @@ sub course_details {
              {text=>$brtexttwo});
     $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).
+        '<div role="main">'.
+        '<h2>'.$textthree.'</h2>'.
+        &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles,undef,$hostname).
         '<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>'
-        ]).
+            '<a href = "javascript:document.coursecatalog.submit()">'.$textfour.'</a>']).
         &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
                                                  'showdetails','courseid']).
-        '</form>');
+        '</form></div>');
     return;
 }
 
@@ -405,9 +745,10 @@ END
 }
 
 sub courselink_javascript {
+    my ($hostname) = @_;
     return <<"END";
 
-function ToSyllabus(cdom,cnum) {
+function ToSyllabus(cdom,cnum,usehttp) {
     if (cdom == '' || cdom == null) {
         return;
     }
@@ -415,6 +756,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();
 }
 
@@ -431,14 +779,10 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype) = @_;
-    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) = 
@@ -451,10 +795,10 @@ sub instcode_course_selector {
              '</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,$cattype);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};
@@ -462,7 +806,7 @@ sub instcode_course_selector {
                   '<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,
@@ -501,6 +845,8 @@ sub cat_header {
     my $brtext = 'Course listing';
     if ($env{'form.currcat_0'} eq 'communities::0') {
         $brtext = 'Community listing';
+    } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+        $brtext = 'Placement test listing';
     }
     if ($env{'form.state'} eq 'listing') {
         if ($numtitles > 0) {
@@ -517,19 +863,21 @@ sub cat_header {
         ({href=>"/adm/coursecatalog",
           text=>"Course/Community Catalog"});
     }
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog').
+              '<div role="main">');
     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>');
+                  '<table border="0"><tr><th align="left"><label for="showdom">'.&mt('Domain:').'</label></th><td>'.
+                  &Apache::loncommon::select_dom_form($codedom,'showdom','',1,'','','','','showdom').
+                  '&nbsp;<input type="submit" name="godom" value="'.&mt('Change').'" />'."\n".
+                  '<input type="hidden" name="initialshowdom" value="'.$codedom.'" />'."\n".
+                  '</td></tr></table></form>');
+    }
+    my $onsubmit;
+    unless ($env{'form.currcat_0'} eq 'instcode::0') {
+        $onsubmit = ' onsubmit="return check_selected();"';
     }
-    $r->print('<form name="coursecats" method="post" action="/adm/coursecatalog"'.
-              ' onsubmit="return check_selected();">'.
+    $r->print('<form name="coursecats" method="post" action="/adm/coursecatalog"'.$onsubmit.'>'.
               '<table border="0"><tr>'.$catlinks.'</tr></table></form>');
     return;
 }
@@ -541,9 +889,10 @@ sub category_breadcrumbs {
     my $currcat_str = 
         '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" />'.
         '<input type="hidden" name="showdom" value="'.$dom.'" />';
-    my $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr><td>';
+    my $catlinks = '<th class="LC_middle LC_left">'.&mt('Catalog:').'</th><td><div class="LC_leftfloat">';
     my $has_subcats;
     my $selitem;
+    my $update_button;
     if (ref($cats[0]) eq 'ARRAY') {
         if (@{$cats[0]} == 0) {
             $catlinks .= &mt('No categories defined in this domain'); 
@@ -554,6 +903,9 @@ sub category_breadcrumbs {
             } elsif ($cats[0][0] eq 'communities') {
                 $catlinks .= &mt('Communities');
                 $env{'form.currcat_0'} = 'communities::0';
+            } elsif ($cats[0][0] eq 'placement') {
+                $catlinks .= &mt('Placement Tests');
+                $env{'form.currcat_0'} = 'placement::0';
             } else {
                 my $name = $cats[0][0];
                 my $item = &escape($name).'::0';
@@ -562,6 +914,7 @@ sub category_breadcrumbs {
             }
             $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
         } else {
+            $update_button = 1;
             $catlinks .= &main_category_selector(@cats);
             if (($env{'form.currcat_0'} ne '') && 
                 ($env{'form.currcat_0'} ne 'instcode::0')) {
@@ -571,7 +924,7 @@ sub category_breadcrumbs {
     } else {
         $catlinks .= &mt('Official courses (with institutional codes)');
                      $env{'form.currcat_0'} = 'instcode::0';
-         $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
+        $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
     }
     if ($deeper) {
         for (my $i=1; $i<=$deeper; $i++) {
@@ -579,11 +932,10 @@ sub category_breadcrumbs {
             next if ($shallower == 0);
             my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
             if ($cat ne '') {
-                $catlinks .= '<td valign="top">'.
-                             '<select name="currcat_'.$shallower.'" onchange="'.
-                             'setCatDepth('."'$shallower'".');this.form.submit();">';
+                my $labeltext = &HTML::Entities::encode(&mt('Level [_1] category',$shallower),'<>&"');
+                $catlinks .= '<select name="currcat_'.$shallower.'" aria-label="'.$labeltext.'">';
                 if (ref($cats[$shallower]{$container}) eq 'ARRAY') {
-                    $catlinks .= '<option value="">'.&mt('De-select').'</option>';
+                    $catlinks .= '<option value="-1">'.&mt('De-select').'</option>';
                     for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) {
                         my $name = $cats[$shallower]{$container}[$j];
                         my $item = &escape($name).':'.&escape($container).':'.$shallower;
@@ -595,7 +947,8 @@ sub category_breadcrumbs {
                            '<option value="'.$item.'"'.$selected.'>'.$name.'</option>';
                     }
                 }
-                $catlinks .= '</select>';
+                $catlinks .= '</select>'.
+                             '<input type="hidden" name="initialcurrcat_'.$shallower.'" value="'.$env{'form.currcat_'.$shallower}.'" />';
             }
             unless ($i == $deeper) {
                 $catlinks .= $crumbsymbol;
@@ -613,7 +966,8 @@ sub category_breadcrumbs {
             $has_subcats = 1;
             my $buttontext = &mt('Show subcategories');
             my $selitem = 'currcat_'.$deeperlevel;
-            $catlinks .= '&nbsp;<select name="'.$selitem.'" onchange="this.form.submit()">';
+            my $labeltext = &HTML::Entities::encode(&mt('Level [_1] category',$deeperlevel),'<>&"');
+            $catlinks .= '&nbsp;<select name="'.$selitem.'" aria-label="'.$labeltext.'">';
             if (@{$cats[$deeperlevel]{$cat}}) {
                 $catlinks .= '<option value="" selected="selected">'.
                              &mt('Subcategory ...').'</option>';
@@ -630,13 +984,18 @@ sub category_breadcrumbs {
     } else {
         $selitem = 'currcat_0';
     }
-    $catlinks .= $currcat_str.'</td></tr></table></td>';
+    $catlinks .= $currcat_str;
+    if ($update_button) {
+        $catlinks .= '&nbsp;<input type="submit" name="gocat" value="'.&mt('Update').'" />'."\n";
+    }
+    $catlinks .= '</div></td>';
     return ($catlinks,$has_subcats,$selitem);
 }
 
 sub main_category_selector {
     my (@cats) = @_;
-    my $maincatlinks = '<select name="currcat_0" onchange="setCatDepth('."'0'".');this.form.submit();">'."\n";
+    my $labeltext = &HTML::Entities::encode(&mt('Top level category'),'<>&"');
+    my $maincatlinks = '<select name="currcat_0" aria-label="'.$labeltext.'">'."\n";
     if (ref($cats[0]) eq 'ARRAY') {
         if (@{$cats[0]} > 1) {
             my $selected = '';
@@ -658,12 +1017,15 @@ sub main_category_selector {
                 $maincatlinks .= &mt('Official courses (with institutional codes)');
             } elsif ($name eq 'communities') {
                 $maincatlinks .= &mt('Communities');
+            } elsif ($name eq 'placement') {
+                $maincatlinks .= &mt('Placement Tests');
             } else {
                 $maincatlinks .= $name;
             }
             $maincatlinks .= '</option>'."\n";
         }
-        $maincatlinks .= '</select>'."\n";
+        $maincatlinks .= '</select>'."\n".
+                         '<input type="hidden" name="initialcurrcat_0" value="'.$env{'form.currcat_0'}.'" />'."\n";
     }
     return $maincatlinks;
 }
@@ -683,13 +1045,13 @@ 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">';
+    $output .= '<div class="LC_floatleft" style="text-align: top">';
     if (($env{'form.currcat_0'} ne 'instcode::0') &&
         ($env{'form.currcat_0'} ne '') && ($has_subcats)) {
         my $include_subcat_status;
@@ -720,6 +1082,8 @@ sub additional_filters {
     my $selfenroll_text;
     if ($env{'form.currcat_0'} eq 'communities::0') {
         $selfenroll_text = &mt('Only show communities which currently allow self-enrollment (or will allow it in the future)');
+    } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+        $selfenroll_text = &mt('Only show placement tests which currently allow self-enrollment (or will allow it in the future)');
     } else {
         $selfenroll_text = &mt('Only show courses which currently allow self-enrollment (or will allow it in the future)');
     }
@@ -727,7 +1091,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'}) {
@@ -738,7 +1102,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'}) {
@@ -749,25 +1112,31 @@ sub additional_filters {
             }
         } else {
             $statusdisplay = 'none';
-            $cellborder = 'border-left: 0px';
+            $cellborder = 'border-left: 0px;';
         }
+        $cellborder .= ' vertical-align: top;';
         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);
-        } 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 community (domain staff only)');
+            $hidden_text = &mt('Include communities set to be hidden from catalog (domain staff only)');
+        } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+            $details_text = &mt('Show full details for each placement test (domain staff only)');
+            $hidden_text = &mt('Include placement tests set to be hidden from catalog (domain staff only)');
+        } else {
+            $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".
-                   '<td id="statuscell" valign="top" style="'.$cellborder.'">'.
-                   '<div id="statuschoice" style="display:'.$statusdisplay.'">';
+                   $details_text.'</label></span></div>'."\n".
+                   '<div class="LC_floatleft" id="statuscell" style="'.$cellborder.'">'.
+                   '<div class="LC_floatleft" id="statuschoice" style="display:'.$statusdisplay.'; margin-left: 10px">';
         if (ref($orderref) eq 'ARRAY') {
             if (@{$orderref} > 0) {
                 foreach my $type (@{$orderref}) {
@@ -797,13 +1166,14 @@ sub additional_filters {
                             date      => 'immediately prior to specific date:',
                         );
                         my @statuses = &Apache::loncommon::get_env_multiple('form.showcounts');
-                        $output .= '<span id="choosewasacctext" class="LC_nobreak">';
+                        my $wasactivetext;
                         if ($checked) {
-                            $output .= &get_wasactive_text();
+                            $wasactivetext = &get_wasactive_text();
                         }
-                        $output .= '</span>'.
-                                   '<div id="choosewasactive" style="display:'.$wasactivedisplay.'">'.
-                                   '<table>';
+                        $output .= '<div id="choosewasactive" style="display:'.$wasactivedisplay.'">'."\n".
+                                   '<fieldset style="margin-left: 4px">'."\n".
+                                   '<legend id="choosewasacctext" style="font-weight: normal">'."\n".
+                                   $wasactivetext.'</legend>'."\n";
                         my @milestones = ('accessend');
                         if (&Apache::lonnet::auto_run(undef,$codedom)) {
                             push(@milestones,'enrollend');
@@ -819,8 +1189,7 @@ sub additional_filters {
                                 $checked = ' checked="checked"';
                             }
                             $output .=
-                                '<tr><td width="10">&nbsp;</td><td>'.
-                                '<span class="LC_nobreak"><label>'.
+                                '<span class="LC_nobreak" style="padding-left:10px;"><label>'.
                                 '<input type="radio" value="'.$item.'" name="wasactive"'.$checked.' />'.
                                 $milestonetext{$item}.'</label></span>';
                             if ($item eq 'date') {
@@ -838,19 +1207,19 @@ sub additional_filters {
                                                                         '','','',1,'',
                                                                         '','',1);
                             }
-                            $output .= '</td></tr>';
+                            $output .= '<br />';
                         }
-                        $output .= '</table></div>';
+                        $output .= '</fieldset></div>';
                     }
                     $output .= '<br />';
                 }
             }
         }
-        $output .= '</div></td>';
+        $output .= '</div></div>';
     } else {
-        $output .= '</td>';  
+        $output .= '</div>';  
     }
-    $output .= '</tr></table></fieldset></div>'.
+    $output .= '</fieldset></div>'.
                '<div style="clear:both;margin:0;"></div>';  
     return $output;
 }
@@ -868,6 +1237,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');
@@ -893,11 +1278,11 @@ sub get_statustitles {
 }
 
 sub get_wasactive_text {
-    my $wasacctext = ' -- ';
+    my $wasacctext;
     if ($env{'form.currcat_0'} eq 'communities::0') {
-        $wasacctext .= &mt('where member access status was current ...');
+        $wasacctext .= &mt('count where member access status was current ...');
     } else {
-        $wasacctext .= &mt('where student access status was current ...');
+        $wasacctext .= &mt('count where student access status was current ...');
     }
     return $wasacctext;
 }
@@ -949,6 +1334,8 @@ sub search_courselist {
         }
         if ($env{'form.currcat_0'} eq 'communities::0') {
             $typefilter = 'Community';
+        } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+            $typefilter = 'Placement';
         } else {
             $typefilter = '.';
         }
@@ -961,12 +1348,13 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall,$hostname) = @_;
     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;
         }
@@ -979,7 +1367,9 @@ sub print_course_listing {
             $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 { 
+            } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+                $output .= &mt('The courseID provided does not match a placement test in this domain.');
+            } else {
                 $output .= &mt('The courseID provided does not match a course in this domain.');
             }
             $output .= '</p>';
@@ -995,13 +1385,15 @@ sub print_course_listing {
             $output = '<p class="LC_info">';
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= &mt('No communities match the criteria you selected.');
+            } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+                $output .= &mt('No placement tests match the criteria you selected.');
             } else {
                 $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 />';
@@ -1009,7 +1401,7 @@ sub print_course_listing {
     }
     my $now = time;
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,$trails,$allitems);
+                                     $now,$trails,$allitems,$canviewall,$hostname);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -1018,7 +1410,8 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,
+        $trails,$allitems,$canviewall,$hostname) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -1043,18 +1436,22 @@ sub construct_data_table {
         if (defined($sortname{$item})) {
             $output .= '<a href="javascript:changeSort('."'$sortname{$item}'".')">'.&mt($item).'</a>';
         } elsif ($item eq 'Count') {
-            $output .= '&nbsp;&nbsp;';
+            $output .= '#';
         } else {
             $output .= &mt($item);
         }
         $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>'.
                            '<th>'.&mt('Member Counts').'</th>';
+            } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+                $output .=
+                    '<th>'.&mt('Default Access Dates for Students').'</th>'.
+                    '<th>'.&mt('Student Counts').'</th>';               
             } else {
                 $output .=
                     '<th>'.&mt('Default Access Dates for Students').'</th>'.
@@ -1063,7 +1460,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') { 
@@ -1102,7 +1499,7 @@ sub construct_data_table {
     my (%numbers,%creditsum);
     my ($showcredits,$defofficial,$defunofficial,$deftextbook);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
-    unless ($env{'form.currcat_0'} eq 'communities::0') {
+    unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) {
         if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
             $showcredits = 1;
             $defofficial = $domdefaults{'officialcredits'};
@@ -1110,7 +1507,7 @@ sub construct_data_table {
             $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,$deftextbook);
@@ -1140,16 +1537,36 @@ sub construct_data_table {
     }
     my $count = 1;
     my $totalsec = 0;
+    my %clutteredxlists;
+    foreach my $course (keys(%courseinfo)) {
+        if (ref($courseinfo{$course}) eq 'HASH') {
+            if ($courseinfo{$course}{'xlist'} ne '') {
+                my $crskey = $courseinfo{$course}{'cnum'}.':'.$courseinfo{$course}{'code'};
+                my @xlists = split(/,\s/,$courseinfo{$course}{'xlist'});
+                $clutteredxlists{$crskey} = \@xlists;
+            }
+        }
+    }
+    if (keys(%clutteredxlists)) {
+        my %reformattedxlists = &Apache::lonnet::auto_instsec_reformat($domain,'declutter',\%clutteredxlists);
+        foreach my $crskey (keys(%reformattedxlists)) {
+            if (ref($reformattedxlists{$crskey}) eq 'ARRAY') {
+                my $course = $domain.'_'.(split(/:/,$crskey))[0];
+                $courseinfo{$course}{'xlist'} = join(', ',@{$reformattedxlists{$crskey}});
+            }
+        }
+    }
     foreach my $item (@sorted_courses) {
         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,$hostname);
             $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',
@@ -1168,6 +1585,8 @@ sub construct_data_table {
                 $lt{'Active'} = &mt('Total current members'); 
                 $lt{'Future'} = &mt('Total future members');
                 $lt{'Previous'} = &mt('Total previous members');
+            } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+                $lt{'courses'} = &mt('Total placement tests');
             }
             my $colspan = 8;
             if ($showcredits) {
@@ -1208,12 +1627,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);
@@ -1226,7 +1645,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'};
@@ -1237,6 +1656,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'})) {
@@ -1280,6 +1700,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;
@@ -1309,7 +1730,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'}) {
@@ -1462,9 +1883,11 @@ 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,$hostname) = @_;
     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'};
@@ -1478,6 +1901,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].',
@@ -1493,7 +1917,13 @@ sub courseinfo_row {
             @cats = split('&',$categories);
         }
         if ((ref($trails) eq 'ARRAY') && (ref($allitems) eq 'HASH')) {
-            my @categories = map { $trails->[$allitems->{$_}]; } @cats;
+            my @categories;
+            foreach my $cat (@cats) {
+                next if ($cat eq '');
+                if (($allitems->{$cat} ne '') && ($trails->[$allitems->{$cat}] ne '')) {
+                    push(@categories,$trails->[$allitems->{$cat}]);
+                }
+            }
             $categorylist = join('<br />',@categories);
         }
         if ($categorylist eq '') {
@@ -1505,18 +1935,25 @@ 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()) ||
+                    (&Apache::lonnet::waf_allssl($hostname))) {
+                $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>'.
                 '<td>'.$counts.'</td>';
-            unless ($env{'form.currcat_0'} eq 'communities::0') {
+            unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) {
                 $output .= '<td>'.$autoenrollment.'</td>';
             }
         } else {
@@ -1585,27 +2022,39 @@ sub identify_sections {
 sub get_valid_classes {
     my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
     my $response;
-    my %validations;
+    my (@sections,@format_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') {
-                if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) {
+        @sections = split(/,\s+/,$seclist);
+        my $crskey = $cnum.':'.$crscode;
+        my %formattedsec = &Apache::lonnet::auto_instsec_reformat($cdom,'clutter',
+                                                                  {$crskey => \@sections});
+        if (ref($formattedsec{$crskey}) eq 'ARRAY') {
+            @format_sections = @{$formattedsec{$crskey}};
+            map { $possclasses{$crscode.$_} = 1; } @format_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)) {
+        for (my $i=0; $i<@sections; $i++) {
+            if ($okclasses{$crscode.$format_sections[$i]}) {
+                my $sec = $sections[$i];
+                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 ++;
                 }
@@ -1618,6 +2067,13 @@ sub get_valid_classes {
                         join(', ',@{$validations{'sections'}}).'<br />';
         }
         if (@{$validations{'xlists'}}) {
+            my $crskey = $cnum.':'.$crscode;
+            my %reformattedxlists =
+                &Apache::lonnet::auto_instsec_reformat($cdom,'declutter',
+                                                       {$crskey => $validations{'xlists'}});
+            if (ref($reformattedxlists{$crskey}) eq 'ARRAY') {
+                $validations{'xlists'} = $reformattedxlists{$crskey};
+            }
             $response .= &mt('Courses:').' '.
                         join(', ',@{$validations{'xlists'}});
         }