--- loncom/interface/coursecatalog.pm	2013/11/21 16:34:23	1.58.4.9
+++ loncom/interface/coursecatalog.pm	2010/03/22 20:11:22	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.58.4.9 2013/11/21 16:34:23 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.59 2010/03/22 20:11:22 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,20 +66,13 @@ sub handler {
     }
     my $formname = 'coursecatalog';
     if ($env{'form.showdom'} ne '') {
-        $env{'form.showdom'} = &LONCAPA::clean_domain($env{'form.showdom'});
         if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
             $codedom = $env{'form.showdom'};
-        } else {
-            $env{'form.showdom'} = '';
         }
     }
     my $domdesc = &Apache::lonnet::domain($codedom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
-    if ($env{'form.catalog_maxdepth'} ne '') {
-        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
-    }
-
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
     my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
@@ -94,9 +87,8 @@ sub handler {
     }
     &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,
                                            \%idx,\@jsarray,$subcats);
-    my ($numtitles,@codetitles);
     if ($env{'form.coursenum'} ne '' && &user_is_known()) {
-        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
+        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
         my $catjs = <<"ENDSCRIPT";
@@ -122,12 +114,12 @@ function setCourseId(caller) {
 
 ENDSCRIPT
         $catjs .= &courselink_javascript(); 
+        my $numtitles;
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   $catlinks,$catjs,\@codetitles);
+                                                   $catlinks,$catjs);
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles));
+                $r->print(&print_course_listing($codedom,$numtitles));
             }
         } else {
             my (%add_entries);
@@ -172,7 +164,7 @@ ENDJS
                           $display_button.'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles));
+                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
             }
         }
     }
@@ -181,7 +173,7 @@ ENDJS
 }
 
 sub course_details {
-    my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_;
+    my ($r,$codedom,$formname,$domdesc,$trails,$allitems) = @_;
     my $output;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
@@ -189,42 +181,24 @@ 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 $brtexttwo = 'Course details';
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $brtextone = 'Community listing';
-        $brtexttwo = 'Community details';
-    }
     &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"javascript:document.$formname.submit()",
-              text=>$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).
+              text=>"Course listing"},
+             {text=>"Course details"});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+    $r->print('<br />'.&mt('Detailed course information:').'<br /><br />'.
+              &print_course_listing($codedom,undef,$trails,$allitems).
               '<br /><br />');
     $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
-              '<a href = "javascript:document.coursecatalog.submit()">');
-    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>'.
+              '<a href = "javascript:document.coursecatalog.submit()">'.
+              &mt('Back to course listing').'</a>'.
               &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
                                                        'showdetails','courseid']).'</form>');
     return;
@@ -257,9 +231,10 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_;
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_;
     my %coursecodes = ();
     my %codes = ();
+    my @codetitles = ();
     my %cat_titles = ();
     my %cat_order = ();
     my %cat_items;
@@ -269,7 +244,7 @@ sub instcode_course_selector {
                        marginheight => "0",);
     my ($jscript,$totcodes,$numtitles,$lasttitle) = 
         &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
-                           \%cat_items,$codetitles,\%cat_titles,\%cat_order);
+                           \%cat_items,\@codetitles,\%cat_titles,\%cat_order);
     my $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n".
               '</script>';
     if ($totcodes) {
@@ -286,11 +261,12 @@ sub instcode_course_selector {
         if ($numtitles > 0) {
             $r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'.
                       &Apache::courseclassifier::build_instcode_selectors($numtitles,
-                       $lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order));
+                       $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order));
         }
         $r->print('<input type="hidden" name="coursenum" value="" />'."\n".
                   '<input type="hidden" name="sortby" value="" />'."\n".
                   '<input type="hidden" name="state" value="listing" />'."\n".
+                  '<input type="hidden" name="form.currcat_0" value="instcode::0" />'."\n".
                   '<input type="submit" name="catalogfilter" value="'.
                   &mt('Display courses').'" />'.
                   '<input type="hidden" name="numtitles" value="'.$numtitles.
@@ -312,23 +288,17 @@ sub cat_header {
     my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
     my $start_page =
         &Apache::loncommon::start_page('Other',$js,
-                                       {
-                                         'add_entries' => $add_entries,
-                                         'no_inline_link'   => 1,});
+                                       { 'add_entries' => $add_entries, });
     $r->print($start_page);
-    my $brtext = 'Course listing';
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $brtext = 'Community listing';
-    }
     if ($env{'form.state'} eq 'listing') {
         if ($numtitles > 0) {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
                   text=>"Course/Community Catalog"},
-                 {text=>$brtext});
+                 {text=>"Course listing"});
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb
-            ({text=>$brtext});
+            ({text=>"Course listing"});
         }
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -407,7 +377,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).':'.&escape($container).':'.$shallower;
+                        my $item = &escape($name).':'.$container.':'.$shallower;
                         my $selected = '';
                         if ($item eq $env{'form.currcat_'.$shallower}) {
                             $selected = ' selected="selected"';
@@ -587,8 +557,8 @@ sub user_is_dc {
 }
 
 sub search_official_courselist {
-    my ($domain,$numtitles,$codetitles) = @_;
-    my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles,$codetitles);
+    my ($domain,$numtitles) = @_;
+    my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles);
     my $showhidden;
     if (&user_is_dc($domain)) {
         $showhidden = $env{'form.showhidden'};
@@ -645,7 +615,7 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
@@ -660,16 +630,12 @@ sub print_course_listing {
                                                  $env{'form.coursenum'},
                                                  undef,undef,'.',1);
         if (keys(%courses) == 0) {
-            if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output .= &mt('The courseID provided does not match a community in this domain.');
-            } else {
-                $output .= &mt('The courseID provided does not match a course in this domain.');
-            }
+            $output .= &mt('The courseID provided does not match a course in this domain.');
             return $output;
         }
     } else {
         if ($env{'form.currcat_0'} eq 'instcode::0') {
-            %courses = &search_official_courselist($domain,$numtitles,$codetitles);
+            %courses = &search_official_courselist($domain,$numtitles);
         } else {
             %courses = &search_courselist($domain,$subcats);
         }
@@ -733,14 +699,10 @@ sub construct_data_table {
     }
     if ($knownuser) {
         if ($details) {
-            if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output .= '<th>'.&mt('Default Access Dates for Members').'</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>';
-            }
+            $output .=
+              '<th>'.&mt('Default Access Dates for Students').'</th>'.
+              '<th>'.&mt('Student Counts').'</th>'.
+              '<th>'.&mt('Auto-enrollment of[_1]registered students','<br />').'</th>';
         } else {
             $output .= '<th>'.&mt('Details').'</th>';
         }
@@ -811,8 +773,8 @@ sub build_courseinfo_hash {
             $selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
             $categories = $courses->{$course}{'categories'};
             push(@owners,$singleowner);
-            if ($courses->{$course}{'co-owners'} ne '') {
-                foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) {
+            if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {
+                foreach my $item (@{$courses->{$course}{'co-owners'}}) {
                     push(@owners,$item);
                 }
             }
@@ -1009,14 +971,10 @@ 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>'.
+               '<td>'.$autoenrollment.'</td>';
         } else {
             $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
         }
@@ -1029,13 +987,7 @@ sub courseinfo_row {
             if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
                 $output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';
             } else { 
-                $output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a><br />';
-                if ($info->{'selfenroll_end'} == 0) {
-                    $output .= &mt('Available permanently');
-                } elsif ($info->{'selfenroll_end'} > $now) {
-                    $output .= &mt('Self-enrollment ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>');
-                }
-                $output .= '</td>';
+                $output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a></td>';
             }
             $selfenroll = 1;
         }