--- loncom/interface/coursecatalog.pm	2013/03/01 18:09:16	1.73
+++ loncom/interface/coursecatalog.pm	2016/04/04 01:09:47	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.73 2013/03/01 18:09:16 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.89 2016/04/04 01:09:47 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) = @_;
@@ -66,8 +67,11 @@ sub handler {
     }
     my $formname = 'coursecatalog';
     if ($env{'form.showdom'} ne '') {
+        $env{'form.showdom'} = &LONCAPA::clean_domain($env{'form.showdom'});
         if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
             $codedom = $env{'form.showdom'};
+        } else {
+            $env{'form.showdom'} = '';
         }
     }
     my $domdesc = &Apache::lonnet::domain($codedom,'description');
@@ -75,20 +79,151 @@ sub handler {
 
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
-    my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
+    my $knownuser = &user_is_known();
+    my $canviewall = &canview_all();
+    
+    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';
+        }
     } else {
         $cathash = {};
+        $cattype = 'std';
+    }
+    if ($cattype eq 'none') {
+        $r->print(&Apache::loncommon::start_page('Course/Community Catalog'));
+        &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/coursecatalog",
+          text=>"Course/Community Catalog"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+        if ($knownuser || $canviewall) {
+            $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
+        } else {
+            if ($domconfig{'coursecategories'}{'auth'} eq 'none') {
+                $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
+            } else {
+                $r->print('<div>'.&mt('The catalog of LON-CAPA courses/communities provided for: "[_1]" is only available to users who are logged in.',$domdesc).'</div>');
+            }
+        }      
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+
+    my $cnum; 
+    if ($cattype eq 'codesrch') {
+        my ($uniquecode,$codemsg,$brtext);
+        if ($env{'form.uniquecode'}) {
+            $uniquecode = $env{'form.uniquecode'};
+            $uniquecode =~ s/^\s+|\s+$//g;
+        }
+        my $js = '<script type="text/javascript">'."\n".
+                 '// <![CDATA['."\n".
+                 &courselink_javascript()."\n".
+                 '// ]]>'."\n".
+                 '</script>'."\n";
+        $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
+        if ($uniquecode =~ /^\w{6}$/) {
+            &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/coursecatalog",
+              text=>"Course/Community Catalog"});
+            $brtext = 'Search Result';
+        } else {
+            $brtext = 'Course/Community Catalog';
+        }
+        &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/coursecatalog",
+          text=>"$brtext"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+        $r->print(&coursesearch($codedom,$domdesc,$uniquecode));
+        if ($uniquecode =~ /^\w{6}$/) {
+            $r->print('<hr />');
+            my $confname = $codedom.'-domainconfig';
+            my %codes = &Apache::lonnet::get('uniquecodes',[$uniquecode],$codedom,$confname);
+            if ($codes{$uniquecode}) {
+                $cnum = $codes{$uniquecode};
+                my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.',
+                                                            $cnum,undef,undef,'.',1);
+                if (keys(%courses)) {
+                    $env{'form.coursenum'} = $cnum;
+                    my %courseinfo = &build_courseinfo_hash(\%courses,$knownuser,$codedom,$canviewall);
+                    undef($env{'form.coursenum'});
+                    if (ref($courseinfo{$codedom.'_'.$cnum}) eq 'HASH') {
+                        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+                        my @cols = ('title','ownerlastnames','seclist','access');
+                        my %lt = &Apache::lonlocal::texthash(
+                                     title          => 'Title',
+                                     ownerlastnames => 'Owner & Co-owner(s)',
+                                     seclist        => 'Sections',
+                                     access         => 'Default Access Dates for Students',
+                                 );
+                        my @shown;
+                        foreach my $item (@cols) {
+                            if ($courseinfo{$codedom.'_'.$cnum}{$item}) {
+                                push(@shown,$item);
+                            }
+                        }
+                        my $num = 0;
+                        foreach my $item (@shown) {
+                            $num ++;
+                            $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}).
+                                      $courseinfo{$codedom.'_'.$cnum}{$item});
+                            if ($item eq 'title') {
+                                if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) {
+                                    $r->print('&nbsp;<font size="-2">'.
+                                              '<a href="javascript:ToSyllabus('."'$codedom','$cnum'".')">'.
+                                              &mt('Syllabus').'</a></font>');
+                                }
+                            }
+                            my $arg = ( $num == scalar(@shown) ? 1 : '' );
+                            $r->print(&Apache::lonhtmlcommon::row_closure($arg));
+                        }
+                        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+                        my $selfenroll = &selfenroll_status($courseinfo{$codedom.'_'.$cnum},$codedom.'_'.$cnum);
+                        if ($selfenroll) {
+                            $r->print('<br />'.$selfenroll);
+                        }
+                        $r->print('<form name="linklaunch" method="post" action="">'."\n".
+                                  '<input type="hidden" name="backto" value="coursecatalog" />'."\n".
+                                  '<input type="hidden" name="courseid" value="" />'."\n".
+                                  '</form>'."\n");
+
+                    } else {
+                        $codemsg = &mt('Code matched, but course ID to which this mapped is invalid.');
+                    }
+                } else {
+                    $codemsg = &mt('Code matched, but course ID to which this mapped is invalid.');              
+                } 
+            } else {
+                $codemsg = &mt('No match');
+            }
+        }
+        $r->print('<br />'.&Apache::loncommon::end_page());
+        return OK;
+    } else {
+        if ($env{'form.coursenum'}) {
+            $cnum = $env{'form.coursenum'};
+        }
     }
-    my $subcats;
+
+    if ($env{'form.catalog_maxdepth'} ne '') {
+        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
+    }
+
+    my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats);
     if ($env{'form.withsubcats'}) {
         $subcats = \%subcathash;
     }
     &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,
                                            \%idx,\@jsarray,$subcats);
     my ($numtitles,@codetitles);
-    if ($env{'form.coursenum'} ne '' && &user_is_known()) {
+    if (($env{'form.coursenum'} ne '') && ($knownuser)) {
         &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
@@ -116,7 +251,7 @@ function setCourseId(caller) {
 
 ENDSCRIPT
         $catjs .= &courselink_javascript();
-        if (&user_is_dc($codedom)) {
+        if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
 function toggleStatuses() {
@@ -147,10 +282,10 @@ ENDTOGGJS
         }
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   $catlinks,$catjs,\@codetitles);
+                                                   $catlinks,$catjs,\@codetitles,$cattype,$canviewall);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles));
+                                                \@codetitles,$canviewall));
             }
         } else {
             my (%add_entries);
@@ -160,6 +295,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 == "") {
@@ -170,11 +306,11 @@ function check_selected() {
 ENDJS
             }
             $catjs = '<script type="text/javascript">'."\n".$catjs."\n".'</script>';
-            &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks);
+            &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks,undef,$cattype);
             if ($env{'form.currcat_0'} ne '') {
                 $r->print('<form name="'.$formname.
                           '" method="post" action="/adm/coursecatalog">'.
-                          &additional_filters($codedom,$has_subcats)."\n");
+                          &additional_filters($codedom,$has_subcats,$canviewall)."\n");
                 $r->print('<input type="hidden" name="catalog_maxdepth" value="'.
                           $deeper.'" />'."\n");
                 for (my $i=0; $i<$deeper; $i++) {
@@ -183,6 +319,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');
                 }
@@ -195,7 +333,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));
             }
         }
     }
@@ -221,37 +360,57 @@ 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()",
               text=>$brtextone},
              {text=>$brtexttwo});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-    $r->print('<br />');
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $r->print(&mt('Detailed community information:'));
-    } else {
-        $r->print(&mt('Detailed course information:'));
-    }
-    $r->print('<br /><br />'.
-              &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
-              '<br /><br />');
-    $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
-              '<a href = "javascript:document.coursecatalog.submit()">');
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $r->print(&mt('Back to community listing'));
-    } else {
-        $r->print(&mt('Back to course listing'));
-    }
-    $r->print('</a>'.
-              &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
-                                                       'showdetails','courseid']).'</form>');
+    $r->print(
+        &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog').
+        '<h2>'.$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()">'.$textfour.'</a>']).
+        &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
+                                                 'showdetails','courseid']).
+        '</form>');
     return;
 }
 
+sub coursesearch {
+    my ($codedom,$domdesc,$uniquecode) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                                           crlk => 'Course look-up',  
+                                           code => 'Code',
+                                           ifyo => 'Enter the course code (six letters and numbers)',
+                                           srch => 'Find course',
+                                         );
+    return <<"END";
+<h3>$lt{'crlk'} ($domdesc)</h3>
+$lt{'ifyo'}
+<form name="searchbycode" method="post" action="">
+<span class="LC_nobreak">
+<input type="text" value="$uniquecode" size="6" name="uniquecode" />&nbsp;
+<br />
+<input type="submit" value="$lt{'srch'}" name="srch" /></span>
+</form>
+END
+}
+
 sub courselink_javascript {
     return <<"END";
 
@@ -279,7 +438,7 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_;
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_;
     my %coursecodes = ();
     my %codes = ();
     my %cat_titles = ();
@@ -292,22 +451,25 @@ sub instcode_course_selector {
     my ($jscript,$totcodes,$numtitles,$lasttitle) = 
         &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
                            \%cat_items,$codetitles,\%cat_titles,\%cat_order);
-    my $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n".
-              '</script>';
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             "$jscript\n$catjs\n".
+             '// ]]>'."\n".
+             '</script>';
     if ($totcodes) {
         if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
-            $add_entries{'onLoad'} = 'setElements();';
+            $add_entries{'onload'} = 'setElements();';
         }
-        if (&user_is_dc($codedom)) {
-            $add_entries{'onLoad'} .= ' toggleStatuses();toggleWasActive();'
+        if (&user_is_dc($codedom) || $canviewall) {
+            $add_entries{'onload'} .= ' toggleStatuses();toggleWasActive();'
         }
-        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
+        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};
         $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
                   '<input type="hidden" name="catalog_maxdepth" value="'.$cat_maxdepth.'" />'."\n".
                   '<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'."\n".
                   '<input type="hidden" name="currcat_0" value="instcode::0" />'.
-                  &additional_filters($codedom));
+                  &additional_filters($codedom,undef,$canviewall));
         if ($numtitles > 0) {
             $r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'.
                       &Apache::courseclassifier::build_instcode_selectors($numtitles,
@@ -321,8 +483,12 @@ sub instcode_course_selector {
                   '<input type="hidden" name="numtitles" value="'.$numtitles.
                   '" /></form><br /><br />');
     } else {
-        $js = '<script type"text/javascript">'."\n$catjs\n".'</script>';
-        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
+        $js = '<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
+              "$catjs\n".
+              '// ]]>'."\n".
+              '</script>';
+        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};
         $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
                   '<input type="hidden" name="catalog_maxdepth" value="'.$cat_maxdepth.'" />'.
@@ -334,7 +500,7 @@ sub instcode_course_selector {
 }
 
 sub cat_header {
-    my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
+    my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles,$cattype) = @_;
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        { 'add_entries' => $add_entries, });
@@ -342,6 +508,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) {
@@ -359,15 +527,17 @@ sub cat_header {
           text=>"Course/Community Catalog"});
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-    my $onchange = 'this.form.submit()';
-    $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
-              '<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
-              &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
-    if (!$onchange) {
+    if ($cattype eq 'std') {
+        my $onchange = 'this.form.submit()';
+        $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
+                  '<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
+                  &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
+        if (!$onchange) {
 	   $r->print('&nbsp;<input type="submit" name="godom" value="'.&mt('Change').'" />');
+        }
+        $r->print('</td></tr></table></form>');
     }
-    $r->print('</td></tr></table></form>'.
-	      '<form name="coursecats" method="post" action="/adm/coursecatalog"'.
+    $r->print('<form name="coursecats" method="post" action="/adm/coursecatalog"'.
               ' onsubmit="return check_selected();">'.
               '<table border="0"><tr>'.$catlinks.'</tr></table></form>');
     return;
@@ -393,6 +563,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';
@@ -497,6 +670,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;
             }
@@ -522,10 +697,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">';
@@ -559,6 +734,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)');
     }
@@ -566,7 +743,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'}) {
@@ -593,15 +770,20 @@ sub additional_filters {
         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);
+        } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+            $details_text = &mt('Show full details for each placement test ([_1] only)',$dc_title);
+            $hidden_text = &mt('Include placement tests 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);
         }
+        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".
@@ -631,12 +813,12 @@ sub additional_filters {
                                ' />'.$title.'</label></span>';
                     if ($type eq 'Previous') {
                         my %milestonetext = &Apache::lonlocal::texthash (
-                            accessend => 'prior to default end access date',
-                            enrollend => 'prior to end date for auto-enrollment',
-                            date      => 'prior to specific date:',
+                            accessend => 'immediately prior to default end access date',
+                            enrollend => 'immediately prior to end date for auto-enrollment',
+                            date      => 'immediately prior to specific date:',
                         );
                         my @statuses = &Apache::loncommon::get_env_multiple('form.showcounts');
-                        $output .= '<span id="choosewasacctext">';
+                        $output .= '<span id="choosewasacctext" class="LC_nobreak">';
                         if ($checked) {
                             $output .= &get_wasactive_text();
                         }
@@ -707,6 +889,17 @@ sub user_is_dc {
     return;
 }
 
+sub canview_all {
+    my $canviewall = 0;
+    my $page = 'coursecatalog';
+    if (&LONCAPA::lonauthcgi::can_view($page)) {
+        $canviewall = 1;
+    } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
+        $canviewall= 1;
+    }
+    return $canviewall;
+}
+
 sub get_statustitles {
     my ($caller) = @_;
     my @status_order = ('Active','Future','Previous');
@@ -734,9 +927,9 @@ sub get_statustitles {
 sub get_wasactive_text {
     my $wasacctext = ' -- ';
     if ($env{'form.currcat_0'} eq 'communities::0') {
-        $wasacctext .= &mt('where members had access ...');
+        $wasacctext .= &mt('where member access status was current ...');
     } else {
-        $wasacctext .= &mt('where students had access ...');
+        $wasacctext .= &mt('where student access status was current ...');
     }
     return $wasacctext;
 }
@@ -788,6 +981,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 = '.';
         }
@@ -800,12 +995,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;
         }
@@ -815,11 +1011,15 @@ sub print_course_listing {
                                                  $env{'form.coursenum'},
                                                  undef,undef,'.',1);
         if (keys(%courses) == 0) {
+            $output = '<p class="LC_error">';
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= &mt('The courseID provided does not match a community in this domain.');
-            } else { 
+            } 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>';
             return $output;
         }
     } else {
@@ -829,30 +1029,26 @@ sub print_course_listing {
             %courses = &search_courselist($domain,$subcats);
         }
         if (keys(%courses) == 0) {
+            $output = '<p class="LC_info">';
             if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output =
-                    '<p class="LC_info">'
-                   .&mt('No communities match the criteria you selected.')
-                   .'</p>';
+                $output .= &mt('No communities match the criteria you selected.');
+            } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+                $output .= &mt('No placement tests match the criteria you selected.');
             } else {
-                $output =
-                    '<p class="LC_info">'
-                   .&mt('No courses match the criteria you selected.')
-                   .'</p>';
+                $output .= &mt('No courses match the criteria you selected.');
             }
+            $output .= '</p>';
             return $output;
         }
-        if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) {
+        if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain)) && (!$canviewall)) {
             $output = '<b>'.&mt('Note for students:').'</b> '
                      .&mt('If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.')
                      .'<br /><br />';
         }
     }
     my $now = time;
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,\%domconfig,$trails,$allitems);
+                                     $now,$trails,$allitems,$canviewall);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -861,8 +1057,7 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$domain,$courses,$details,$usersections,$now,$domconfig,
-        $trails,$allitems) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -894,11 +1089,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>'.
@@ -907,7 +1106,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') { 
@@ -944,19 +1143,20 @@ sub construct_data_table {
     $output .= '<th>'.&mt('Self-enroll (if permitted)').'</th>';
     &Apache::loncommon::end_data_table_header_row();
     my (%numbers,%creditsum);
-    my ($showcredits,$defofficial,$defunofficial);
+    my ($showcredits,$defofficial,$defunofficial,$deftextbook);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
-    unless ($env{'form.currcat_0'} eq 'communities::0') {
-        if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
+    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'};
-            $defunofficial = $domdefaults{'unofficialcredits'}; 
+            $defunofficial = $domdefaults{'unofficialcredits'};
+            $deftextbook = $domdefaults{'textbookcredits'};
         }
     }
-    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$details,
+    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$canviewall,$details,
                                             $usersections,\@fields,\%fieldtitles,
                                             $wasactiveon,\%numbers,\%creditsum,
-                                            $showcredits,$defofficial,$defunofficial);
+                                            $showcredits,$defofficial,$defunofficial,$deftextbook);
     my %Sortby;
     foreach my $course (sort(keys(%{$courses}))) {
         if ($env{'form.sortby'} eq 'code') {
@@ -987,12 +1187,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',
@@ -1011,6 +1211,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) {
@@ -1051,12 +1253,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);
@@ -1152,7 +1354,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'}) {
@@ -1305,7 +1507,7 @@ 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);
     if (ref($info) eq 'HASH') {
@@ -1354,41 +1556,51 @@ sub courseinfo_row {
     }
     $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 {
             $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
         }
     }
-    my $selfenroll;
-    if ($info->{'selfenroll_types'}) {
-        my $showstart = &Apache::lonlocal::locallocaltime($info->{'selfenroll_start'});
-        my $showend = &Apache::lonlocal::locallocaltime($info->{'selfenroll_end'});
-        if (($info->{'selfenroll_end'} > 0) && ($info->{'selfenroll_end'} > $now)) {
-            if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
-                $output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';
-            } else { 
-                $output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a><br />';
-                if ($info->{'selfenroll_end'} == 0) {
-                    $output .= &mt('Available permanently');
-                } elsif ($info->{'selfenroll_end'} > $now) {
-                    $output .= &mt('Self-enrollment ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
+    my $selfenroll = &selfenroll_status($info,$course);
+    if ($selfenroll) {
+        $output .= '<td>'.$selfenroll.'</td>';
+    } else {
+        $output .= '<td>&nbsp;</td>';
+    }
+    $$countref ++;
+    return $output;
+}
+
+sub selfenroll_status {
+    my ($info,$course) = @_;
+    my $now = time;
+    my $output;
+    if (ref($info) eq 'HASH') {
+        if ($info->{'selfenroll_types'}) {
+            my $showstart = &Apache::lonlocal::locallocaltime($info->{'selfenroll_start'});
+            my $showend = &Apache::lonlocal::locallocaltime($info->{'selfenroll_end'});
+            if (($info->{'selfenroll_end'} > 0) && ($info->{'selfenroll_end'} > $now)) {
+                if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
+                    $output = &mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
+                } else {
+                    $output = '<a href="javascript:ToSelfenroll('."'$course'".')">'.
+                              &mt('Enroll in course').'</a><br />';
+                    if ($info->{'selfenroll_end'} == 0) {
+                        $output .= &mt('Available permanently');
+                    } elsif ($info->{'selfenroll_end'} > $now) {
+                        $output .= &mt('Self-enrollment ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
+                    }
                 }
-                $output .= '</td>';
             }
-            $selfenroll = 1;
         }
     }
-    if (!$selfenroll) {
-        $output .= '<td>&nbsp;</td>';
-    }
-    $$countref ++;
     return $output;
 }