--- loncom/interface/coursecatalog.pm	2014/04/28 01:48:04	1.82
+++ loncom/interface/coursecatalog.pm	2018/12/16 03:17:07	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.82 2014/04/28 01:48:04 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.97 2018/12/16 03:17:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonlocal;
 use Apache::courseclassifier;
 use Apache::lonacc;
 use LONCAPA;
+use LONCAPA::lonauthcgi;
 
 sub handler {
     my ($r) = @_;
@@ -56,7 +57,8 @@ 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;
 
     if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { 
         $codedom = $env{'user.domain'};
@@ -73,24 +75,41 @@ 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 %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$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) {
+        if ($knownuser || $canviewall) {
             $cattype = $domconfig{'coursecategories'}{'auth'};
         } else {
             $cattype = $domconfig{'coursecategories'}{'unauth'};
         }
+        if ($cattype eq '') {
+            $cattype = 'std';
+        }
     } else {
         $cathash = {};
-        $cattype eq 'std';
+        $cattype = 'std';
     }
     if ($cattype eq 'none') {
         $r->print(&Apache::loncommon::start_page('Course/Community Catalog'));
@@ -98,7 +117,7 @@ sub handler {
         ({href=>"/adm/coursecatalog",
           text=>"Course/Community Catalog"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-        if ($knownuser) {
+        if ($knownuser || $canviewall) {
             $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
         } else {
             if ($domconfig{'coursecategories'}{'auth'} eq 'none') {
@@ -120,7 +139,7 @@ sub handler {
         }
         my $js = '<script type="text/javascript">'."\n".
                  '// <![CDATA['."\n".
-                 &courselink_javascript()."\n".
+                 &courselink_javascript($r)."\n".
                  '// ]]>'."\n".
                  '</script>'."\n";
         $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
@@ -146,8 +165,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());
@@ -171,8 +190,12 @@ 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'})) {
+                                        $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>');
                                 }
                             }
@@ -202,21 +225,31 @@ 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(\@cats,\%maxd);
     my ($numtitles,@codetitles);
     if (($env{'form.coursenum'} ne '') && ($knownuser)) {
         &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
@@ -226,9 +259,29 @@ sub handler {
         my $catjs = <<"ENDSCRIPT";
 
 function setCatDepth(depth) {
-    document.coursecats.catalog_maxdepth.value = depth;
-    if (depth == '') {
-        document.coursecats.currcat_0.value = '';
+    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;
@@ -245,8 +298,8 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript();
-        if (&user_is_dc($codedom)) {
+        $catjs .= &courselink_javascript($r);
+        if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
 function toggleStatuses() {
@@ -277,10 +330,10 @@ 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));
             }
         } else {
             my (%add_entries);
@@ -290,6 +343,7 @@ ENDTOGGJS
                 if (!$deeper) {
                     $alert = &mt('Choose a category to display');
                 }
+                &js_escape(\$alert);
                 $catjs .= <<ENDJS;
 function check_selected() {
     if (document.coursecats.$selitem.options[document.coursecats.$selitem.selectedIndex].value == "") {
@@ -304,7 +358,7 @@ ENDJS
             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++) {
@@ -313,6 +367,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');
                 }
@@ -325,7 +381,8 @@ ENDJS
                           $display_button.'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles));
+                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles,
+                                                $canviewall));
             }
         }
     }
@@ -333,13 +390,74 @@ ENDJS
     return OK;
 }
 
+sub validate_input {
+    my ($cats,$maxd) = @_;
+    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;
+    return;
+}
+
 sub course_details {
     my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_;
     my $output;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
     my $js = '<script type="text/javascript">'."\n".
-             &courselink_javascript().'</script>'."\n";
+             &courselink_javascript($r).'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        {'add_entries' => \%add_entries, });
@@ -351,9 +469,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()",
@@ -361,20 +488,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>'.
+        '<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>');
@@ -386,7 +505,7 @@ sub coursesearch {
     my %lt = &Apache::lonlocal::texthash (
                                            crlk => 'Course look-up',  
                                            code => 'Code',
-                                           ifyo => 'Enter the character code (six letters and numbers)',
+                                           ifyo => 'Enter the course code (six letters and numbers)',
                                            srch => 'Find course',
                                          );
     return <<"END";
@@ -402,9 +521,11 @@ END
 }
 
 sub courselink_javascript {
+    my ($r) = @_;
+    my $hostname = $r->hostname();
     return <<"END";
 
-function ToSyllabus(cdom,cnum) {
+function ToSyllabus(cdom,cnum,usehttp) {
     if (cdom == '' || cdom == null) {
         return;
     }
@@ -412,6 +533,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();
 }
 
@@ -428,7 +556,7 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype) = @_;
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_;
     my %coursecodes = ();
     my %codes = ();
     my %cat_titles = ();
@@ -448,10 +576,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'};
@@ -459,7 +587,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,
@@ -498,6 +626,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) {
@@ -551,6 +681,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';
@@ -655,6 +788,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;
             }
@@ -680,10 +815,10 @@ sub get_depth_values {
 }
 
 sub additional_filters {
-    my ($codedom,$has_subcats) = @_;
+    my ($codedom,$has_subcats,$canviewall) = @_;
     my $is_dc = &user_is_dc($codedom);
     my $output = '<div class="LC_left_float">';
-    if ($is_dc) {
+    if ($is_dc || $canviewall) {
         $output .= '<fieldset><legend>'.&mt('Options').'</legend>';
     }
     $output .= '<table><tr><td valign="top">';
@@ -717,6 +852,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)');
     }
@@ -724,7 +861,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'}) {
@@ -735,7 +872,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,17 +885,22 @@ sub additional_filters {
             $cellborder = 'border-left: 0px';
         }
         if ($env{'form.currcat_0'} eq 'communities::0') {
-            $details_text = &mt('Show full details for each community ([_1] only)',$dc_title);
-            $hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title);
-        } 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".
@@ -865,6 +1006,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');
@@ -946,6 +1103,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 = '.';
         }
@@ -958,12 +1117,13 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
+    my $canviewall = &canview_all();
     my $details = $env{'form.coursenum'};
-    if (&user_is_dc($domain)) {
+    if (&user_is_dc($domain) || $canviewall) {
         if ($env{'form.showdetails'}) {
             $details = 1;
         }
@@ -976,7 +1136,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>';
@@ -992,13 +1154,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 />';
@@ -1006,7 +1170,7 @@ sub print_course_listing {
     }
     my $now = time;
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,$trails,$allitems);
+                                     $now,$trails,$allitems,$canviewall);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -1015,7 +1179,7 @@ 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) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -1047,11 +1211,15 @@ sub construct_data_table {
         $output .= '</th>';
     }
     my (@fields,%fieldtitles,$wasactiveon);
-    if ($knownuser) {
+    if ($knownuser || ($canviewall && $details)) {
         if ($details) {
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= '<th>'.&mt('Default Access Dates for Members').'</th>'.
                            '<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>'.
@@ -1060,7 +1228,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') { 
@@ -1099,7 +1267,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'};
@@ -1107,7 +1275,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);
@@ -1141,12 +1309,12 @@ sub construct_data_table {
         foreach my $course (@{$Sortby{$item}}) {
             $output.=&Apache::loncommon::start_data_table_row(); 
             $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,
-                                     \$count,$now,$course,$trails,$allitems,\%numbers);
+                                     \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
-    if (($knownuser) && ($count > 1) && $env{'form.showdetails'}) {
-        if (&user_is_dc($domain)) {
+    if (($knownuser || $canviewall) && ($count > 1) && $env{'form.showdetails'}) {
+        if (&user_is_dc($domain) || $canviewall) {
             my %lt = &Apache::lonlocal::texthash (
                                                      'Active'   => 'Total current students',
                                                      'Future'   => 'Total future students',
@@ -1165,6 +1333,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) {
@@ -1205,12 +1375,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);
@@ -1223,7 +1393,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'};
@@ -1234,6 +1404,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'})) {
@@ -1277,6 +1448,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;
@@ -1306,7 +1478,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'}) {
@@ -1459,9 +1631,10 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers) = @_;
+    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_;
     my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
-        $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories);
+        $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories,
+        $extsyllplain);
     if (ref($info) eq 'HASH') {
         $cdom = $info->{'cdom'};
         $cnum = $info->{'cnum'};
@@ -1475,6 +1648,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].',
@@ -1502,18 +1676,22 @@ 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)) {
+            $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 {
@@ -1582,27 +1760,32 @@ sub identify_sections {
 sub get_valid_classes {
     my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
     my $response;
-    my %validations;
+    my (@sections,@xlists,%possclasses,%okclasses,%validations);
     @{$validations{'sections'}} = ();
     @{$validations{'xlists'}} = ();
     my $totalitems = 0;
     if ($seclist) {
-        foreach my $sec (split(/, /,$seclist)) {
-            my $class = $crscode.$sec;
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
-							 $class) eq 'ok') {
+        @sections = split(/,\s+/,$seclist);
+        map { $possclasses{$crscode.$_} = 1; } @sections;
+    }
+    if ($xlist_items) {
+        @xlists = split(/,\s+/,$xlist_items);
+        map { $possclasses{$_} = 1; } @xlists;
+    }
+    my %okclasses = &Apache::lonnet::auto_validate_instclasses($cdom,$cnum,$owners,
+                                                               \%possclasses);
+    if (keys(%okclasses)) {
+        foreach my $sec (@sections) {
+            if ($okclasses{$crscode.$sec}) {
                 if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) {
                     push(@{$validations{'sections'}},$sec);
                     $totalitems ++;
                 }
             }
         }
-    }
-    if ($xlist_items) {
-        foreach my $item (split(/, /,$xlist_items)) {
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
-							 $item) eq 'ok') {
-                if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) {
+        foreach my $item (@xlists) {
+            if ($okclasses{$item}) {
+                if (!grep(/^\Q$item\E$/,@{$validations{'xlists'}})) {
                     push(@{$validations{'xlists'}},$item);
                     $totalitems ++;
                 }