--- loncom/interface/coursecatalog.pm	2009/05/01 01:30:08	1.51
+++ loncom/interface/coursecatalog.pm	2014/01/15 18:49:19	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.51 2009/05/01 01:30:08 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.78 2014/01/15 18:49:19 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,13 +66,20 @@ 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');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
+    if ($env{'form.catalog_maxdepth'} ne '') {
+        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
+    }
+
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
     my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
@@ -87,10 +94,12 @@ sub handler {
     }
     &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,
                                            \%idx,\@jsarray,$subcats);
+    my ($numtitles,@codetitles);
     if ($env{'form.coursenum'} ne '' && &user_is_known()) {
-        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems);
+        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
+        my $wasacctext = &get_wasactive_text();
         my $catjs = <<"ENDSCRIPT";
 
 function setCatDepth(depth) {
@@ -113,13 +122,42 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript(); 
-        my $numtitles;
+        $catjs .= &courselink_javascript();
+        if (&user_is_dc($codedom)) {
+            $catjs .= <<ENDTOGGJS
+
+function toggleStatuses() {
+    if (document.$formname.showdetails.checked) {
+        document.getElementById('statuschoice').style.display='block';
+        document.getElementById('statuscell').style.borderLeft='1px solid'; 
+    } else {
+        document.getElementById('statuschoice').style.display='none';
+        document.getElementById('statuscell').style.borderLeft='0px';
+    }
+    return;
+}
+
+function toggleWasActive() {
+    if (document.getElementById('counts_Previous')) {
+        if (document.getElementById('counts_Previous').checked) {
+            document.getElementById('choosewasactive').style.display='block';
+            document.getElementById('choosewasacctext').innerHTML = '$wasacctext';
+        } else {
+            document.getElementById('choosewasactive').style.display='none';
+            document.getElementById('choosewasacctext').innerHTML = '';
+        }
+    }
+    return;
+}
+
+ENDTOGGJS
+        }
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   $catlinks,$catjs);
+                                                   $catlinks,$catjs,\@codetitles);
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom,$numtitles));
+                $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
+                                                \@codetitles));
             }
         } else {
             my (%add_entries);
@@ -149,16 +187,22 @@ ENDJS
                 for (my $i=0; $i<$deeper; $i++) {
                     $r->print('<input type="hidden" name="currcat_'.$i.'" value="'.$env{'form.currcat_'.$i}.'" />'."\n");
                 }
+                my $display_button;
+                if ($env{'form.currcat_0'} eq 'communities::0') {
+                    $display_button = &mt('Display communities');
+                } else {
+                    $display_button = &mt('Display courses');
+                }
                 $r->print('<input type="hidden" name="coursenum" value="" />'."\n".
                           '<input type="hidden" name="sortby" value="" />'."\n".
                           '<input type="hidden" name="state" value="listing" />'."\n".
                           '<input type="hidden" name="showdom" value="'.
                           $env{'form.showdom'}.'" />'.
                           '<input type="submit" name="catalogfilter" value="'.
-                          &mt('Display courses').'" /></form><br /><br />');
+                          $display_button.'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
+                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles));
             }
         }
     }
@@ -167,36 +211,50 @@ ENDJS
 }
 
 sub course_details {
-    my ($r,$codedom,$formname,$domdesc,$trails,$allitems) = @_;
+    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";
     my $start_page =
-        &Apache::loncommon::start_page('Course Catalog',$js,
-                                           {
-                                             'add_entries' => \%add_entries,
-                                             'no_inline_link'   => 1,});
+        &Apache::loncommon::start_page('Course/Community Catalog',$js,
+                                       {'add_entries' => \%add_entries, });
     $r->print($start_page);
     if ($env{'form.numtitles'} > 0) {
         &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Select courses"});
+                  text=>"Course/Community Catalog"});
+    }
+    my $brtextone = 'Course listing';
+    my $brtexttwo = 'Course details';
+    if ($env{'form.currcat_0'} eq 'communities::0') {
+        $brtextone = 'Community listing';
+        $brtexttwo = 'Community details';
     }
     &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"javascript:document.$formname.submit()",
-              text=>"Course listing"},
-             {text=>"Course details"});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details'));
-    $r->print('<br />'.&mt('Detailed course information:').'<br /><br />'.
-              &print_course_listing($codedom,undef,$trails,$allitems).
-              '<br /><br />');
-    $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
-              '<a href = "javascript:document.coursecatalog.submit()">'.
-              &mt('Back to course listing').'</a>'.
-              &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
-                                                       'showdetails','courseid']).'</form>');
+              text=>$brtextone},
+             {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).
+        '<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>'
+        ]).
+        &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
+                                                 'showdetails','courseid']).
+        '</form>');
     return;
 }
 
@@ -227,10 +285,9 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_;
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_;
     my %coursecodes = ();
     my %codes = ();
-    my @codetitles = ();
     my %cat_titles = ();
     my %cat_order = ();
     my %cat_items;
@@ -240,12 +297,15 @@ sub instcode_course_selector {
                        marginheight => "0",);
     my ($jscript,$totcodes,$numtitles,$lasttitle) = 
         &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
-                           \%cat_items,\@codetitles,\%cat_titles,\%cat_order);
+                           \%cat_items,$codetitles,\%cat_titles,\%cat_order);
     my $js = '<script type"text/javascript">'."\n$jscript\n$catjs\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();'
         }
         &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
         my $cat_maxdepth = $env{'form.catalog_maxdepth'};
@@ -257,12 +317,11 @@ sub instcode_course_selector {
         if ($numtitles > 0) {
             $r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'.
                       &Apache::courseclassifier::build_instcode_selectors($numtitles,
-                       $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order));
+                       $lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order));
         }
         $r->print('<input type="hidden" name="coursenum" value="" />'."\n".
                   '<input type="hidden" name="sortby" value="" />'."\n".
                   '<input type="hidden" name="state" value="listing" />'."\n".
-                  '<input type="hidden" name="form.currcat_0" value="instcode::0" />'."\n".
                   '<input type="submit" name="catalogfilter" value="'.
                   &mt('Display courses').'" />'.
                   '<input type="hidden" name="numtitles" value="'.$numtitles.
@@ -283,32 +342,30 @@ sub instcode_course_selector {
 sub cat_header {
     my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
     my $start_page =
-        &Apache::loncommon::start_page('Other',$js,
-                                       {
-                                         'add_entries' => $add_entries,
-                                         'no_inline_link'   => 1,});
+        &Apache::loncommon::start_page('Course/Community Catalog',$js,
+                                       { 'add_entries' => $add_entries, });
     $r->print($start_page);
+    my $brtext = 'Course listing';
+    if ($env{'form.currcat_0'} eq 'communities::0') {
+        $brtext = 'Community listing';
+    }
     if ($env{'form.state'} eq 'listing') {
         if ($numtitles > 0) {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Select courses"},
-                 {text=>"Course listing"});
+                  text=>"Course/Community Catalog"},
+                 {text=>$brtext});
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb
-            ({text=>"Course listing"});
+            ({text=>$brtext});
         }
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/coursecatalog",
-          text=>"Select courses"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
-    }
-    my $onchange;
-    unless (($env{'browser.interface'} eq 'textual') || ($env{'form.interface'} eq 'textual')) {
-        $onchange = 1;
+          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));
@@ -326,73 +383,69 @@ sub category_breadcrumbs {
     my ($dom,@cats) = @_;
     my $crumbsymbol = ' &#x25b6; ';
     my ($currdepth,$deeper) = &get_depth_values();
-    my $currcat_str = '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" /><input type="hidden" name="showdom" value="'.$dom.'" />';
-    my $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr>';
+    my $currcat_str = 
+        '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" />'.
+        '<input type="hidden" name="showdom" value="'.$dom.'" />';
+    my $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr><td>';
     my $has_subcats;
     my $selitem;
-    for (my $i=0; $i<$deeper; $i++) {
-        $currcat_str .= '<input type="hidden" name="currcat_'.$i.'" value="'.$env{'form.currcat_'.$i}.'" />';
-        my ($cattitle,$shallower);
-        if ($i == 0) {
-            if (ref($cats[0]) eq 'ARRAY') {
-                if (@{$cats[0]} > 1) {
-                    $cattitle = &mt('Main Categories');
-                }
+    if (ref($cats[0]) eq 'ARRAY') {
+        if (@{$cats[0]} == 0) {
+            $catlinks .= &mt('No categories defined in this domain'); 
+        } elsif (@{$cats[0]} == 1) {
+            if ($cats[0][0] eq 'instcode') {
+                $catlinks .= &mt('Official courses (with institutional codes)');
+                $env{'form.currcat_0'} = 'instcode::0';
+            } elsif ($cats[0][0] eq 'communities') {
+                $catlinks .= &mt('Communities');
+                $env{'form.currcat_0'} = 'communities::0';
+            } else {
+                my $name = $cats[0][0];
+                my $item = &escape($name).'::0';
+                $catlinks .= $name;
+                $env{'form.currcat_0'} = $item;
             }
+            $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
         } else {
-            $shallower = $i-1;
-            my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
-            $cattitle = $cat;
-        }
-        if ($cattitle ne '') {
-            $catlinks .= '<td valign="top"><a href="javascript:setCatDepth('."'$shallower'".')">'.$cattitle.'</a>'.$crumbsymbol.'</td>';
+            $catlinks .= &main_category_selector(@cats);
+            if (($env{'form.currcat_0'} ne '') && 
+                ($env{'form.currcat_0'} ne 'instcode::0')) {
+                $catlinks .= $crumbsymbol;
+            }
         }
-    }
-    if ($deeper == 0) {
-        $catlinks .= '<td>';
-        if (ref($cats[0]) eq 'ARRAY') {
-            if ((@{$cats[0]} == 1) && (@cats == 1)) {
-                if ($cats[0][0] eq 'instcode') {
-                    $catlinks .= &mt('Official courses (with institutional codes)').
-                                 '<input type="hidden" name="currcat_0" value="instcode::0" />';
-                    $env{'form.currcat_0'} = 'instcode::0';
-                } else {
-                    my $name = $cats[0][0];
-                    my $item = &escape($name).'::0';
-                    $catlinks .= $name.
-                             '<input type="hidden" name="currcat_0" value="'.$item.'" />';
-                    $env{'form.currcat_0'} = $item;
-                }
-            } else {
-                $has_subcats = 1;
-                my $buttontext = &mt('Show subcategories');
-                $selitem = 'currcat_0';
-                $catlinks .= '<select name="'.$selitem.'">'."\n";
-                if (@{$cats[0]} > 1) {
-                    $catlinks .= '<option value="" selected="selected">'.&mt('Select').'</option>'."\n";
-                    $buttontext = &mt('Pick main category');
-                }
-                for (my $i=0; $i<@{$cats[0]}; $i++) {
-                    my $name = $cats[0][$i];
-                    my $item = &escape($name).'::0';
-                    $catlinks .= '<option value="'.$item.'">';
-                    if ($name eq 'instcode') {
-                        $catlinks .= &mt('Official courses (with institutional codes)');
-                    } else {
-                        $catlinks .= $name;
+    } else {
+        $catlinks .= &mt('Official courses (with institutional codes)');
+                     $env{'form.currcat_0'} = 'instcode::0';
+         $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
+    }
+    if ($deeper) {
+        for (my $i=1; $i<=$deeper; $i++) {
+            my $shallower = $i-1;
+            next if ($shallower == 0);
+            my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
+            if ($cat ne '') {
+                $catlinks .= '<td valign="top">'.
+                             '<select name="currcat_'.$shallower.'" onchange="'.
+                             'setCatDepth('."'$shallower'".');this.form.submit();">';
+                if (ref($cats[$shallower]{$container}) eq 'ARRAY') {
+                    $catlinks .= '<option value="">'.&mt('De-select').'</option>';
+                    for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) {
+                        my $name = $cats[$shallower]{$container}[$j];
+                        my $item = &escape($name).':'.&escape($container).':'.$shallower;
+                        my $selected = '';
+                        if ($item eq $env{'form.currcat_'.$shallower}) {
+                            $selected = ' selected="selected"';
+                        }
+                        $catlinks .= 
+                           '<option value="'.$item.'"'.$selected.'>'.$name.'</option>';
                     }
-                    $catlinks .= '</option>'."\n";
                 }
-                $catlinks .= '</select>'."\n".
-                             '&nbsp;<input type="submit" name="gocats" value="'.
-                             $buttontext.'" />';
+                $catlinks .= '</select>';
             }
-        } else {
-            $catlinks .= &mt('Official courses (with institutional codes)').
-                         '<input type="hidden" name="currcat_0" value="instcode::0" />';
-            $env{'form.currcat_0'} = 'instcode::0';
+            unless ($i == $deeper) {
+                $catlinks .= $crumbsymbol;
+            } 
         }
-    } else {
         my ($cat,$container,$depth);
         if ($env{'form.currcat_'.$currdepth} eq '') {
             my $shallower = $currdepth - 1;
@@ -400,38 +453,66 @@ sub category_breadcrumbs {
         } else {
             ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth});
         }
-        my $deeper = $depth +1;
-        my $currcat = $cat;
-        if ($cat eq 'instcode') {
-            $currcat = &mt('Official courses (with institutional codes)');
-        }
-        $catlinks .= '<td><b>'.$currcat.'</b>';
-        if (ref($cats[$deeper]{$cat}) eq 'ARRAY') {
+        my $deeperlevel = $depth +1;
+        if (ref($cats[$deeperlevel]{$cat}) eq 'ARRAY') {
             $has_subcats = 1;
             my $buttontext = &mt('Show subcategories');
-            $selitem = 'currcat_'.$deeper;
-            $catlinks .= ':&nbsp;<select name="'.$selitem.'">';
-            if (@{$cats[$deeper]{$cat}} > 1) {
+            my $selitem = 'currcat_'.$deeperlevel;
+            $catlinks .= '&nbsp;<select name="'.$selitem.'" onchange="this.form.submit()">';
+            if (@{$cats[$deeperlevel]{$cat}}) {
                 $catlinks .= '<option value="" selected="selected">'.
-                             &mt('Select').'</option>';
-                $buttontext = &mt('Pick subcategory');
+                             &mt('Subcategory ...').'</option>';
             }
-            for (my $k=0; $k<@{$cats[$deeper]{$cat}}; $k++) {
-                my $name = $cats[$deeper]{$cat}[$k];
-                my $item = &escape($name).':'.&escape($cat).':'.$deeper;
+            for (my $k=0; $k<@{$cats[$deeperlevel]{$cat}}; $k++) {
+                my $name = $cats[$deeperlevel]{$cat}[$k];
+                my $item = &escape($name).':'.&escape($cat).':'.$deeperlevel;
                 $catlinks .= '<option value="'.$item.'">'.$name.'</option>'."\n";
             }
-            $catlinks .= '</select>'."\n".
-                         '&nbsp;<input type="submit" name="gocats" value="'.
-                         $buttontext.'" />';
+            $catlinks .= '</select>'."\n";
         } elsif ($cat ne 'instcode') {
             $catlinks .= '&nbsp;'.&mt('(No subcategories)');
         }
+    } else {
+        $selitem = 'currcat_0';
     }
     $catlinks .= $currcat_str.'</td></tr></table></td>';
     return ($catlinks,$has_subcats,$selitem);
 }
 
+sub main_category_selector {
+    my (@cats) = @_;
+    my $maincatlinks = '<select name="currcat_0" onchange="setCatDepth('."'0'".');this.form.submit();">'."\n";
+    if (ref($cats[0]) eq 'ARRAY') {
+        if (@{$cats[0]} > 1) {
+            my $selected = '';
+            if ($env{'form.currcat_0'} eq '') {
+                $selected = ' selected="selected"';    
+            }
+            $maincatlinks .= 
+                '<option value=""'.$selected.'>'.&mt('Select').'</option>'."\n";
+        }
+        for (my $i=0; $i<@{$cats[0]}; $i++) {
+            my $name = $cats[0][$i];
+            my $item = &escape($name).'::0';
+            my $selected;
+            if ($env{'form.currcat_0'} eq $item) {
+                $selected = ' selected="selected"';
+            }
+            $maincatlinks .= '<option value="'.$item.'"'.$selected.'>';
+            if ($name eq 'instcode') {
+                $maincatlinks .= &mt('Official courses (with institutional codes)');
+            } elsif ($name eq 'communities') {
+                $maincatlinks .= &mt('Communities');
+            } else {
+                $maincatlinks .= $name;
+            }
+            $maincatlinks .= '</option>'."\n";
+        }
+        $maincatlinks .= '</select>'."\n";
+    }
+    return $maincatlinks;
+}
+
 sub get_depth_values {
     my $currdepth = 0;
     my $deeper = 0;
@@ -448,8 +529,13 @@ sub get_depth_values {
 
 sub additional_filters {
     my ($codedom,$has_subcats) = @_;
-    my $output = '<table>';
-    if (($env{'form.currcat_0'} ne 'instcode::0') && 
+    my $is_dc = &user_is_dc($codedom);
+    my $output = '<div class="LC_left_float">';
+    if ($is_dc) {
+        $output .= '<fieldset><legend>'.&mt('Options').'</legend>';
+    }
+    $output .= '<table><tr><td valign="top">';
+    if (($env{'form.currcat_0'} ne 'instcode::0') &&
         ($env{'form.currcat_0'} ne '') && ($has_subcats)) {
         my $include_subcat_status;
         if ($env{'form.withsubcats'}) {
@@ -465,43 +551,152 @@ sub additional_filters {
         }
         my ($catname) = split(/:/,$env{'form.currcat_'.$counter});
         if ($catname ne '') {
-            $output .= '<tr><td><label>'.
+            $output .= '<span class="LC_nobreak"><label>'.
                        '<input type="checkbox" name="withsubcats" value="1" '.
                        $include_subcat_status.'/>'.
                        &mt('Include subcategories within "[_1]"',
-                           &unescape($catname)).'</label></td></tr>';
+                           &unescape($catname)).'</label></span><br />';
         }
     }
     my $show_selfenroll_status;
     if ($env{'form.showselfenroll'}) {
         $show_selfenroll_status = 'checked="checked" ';
     }
-    $output .= '<tr><td>'.
+    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)');
+    } else {
+        $selfenroll_text = &mt('Only show courses which currently allow self-enrollment (or will allow it in the future)');
+    }
+    $output .= '<span class="LC_nobreak">'.
                '<label><input type="checkbox" name="showselfenroll" value="1" '.
-               $show_selfenroll_status.'/>'.
-               &mt('Only show courses which allow self-enrollment').
-               '</label></td></tr>';
-    if (&user_is_dc($codedom)) {
+               $show_selfenroll_status.'/>'.$selfenroll_text.
+               '</label></span><br />';
+    if ($is_dc) {
+        my ($titlesref,$orderref) = &get_statustitles('filters');
         my $showdetails_status;
         if ($env{'form.showdetails'}) {
             $showdetails_status = 'checked="checked" ';
         }
         my $showhidden_status;
         if ($env{'form.showhidden'}) {
-             $showhidden_status = 'checked="checked" ';
+            $showhidden_status = 'checked="checked" ';
         }
+        my @currstatuses = &Apache::loncommon::get_env_multiple('form.showcounts');
         my $dc_title = &Apache::lonnet::plaintext('dc');
-        $output .= '<tr><td>'."\n".
-                   '<label><input type="checkbox" name="showdetails" value="1" '.
-                   $showdetails_status.'/>'.
-                   &mt('Show full details for each course ([_1] only)',$dc_title).
-                   '</label>'."\n".'</td></tr><tr><td>'.
+        my ($details_text,$hidden_text,$statusdisplay,$cellborder);
+        my $wasactivedisplay = 'none';
+        if ($env{'form.showdetails'}) {
+            $statusdisplay = 'block';
+            $cellborder = 'border-left: 1px solid;';
+            if (grep(/^Previous$/,@currstatuses)) {
+                $wasactivedisplay = 'block';
+            }
+        } else {
+            $statusdisplay = 'none';
+            $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);
+        }
+        $output .= '<span class="LC_nobreak">'.
                    '<label><input type="checkbox" name="showhidden" value="1" '.
-                   $showhidden_status.'/>'.
-                   &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title).
-                   '</label>'."\n".'</td></tr>';
+                   $showhidden_status.'/>'.$hidden_text.
+                   '</label></span><br />'."\n".
+                   '<span class="LC_nobreak">'.
+                   '<label><input type="checkbox" name="showdetails" value="1" '.
+                   $showdetails_status.'onclick="toggleStatuses();" />'.
+                   $details_text.'</label></span></td>'."\n".
+                   '<td id="statuscell" valign="top" style="'.$cellborder.'">'.
+                   '<div id="statuschoice" style="display:'.$statusdisplay.'">';
+        if (ref($orderref) eq 'ARRAY') {
+            if (@{$orderref} > 0) {
+                foreach my $type (@{$orderref}) {
+                    my $checked;
+                    if (grep(/^\Q$type\E$/,@currstatuses)) {
+                        $checked = ' checked="checked"';
+                    }
+                    my $title;
+                    if (ref($titlesref) eq 'HASH') {
+                        $title = $titlesref->{$type};
+                    }
+                    unless ($title) {
+                        $title = &mt($type);
+                    }
+                    my $onclick;
+                    if ($type eq 'Previous') {
+                        $onclick = ' onclick="toggleWasActive();"'; 
+                    }
+                    $output .= '<span class="LC_nobreak">'.
+                               '<label><input type="checkbox" id="counts_'.$type.'"'.
+                               ' name="showcounts" value="'.$type.'"'.$checked.$onclick.
+                               ' />'.$title.'</label></span>';
+                    if ($type eq 'Previous') {
+                        my %milestonetext = &Apache::lonlocal::texthash (
+                            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" class="LC_nobreak">';
+                        if ($checked) {
+                            $output .= &get_wasactive_text();
+                        }
+                        $output .= '</span>'.
+                                   '<div id="choosewasactive" style="display:'.$wasactivedisplay.'">'.
+                                   '<table>';
+                        my @milestones = ('accessend');
+                        if (&Apache::lonnet::auto_run(undef,$codedom)) {
+                            push(@milestones,'enrollend');
+                        }
+                        push(@milestones,'date');
+                        foreach my $item (@milestones) {
+                            my $checked;
+                            if ($env{'form.state'} eq 'listing') {
+                                if ($env{'form.wasactive'} eq $item) {
+                                    $checked = ' checked="checked"';
+                                }
+                            } elsif ($item eq 'accessend') {
+                                $checked = ' checked="checked"';
+                            }
+                            $output .=
+                                '<tr><td width="10">&nbsp;</td><td>'.
+                                '<span class="LC_nobreak"><label>'.
+                                '<input type="radio" value="'.$item.'" name="wasactive"'.$checked.' />'.
+                                $milestonetext{$item}.'</label></span>';
+                            if ($item eq 'date') {
+                                my $wasactiveon;
+                                if (grep(/^Previous$/,@currstatuses)) {
+                                    $wasactiveon =
+                                        &Apache::lonhtmlcommon::get_date_from_form('wasactiveon');
+                                } else {
+                                    $wasactiveon = 'now';
+                                }
+                                $output .= ' '.
+                                    &Apache::lonhtmlcommon::date_setter('coursecatalog',
+                                                                        'wasactiveon',
+                                                                        $wasactiveon,
+                                                                        '','','',1,'',
+                                                                        '','',1);
+                            }
+                            $output .= '</td></tr>';
+                        }
+                        $output .= '</table></div>';
+                    }
+                    $output .= '<br />';
+                }
+            }
+        }
+        $output .= '</div></td>';
+    } else {
+        $output .= '</td>';  
     }
-    $output .= '</table><br />';
+    $output .= '</tr></table></fieldset></div>'.
+               '<div style="clear:both;margin:0;"></div>';  
     return $output;
 }
 
@@ -518,9 +713,43 @@ sub user_is_dc {
     return;
 }
 
+sub get_statustitles {
+    my ($caller) = @_;
+    my @status_order = ('Active','Future','Previous');
+    my %status_title;
+    if ($caller eq 'filters') {
+        %status_title = &Apache::lonlocal::texthash(
+                           Previous => 'Show count for past access',
+                           Active => 'Show count for current student access',
+                           Future => 'Show count for future student access',
+                        );
+        if ($env{'form.currcat_0'} eq 'communities::0') {
+            $status_title{'Active'} = 'Show count for current member access';
+            $status_title{'Future'} = 'Show count for future member access'; 
+        }
+    } else {    
+        %status_title = &Apache::lonlocal::texthash(
+                           Previous => 'Previous access',
+                           Active => 'Current access',
+                           Future => 'Future access',
+                        );
+    }
+    return (\%status_title,\@status_order);
+}
+
+sub get_wasactive_text {
+    my $wasacctext = ' -- ';
+    if ($env{'form.currcat_0'} eq 'communities::0') {
+        $wasacctext .= &mt('where member access status was current ...');
+    } else {
+        $wasacctext .= &mt('where student access status was current ...');
+    }
+    return $wasacctext;
+}
+
 sub search_official_courselist {
-    my ($domain,$numtitles) = @_;
-    my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles);
+    my ($domain,$numtitles,$codetitles) = @_;
+    my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles,$codetitles);
     my $showhidden;
     if (&user_is_dc($domain)) {
         $showhidden = $env{'form.showhidden'};
@@ -559,20 +788,25 @@ sub search_courselist {
         } else {
             $filterstr = $filter; 
         }
-        my $showhidden;
+        my ($showhidden,$typefilter);
         if (&user_is_dc($domain)) {
             $showhidden = $env{'form.showhidden'};
         }
+        if ($env{'form.currcat_0'} eq 'communities::0') {
+            $typefilter = 'Community';
+        } else {
+            $typefilter = '.';
+        }
         %courses = 
             &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef,
-                                          '.',1,$env{'form.showselfenroll'},
+                                          $typefilter,1,$env{'form.showselfenroll'},
                                           $filterstr,$showhidden,'coursecatalog');
     }
     return %courses;
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
@@ -587,17 +821,29 @@ sub print_course_listing {
                                                  $env{'form.coursenum'},
                                                  undef,undef,'.',1);
         if (keys(%courses) == 0) {
-            $output .= &mt('The courseID provided does not match a course in this domain.');
+            $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 { 
+                $output .= &mt('The courseID provided does not match a course in this domain.');
+            }
+            $output .= '</p>';
             return $output;
         }
     } else {
         if ($env{'form.currcat_0'} eq 'instcode::0') {
-            %courses = &search_official_courselist($domain,$numtitles);
+            %courses = &search_official_courselist($domain,$numtitles,$codetitles);
         } else {
             %courses = &search_courselist($domain,$subcats);
         }
         if (keys(%courses) == 0) {
-            $output = &mt('No courses match the criteria you selected.');
+            $output = '<p class="LC_info">';
+            if ($env{'form.currcat_0'} eq 'communities::0') {
+                $output .= &mt('No communities 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))) {
@@ -609,7 +855,8 @@ sub print_course_listing {
     my $now = time;
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
-    $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig,$trails,$allitems);
+    $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
+                                     $now,\%domconfig,$trails,$allitems);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -618,14 +865,14 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$courses,$details,$usersections,$now,$domconfig,$trails,
-        $allitems) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,$domconfig,
+        $trails,$allitems) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
         $sortname{'Categories'} = 'cats';
         $sortname{'Title'} = 'title';
-        $sortname{'Owner(s)'} = 'owner';
+        $sortname{'Owner & Co-owner(s)'} = 'owner';
     }
     my $output = &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row();
@@ -635,7 +882,7 @@ sub construct_data_table {
     } else {
         push(@coltitles,'Categories');
     }
-    push(@coltitles,('Sections','Crosslisted','Title','Owner(s)'));
+    push(@coltitles,('Sections','Crosslisted','Title','Owner & Co-owner(s)'));
     if (ref($usersections) eq 'HASH') {
        $coltitles[1] = 'Your Section';
     }
@@ -650,20 +897,71 @@ sub construct_data_table {
         }
         $output .= '</th>';
     }
+    my (@fields,%fieldtitles,$wasactiveon);
     if ($knownuser) {
         if ($details) {
-            $output .=
-              '<th>'.&mt('Default Access Dates for Students').'</th>'.
-              '<th>'.&mt('Student Counts').'</th>'.
-              '<th>'.&mt('Auto-enrollment of[_1]registered students','<br />').'</th>';
+            if ($env{'form.currcat_0'} eq 'communities::0') {
+                $output .= '<th>'.&mt('Default Access Dates for Members').'</th>'.
+                           '<th>'.&mt('Member Counts').'</th>';
+            } else {
+                $output .=
+                    '<th>'.&mt('Default Access Dates for Students').'</th>'.
+                    '<th>'.&mt('Student Counts').'</th>'.
+                    '<th>'.&mt('Auto-enrollment of[_1]registered students','<br />').'</th>';
+            }
+            my ($titlesref,$orderref) = &get_statustitles();
+            my @statuses;
+            if (&user_is_dc($domain)) {
+                @statuses = &Apache::loncommon::get_env_multiple('form.showcounts');
+                if (grep(/^Previous$/,@statuses)) {
+                    if ($env{'form.wasactive'} eq 'date') { 
+                        $wasactiveon = 
+                            &Apache::lonhtmlcommon::get_date_from_form('wasactiveon');
+                    } else {
+                        $wasactiveon = $env{'form.wasactive'};
+                    }
+                }
+                if (ref($orderref) eq 'ARRAY') {
+                    foreach my $status (@{$orderref}) {
+                        if (grep(/^\Q$status\E$/,@statuses)) {
+                            push(@fields,$status); 
+                        }
+                    }
+                }
+            } else {
+                @fields = ('Active','Future');
+            }
+            foreach my $status (@fields) {
+                my $title;
+                if (ref($titlesref) eq 'HASH') {
+                    $title = $titlesref->{$status};
+                }
+                unless ($title) {
+                    $title = &mt($status);
+                }
+                $fieldtitles{$status} = $title;
+            }
         } else {
             $output .= '<th>'.&mt('Details').'</th>';
         }
     }
     $output .= '<th>'.&mt('Self-enroll (if permitted)').'</th>';
     &Apache::loncommon::end_data_table_header_row();
-    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$details,
-                                            $usersections);
+    my (%numbers,%creditsum);
+    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'} || $domdefaults{'textbookcredits'}) {
+            $showcredits = 1;
+            $defofficial = $domdefaults{'officialcredits'};
+            $defunofficial = $domdefaults{'unofficialcredits'};
+            $deftextbook = $domdefaults{'textbookcredits'};
+        }
+    }
+    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$details,
+                                            $usersections,\@fields,\%fieldtitles,
+                                            $wasactiveon,\%numbers,\%creditsum,
+                                            $showcredits,$defofficial,$defunofficial,$deftextbook);
     my %Sortby;
     foreach my $course (sort(keys(%{$courses}))) {
         if ($env{'form.sortby'} eq 'code') {
@@ -689,22 +987,84 @@ sub construct_data_table {
         @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
     }
     my $count = 1;
+    my $totalsec = 0;
     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);
+                                     \$count,$now,$course,$trails,$allitems,\%numbers);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
+    if (($knownuser) && ($count > 1) && $env{'form.showdetails'}) {
+        if (&user_is_dc($domain)) {
+            my %lt = &Apache::lonlocal::texthash (
+                                                     'Active'   => 'Total current students',
+                                                     'Future'   => 'Total future students',
+                                                     'Previous' => 'Total previous students',
+                                                     'courses'  => 'Total unique codes and courses without codes',
+                                                     'sections' => 'Total sections',
+                                                     'xlists'   => 'Total cross-listings',
+                                                 );
+            if ($showcredits) {
+                $lt{'cr_Active'} = &mt('Total current student credit hours');
+                $lt{'cr_Future'} = &mt('Total future student credit hours');
+                $lt{'cr_Previous'} = &mt('Total previous student credit hours');
+            }
+            if ($env{'form.currcat_0'} eq 'communities::0') {
+                $lt{'courses'} = &mt('Total communities');
+                $lt{'Active'} = &mt('Total current members'); 
+                $lt{'Future'} = &mt('Total future members');
+                $lt{'Previous'} = &mt('Total previous members');
+            }
+            my $colspan = 8;
+            if ($showcredits) {
+                $colspan = 4;
+            }
+            $output .= '<tr class="LC_footer_row">'.
+                       '<td colspan="2">&nbsp;</td>'.
+                       '<td colspan="'.$colspan.'">'.
+                       '<table border="0">';
+            foreach my $item ('courses','sections','xlists') {
+                $output .= '<tr>'.
+                           '<td>'.$lt{$item}.'</td><td>&nbsp;</td>'.
+                           '<td align="right">'.$numbers{$item}.'</td>'.
+                           '</tr>'."\n";
+            }
+            if (@fields > 0) { 
+                foreach my $status (@fields) {
+                    $output .= '<tr>'.
+                               '<td>'.$lt{$status}.'</td><td>&nbsp;</td>'.
+                               '<td align="right">'.$numbers{$status}.'</td>'.
+                               '</tr>'."\n";
+                }
+            }
+            $output .= '</table></td>';
+            if ($showcredits) {
+                $output .= '<td colspan="'.$colspan.'" valign="bottom"><table>';
+                foreach my $status (@fields) {
+                    $output .= '<tr>'.
+                               '<td>'.$lt{'cr_'.$status}.'</td><td>&nbsp;</td>'.
+                               '<td align="right">'.$creditsum{$status}.'</td></tr>';
+                }
+                $output .= '</table></td></tr>';
+            }
+        }
+    }
     $output .= &Apache::loncommon::end_data_table();
     return $output;
 }
 
 sub build_courseinfo_hash {
-    my ($courses,$knownuser,$details,$usersections) = @_;
+    my ($courses,$knownuser,$domain,$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)) {
+        $gettotals = 1;
+    }
+    my (%uniquecodes,$nocodes,$defcreds);
     foreach my $course (keys(%{$courses})) {
         my $descr;
         if (ref($courses->{$course}) eq 'HASH') {
@@ -726,14 +1086,19 @@ sub build_courseinfo_hash {
             $selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
             $categories = $courses->{$course}{'categories'};
             push(@owners,$singleowner);
-            if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {
-                foreach my $item (@{$courses->{$course}{'co-owners'}}) {
+            if ($courses->{$course}{'co-owners'} ne '') {
+                foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) {
                     push(@owners,$item);
                 }
             }
         }
+        if ($instcode ne '') {
+            $uniquecodes{$instcode} = 1;
+        } else {
+            $nocodes ++;
+        } 
         foreach my $owner (@owners) {
-            my ($ownername,$ownerdom) = @_; 
+            my ($ownername,$ownerdom); 
             if ($owner =~ /:/) {
                 ($ownername,$ownerdom) = split(/:/,$owner);
             } else {
@@ -769,26 +1134,54 @@ sub build_courseinfo_hash {
         my @crosslistings;
         my ($seclist,$numsec) = 
             &identify_sections($coursehash{'internal.sectionnums'});
-        if (ref($usersections) eq 'HASH') {
-            if (ref($usersections->{$course}) eq 'ARRAY') {
-                $seclist = join(', ',@{$usersections->{$course}});
-            }
-        }
         $courseinfo{$course}{'seclist'} = $seclist;
         my ($xlist_items,$numxlist) = 
             &identify_sections($coursehash{'internal.crosslistings'});
+        if (ref($numbers) eq 'HASH') {
+            $numbers->{'sections'} += $numsec; 
+            $numbers->{'xlists'} += $numxlist;  
+        }
         my $showsyllabus = 1; # default is to include a syllabus link
         if (defined($coursehash{'showsyllabus'})) {
             $showsyllabus = $coursehash{'showsyllabus'};
         }
         $courseinfo{$course}{'showsyllabus'} = $showsyllabus;
+        if ($showcredits) {
+            if ($coursehash{'internal.defaultcredits'}) {
+                $courseinfo{$course}{'defaultcredits'} = $coursehash{'internal.defaultcredits'};
+            } elsif ($instcode ne '') {
+                $courseinfo{$course}{'defaultcredits'} = $defofficial;
+            } else {
+                $courseinfo{$course}{'defaultcredits'} = $defunofficial;
+            }
+            $defcreds = $courseinfo{$course}{'defaultcredits'};
+        }
         if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) ||
             ($knownuser && ($details == 1))) {
-            $courseinfo{$course}{'counts'} =  &count_students($cdom,$cnum,$numsec);
-            $courseinfo{$course}{'autoenrollment'} =
-                &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items,
-                                 $instcode,\@owners,$cdom,$cnum);
-
+            my $milestone;
+            if ($wasactiveon eq 'accessend') {
+                if ($coursehash{'default_enrollment_end_date'}) {
+                    $milestone = $coursehash{'default_enrollment_end_date'};
+                } else {
+                    $milestone = time;
+                }
+            } elsif ($wasactiveon eq 'enrollend') {
+                if ($coursehash{'internal.autoend'}) {
+                    $milestone = $coursehash{'internal.autoend'};
+                } else {
+                    $milestone = time;
+                }
+            } else {
+                $milestone = $wasactiveon;
+            }
+            $courseinfo{$course}{'counts'} =  
+                &count_students($cdom,$cnum,$numsec,$fields,$fieldtitles,$gettotals,
+                                $numbers,$creditsum,$showcredits,$defcreds,$milestone);
+            if ($instcode ne '') {
+                $courseinfo{$course}{'autoenrollment'} =
+                    &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items,
+                                     $instcode,\@owners,$cdom,$cnum);
+            }
             my $startaccess = '';
             my $endaccess = '';
             my $accessdates;
@@ -841,39 +1234,83 @@ sub build_courseinfo_hash {
         }
         $courseinfo{$course}{'xlist'} = $xlist_items;
     }
+    if (ref($numbers) eq 'HASH') {
+        $numbers->{'courses'} = $nocodes + scalar(keys(%uniquecodes));
+    }
     return %courseinfo;
 }
 
 sub count_students {
-    my ($cdom,$cnum,$numsec) = @_;
+    my ($cdom,$cnum,$numsec,$fieldsref,$titlesref,$getcounts,$numbers,$creditsum,
+        $showcredits,$defcreds,$wasactiveon) = @_;
+    my $countslist = '<span class="LC_nobreak">'.
+                     &mt('[quant,_1,section,sections,No sections]',$numsec).'</span>';
+    my (@fields,%titles,$showexpired);
+    if ((ref($fieldsref) eq 'ARRAY') && (ref($titlesref) eq 'HASH') &&
+        (ref($numbers) eq 'HASH')) {
+        @fields = @{$fieldsref};
+        %titles = %{$titlesref};
+        if (grep(/^Previous$/,@fields)) {
+            $showexpired = 1;
+        }
+    } else {
+        return;
+    }
     my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum);
-    my %student_count = (
-                           Active => 0,
-                           Future => 0,
-                           Expired => 0,
-                       );
+    my (%student_count,%credit_count);
+    %student_count = (
+                           Active   => 0,
+                           Future   => 0,
+                           Previous => 0,
+                     );
+    if ($showcredits) {
+        %credit_count = (
+                          Active   => 0,
+                          Future   => 0,
+                          Previous => 0,
+                        );
+    }
     my %idx;
     $idx{'status'} = &Apache::loncoursedata::CL_STATUS();
-    my %status_title = &Apache::lonlocal::texthash(
-                           Expired => 'Previous access',
-                           Active => 'Current access',
-                           Future => 'Future access',
-                       );
-
+    $idx{'end'}    = &Apache::loncoursedata::CL_END();
+    $idx{'credits'} = &Apache::loncoursedata::CL_CREDITS();
     while (my ($student,$data) = each(%$classlist)) {
-        $student_count{$data->[$idx{'status'}]} ++;
+        my $status = $data->[$idx{'status'}];
+        my $credits = $data->[$idx{'credits'}];
+        if ($credits eq '') {
+            $credits = $defcreds;  
+        }
+        if ($status eq 'Expired') {
+            if (($showexpired) &&
+                ($data->[$idx{'end'}] >= $wasactiveon)) {
+                $student_count{'Previous'} ++;
+                if ($showcredits) {
+                    $credit_count{'Previous'} += $credits; 
+                }
+            }
+        } else {
+            $student_count{$status} ++;
+            if ($showcredits) {
+                $credit_count{$status} += $credits;
+            }
+        }
     }
-
-    my $countslist = &mt('[quant,_1,section:,sections:,No sections]',$numsec).'<br />';
-    foreach my $status ('Active','Future') {
-        $countslist .= '<span class="LC_nobreak">'.$status_title{$status}.': '.
-                       $student_count{$status}.'</span><br />';
+    if (@fields) {
+        $countslist .= ':<br />';
+        foreach my $status (@fields) {
+            $countslist .= '<span class="LC_nobreak">'.$titles{$status}.': '.
+                           $student_count{$status}.'</span><br />';
+            $numbers->{$status} += $student_count{$status};
+            if ($showcredits) {
+                $creditsum->{$status} += $credit_count{$status};
+            }
+        }
     }
     return $countslist;
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems) = @_;
+    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers) = @_;
     my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
         $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories);
     if (ref($info) eq 'HASH') {
@@ -925,9 +1362,11 @@ sub courseinfo_row {
     if ($knownuser) {
         if ($details) {
             $output .=
-               '<td>'.$accessdates.'</td>'. 
-               '<td>'.$counts.'</td>'.
-               '<td>'.$autoenrollment.'</td>';
+                '<td>'.$accessdates.'</td>'.
+                '<td>'.$counts.'</td>';
+            unless ($env{'form.currcat_0'} eq 'communities::0') {
+                $output .= '<td>'.$autoenrollment.'</td>';
+            }
         } else {
             $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
         }
@@ -940,7 +1379,13 @@ sub courseinfo_row {
             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></td>';
+                $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>');
+                }
+                $output .= '</td>';
             }
             $selfenroll = 1;
         }