--- loncom/interface/coursecatalog.pm 2006/12/05 02:55:51 1.11 +++ loncom/interface/coursecatalog.pm 2009/03/18 20:58:02 1.50 @@ -1,3 +1,7 @@ +# The LearningOnline Network with CAPA +# Handler for displaying the course catalog interface +# +# $Id: coursecatalog.pm,v 1.50 2009/03/18 20:58:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,66 +46,189 @@ 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) { - my $handle=&LONCAPA::clean_handle($lonid->value); - } - 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}; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['sortby','showdom']); + 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(); + + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); + my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash); + if (ref($domconfig{'coursecategories'}) eq 'HASH') { + $cathash = $domconfig{'coursecategories'}{'cats'}; + } else { + $cathash = {}; + } + my $subcats; + if ($env{'form.withsubcats'}) { + $subcats = \%subcathash; + } + &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, + \%idx,\@jsarray,$subcats); if ($env{'form.coursenum'} ne '' && &user_is_known()) { - &course_details($r,$codedom,$formname,$domdesc); + &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems); } else { - &course_selector($r,$codedom,$formname,$domdesc); - if ($env{'form.state'} eq 'listing') { - $r->print('<br /><br />'.&print_course_listing($codedom).'<br />'); + my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); + my $catjs = <<"ENDSCRIPT"; + +function setCatDepth(depth) { + document.coursecats.catalog_maxdepth.value = depth; + if (depth == '') { + document.coursecats.currcat_0.value = ''; + } + document.coursecats.submit(); + return; +} + +function changeSort(caller) { + document.$formname.sortby.value = caller; + document.$formname.submit(); +} + +function setCourseId(caller) { + document.$formname.coursenum.value = caller; + document.$formname.submit(); +} + +ENDSCRIPT + $catjs .= &courselink_javascript(); + 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); + my ($currdepth,$deeper) = &get_depth_values(); + if ($selitem) { + my $alert = &mt('Choose a subcategory to display'); + if (!$deeper) { + $alert = &mt('Choose a category to display'); + } + $catjs .= <<ENDJS; +function check_selected() { + if (document.coursecats.$selitem.options[document.coursecats.$selitem.selectedIndex].value == "") { + alert('$alert'); + return false; + } +} +ENDJS + } + $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('<form name="'.$formname. + '" method="post" action="/adm/coursecatalog">'. + &additional_filters($codedom,$has_subcats)."\n"); + $r->print('<input type="hidden" name="catalog_maxdepth" value="'. + $deeper.'" />'."\n"); + for (my $i=0; $i<$deeper; $i++) { + $r->print('<input type="hidden" name="currcat_'.$i.'" value="'.$env{'form.currcat_'.$i}.'" />'."\n"); + } + $r->print('<input type="hidden" name="coursenum" value="" />'."\n". + '<input type="hidden" name="sortby" value="" />'."\n". + '<input type="hidden" name="state" value="listing" />'."\n". + '<input type="hidden" name="showdom" value="'. + $env{'form.showdom'}.'" />'. + '<input type="submit" name="catalogfilter" value="'. + &mt('Display courses').'" /></form><br /><br />'); + } + if ($env{'form.state'} eq 'listing') { + $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats)); + } } } - $r->print(&Apache::loncommon::end_page()); + $r->print('<br />'.&Apache::loncommon::end_page()); return OK; } sub course_details { - my ($r,$codedom,$formname,$domdesc) = @_; + my ($r,$codedom,$formname,$domdesc,$trails,$allitems) = @_; my $output; my %add_entries = (topmargin => "0", marginheight => "0",); + my $js = '<script type="text/javascript">'."\n". + &courselink_javascript().'</script>'."\n"; my $start_page = - &Apache::loncommon::start_page('Course Catalog','', + &Apache::loncommon::start_page('Course Catalog',$js, { '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">'. - &print_course_listing($codedom).'<br /><br />'); - $r->print('<a href = "javascript:document.coursecatalog.submit()">'. + &print_course_listing($codedom,undef,$trails,$allitems). + '<br /><br />'); + $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'. + '<a href = "javascript:document.coursecatalog.submit()">'. &mt('Back to course listing').'</a>'. - '<input type="hidden" name="sortby" value="'. - $env{'form.sortby'}.'" />'. - '<input type="hidden" name="state" value="listing" /></form>'); + &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter', + 'showdetails','courseid']).'</form>'); + return; } -sub course_selector { - my ($r,$codedom,$formname,$domdesc) = @_; +sub courselink_javascript { + return <<"END"; + +function ToSyllabus(cdom,cnum) { + if (cdom == '' || cdom == null) { + return; + } + if (cnum == '' || cnum == null) { + return; + } + document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus"; + document.linklaunch.submit(); +} + +function ToSelfenroll(courseid) { + if (courseid == '') { + return; + } + document.linklaunch.action = "/adm/selfenroll"; + document.linklaunch.courseid.value = courseid; + document.linklaunch.submit(); +} + +END +} + + +sub instcode_course_selector { + my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_; my %coursecodes = (); my %codes = (); my @codetitles = (); @@ -119,7 +246,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') { @@ -133,83 +263,68 @@ 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| -function changeSort(caller) { - document.$formname.sortby.value = caller; - document.$formname.submit(); -} -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.'" />'."\n". + '<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'."\n". + '<input type="hidden" name="currcat_0" value="instcode::0" />'. + &additional_filters($codedom)); if ($numtitles > 0) { + $r->print('<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]})) { @@ -234,24 +349,271 @@ function setCourseId(caller) { '<select name="'.$codetitles[$lasttitle-1].'">'."\n". '<option value="0">All'."\n". '</option>'."\n".'</select>'."\n". - '</td>' - ); - $r->print('</tr></table>'); + '</td></tr></table>'."\n"); 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('<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>'); + $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 { - $r->print(&Apache::loncommon::start_page('Course Catalog','', - { - 'no_inline_link' => 1,})); - $r->print('<br />'.&mt('No official courses to display for [_1].',$domdesc)); + $js = '<script type"text/javascript">'."\n$catjs\n".'</script>'; + &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('Other',$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')); + } + my $onchange; + unless (($env{'browser.interface'} eq 'textual') || ($env{'form.interface'} eq 'textual')) { + $onchange = 1; + } + $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(' <input type="submit" name="godom" value="'.&mt('Change').'" />'); + } + $r->print('</td></tr></table></form>'. + '<form name="coursecats" method="post" action="/adm/coursecatalog"'. + ' onsubmit="return check_selected();">'. + '<table border="0"><tr>'.$catlinks.'</tr></table></form>'); return; } +sub category_breadcrumbs { + my ($dom,@cats) = @_; + my $crumbsymbol = ' ▶ '; + my ($currdepth,$deeper) = &get_depth_values(); + my $currcat_str = '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" /><input type="hidden" name="showdom" value="'.$dom.'" />'; + my $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr>'; + my $has_subcats; + my $selitem; + for (my $i=0; $i<$deeper; $i++) { + $currcat_str .= '<input type="hidden" name="currcat_'.$i.'" value="'.$env{'form.currcat_'.$i}.'" />'; + my ($cattitle,$shallower); + if ($i == 0) { + if (ref($cats[0]) eq 'ARRAY') { + if (@{$cats[0]} > 1) { + $cattitle = &mt('Main Categories'); + } + } + } else { + $shallower = $i-1; + my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); + $cattitle = $cat; + } + if ($cattitle ne '') { + $catlinks .= '<td valign="top"><a href="javascript:setCatDepth('."'$shallower'".')">'.$cattitle.'</a>'.$crumbsymbol.'</td>'; + } + } + if ($deeper == 0) { + $catlinks .= '<td>'; + if (ref($cats[0]) eq 'ARRAY') { + if ((@{$cats[0]} == 1) && (@cats == 1)) { + if ($cats[0][0] eq 'instcode') { + $catlinks .= &mt('Official courses (with institutional codes)'). + '<input type="hidden" name="currcat_0" value="instcode::0" />'; + $env{'form.currcat_0'} = 'instcode::0'; + } else { + my $name = $cats[0][0]; + my $item = &escape($name).'::0'; + $catlinks .= $name. + '<input type="hidden" name="currcat_0" value="'.$item.'" />'; + $env{'form.currcat_0'} = $item; + } + } else { + $has_subcats = 1; + my $buttontext = &mt('Show subcategories'); + $selitem = 'currcat_0'; + $catlinks .= '<select name="'.$selitem.'">'."\n"; + if (@{$cats[0]} > 1) { + $catlinks .= '<option value="" selected="selected">'.&mt('Select').'</option>'."\n"; + $buttontext = &mt('Pick main category'); + } + for (my $i=0; $i<@{$cats[0]}; $i++) { + my $name = $cats[0][$i]; + my $item = &escape($name).'::0'; + $catlinks .= '<option value="'.$item.'">'; + if ($name eq 'instcode') { + $catlinks .= &mt('Official courses (with institutional codes)'); + } else { + $catlinks .= $name; + } + $catlinks .= '</option>'."\n"; + } + $catlinks .= '</select>'."\n". + ' <input type="submit" name="gocats" value="'. + $buttontext.'" />'; + } + } 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><b>'.$currcat.'</b>'; + if (ref($cats[$deeper]{$cat}) eq 'ARRAY') { + $has_subcats = 1; + my $buttontext = &mt('Show subcategories'); + $selitem = 'currcat_'.$deeper; + $catlinks .= ': <select name="'.$selitem.'">'; + if (@{$cats[$deeper]{$cat}} > 1) { + $catlinks .= '<option value="" selected="selected">'. + &mt('Select').'</option>'; + $buttontext = &mt('Pick subcategory'); + } + 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". + ' <input type="submit" name="gocats" value="'. + $buttontext.'" />'; + } elsif ($cat ne 'instcode') { + $catlinks .= ' '.&mt('(No subcategories)'); + } + } + $catlinks .= $currcat_str.'</td></tr></table></td>'; + return ($catlinks,$has_subcats,$selitem); +} + +sub get_depth_values { + my $currdepth = 0; + my $deeper = 0; + if ($env{'form.catalog_maxdepth'} ne '') { + $currdepth = $env{'form.catalog_maxdepth'}; + if ($env{'form.currcat_'.$currdepth} eq '') { + $deeper = $currdepth; + } else { + $deeper = $currdepth + 1; + } + } + return ($currdepth,$deeper); +} + +sub additional_filters { + my ($codedom,$has_subcats) = @_; + my $output = '<table>'; + if (($env{'form.currcat_0'} ne 'instcode::0') && + ($env{'form.currcat_0'} ne '') && ($has_subcats)) { + my $include_subcat_status; + if ($env{'form.withsubcats'}) { + $include_subcat_status = 'checked="checked" '; + } + my $counter = $env{'form.catalog_maxdepth'}; + if ($counter > 0) { + if ($env{'form.state'} eq 'listing') { + $counter --; + } elsif ($env{'form.currcat_'.$counter} eq '') { + $counter --; + } + } + my ($catname) = split(/:/,$env{'form.currcat_'.$counter}); + if ($catname ne '') { + $output .= '<tr><td><label>'. + '<input type="checkbox" name="withsubcats" value="1" '. + $include_subcat_status.'/>'. + &mt('Include subcategories within "[_1]"', + &unescape($catname)).'</label></td></tr>'; + } + } + my $show_selfenroll_status; + if ($env{'form.showselfenroll'}) { + $show_selfenroll_status = 'checked="checked" '; + } + $output .= '<tr><td>'. + '<label><input type="checkbox" name="showselfenroll" value="1" '. + $show_selfenroll_status.'/>'. + &mt('Only show courses which allow self-enrollment'). + '</label></td></tr>'; + if (&user_is_dc($codedom)) { + my $showdetails_status; + if ($env{'form.showdetails'}) { + $showdetails_status = 'checked="checked" '; + } + my $showhidden_status; + if ($env{'form.showhidden'}) { + $showhidden_status = 'checked="checked" '; + } + my $dc_title = &Apache::lonnet::plaintext('dc'); + $output .= '<tr><td>'."\n". + '<label><input type="checkbox" name="showdetails" value="1" '. + $showdetails_status.'/>'. + &mt('Show full details for each course ([_1] only)',$dc_title). + '</label>'."\n".'</td></tr><tr><td>'. + '<label><input type="checkbox" name="showhidden" value="1" '. + $showhidden_status.'/>'. + &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title). + '</label>'."\n".'</td></tr>'; + } + $output .= '</table><br />'; + return $output; +} + +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) = @_; @@ -336,188 +698,344 @@ 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); + my $showhidden; + if (&user_is_dc($domain)) { + $showhidden = $env{'form.showhidden'}; + } + my %courses = + &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.',undef,undef, + 'Course',1,$env{'form.showselfenroll'},undef, + $showhidden,'coursecatalog'); return %courses; } +sub search_courselist { + my ($domain,$subcats) = @_; + 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; + my $filterstr; + if ($filter ne '') { + if ($env{'form.withsubcats'}) { + if (ref($subcats) eq 'HASH') { + if (ref($subcats->{$filter}) eq 'ARRAY') { + $filterstr = join('&',@{$subcats->{$filter}}); + if ($filterstr ne '') { + $filterstr = $filter.'&'.$filterstr; + } + } else { + $filterstr = $filter; + } + } else { + $filterstr = $filter; + } + } else { + $filterstr = $filter; + } + my $showhidden; + if (&user_is_dc($domain)) { + $showhidden = $env{'form.showhidden'}; + } + %courses = + &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef, + '.',1,$env{'form.showselfenroll'}, + $filterstr,$showhidden,'coursecatalog'); + } + return %courses; +} sub print_course_listing { - my ($domain) = @_; + my ($domain,$numtitles,$trails,$allitems,$subcats) = @_; 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,'.',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,$subcats); + } 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'}) && (!&user_is_dc($domain))) { + $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,$trails,$allitems); + $output .= "\n".'<form name="linklaunch" method="post" action="">'. + '<input type="hidden" name="backto" value="coursecatalog" />'. + '<input type="hidden" name="courseid" value="" />'. + &Apache::lonhtmlcommon::echo_form_input(['catalogfilter','courseid']).'</form>'; + return $output; +} + +sub construct_data_table { + my ($knownuser,$courses,$details,$usersections,$now,$domconfig,$trails, + $allitems) = @_; my %sortname; - if ($env{'form.coursenum'} eq '') { + if (($details eq '') || ($env{'form.showdetails'})) { $sortname{'Code'} = 'code'; + $sortname{'Categories'} = 'cats'; $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'); + if ($env{'form.currcat_0'} eq 'instcode::0') { + push(@coltitles,'Code'); + } else { + push(@coltitles,'Categories'); + } + push(@coltitles,('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 .= ' '; } else { $output .= &mt($item); } $output .= '</th>'; } - if (&user_is_known()) { - if ($env{'form.coursenum'} eq '') { - $output .= '<th> </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>'; + '<th>'.&mt('Auto-enrollment of[_1]registered students','<br />').'</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 'cats') { + push(@{$Sortby{$courseinfo{$course}{'categories'}}},$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; - if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner')) { + if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner') || + ($env{'form.sortby'} eq 'cats')) { @sorted_courses = sort(keys(%Sortby)); } 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,$trails,$allitems); $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 ($instcode,$singleowner,$ttype,$selfenroll_types, + $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories); + 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'}; + $categories = $courses->{$course}{'categories'}; + 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; + $courseinfo{$course}{'categories'} = $categories; 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 = &mt('No ending date'); + } + } + if ($startaccess) { + $accessdates .= '<i>'.&mt('From:[_1]','</i> '.$startaccess).'<br />'; + } + if ($endaccess) { + $accessdates .= '<i>'.&mt('To:[_1]','</i> '.$endaccess).'<br />'; + } + if (($selfenroll_types ne '') && + ($selfenroll_end > 0 && $selfenroll_end > $now)) { + my ($selfenroll_start_access,$selfenroll_end_access); + if (($coursehash{'default_enrollment_start_date'} ne + $coursehash{'internal.selfenroll_start_access'}) || + ($coursehash{'default_enrollment_end_date'} ne + $coursehash{'internal.selfenroll_end_access'})) { + if ( defined($coursehash{'internal.selfenroll_start_access'}) ) { + $selfenroll_start_access = &Apache::lonlocal::locallocaltime($coursehash{'internal.selfenroll_start_access'}); + } + if ( defined($coursehash{'default_enrollment_end_date'}) ) { + $selfenroll_end_access = &Apache::lonlocal::locallocaltime($coursehash{'internal.selfenroll_end_access'}); + if ($coursehash{'internal.selfenroll_end_access'} == 0) { + $selfenroll_end_access = &mt('No ending date'); + } + } + if ($selfenroll_start_access || $selfenroll_end_access) { + $accessdates .= '<br/><br /><i>'.&mt('Self-enrollers:').'</i><br />'; + if ($selfenroll_start_access) { + $accessdates .= '<i>'.&mt('From:[_1]','</i> '.$selfenroll_start_access).'<br />'; + } + if ($selfenroll_end_access) { + $accessdates .= '<i>'.&mt('To:[_1]','</i> '.$selfenroll_end_access).'<br />'; + } + } + } } + $courseinfo{$course}{'access'} = $accessdates; } if ($xlist_items eq '') { $xlist_items = &mt('No'); @@ -528,7 +1046,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,23 +1065,23 @@ sub count_students { $student_count{$data->[$idx{'status'}]} ++; } - my $countslist; + my $countslist = &mt('[quant,_1,section:,sections:,No sections]',$numsec).'<br />'; foreach my $status ('Active','Future') { - $countslist .= '<nobr>'.$status_title{$status}.': '. - $student_count{$status}.'</nobr><br />'; + $countslist .= '<span class="LC_nobreak">'.$status_title{$status}.': '. + $student_count{$status}.'</span><br />'; } return $countslist; } sub courseinfo_row { - my ($info) = @_; + my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems) = @_; my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, - $accessdates,$showsyllabus,$counts,$autoenrollment,$output); + $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories); 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'}; @@ -572,32 +1090,66 @@ sub courseinfo_row { $counts = $info->{'counts'}; $autoenrollment = $info->{'autoenrollment'}; $showsyllabus = $info->{'showsyllabus'}; + $categories = $info->{'categories'}; } else { $output = '<td colspan="8">'.&mt('No information available for [_1].', $code).'</td>'; return $output; } - $output .= '<td>'.$code.'</td>'. - '<td>'.$seclist.'</td>'. + $output .= '<td>'.$$countref.'</td>'; + if ($env{'form.currcat_0'} eq 'instcode::0') { + $output .= '<td>'.$code.'</td>'; + } else { + my ($categorylist,@cats); + if ($categories ne '') { + @cats = split('&',$categories); + } + if ((ref($trails) eq 'ARRAY') && (ref($allitems) eq 'HASH')) { + my @categories = map { $trails->[$allitems->{$_}]; } @cats; + $categorylist = join('<br />',@categories); + } + if ($categorylist eq '') { + $categorylist = ' '; + } + $output .= '<td>'.$categorylist.'</td>'; + } + $output .= '<td>'.$seclist.'</td>'. '<td>'.$xlist_items.'</td>'. '<td>'.$title.' <font size="-2">'; if ($showsyllabus) { - $output .= &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$cnum,$cdom); + $output .= '<a href="javascript:ToSyllabus('."'$cdom','$cnum'".')">'.&mt('Syllabus').'</a>'; } else { $output .= ' '; } $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="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a></td>'; + } + $selfenroll = 1; + } + } + if (!$selfenroll) { + $output .= '<td> </td>'; + } + $$countref ++; return $output; } @@ -619,21 +1171,22 @@ sub identify_sections { } } @secnums = sort {$a <=> $b} @secnums; - my $seclist = join(', ',@secnums); - return $seclist; + $seclist = join(', ',@secnums); + 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 +1196,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); @@ -655,12 +1208,12 @@ sub get_valid_classes { } if ($totalitems > 0) { if (@{$validations{'sections'}}) { - $response = &mt('Sections: '). - join(',',@{$validations{'sections'}}).'<br />'; + $response = &mt('Sections:').' '. + join(', ',@{$validations{'sections'}}).'<br />'; } if (@{$validations{'xlists'}}) { - $response .= &mt('Courses: '). - join(',',@{$validations{'xlists'}}); + $response .= &mt('Courses:').' '. + join(', ',@{$validations{'xlists'}}); } } return $response; @@ -806,7 +1359,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,19 +1375,22 @@ 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; } + $autoenrolldates = &mt('Not enabled').'<br />' + .&mt('Starts: [_1]',$autostart) + .'<br />'.$valid_classes; + } } } else { if ($coursehash->{'internal.autoend'} && $coursehash->{'internal.autoend'} < $now) { - $autoenrolldates = &mt('Not enabled<br />Ended: ').$autoend; + $autoenrolldates = &mt('Not enabled').'<br />' + .&mt('Ended: [_1]',$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 />'). + $autoenrolldates = &mt('Currently enabled').'<br />'. $valid_classes; } }