--- loncom/interface/coursecatalog.pm	2010/08/14 02:00:27	1.58.4.2
+++ loncom/interface/coursecatalog.pm	2014/05/17 23:14:41	1.85
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.58.4.2 2010/08/14 02:00:27 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.85 2014/05/17 23:14:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,8 +66,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,27 +78,154 @@ 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 ($cathash,$cattype);
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
         $cathash = $domconfig{'coursecategories'}{'cats'};
+        if ($knownuser) {
+            $cattype = $domconfig{'coursecategories'}{'auth'};
+        } else {
+            $cattype = $domconfig{'coursecategories'}{'unauth'};
+        }
+        if ($cattype eq '') {
+            $cattype = 'std';
+        }
     } else {
         $cathash = {};
+        $cattype = 'std';
     }
-    my $subcats;
+    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) {
+            $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);
+                    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'};
+        }
+    }
+
+    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.currcat_0'} eq 'instcode::0') {
-            $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   undef,undef,\@codetitles);
-        }
+    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);
+        my $wasacctext = &get_wasactive_text();
         my $catjs = <<"ENDSCRIPT";
 
 function setCatDepth(depth) {
@@ -118,10 +248,39 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript(); 
+        $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,\@codetitles);
+                                                   $catlinks,$catjs,\@codetitles,$cattype);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
                                                 \@codetitles));
@@ -144,7 +303,7 @@ 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">'.
@@ -186,16 +345,14 @@ sub course_details {
              &courselink_javascript().'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
-                                           {
-                                             'add_entries' => \%add_entries,
-                                             'no_inline_link'   => 1,});
+                                       {'add_entries' => \%add_entries, });
     $r->print($start_page);
     if ($env{'form.numtitles'} > 0) {
         &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
                   text=>"Course/Community Catalog"});
     }
-    my $brtextone = 'Course listing'; 
+    my $brtextone = 'Course listing';
     my $brtexttwo = 'Course details';
     if ($env{'form.currcat_0'} eq 'communities::0') {
         $brtextone = 'Community listing';
@@ -205,28 +362,48 @@ sub course_details {
              ({href=>"javascript:document.$formname.submit()",
               text=>$brtextone},
              {text=>$brtexttwo});
-    $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>'.
+        (($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;
 }
 
+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";
 
@@ -254,7 +431,7 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_;
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype) = @_;
     my %coursecodes = ();
     my %codes = ();
     my %cat_titles = ();
@@ -267,13 +444,19 @@ 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();'
         }
-        &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".
@@ -288,14 +471,17 @@ sub instcode_course_selector {
         $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.
                   '" /></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.'" />'.
@@ -307,12 +493,10 @@ 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('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') {
@@ -334,18 +518,17 @@ sub cat_header {
           text=>"Course/Community Catalog"});
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-    my $onchange;
-    unless ($env{'form.interface'} eq 'textual') {
-        $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;
@@ -383,8 +566,6 @@ sub category_breadcrumbs {
             if (($env{'form.currcat_0'} ne '') && 
                 ($env{'form.currcat_0'} ne 'instcode::0')) {
                 $catlinks .= $crumbsymbol;
-            } else {
-                $catlinks .= '</td>';
             }
         }
     } else {
@@ -405,7 +586,7 @@ sub category_breadcrumbs {
                     $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).':'.$container.':'.$shallower;
+                        my $item = &escape($name).':'.&escape($container).':'.$shallower;
                         my $selected = '';
                         if ($item eq $env{'form.currcat_'.$shallower}) {
                             $selected = ' selected="selected"';
@@ -503,8 +684,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'}) {
@@ -520,11 +706,11 @@ 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;
@@ -533,25 +719,38 @@ sub additional_filters {
     }
     my $selfenroll_text;
     if ($env{'form.currcat_0'} eq 'communities::0') {
-        $selfenroll_text = &mt('Only show communities which allow self-enrollment');
+        $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 allow self-enrollment');
+        $selfenroll_text = &mt('Only show courses which currently allow self-enrollment (or will allow it in the future)');
     }
-    $output .= '<tr><td>'.
+    $output .= '<span class="LC_nobreak">'.
                '<label><input type="checkbox" name="showselfenroll" value="1" '.
                $show_selfenroll_status.'/>'.$selfenroll_text.
-               '</label></td></tr>';
-    if (&user_is_dc($codedom)) {
+               '</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');
-        my ($details_text,$hidden_text);
+        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);
@@ -559,15 +758,100 @@ sub additional_filters {
             $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 .= '<tr><td>'."\n".
-                   '<label><input type="checkbox" name="showdetails" value="1" '.
-                   $showdetails_status.'/>'.$details_text.
-                   '</label>'."\n".'</td></tr><tr><td>'.
+        $output .= '<span class="LC_nobreak">'.
                    '<label><input type="checkbox" name="showhidden" value="1" '.
                    $showhidden_status.'/>'.$hidden_text.
-                   '</label>'."\n".'</td></tr>';
+                   '</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;
 }
 
@@ -584,6 +868,40 @@ 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,$codetitles) = @_;
     my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles,$codetitles);
@@ -658,11 +976,13 @@ 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 {
+            } else { 
                 $output .= &mt('The courseID provided does not match a course in this domain.');
             }
+            $output .= '</p>';
             return $output;
         }
     } else {
@@ -672,11 +992,13 @@ 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 = &mt('No communities match the criteria you selected.');
+                $output .= &mt('No communities match the criteria you selected.');
             } else {
-                $output = &mt('No courses match the criteria you selected.');
+                $output .= &mt('No courses match the criteria you selected.');
             }
+            $output .= '</p>';
             return $output;
         }
         if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) {
@@ -686,9 +1008,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,$trails,$allitems);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -697,14 +1018,13 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$courses,$details,$usersections,$now,$domconfig,$trails,
-        $allitems) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,$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();
@@ -714,7 +1034,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';
     }
@@ -729,24 +1049,71 @@ sub construct_data_table {
         }
         $output .= '</th>';
     }
+    my (@fields,%fieldtitles,$wasactiveon);
     if ($knownuser) {
         if ($details) {
             if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output .= '<th>'.&mt('Default Access Dates for Members').'</th>';
+                $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') {
@@ -772,22 +1139,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') {
@@ -809,12 +1238,17 @@ 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); 
             if ($owner =~ /:/) {
@@ -852,26 +1286,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;
@@ -924,39 +1386,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') {
@@ -1007,38 +1513,52 @@ sub courseinfo_row {
                '<td>'.$ownerlast.'</td>';
     if ($knownuser) {
         if ($details) {
-            if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output .= '<td>'.$accessdates.'</td>';
-            } else {
-                $output .=
-                    '<td>'.$accessdates.'</td>'.
-                    '<td>'.$counts.'</td>'.
-                    '<td>'.$autoenrollment.'</td>';
+            $output .=
+                '<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>';
         }
     }
-    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></td>';
-            }
-            $selfenroll = 1;
-        }
-    }
-    if (!$selfenroll) {
+    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>');
+                    }
+                }
+            }
+        }
+    }
+    return $output;
+}
+
 sub identify_sections {
     my ($seclist) = @_;
     my @secnums;