--- loncom/interface/coursecatalog.pm	2019/07/21 14:26:02	1.100
+++ 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.100 2019/07/21 14:26:02 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.108 2025/02/24 23:20:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::courseclassifier;
 use Apache::lonacc;
+use HTML::Entities();
 use LONCAPA;
 use LONCAPA::lonauthcgi;
 
@@ -59,6 +60,7 @@ sub handler {
 
     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'};
@@ -86,29 +88,28 @@ sub handler {
             ({href=>"/adm/coursecatalog",
               text=>"Course/Community Catalog"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-        $r->print('<div>'.&mt('Access to catalog LON-CAPA courses/communities unavailable for: "[_1]" on servers run by: "[_2]".',
+        $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 %domconfig =
-        &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
+    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 || $canviewall) {
-            $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') {
@@ -118,19 +119,31 @@ sub handler {
           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>');
+            $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'}) {
@@ -139,7 +152,7 @@ sub handler {
         }
         my $js = '<script type="text/javascript">'."\n".
                  '// <![CDATA['."\n".
-                 &courselink_javascript($r)."\n".
+                 &courselink_javascript($hostname)."\n".
                  '// ]]>'."\n".
                  '</script>'."\n";
         $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
@@ -192,7 +205,8 @@ sub handler {
                                 if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) {
                                     my $usehttp = 0;
                                     if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) {
-                                        unless (&Apache::lonnet::uses_sts()) {
+                                        unless ((&Apache::lonnet::uses_sts()) ||
+                                                (&Apache::lonnet::waf_allssl($hostname))) {
                                             $usehttp = 1;
                                         }
                                     }
@@ -251,44 +265,22 @@ sub handler {
         $toplevelstr =~ s/,$//;
         $maxdepthstr =~ s/,$//;
     }
-    &validate_input($codedom,\@cats,\%maxd,$domconfig{'coursecategories'});
+    &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) {
-    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;
-}
-
 function changeSort(caller) {
     document.$formname.sortby.value = caller;
     document.$formname.submit();
@@ -300,7 +292,7 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript($r);
+        $catjs .= &courselink_javascript($hostname);
         if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
@@ -335,28 +327,50 @@ ENDTOGGJS
                                                    $catlinks,$catjs,\@codetitles,$cattype,$canviewall);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles,$canviewall));
+                                                \@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');
-                }
-                &js_escape(\$alert);
-                $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">'.
@@ -384,16 +398,17 @@ ENDJS
             }
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles,
-                                                $canviewall));
+                                                $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,$configref) = @_;
+    my ($codedom,$cats,$maxd,$crscatsref) = @_;
     my $currcat = '';
     my $depth = 0;
     if ($env{'form.catalog_maxdepth'} ne '') {
@@ -486,8 +501,8 @@ sub validate_input {
     }
 
     foreach my $key (sort(keys(%env))) {
-        if ($key =~ /^form\.(.+)$/) {
-            unless ($possibles{$1}) {
+        if ($key =~ /^form\.currcat_(.+)$/) {
+            unless ($possibles{'currcat_'.$1}) {
                 delete($env{$key});
             }
         }
@@ -519,12 +534,8 @@ sub validate_input {
     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($configref) eq 'HASH') {
-                    if (ref($configref->{'cats'}) eq 'HASH') {
-                        unless (exists($configref->{'cats'}->{$env{'form.currcat_0'}})) {
-                            delete($env{'form.currcat_0'});
-                        }
-                    } else {
+                if (ref($crscatsref) eq 'HASH') {
+                    unless (exists($crscatsref->{$env{'form.currcat_0'}})) {
                         delete($env{'form.currcat_0'});
                     }
                 } else {
@@ -625,12 +636,8 @@ sub validate_input {
         foreach my $key (keys(%currcats)) {
             if ($env{'form.'.$key} eq '') {
                 delete($env{'form.'.$key});
-            } elsif (ref($configref) eq 'HASH') {
-                if (ref($configref->{'cats'}) eq 'HASH') {
-                    unless (exists($configref->{'cats'}->{$env{'form.'.$key}})) {
-                        delete($env{'form.'.$key});
-                    }
-                } else {
+            } elsif (ref($crscatsref) eq 'HASH') {
+                unless (exists($crscatsref->{$env{'form.'.$key}})) {
                     delete($env{'form.'.$key});
                 }
             } else {
@@ -644,16 +651,11 @@ sub validate_input {
 sub get_instcode_allowable {
     my ($codedom,$possvalref) = @_;
     return 1 unless (ref($possvalref) eq 'HASH');
-    my $caller = 'global';
-    my %coursecodes = ();
-    my %codes = ();
-    my @codetitles = ();
-    my %cat_titles = ();
-    my %cat_order = ();
-    my $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom);
-    if ($totcodes > 0) {
-        if (&Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,
-                           \%codes,\@codetitles,\%cat_titles,\%cat_order) eq 'ok') {
+    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++) {
@@ -673,12 +675,12 @@ sub get_instcode_allowable {
 }
 
 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($r).'</script>'."\n";
+             &courselink_javascript($hostname).'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        {'add_entries' => \%add_entries, });
@@ -709,15 +711,16 @@ sub course_details {
              {text=>$brtexttwo});
     $r->print(
         &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog').
+        '<div role="main">'.
         '<h2>'.$textthree.'</h2>'.
-        &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
+        &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()">'.$textfour.'</a>']).
         &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
                                                  'showdetails','courseid']).
-        '</form>');
+        '</form></div>');
     return;
 }
 
@@ -742,8 +745,7 @@ END
 }
 
 sub courselink_javascript {
-    my ($r) = @_;
-    my $hostname = $r->hostname();
+    my ($hostname) = @_;
     return <<"END";
 
 function ToSyllabus(cdom,cnum,usehttp) {
@@ -778,13 +780,9 @@ END
 
 sub instcode_course_selector {
     my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_;
-    my %coursecodes = ();
-    my %codes = ();
     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) = 
@@ -865,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;
 }
@@ -889,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'); 
@@ -913,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')) {
@@ -922,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++) {
@@ -930,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;
@@ -946,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;
@@ -964,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>';
@@ -981,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 = '';
@@ -1016,7 +1024,8 @@ sub main_category_selector {
             }
             $maincatlinks .= '</option>'."\n";
         }
-        $maincatlinks .= '</select>'."\n";
+        $maincatlinks .= '</select>'."\n".
+                         '<input type="hidden" name="initialcurrcat_0" value="'.$env{'form.currcat_0'}.'" />'."\n";
     }
     return $maincatlinks;
 }
@@ -1042,7 +1051,7 @@ sub additional_filters {
     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;
@@ -1103,8 +1112,9 @@ 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 (domain staff only)');
             $hidden_text = &mt('Include communities set to be hidden from catalog (domain staff only)');
@@ -1124,9 +1134,9 @@ sub additional_filters {
         $output .= '<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}) {
@@ -1156,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');
@@ -1178,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') {
@@ -1197,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;
 }
@@ -1268,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;
 }
@@ -1338,7 +1348,7 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall,$hostname) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
@@ -1391,7 +1401,7 @@ sub print_course_listing {
     }
     my $now = time;
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,$trails,$allitems,$canviewall);
+                                     $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="" />'.
@@ -1400,7 +1410,8 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,
+        $trails,$allitems,$canviewall,$hostname) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -1425,7 +1436,7 @@ 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);
         }
@@ -1526,11 +1537,31 @@ 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,$canviewall);
+                                     \$count,$now,$course,$trails,$allitems,
+                                     \%numbers,$canviewall,$hostname);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
@@ -1852,7 +1883,8 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_;
+    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,
         $extsyllplain);
@@ -1885,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 '') {
@@ -1899,7 +1937,8 @@ sub courseinfo_row {
     if ($showsyllabus) {
         my $usehttp = 0;
         if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) {
-            unless (&Apache::lonnet::uses_sts()) {
+            unless ((&Apache::lonnet::uses_sts()) ||
+                    (&Apache::lonnet::waf_allssl($hostname))) {
                 $usehttp = 1;
             }
         }
@@ -1983,13 +2022,19 @@ sub identify_sections {
 sub get_valid_classes {
     my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
     my $response;
-    my (@sections,@xlists,%possclasses,%okclasses,%validations);
+    my (@sections,@format_sections,@xlists,%possclasses,%okclasses,%validations);
     @{$validations{'sections'}} = ();
     @{$validations{'xlists'}} = ();
     my $totalitems = 0;
     if ($seclist) {
         @sections = split(/,\s+/,$seclist);
-        map { $possclasses{$crscode.$_} = 1; } @sections;
+        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);
@@ -1998,9 +2043,10 @@ sub get_valid_classes {
     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'}})) {
+        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 ++;
                 }
@@ -2021,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'}});
         }