--- loncom/interface/coursecatalog.pm	2021/12/12 21:47:58	1.88.2.9
+++ loncom/interface/coursecatalog.pm	2019/07/23 01:30:35	1.101
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.88.2.9 2021/12/12 21:47:58 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.101 2019/07/23 01:30:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,8 +57,8 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['sortby','showdom']);
 
-    my $codedom = &Apache::lonnet::default_login_domain();
-    my $hostname = $r->hostname();
+    my $serverdefdom = &Apache::lonnet::default_login_domain();
+    my $codedom = $serverdefdom;
 
     if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { 
         $codedom = $env{'user.domain'};
@@ -75,9 +75,22 @@ sub handler {
             $env{'form.showdom'} = '';
         }
     }
-    my $domdesc = &Apache::lonnet::domain($codedom,'description');
+    my $domdesc = &Apache::lonnet::domain($serverdefdom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-
+    
+    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>'.&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();
@@ -125,7 +138,7 @@ sub handler {
         }
         my $js = '<script type="text/javascript">'."\n".
                  '// <![CDATA['."\n".
-                 &courselink_javascript($hostname)."\n".
+                 &courselink_javascript($r)."\n".
                  '// ]]>'."\n".
                  '</script>'."\n";
         $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
@@ -178,8 +191,7 @@ sub handler {
                                 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))) {
+                                        unless (&Apache::lonnet::uses_sts()) {
                                             $usehttp = 1;
                                         }
                                     }
@@ -241,8 +253,7 @@ sub handler {
     &validate_input($codedom,\@cats,\%maxd,$cathash);
     my ($numtitles,@codetitles);
     if (($env{'form.coursenum'} ne '') && ($knownuser)) {
-        &course_details($r,$codedom,$formname,$domdesc,$hostname,\@trails,
-                        \%allitems,\@codetitles);
+        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
         my $wasacctext = &get_wasactive_text();
@@ -270,7 +281,7 @@ function setCatDepth(depth) {
         }
         document.coursecats.catalog_maxdepth.value = depth;
     } else {
-        document.coursecats.currcat_0.value = '';
+        document.coursecats.currcat_0.value = ''; 
         document.coursecats.catalog_maxdepth.value = '';
     }
     document.coursecats.submit();
@@ -288,7 +299,7 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript($hostname);
+        $catjs .= &courselink_javascript($r);
         if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
@@ -323,7 +334,7 @@ ENDTOGGJS
                                                    $catlinks,$catjs,\@codetitles,$cattype,$canviewall);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles,$canviewall,$hostname));
+                                                \@codetitles,$canviewall));
             }
         } else {
             my (%add_entries);
@@ -357,6 +368,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');
                 }
@@ -370,7 +383,7 @@ ENDJS
             }
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles,
-                                                $canviewall,$hostname));
+                                                $canviewall));
             }
         }
     }
@@ -610,6 +623,8 @@ sub validate_input {
             } elsif (ref($crscatsref) eq 'HASH') {
                 unless (exists($crscatsref->{$env{'form.'.$key}})) {
                     delete($env{'form.'.$key});
+                } else {
+                    delete($env{'form.'.$key});
                 }
             } else {
                 delete($env{'form.'.$key});
@@ -622,11 +637,16 @@ sub validate_input {
 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 $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 @standardnames = &Apache::loncommon::get_standard_codeitems();
             my %local_to_standard;
             for (my $i=0; $i<@codetitles; $i++) {
@@ -646,12 +666,12 @@ sub get_instcode_allowable {
 }
 
 sub course_details {
-    my ($r,$codedom,$formname,$domdesc,$hostname,$trails,$allitems,$codetitles) = @_;
+    my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_;
     my $output;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
     my $js = '<script type="text/javascript">'."\n".
-             &courselink_javascript($hostname).'</script>'."\n";
+             &courselink_javascript($r).'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        {'add_entries' => \%add_entries, });
@@ -663,9 +683,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()",
@@ -673,20 +702,12 @@ 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,undef,$hostname).
+        '<h2>'.$textthree.'</h2>'.
+        &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
         '<br />'.
         '<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
         &Apache::lonhtmlcommon::actionbox([
-            '<a href = "javascript:document.coursecatalog.submit()">'.
-            (($env{'form.currcat_0'} eq 'communities::0') ?
-                &mt('Back to community listing') : &mt('Back to course listing')).
-            '</a>'
-        ]).
+            '<a href = "javascript:document.coursecatalog.submit()">'.$textfour.'</a>']).
         &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
                                                  'showdetails','courseid']).
         '</form>');
@@ -714,7 +735,8 @@ END
 }
 
 sub courselink_javascript {
-    my ($hostname) = @_;
+    my ($r) = @_;
+    my $hostname = $r->hostname();
     return <<"END";
 
 function ToSyllabus(cdom,cnum,usehttp) {
@@ -749,9 +771,13 @@ 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 %cat_items;
+    my $caller = 'global';
+    my $format_reply;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
     my ($jscript,$totcodes,$numtitles,$lasttitle) = 
@@ -814,6 +840,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) {
@@ -867,6 +895,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';
@@ -971,6 +1002,8 @@ 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;
             }
@@ -1033,6 +1066,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)');
     }
@@ -1066,6 +1101,9 @@ sub additional_filters {
         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)');
+        } 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)');
@@ -1279,6 +1317,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 = '.';
         }
@@ -1291,7 +1331,7 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall,$hostname) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
@@ -1310,7 +1350,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>';
@@ -1326,6 +1368,8 @@ 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.');
             }
@@ -1340,7 +1384,7 @@ sub print_course_listing {
     }
     my $now = time;
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,$trails,$allitems,$canviewall,$hostname);
+                                     $now,$trails,$allitems,$canviewall);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -1349,8 +1393,7 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$domain,$courses,$details,$usersections,$now,
-        $trails,$allitems,$canviewall,$hostname) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -1387,6 +1430,10 @@ sub construct_data_table {
             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>'.
@@ -1434,7 +1481,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'};
@@ -1472,31 +1519,11 @@ 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,$hostname);
+                                     \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
@@ -1520,6 +1547,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) {
@@ -1816,8 +1845,7 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,
-        $numbers,$canviewall,$hostname) = @_;
+    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_;
     my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
         $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories,
         $extsyllplain);
@@ -1864,8 +1892,7 @@ sub courseinfo_row {
     if ($showsyllabus) {
         my $usehttp = 0;
         if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) {
-            unless ((&Apache::lonnet::uses_sts()) ||
-                    (&Apache::lonnet::waf_allssl($hostname))) {
+            unless (&Apache::lonnet::uses_sts()) {
                 $usehttp = 1;
             }
         }
@@ -1880,7 +1907,7 @@ sub courseinfo_row {
             $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 {
@@ -1949,19 +1976,13 @@ sub identify_sections {
 sub get_valid_classes {
     my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
     my $response;
-    my (@sections,@format_sections,@xlists,%possclasses,%okclasses,%validations);
+    my (@sections,@xlists,%possclasses,%okclasses,%validations);
     @{$validations{'sections'}} = ();
     @{$validations{'xlists'}} = ();
     my $totalitems = 0;
     if ($seclist) {
         @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;
-        }
+        map { $possclasses{$crscode.$_} = 1; } @sections;
     }
     if ($xlist_items) {
         @xlists = split(/,\s+/,$xlist_items);
@@ -1970,10 +1991,9 @@ sub get_valid_classes {
     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'}})) {
+        foreach my $sec (@sections) {
+            if ($okclasses{$crscode.$sec}) {
+                if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) {
                     push(@{$validations{'sections'}},$sec);
                     $totalitems ++;
                 }
@@ -1994,13 +2014,6 @@ 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'}});
         }