--- loncom/interface/coursecatalog.pm	2006/10/18 13:52:17	1.9
+++ loncom/interface/coursecatalog.pm	2008/06/20 13:45:12	1.31
@@ -1,3 +1,7 @@
+# The LearningOnline Network with CAPA
+# Handler for displaying the course catalog interface
+#
+# $Id: coursecatalog.pm,v 1.31 2008/06/20 13:45:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,31 +46,58 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
-    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-    my $lonid=$cookies{'lonID'};
+    my $handle = &Apache::lonnet::check_for_valid_session($r);
     my $lonidsdir=$r->dir_config('lonIDsDir');
-    my $handle;
-    if ($lonid) {
-        $handle=$lonid->value;
-        $handle=~s/\W//g;
-    }
-    if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
+    if ($handle ne '') {
         &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
     }
     &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']);
-    my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
-    my $formname = 'coursecatalog';
-    my $domdesc = $Apache::lonnet::domaindescription{$codedom};
 
+    my $codedom = &Apache::lonnet::default_login_domain();
+
+    if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { 
+        $codedom = $env{'user.domain'};
+        if ($env{'request.role.domain'} ne '') {
+            $codedom = $env{'request.role.domain'};
+        }
+    }
+    my $formname = 'coursecatalog';
+    if ($env{'form.showdom'} ne '') {
+        if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
+            $codedom = $env{'form.showdom'};
+        }
+    }
+    my $domdesc = &Apache::lonnet::domain($codedom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     if ($env{'form.coursenum'} ne '' && &user_is_known()) {
         &course_details($r,$codedom,$formname,$domdesc);
     } else {
-        &course_selector($r,$codedom,$formname,$domdesc);
-        if ($env{'form.state'} eq 'listing') {
-            $r->print('<br /><br />'.&print_course_listing($codedom).'<br />');
+        my $catlinks = &category_breadcrumbs($codedom);
+        my $catjs = <<"ENDSCRIPT";
+
+function setCatDepth(depth) {
+    document.coursecats.catalog_maxdepth.value = depth;
+    document.coursecats.submit();
+    return;
+}
+
+ENDSCRIPT
+        my $numtitles;
+        if ($env{'form.currcat_0'} eq 'instcode::0') {
+            $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
+                                                   $catlinks,$catjs);
+            if ($env{'form.state'} eq 'listing') {
+                $r->print(&print_course_listing($codedom,$numtitles));
+            }
+        } else {
+            my (%add_entries);
+            $catjs = '<script type="text/javascript">'."\n".$catjs."\n".'</script>';
+            &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks);
+            if ($env{'form.currcat_0'} ne '') {
+                $r->print(&print_course_listing($codedom));
+            }
         }
     }
     $r->print(&Apache::loncommon::end_page());
@@ -84,15 +115,18 @@ sub course_details {
                                              'add_entries' => \%add_entries,
                                              'no_inline_link'   => 1,});
     $r->print($start_page);
+    if ($env{'form.numtitles'} > 0) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>"/adm/coursecatalog",
+                  text=>"Select courses"});
+    }
     &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>"/adm/coursecatalog",
-              text=>"Select courses"},
-             {href=>"javascript:document.$formname.submit()",
+             ({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 />'.
-              '<form name="coursecatalog" method="post">'.
+              '<form name="'.$formname.'" method="post">'.
               &print_course_listing($codedom).'<br /><br />');
     $r->print('<a href = "javascript:document.coursecatalog.submit()">'.
               &mt('Back to course listing').'</a>'.
@@ -101,8 +135,8 @@ sub course_details {
               '<input type="hidden" name="state" value="listing" /></form>');
 }
 
-sub course_selector {
-    my ($r,$codedom,$formname,$domdesc) = @_;
+sub instcode_course_selector {
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_;
     my %coursecodes = ();
     my %codes = ();
     my @codetitles = ();
@@ -120,7 +154,10 @@ sub course_selector {
     my $totcodes = 0;
     my $jscript = '';
     my ($numtitles,$lasttitle);
-    $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
+    my %add_entries = (topmargin    => "0",
+                       marginheight => "0",);
+    my $js;
+    $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom);
     if ($totcodes > 0) {
         $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
         if ($format_reply eq 'ok') {
@@ -134,41 +171,49 @@ sub course_selector {
             if ($numtitles > 4) {
                 $lasttitle = 4;
             }
-            my @data = ('top');
-            for (my $k=0; $k<$lasttitle; $k++) {
-                my $cat = $codetitles[$k];
-                my $level = 1;
-                $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept);     }
-            $scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles);
-            $jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist);
-        }
-        if ($env{'form.state'} eq 'listing') {
-            $jscript .= '
+            if ($numtitles == 0) {
+                if (!defined($env{'form.state'})) {
+                    $env{'form.state'} = 'listing';
+                }
+            } else {
+                my @data = ('top');
+                for (my $k=0; $k<$lasttitle; $k++) {
+                    my $cat = $codetitles[$k];
+                    my $level = 1;
+                    $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept);
+                }
+                $scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles);
+                $jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist);
+                if ($env{'form.state'} eq 'listing') {
+                    $jscript .= '
 function setElements() {
 ';
-            for (my $i=0; $i<@codetitles-1; $i++) {
-                if ($env{'form.'.$codetitles[$i]} != -1) {
-                    $jscript .= '
+                    for (my $i=0; $i<@codetitles-1; $i++) {
+                        if ($env{'form.'.$codetitles[$i]} != -1) {
+                            $jscript .= '
     for (var j=0; j<document.'.$formname.'.'.$codetitles[$i].'.length; j++) {
         if (document.'.$formname.'.'.$codetitles[$i].'[j].value == "'.$env{'form.'.$codetitles[$i]}.'") {
             document.'.$formname.'.'.$codetitles[$i].'.selectedIndex = j;
         }
     }
 ';
-                }
-            }
-            $jscript .= '   courseSet()'."\n";
-            if ($env{'form.'.$codetitles[-1]} != -1) {
-                $jscript .= '
+                        }
+                    }
+                    $jscript .= '   courseSet()'."\n";
+                    if ($env{'form.'.$codetitles[-1]} != -1) {
+                        $jscript .= '
     for (var j=0; j<document.'.$formname.'.'.$codetitles[-1].'.length; j++) {
         if (document.'.$formname.'.'.$codetitles[-1].'[j].value == "'.$env{'form.'.$codetitles[-1]}.'") {
             document.'.$formname.'.'.$codetitles[-1].'.selectedIndex = j;
         }
     }
 ';
+                    }
+                    $jscript .= '}';
+                }
             }
-            $jscript .= '}';
-            $jscript .= qq|
+            if ($env{'form.state'} eq 'listing') {
+                $jscript .= qq|
 function changeSort(caller) {
     document.$formname.sortby.value = caller;
     document.$formname.submit();
@@ -177,40 +222,27 @@ function setCourseId(caller) {
    document.$formname.coursenum.value = caller;
    document.$formname.submit(); 
 }\n|;
+            }
         }
-        my $js = '<script type"text/javascript">'."\n$jscript\n".
-                 '</script>';
-        my %add_entries = (topmargin    => "0",
-                           marginheight => "0",);
-        if ($env{'form.state'} eq 'listing') {
+        $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n".
+              '</script>';
+        if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
             $add_entries{'onLoad'} = 'setElements()';
         }
-        my $start_page =
-            &Apache::loncommon::start_page('Course Catalog',$js,
-                                           {
-                                             'add_entries' => \%add_entries,
-                                             'no_inline_link'   => 1,});
-        $r->print($start_page);
-        if ($env{'form.state'} eq 'listing') {
-            &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>"/adm/coursecatalog",
-              text=>"Select courses"},
-             {text=>"Course listing"});
-             $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'));
-        }
-        $r->print('<h3>'.&mt('Display information about official [_1] classes for which LON-CAPA courses have been created:',$domdesc).'</h3>');
-        $r->print(&mt('<b>Choose which course(s) to list.</b><br />'));
-        $r->print('<form name="coursecatalog" method="post">');
+        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
+        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.'" />'.
+                  '<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'.
+                  '<input type="hidden" name="currcat_0" value="instcode::0" />');
         if ($numtitles > 0) {
+            $r->print('<br /><b>'.&mt('Choose which course(s) to list.').'</b><br />');
             $r->print('<table><tr>');
             for (my $k=0; $k<$lasttitle-1; $k++) {
-                my @unsorted = @{$cat_items{$codetitles[$k]}};
-                my @items;
+                my (@items,@unsorted);
+                if (ref($cat_items{$codetitles[$k]}) eq 'ARRAY') {
+                    @unsorted = @{$cat_items{$codetitles[$k]}};
+                }
                 &Apache::courseclassifier::sort_cats($k,\%cat_order,\@codetitles,\@unsorted,\@items);
                 my @longitems;
                 if (defined($cat_titles{$codetitles[$k]})) {
@@ -237,22 +269,195 @@ function setCourseId(caller) {
                       '</option>'."\n".'</select>'."\n".
                  '</td>'
                 );
+            my $show_selfenroll_status;
+            if ($env{'form.showselfenroll'}) {
+                $show_selfenroll_status = 'checked="checked" ';
+            }
+            if (&user_is_dc($codedom)) {
+                my $showdetails_status;
+                if ($env{'form.showdetails'}) {
+                    $showdetails_status = 'checked="checked" ';
+                }
+                $r->print('<td></td><td><label><input type="checkbox" name="showdetails" value="1" '.$showdetails_status.'/>'.&mt('Show full details for each course (DC only)').'</label><br /><label><input type="checkbox" name="showselfenroll" value="1" '.$show_selfenroll_status.'/>'.&mt('Only show courses which allow self-enrollment').'</label></td>');
+            } else {
+                $r->print('<td></td><td><br /><label><input type="checkbox" name="showselfenroll" value="1" '.$show_selfenroll_status.'/>'.&mt('Only show courses which allow self-enrollment').'</label></td>');
+            }
             $r->print('</tr></table>');
             if ($numtitles > 4) {
                 $r->print('<br /><br />'.$codetitles[$numtitles-1].'<br />'."\n".
                 '<input type="text" name="'.$codetitles[$numtitles-1].'" /><br />'."\n");
             }
+            $r->print('<br />');
+        }
+        $r->print('<input type="hidden" name="coursenum" value="" /><input type="hidden" name="sortby" value="" /><input type="hidden" name="state" value="listing" /><input type="hidden" name="form.currcat_0" value="instcode::0" />');
+        if ($numtitles > 0) {
+            $r->print('<input type="submit" name="catalogfilter" value="'.&mt('Display courses').'" />');
+        }
+        $r->print('<input type="hidden" name="numtitles" value="'.
+                  $numtitles.'" /></form>');
+        if (($numtitles > 0) && ($env{'form.state'} eq 'listing')) {
+            $r->print('<br />');
         }
-        $r->print('<br /><input type="hidden" name="coursenum" value="" /><input type="hidden" name="state" value="listing" /><input type="hidden" name="sortby" value="" /><input type="submit" name="catalogfilter" value="'.&mt('Display courses').'" /></form>');
     } else {
-        $r->print(&Apache::loncommon::start_page('Course Catalog','',
-                  {
-                   'no_inline_link'   => 1,}));
-        $r->print('<br />'.&mt('No official courses to display for [_1].',$domdesc));
+        &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
+        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.'" />'.
+                  '<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'.
+                  '<input type="hidden" name="currcat_0" value="instcode::0" />');
+        $r->print('<br />'.&mt('No official courses to display for [_1].',$domdesc).'</form>');
     }
+    return $numtitles;
+}
+
+sub cat_header {
+    my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
+    my $start_page =
+        &Apache::loncommon::start_page('Course Catalog',$js,
+                                       {
+                                         'add_entries' => $add_entries,
+                                         'no_inline_link'   => 1,});
+    $r->print($start_page);
+    if ($env{'form.state'} eq 'listing') {
+        if ($numtitles > 0) {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>"/adm/coursecatalog",
+                  text=>"Select courses"},
+                 {text=>"Course listing"});
+        } else {
+            &Apache::lonhtmlcommon::add_breadcrumb
+            ({text=>"Course listing"});
+        }
+        $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'));
+    }
+    $r->print('<table border="0"><tr>'.
+              '<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
+              '<td><b>'.&mt('Domain:').'</b></td><td>'.
+              &Apache::loncommon::select_dom_form($codedom,'showdom','',1).
+	      '&nbsp;<input type="submit" name="godom" value="Go"></td></form></tr><tr>'.
+	      '<form name="coursecats" method="post" action="/adm/coursecatalog">'.
+              $catlinks.'</form></tr></table>');
     return;
 }
 
+sub category_breadcrumbs {
+    my ($dom) = @_;
+    my %domconfig =
+        &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+    my (@cats,@trails,%allitems,%idx,@jsarray);
+    &Apache::loncommon::extract_categories($domconfig{'coursecategories'},\@cats,\@trails,
+                                           \%allitems,\%idx,\@jsarray);
+    my $currdepth = 0;
+    my $deeper = 0;
+    my $currcat_str;
+    if ($env{'form.catalog_maxdepth'} ne '') {
+        $currdepth = $env{'form.catalog_maxdepth'};
+        if ($env{'form.currcat_'.$currdepth} eq '') {
+            $deeper = $currdepth;
+        } else {
+            $deeper = $currdepth + 1;
+        }
+    }
+    $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>';
+    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) {
+            $cattitle = &mt('Main Categories');
+        } else {
+            $shallower = $i-1;
+            my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
+            $cattitle = $cat;
+        }
+        $catlinks .= '<td valign="top"><a href="javascript:setCatDepth('."'$shallower'".')">'.$cattitle.'</a>-&gt;</td>';
+    }
+    if ($deeper == 0) {
+        $catlinks .= '<td>'.&mt('Main Categories').':&nbsp;';
+        if (ref($cats[0]) eq 'ARRAY') {
+            if ((@{$cats[0]} == 1) && ($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 {
+                $catlinks .= '<select name="currcat_0">'."\n";
+                if (@{$cats[0]} > 1) {
+                    my $selstr;
+                    if ($env{'form.currcat_0'} eq '') {
+                        $selstr = ' selected="selected" ';
+                    }
+                    $catlinks .= '<option value=""'.$selstr.'>'.&mt('Select').'</option>'."\n";
+                }
+                for (my $i=0; $i<@{$cats[0]}; $i++) {
+                    my $name = $cats[0][$i];
+                    my $item = &escape($name).'::0';
+                    my $selstr;
+                    if ($env{'form.currcat_'.$i} eq $item) {
+                        $selstr = ' selected="selected" ';
+                    }
+                    $catlinks .= '<option value="'.$item.'"'.$selstr.'>';
+                    if ($name eq 'instcode') {
+                        $catlinks .= &mt('Official courses (with institutional codes)');
+                    } else {
+                        $catlinks .= $name;
+                    }
+                    $catlinks .= '</option>'."\n";
+                }
+                $catlinks .= '</select>'."\n".
+                             '&nbsp;<input type="submit" name="gocats" value="Go" />';
+            }
+        } else {
+            $catlinks .= &mt('Official courses (with institutional codes)').
+                         '<input type="hidden" name="currcat_0" value="instcode::0">';
+            $env{'form.currcat_0'} = 'instcode::0';
+        }
+    } else {
+        my ($cat,$container,$depth);
+        if ($env{'form.currcat_'.$currdepth} eq '') {
+            my $shallower = $currdepth - 1;
+            ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
+        } 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>'.$currcat;
+        if (ref($cats[$deeper]{$cat}) eq 'ARRAY') {
+            $catlinks .= ':&nbsp;<select name="currcat_'.$deeper.'">'.
+                         '<option value="" selected="selected">'.&mt('Select').'</option>';
+            for (my $k=0; $k<@{$cats[$deeper]{$cat}}; $k++) {
+                my $name = $cats[$deeper]{$cat}[$k];
+                my $item = &escape($name).':'.&escape($cat).':'.$deeper;
+                $catlinks .= '<option value="'.$item.'">'.$name.'</option>'."\n";
+            }
+            $catlinks .= '</select>'."\n".
+                         '&nbsp;<input type="submit" name="gocats" value="Go" />';
+        }
+    }
+    $catlinks .= $currcat_str.'</td></tr></table></td>';
+    return $catlinks;
+}
+
+sub user_is_dc {
+    my ($codedom) = @_;
+    if (exists($env{'user.role.dc./'.$codedom.'/'})) {
+        my $livedc = 1;
+        my $now = time;
+        my ($start,$end)=split(/\./,$env{'user.role.dc./'.$codedom.'/'});
+        if ($start && $start>$now) { $livedc = 0; }
+        if ($end   && $end  <$now) { $livedc = 0; }
+        return $livedc;
+    }
+    return;
+}
 
 sub recurse_options {
     my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_;
@@ -337,91 +542,148 @@ sub build_javascript {
     return $output;
 }
 
-sub search_courselist {
-    my ($domain) = @_;
-    my ($instcode,%codedefaults,@code_order);
-    my $defaults_result = 
-        &Apache::lonnet::auto_instcode_defaults($domain,\%codedefaults,
-                                               \@code_order);
-    if ($defaults_result eq 'ok') {
-        $instcode ='^';
-        foreach my $item (@code_order) {
-            if ($env{'form.'.$item} eq '0' ) {
-                $instcode .= $codedefaults{$item}; 
-            } else {
-                $instcode .= $env{'form.'.$item};
+sub search_official_courselist {
+    my ($domain,$numtitles) = @_;
+    my $instcode;
+    if (defined($numtitles) && $numtitles == 0) {
+        $instcode = '.+';
+    } else {
+        my (%codedefaults,@code_order);
+        my $defaults_result = 
+            &Apache::lonnet::auto_instcode_defaults($domain,\%codedefaults,
+                                                    \@code_order);
+        if ($defaults_result eq 'ok') {
+            $instcode ='^';
+            foreach my $item (@code_order) {
+                if ($env{'form.'.$item} eq '0' ) {
+                    $instcode .= $codedefaults{$item}; 
+                } else {
+                    $instcode .= $env{'form.'.$item};
+                }
             }
+            $instcode .= '$';
+        } else {
+            $instcode = '.';
         }
-        $instcode .= '$';
-    } else {
-        $instcode = '.';
     }
     my %courses = &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.',
-                                                undef,undef,'Course',1);
+                                                undef,undef,'Course',1,
+                                                $env{'form.showselfenroll'});
     return %courses;
 }
 
+sub search_courselist {
+    my ($domain) = @_;
+    my $cat_maxdepth = $env{'form.catalog_maxdepth'};
+    my $filter = $env{'form.currcat_'.$cat_maxdepth};
+    if (($filter eq '') && ($cat_maxdepth > 0)) {
+        my $shallower = $cat_maxdepth - 1;
+        $filter = $env{'form.currcat_'.$shallower};
+    }
+    my %courses;
+    if ($filter ne '') {
+        %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',
+                                                 undef,undef,'Course',1,
+                                                 $env{'form.showselfenroll'},$filter);
+    }
+    return %courses;
+}
 
 sub print_course_listing {
-    my ($domain) = @_;
+    my ($domain,$numtitles) = @_;
     my $output;
     my %courses;
+    my $knownuser = &user_is_known();
+    my $details = $env{'form.coursenum'};
+    if (&user_is_dc($domain)) {
+        if ($env{'form.showdetails'}) {
+            $details = 1;
+        }
+    }
     if ($env{'form.coursenum'} ne '') {
         %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.',
                                                  $env{'form.coursenum'},
-                                                 undef,undef,'Course');
+                                                 undef,undef,'Course',1);
         if (keys(%courses) == 0) {
             $output .= &mt('The courseID provided does not match a course in this domain.');
             return $output;
         }
     } else {
-        %courses = &search_courselist($domain);
+        if ($env{'form.currcat_0'} eq 'instcode::0') {
+            %courses = &search_official_courselist($domain,$numtitles);
+        } else {
+            %courses = &search_courselist($domain);
+        }
         if (keys(%courses) == 0) {
             $output = &mt('No courses match the criteria you selected.');
             return $output;
         }
-        if (&user_is_known()) {
-            $output = &mt('<b>Note for students:</b> If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.<br /><br />');
+        if ($knownuser && !$env{'form.showdetails'}) {
+            $output = '<b>'.&mt('Note for students:').'</b> '
+                     .&mt('If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.')
+                     .'<br /><br />';
         }
     }
-    $output .= &Apache::loncommon::start_data_table().
-               &Apache::loncommon::start_data_table_header_row();
-    my @coltitles = ('Code','Sections','Crosslisted','Title','Owner');
+    my $now = time;
+    my %domconfig =
+        &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+    $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig);
+    $output .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']);
+    return $output;
+}
+
+sub construct_data_table {
+    my ($knownuser,$courses,$details,$usersections,$now,$domconfig) = @_;
     my %sortname;
-    if ($env{'form.coursenum'} eq '') {
+    if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
         $sortname{'Title'} = 'title';
-        $sortname{'Owner'} = 'owner';
+        $sortname{'Owner(s)'} = 'owner';
+    }
+    my $output = &Apache::loncommon::start_data_table().
+                 &Apache::loncommon::start_data_table_header_row();
+    my @coltitles = ('Count','Code','Sections','Crosslisted','Title','Owner(s)');
+    if (ref($usersections) eq 'HASH') {
+       $coltitles[1] = 'Your Section';
     }
     foreach my $item (@coltitles) {
         $output .= '<th>';
         if (defined($sortname{$item})) {
             $output .= '<a href="javascript:changeSort('."'$sortname{$item}'".')">'.&mt($item).'</a>';
+        } elsif ($item eq 'Count') {
+            $output .= '&nbsp;&nbsp;';
         } else {
             $output .= &mt($item);
         }
         $output .= '</th>';
     }
-    if (&user_is_known()) {
-        if ($env{'form.coursenum'} eq '') {
-            $output .= '<th>&nbsp;</th>';
-        } else {
+    if ($knownuser) {
+        if ($details) {
             $output .=
               '<th>'.&mt('Default Access Dates for Students').'</th>'.
               '<th>'.&mt('Student Counts').'</th>'.
               '<th>'.&mt('Auto-enrollment of <br />registered students').'</th>';
+        } 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);
+    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$details,
+                                            $usersections);
     my %Sortby;
-    foreach my $course (sort(keys(%courses))) {
+    foreach my $course (sort(keys(%{$courses}))) {
         if ($env{'form.sortby'} eq 'code') {
             push(@{$Sortby{$courseinfo{$course}{'code'}}},$course);
         } elsif ($env{'form.sortby'} eq 'owner') {
-            push(@{$Sortby{$courseinfo{$course}{'ownerlastname'}}},$course);
+            push(@{$Sortby{$courseinfo{$course}{'ownerlastnames'}}},$course);
         } else {
-            push(@{$Sortby{$courseinfo{$course}{'title'}}},$course);
+            my $clean_title = $courseinfo{$course}{'title'};
+            $clean_title =~ s/\W+//g;
+            if ($clean_title eq '') {
+                $clean_title = $courseinfo{$course}{'title'};
+            }
+            push(@{$Sortby{$clean_title}},$course);
         }
     }
     my @sorted_courses;
@@ -430,94 +692,124 @@ sub print_course_listing {
     } else {
         @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
     }
+    my $count = 1;
     foreach my $item (@sorted_courses) {
         foreach my $course (@{$Sortby{$item}}) {
             $output.=&Apache::loncommon::start_data_table_row(); 
-            $output.=&courseinfo_row($courseinfo{$course});
+            $output.=&courseinfo_row($courseinfo{$course},$knownuser,
+                                     $details,\$count,$now,$course);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
     $output .= &Apache::loncommon::end_data_table();
-    my $echo = &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby']);
-    $output .= $echo;
     return $output;
 }
 
 sub build_courseinfo_hash {
-    my (%courses) = @_;
+    my ($courses,$knownuser,$details,$usersections) = @_;
     my %courseinfo;
     my $now = time;
-    foreach my $course (keys(%courses)) {
+    foreach my $course (keys(%{$courses})) {
         my $descr;
-        if ($courses{$course} =~ m/^([^:]*):/i) {
-            $descr = &unescape($1);
-        } else {
-            $descr = &unescape($courses{$course});
+        if (ref($courses->{$course}) eq 'HASH') {
+            $descr = $courses->{$course}{'description'}; 
         }
         my $cleandesc=&HTML::Entities::encode($descr,'<>&"');
         $cleandesc=~s/'/\\'/g;
+        $cleandesc =~ s/^\s+//;
         my ($cdom,$cnum)=split(/\_/,$course);
-
-        my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course});
-        $owner = &unescape($owner);
-        my ($ownername,$ownerdom);
-        if ($owner =~ /:/) {
-            ($ownername,$ownerdom) = split(/:/,$owner);
-        } else {
-            $ownername = $owner;
-            if ($owner ne '') {
-                $ownerdom = $cdom;
+        my ($descr,$instcode,$singleowner,$ttype,$selfenroll_types,
+            $selfenroll_start,$selfenroll_end,@owners,%ownernames);
+        if (ref($courses->{$course}) eq 'HASH') {
+            $descr = $courses->{$course}{'description'};
+            $instcode =  $courses->{$course}{'inst_code'};
+            $singleowner = $courses->{$course}{'owner'};
+            $ttype =  $courses->{$course}{'type'};
+            $selfenroll_types = $courses->{$course}{'selfenroll_types'};
+            $selfenroll_start = $courses->{$course}{'selfenroll_start_date'};
+            $selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
+            push(@owners,$singleowner);
+            if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {
+                foreach my $item (@{$courses->{$course}{'co-owners'}}) {
+                    push(@owners,$item);
+                }
             }
         }
-        my %ownernames;
-        if ($ownername ne '' && $ownerdom ne '') {
-            %ownernames = &Apache::loncommon::getnames($ownername,$ownerdom);
+        foreach my $owner (@owners) {
+            my ($ownername,$ownerdom) = @_; 
+            if ($owner =~ /:/) {
+                ($ownername,$ownerdom) = split(/:/,$owner);
+            } else {
+                $ownername = $owner;
+                if ($owner ne '') {
+                    $ownerdom = $cdom;
+                }
+            }
+            if ($ownername ne '' && $ownerdom ne '') {
+                my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom);
+                $ownernames{$ownername.':'.$ownerdom} = \%namehash; 
+            }
         }
         $courseinfo{$course}{'cdom'} = $cdom;
         $courseinfo{$course}{'cnum'} = $cnum;
         $courseinfo{$course}{'code'} = $instcode;
-        $courseinfo{$course}{'ownerlastname'} = $ownernames{'lastname'};
+        my @lastnames;
+        foreach my $owner (keys(%ownernames)) {
+            if (ref($ownernames{$owner}) eq 'HASH') {
+                push(@lastnames,$ownernames{$owner}{'lastname'});
+            }
+        }
+        $courseinfo{$course}{'ownerlastnames'} = join(', ',sort(@lastnames));
         $courseinfo{$course}{'title'} = $cleandesc;
-        $courseinfo{$course}{'owner'} = $owner;
+        $courseinfo{$course}{'owner'} = $singleowner;
+        $courseinfo{$course}{'selfenroll_types'} = $selfenroll_types;
+        $courseinfo{$course}{'selfenroll_start'} = $selfenroll_start;
+        $courseinfo{$course}{'selfenroll_end'} = $selfenroll_end;
 
         my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
         my @classids;
         my @crosslistings;
-        my $seclist = &identify_sections($coursehash{'internal.sectionnums'});
+        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 = &identify_sections($coursehash{'internal.crosslistings'});
+        my ($xlist_items,$numxlist) = 
+            &identify_sections($coursehash{'internal.crosslistings'});
         my $showsyllabus = 1; # default is to include a syllabus link
         if (defined($coursehash{'showsyllabus'})) {
             $showsyllabus = $coursehash{'showsyllabus'};
         }
         $courseinfo{$course}{'showsyllabus'} = $showsyllabus;
-        if (defined($env{'form.coursenum'})) {
-            if ($cnum eq $env{'form.coursenum'}) {
-                $courseinfo{$course}{'counts'} =  &count_students($cdom,$cnum);
-                $courseinfo{$course}{'autoenrollment'} =
-                   &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items,
-                                    $instcode,$owner,$cdom,$cnum);
-
-               my $startaccess = '';
-               my $endaccess = '';
-               my $accessdates;
-               if ( defined($coursehash{'default_enrollment_start_date'}) ) {
-                   $startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'});
-               }
-               if ( defined($coursehash{'default_enrollment_end_date'}) ) {
-                   $endaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_end_date'});
-                   if ($coursehash{'default_enrollment_end_date'} == 0) {
-                       $endaccess = "No ending date";
-                   }
-               }
-               if ($startaccess) {
-                   $accessdates .= &mt('<i>From:</i> ').$startaccess.'<br />';
-               }
-               if ($endaccess) {
-                   $accessdates .= &mt('<i>To:</i> ').$endaccess.'<br />';
-               }
-               $courseinfo{$course}{'access'} = $accessdates;
+        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 $startaccess = '';
+            my $endaccess = '';
+            my $accessdates;
+            if ( defined($coursehash{'default_enrollment_start_date'}) ) {
+                $startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'});
+            }
+            if ( defined($coursehash{'default_enrollment_end_date'}) ) {
+                $endaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_end_date'});
+                if ($coursehash{'default_enrollment_end_date'} == 0) {
+                    $endaccess = "No ending date";
+                }
+            }
+            if ($startaccess) {
+                $accessdates .= &mt('<i>From:</i> ').$startaccess.'<br />';
             }
+            if ($endaccess) {
+                $accessdates .= &mt('<i>To:</i> ').$endaccess.'<br />';
+            }
+            $courseinfo{$course}{'access'} = $accessdates;
         }
         if ($xlist_items eq '') {
             $xlist_items = &mt('No');
@@ -528,7 +820,7 @@ sub build_courseinfo_hash {
 }
 
 sub count_students {
-    my ($cdom,$cnum) = @_;
+    my ($cdom,$cnum,$numsec) = @_;
     my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum);
     my %student_count = (
                            Active => 0,
@@ -547,7 +839,7 @@ sub count_students {
         $student_count{$data->[$idx{'status'}]} ++;
     }
 
-    my $countslist;
+    my $countslist = &mt('[quant,_1,section]',$numsec).':<br />';
     foreach my $status ('Active','Future') {
         $countslist .= '<nobr>'.$status_title{$status}.': '.
                        $student_count{$status}.'</nobr><br />';
@@ -556,14 +848,14 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info) = @_;
+    my ($info,$knownuser,$details,$countref,$now,$course) = @_;
     my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
         $accessdates,$showsyllabus,$counts,$autoenrollment,$output);
     if (ref($info) eq 'HASH') {
         $cdom = $info->{'cdom'};
         $cnum = $info->{'cnum'};
         $title = $info->{'title'};
-        $ownerlast = $info->{'ownerlastname'};
+        $ownerlast = $info->{'ownerlastnames'};
         $code = $info->{'code'};
         $owner = $info->{'owner'};
         $seclist = $info->{'seclist'};
@@ -577,7 +869,8 @@ sub courseinfo_row {
                                          $code).'</td>';
         return $output;
     }
-    $output .= '<td>'.$code.'</td>'.
+    $output .= '<td>'.$$countref.'</td>'.
+               '<td>'.$code.'</td>'.
                '<td>'.$seclist.'</td>'.
                '<td>'.$xlist_items.'</td>'.
                '<td>'.$title.'&nbsp;<font size="-2">';
@@ -588,16 +881,33 @@ sub courseinfo_row {
     }
     $output .= '</font></td>'.
                '<td>'.$ownerlast.'</td>';
-    if (&user_is_known()) {
-        if ($env{'form.coursenum'} eq '') {
-            $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
-        } else { 
+    if ($knownuser) {
+        if ($details) {
             $output .=
                '<td>'.$accessdates.'</td>'. 
                '<td>'.$counts.'</td>'.
                '<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="/adm/selfenroll?cid='.$course.'">'.&mt('Enroll in course').'</a></td>';
+            }
+            $selfenroll = 1;
+        }
+    }
+    if (!$selfenroll) {
+        $output .= '<td>&nbsp;</td>';
+    }
+    $$countref ++;
     return $output;
 }
 
@@ -620,20 +930,21 @@ sub identify_sections {
     }
     @secnums = sort {$a <=> $b} @secnums;
     my $seclist = join(', ',@secnums);
-    return $seclist;
+    my $numsec = @secnums;
+    return ($seclist,$numsec);
 }
 
 sub get_valid_classes {
-    my ($seclist,$xlist_items,$crscode,$owner,$cdom,$cnum) = @_;
+    my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
     my $response;
     my %validations;
     @{$validations{'sections'}} = ();
     @{$validations{'xlists'}} = ();
     my $totalitems = 0;
     if ($seclist) {
-        foreach my $sec (split(',',$seclist)) {
+        foreach my $sec (split(/, /,$seclist)) {
             my $class = $crscode.$sec;
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner,
+            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
 							 $class) eq 'ok') {
                 if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) {
                     push(@{$validations{'sections'}},$sec);
@@ -643,8 +954,8 @@ sub get_valid_classes {
         }
     }
     if ($xlist_items) {
-        foreach my $item (split(',',$xlist_items)) {
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner,
+        foreach my $item (split(/, /,$xlist_items)) {
+            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
 							 $item) eq 'ok') {
                 if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) {
                     push(@{$validations{'xlists'}},$item);
@@ -656,11 +967,11 @@ sub get_valid_classes {
     if ($totalitems > 0) {
         if (@{$validations{'sections'}}) {
             $response = &mt('Sections: ').
-                        join(',',@{$validations{'sections'}}).'<br />';
+                        join(', ',@{$validations{'sections'}}).'<br />';
         }
         if (@{$validations{'xlists'}}) {
             $response .= &mt('Courses: ').
-                        join(',',@{$validations{'xlists'}});
+                        join(', ',@{$validations{'xlists'}});
         }
     }
     return $response;
@@ -806,7 +1117,7 @@ END
 }
 
 sub autoenroll_info {
-    my ($coursehash,$now,$seclist,$xlist_items,$code,$owner,$cdom,$cnum) = @_;
+    my ($coursehash,$now,$seclist,$xlist_items,$code,$owners,$cdom,$cnum) = @_;
     my $autoenrolldates = &mt('Not enabled');
     if (defined($coursehash->{'internal.autoadds'}) && $coursehash->{'internal.autoadds'} == 1) {
         my ($autostart,$autoend);
@@ -822,7 +1133,7 @@ sub autoenroll_info {
             } else {
                 my $valid_classes = 
                    &get_valid_classes($seclist,$xlist_items,$code,
-                                      $owner,$cdom,$cnum);
+                                      $owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
                     $autoenrolldates = &mt('Not enabled<br />Starts: ').
                                        $autostart.'<br />'.$valid_classes;                }
@@ -832,7 +1143,7 @@ sub autoenroll_info {
                 $autoenrolldates = &mt('Not enabled<br />Ended: ').$autoend;
             } else {
                 my $valid_classes = &get_valid_classes($seclist,$xlist_items,
-                                                       $code,$owner,$cdom,$cnum);
+                                                       $code,$owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
                     $autoenrolldates = &mt('Currently enabled<br />').
                                        $valid_classes;