--- loncom/interface/coursecatalog.pm 2019/08/02 00:24:02 1.88.2.7 +++ loncom/interface/coursecatalog.pm 2016/04/04 01:09:47 1.89 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.88.2.7 2019/08/02 00:24:02 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.89 2016/04/04 01:09:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -77,23 +77,24 @@ sub handler { my $domdesc = &Apache::lonnet::domain($codedom,'description'); &Apache::lonhtmlcommon::clear_breadcrumbs(); - my $crscats = &Apache::lonnet::get_dom_cats($codedom); - my %domdefaults = &Apache::lonnet::get_domain_defaults($codedom); + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); my $knownuser = &user_is_known(); - my $canviewall = &canview_all($knownuser,$codedom); + my $canviewall = &canview_all(); my ($cathash,$cattype); - if (ref($crscats) eq 'HASH') { - %{$cathash} = %{$crscats}; + if (ref($domconfig{'coursecategories'}) eq 'HASH') { + $cathash = $domconfig{'coursecategories'}{'cats'}; + if ($knownuser || $canviewall) { + $cattype = $domconfig{'coursecategories'}{'auth'}; + } else { + $cattype = $domconfig{'coursecategories'}{'unauth'}; + } + if ($cattype eq '') { + $cattype = 'std'; + } } else { $cathash = {}; - } - if ($knownuser || $canviewall) { - $cattype = $domdefaults{'catauth'}; - } else { - $cattype = $domdefaults{'catunauth'}; - } - if ($cattype eq '') { $cattype = 'std'; } if ($cattype eq 'none') { @@ -105,7 +106,7 @@ sub handler { if ($knownuser || $canviewall) { $r->print('
'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'
'); } else { - if ($domdefaults{'catauth'} eq 'none') { + if ($domconfig{'coursecategories'}{'auth'} eq 'none') { $r->print('
'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'
'); } else { $r->print('
'.&mt('The catalog of LON-CAPA courses/communities provided for: "[_1]" is only available to users who are logged in.',$domdesc).'
'); @@ -115,7 +116,7 @@ sub handler { return OK; } - my $cnum; + my $cnum; if ($cattype eq 'codesrch') { my ($uniquecode,$codemsg,$brtext); if ($env{'form.uniquecode'}) { @@ -124,7 +125,7 @@ sub handler { } my $js = ''."\n"; $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js)); @@ -175,14 +176,8 @@ sub handler { $courseinfo{$codedom.'_'.$cnum}{$item}); if ($item eq 'title') { if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { - my $usehttp = 0; - if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { - unless (&Apache::lonnet::uses_sts()) { - $usehttp = 1; - } - } $r->print(' '. - ''. + ''. &mt('Syllabus').''); } } @@ -212,31 +207,21 @@ sub handler { $r->print('
'.&Apache::loncommon::end_page()); return OK; } else { - if ($env{'form.coursenum'} ne '') { - if ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) { - $cnum = $env{'form.coursenum'}; - } else { - delete($env{'form.coursenum'}); - } + if ($env{'form.coursenum'}) { + $cnum = $env{'form.coursenum'}; } } - my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats,%maxd, - $toplevelstr,$maxdepthstr); + if ($env{'form.catalog_maxdepth'} ne '') { + $env{'form.catalog_maxdepth'} =~ s{\D}{}g; + } + + my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats); if ($env{'form.withsubcats'}) { $subcats = \%subcathash; } &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, - \%idx,\@jsarray,$subcats,\%maxd); - if (ref($cats[0]) eq 'ARRAY') { - foreach my $item (@{$cats[0]}) { - $toplevelstr .= "'".&js_escape($item)."::0',"; - $maxdepthstr .= "'$maxd{$item}',"; - } - $toplevelstr =~ s/,$//; - $maxdepthstr =~ s/,$//; - } - &validate_input($codedom,\@cats,\%maxd,$cathash); + \%idx,\@jsarray,$subcats); my ($numtitles,@codetitles); if (($env{'form.coursenum'} ne '') && ($knownuser)) { &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); @@ -246,29 +231,9 @@ sub handler { my $catjs = <<"ENDSCRIPT"; function setCatDepth(depth) { - var depth = parseInt(depth); - if (depth !== NaN) { - if (depth > 0) { - var possmaxd = 0; - var toplevel = new Array($toplevelstr); - var maxdepths = new Array($maxdepthstr); - if (toplevel.length) { - for (var i=0; i possmaxd) { - depth = possmaxd; - } - } - document.coursecats.catalog_maxdepth.value = depth; - } else { + document.coursecats.catalog_maxdepth.value = depth; + if (depth == '') { document.coursecats.currcat_0.value = ''; - document.coursecats.catalog_maxdepth.value = ''; } document.coursecats.submit(); return; @@ -285,7 +250,7 @@ function setCourseId(caller) { } ENDSCRIPT - $catjs .= &courselink_javascript($r); + $catjs .= &courselink_javascript(); if (&user_is_dc($codedom) || $canviewall) { $catjs .= <[0]) eq 'ARRAY') { - if (@{$cats->[0]} == 1) { - if ($cats->[0][0] eq 'instcode') { - $currcat = 'instcode::0'; - } elsif ($cats->[0][0] eq 'communities') { - $currcat = 'communities::0'; - } elsif ($cats->[0][0] eq 'placement') { - $currcat = 'placement::0'; - } else { - my $name = $cats->[0][0]; - $currcat = &escape($name).'::0'; - } - if (exists($maxd->{$cats->[0][0]})) { - if ($env{'form.catalog_maxdepth'} <= $maxd->{$cats->[0][0]}) { - $depth = $env{'form.catalog_maxdepth'}; - } else { - $depth = $maxd->{$cats->[0][0]}; - } - } - } elsif ((@{$cats->[0]} > 1) && ($env{'form.currcat_0'} ne '')) { - my ($escname) = ($env{'form.currcat_0'} =~ /^([^:]+)\:\:0$/); - if ($escname =~ /^instcode|communities|placement$/) { - $currcat = $env{'form.currcat_0'}; - if (exists($maxd->{$escname})) { - if ($env{'form.catalog_maxdepth'} <= $maxd->{$escname}) { - $depth = $env{'form.catalog_maxdepth'}; - } else { - $depth = $maxd->{$escname}; - } - } else { - $depth = 1; - } - } elsif ($escname ne '') { - my $name = &unescape($escname); - if (grep(/^\Q$name\E$/,@{$cats->[0]})) { - $currcat = $env{'form.currcat_0'}; - if (exists($maxd->{$name})) { - if ($env{'form.catalog_maxdepth'} <= $maxd->{$name}) { - $depth = $env{'form.catalog_maxdepth'}; - } else { - $depth = $maxd->{$name}; - } - } - } - } - } - } - } - $env{'form.currcat_0'} = $currcat; - $env{'form.catalog_maxdepth'} = $depth; - - my %possibles = ( - backto => 1, - catalogfilter => 1, - catalog_maxdepth => 1, - courseid => 1, - coursenum => 1, - currcat_0 => 1, - numtitles => 1, - Year => 1, - Semester => 1, - Department => 1, - Number => 1, - showdom => 1, - sortby => 1, - showcounts => 1, - showdetails => 1, - showhidden => 1, - showselfenroll => 1, - state => 1, - uniquecode => 1, - wasactive => 1, - wasactiveon_day => 1, - wasactiveon_month => 1, - wasactiveon_year => 1, - withsubcats => 1, - ); - my %currcats; - if ($env{'form.catalog_maxdepth'} > 0) { - for (my $i=1; $i<=$env{'form.catalog_maxdepth'}; $i++) { - $currcats{'currcat_'.$i} = 1; - $possibles{'currcat_'.$i} = 1; - } - } - - foreach my $key (sort(keys(%env))) { - if ($key =~ /^form\.(.+)$/) { - unless ($possibles{$1}) { - delete($env{$key}); - } - } - } - if (exists($env{'form.backto'})) { - unless ($env{'form.backto'} eq 'coursecatalog') { - delete($env{'form.backto'}); - } - } - if (exists($env{'form.catalogfilter'})) { - unless (($env{'form.catalogfilter'} eq &mt('Display courses')) || - ($env{'form.catalogfilter'} eq &mt('Display communities')) || - ($env{'form.catalogfilter'} eq &mt('Display placement tests'))) { - delete($env{'form.catalogfilter'}); - } - } - if (exists($env{'form.courseid'})) { - if ($env{'form.courseid'} ne '') { - unless ($env{'form.courseid'} =~ /^\Q$codedom\E_$LONCAPA::match_courseid$/) { - $env{'form.courseid'} = ''; - } - } - } - if (exists($env{'form.coursenum'})) { - unless ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) { - $env{'form.coursenum'} = ''; - } - } - if (exists($env{'form.currcat_0'})) { - unless ($env{'form.currcat_0'} =~ /^(instcode|communities|placement)\Q::0\E$/) { - if ($env{'form.currcat_0'} =~ /^.+\Q::0\E$/) { - if (ref($crscatsref) eq 'HASH') { - unless (exists($crscatsref->{$env{'form.currcat_0'}})) { - delete($env{'form.currcat_0'}); - } - } else { - delete($env{'form.currcat_0'}); - } - } else { - delete($env{'form.currcat_0'}); - } - } - } - if (exists($env{'form.numtitles'})) { - unless ($env{'form.numtitles'} =~ /^\d+$/) { - delete($env{'form.numtitles'}); - } - } - my ($gotcodes,%possvals); - foreach my $item ('Year','Semester','Department','Number') { - if (exists($env{'form.'.$item})) { - unless ($env{'form.'.$item} eq '0') { - unless ($gotcodes) { - $gotcodes = &get_instcode_allowable($codedom,\%possvals); - } - if (ref($possvals{$item}) eq 'HASH') { - unless (exists($possvals{$item}{$env{'form.'.$item}})) { - delete($env{'form.'.$item}); - } - } else { - delete($env{'form.'.$item}); - } - } - } - } - if (exists($env{'form.showdom'})) { - unless ($env{'form.showdom'} =~ /^$LONCAPA::match_domain$/) { - delete($env{'form.showdom'}); - } - } - if (exists($env{'form.sortby'})) { - unless ($env{'form.sortby'} =~ /^(title|code|owner|cats)$/) { - delete($env{'form.sortby'}); - } - } - if (exists($env{'form.showcounts'})) { - if (ref($env{'form.showcounts'}) eq 'ARRAY') { - foreach my $item (@{$env{'form.showcounts'}}) { - unless ($item =~ /^(Active|Future|Previous)$/) { - delete($env{'form.showcounts'}); - last; - } - } - } else { - unless ($env{'form.showcounts'} =~ /^(Active|Future|Previous)$/) { - delete($env{'form.showcounts'}); - } - } - } - foreach my $item ('showhidden','showdetails','showselfenroll','withsubcats') { - if (exists($env{'form.'.$item})) { - unless ($env{'form.'.$item} eq '1') { - delete($env{'form.'.$item}); - } - } - } - if (exists($env{'form.state'})) { - unless ($env{'form.state'} eq 'listing') { - delete($env{'form.state'}); - } - } - if (exists($env{'form.uniquecode'})) { - unless ($env{'form.uniquecode'} =~ /^\w{6}$/) { - delete($env{'form.uniquecode'}); - } - } - if (exists($env{'form.wasactive'})) { - unless (($env{'form.wasactive'} eq 'accessend') || ($env{'form.wasactive'} eq 'enrollend')) { - delete($env{'form.wasactive'}); - } - } - if (exists($env{'form.wasactiveon_day'})) { - my $tmpday = $env{'form.wasactiveon_day'}; - unless (($tmpday =~ /^\d+$/) && ($tmpday > 0) && ($tmpday < 32)) { - delete($env{'form.wasactiveon_day'}); - } - } - if (exists($env{'form.wasactiveon_month'})) { - my $tmpmonth = $env{'form.wasactiveon_month'}; - unless (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) { - delete($env{'form.wasactiveon_month'}); - } - } - if (exists($env{'form.wasactiveon_year'})) { - my $tmpyear = $env{'form.wasactiveon_year'}; - unless (($tmpyear =~ /^\d+$/) && ($tmpyear >= 1970)) { - delete($env{'form.wasactiveon_year'}); - } - } - if (keys(%currcats)) { - foreach my $key (keys(%currcats)) { - if ($env{'form.'.$key} eq '') { - delete($env{'form.'.$key}); - } elsif (ref($crscatsref) eq 'HASH') { - unless (exists($crscatsref->{$env{'form.'.$key}})) { - delete($env{'form.'.$key}); - } - } else { - delete($env{'form.'.$key}); - } - } - } - return; -} - -sub get_instcode_allowable { - my ($codedom,$possvalref) = @_; - return 1 unless (ref($possvalref) eq 'HASH'); - my $instcats = &Apache::lonnet::get_dom_instcats($codedom); - if (ref($instcats) eq 'HASH') { - if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH')) { - my %codes = %{$instcats->{'codes'}}; - my @codetitles = @{$instcats->{'codetitles'}}; - my @standardnames = &Apache::loncommon::get_standard_codeitems(); - my %local_to_standard; - for (my $i=0; $i<@codetitles; $i++) { - $local_to_standard{$codetitles[$i]} = $standardnames[$i]; - $possvalref->{$standardnames[$i]} = {}; - } - foreach my $cid (sort(keys(%codes))) { - if (ref($codes{$cid}) eq 'HASH') { - foreach my $item (keys(%{$codes{$cid}})) { - $possvalref->{$local_to_standard{$item}}{$codes{$cid}{$item}} = 1; - } - } - } - } - } - return 1; -} - sub course_details { my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; my $output; my %add_entries = (topmargin => "0", marginheight => "0",); my $js = ''."\n"; + &courselink_javascript().''."\n"; my $start_page = &Apache::loncommon::start_page('Course/Community Catalog',$js, {'add_entries' => \%add_entries, }); @@ -660,9 +360,18 @@ sub course_details { } my $brtextone = 'Course listing'; my $brtexttwo = 'Course details'; + my $textthree = &mt('Detailed course information:'); + my $textfour = &mt('Back to course listing'); if ($env{'form.currcat_0'} eq 'communities::0') { $brtextone = 'Community listing'; $brtexttwo = 'Community details'; + $textthree = &mt('Detailed community information:'); + $textfour = &mt('Back to community listing'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $brtextone = 'Placement test listing'; + $brtexttwo = 'Placement test details'; + $textthree = &mt('Detailed placement test information:'); + $textfour = &mt('Back to placement test listing'); } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:document.$formname.submit()", @@ -670,20 +379,12 @@ sub course_details { {text=>$brtexttwo}); $r->print( &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'). - '

'. - (($env{'form.currcat_0'} eq 'communities::0') ? - &mt('Detailed community information:') : - &mt('Detailed course information:')). - '

'. + '

'.$textthree.'

'. &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles). '
'. '
'. &Apache::lonhtmlcommon::actionbox([ - ''. - (($env{'form.currcat_0'} eq 'communities::0') ? - &mt('Back to community listing') : &mt('Back to course listing')). - '' - ]). + ''.$textfour.'']). &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter', 'showdetails','courseid']). '
'); @@ -711,11 +412,9 @@ END } sub courselink_javascript { - my ($r) = @_; - my $hostname = $r->hostname(); return <<"END"; -function ToSyllabus(cdom,cnum,usehttp) { +function ToSyllabus(cdom,cnum) { if (cdom == '' || cdom == null) { return; } @@ -723,13 +422,6 @@ function ToSyllabus(cdom,cnum,usehttp) { return; } document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus"; - if (usehttp == 1) { - var hostname = '$hostname'; - if (hostname != '') { - document.linklaunch.action = 'http://'+hostname+document.linklaunch.action; - } - document.linklaunch.action += '?usehttp=1'; - } document.linklaunch.submit(); } @@ -747,9 +439,13 @@ END sub instcode_course_selector { my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_; + my %coursecodes = (); + my %codes = (); my %cat_titles = (); my %cat_order = (); - my %cat_items = (); + my %cat_items; + my $caller = 'global'; + my $format_reply; my %add_entries = (topmargin => "0", marginheight => "0",); my ($jscript,$totcodes,$numtitles,$lasttitle) = @@ -812,6 +508,8 @@ sub cat_header { my $brtext = 'Course listing'; if ($env{'form.currcat_0'} eq 'communities::0') { $brtext = 'Community listing'; + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $brtext = 'Placement test listing'; } if ($env{'form.state'} eq 'listing') { if ($numtitles > 0) { @@ -865,6 +563,9 @@ sub category_breadcrumbs { } elsif ($cats[0][0] eq 'communities') { $catlinks .= &mt('Communities'); $env{'form.currcat_0'} = 'communities::0'; + } elsif ($cats[0][0] eq 'placement') { + $catlinks .= &mt('Placement Tests'); + $env{'form.currcat_0'} = 'placement::0'; } else { my $name = $cats[0][0]; my $item = &escape($name).'::0'; @@ -969,6 +670,8 @@ sub main_category_selector { $maincatlinks .= &mt('Official courses (with institutional codes)'); } elsif ($name eq 'communities') { $maincatlinks .= &mt('Communities'); + } elsif ($name eq 'placement') { + $maincatlinks .= &mt('Placement Tests'); } else { $maincatlinks .= $name; } @@ -1031,6 +734,8 @@ sub additional_filters { my $selfenroll_text; if ($env{'form.currcat_0'} eq 'communities::0') { $selfenroll_text = &mt('Only show communities which currently allow self-enrollment (or will allow it in the future)'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $selfenroll_text = &mt('Only show placement tests which currently allow self-enrollment (or will allow it in the future)'); } else { $selfenroll_text = &mt('Only show courses which currently allow self-enrollment (or will allow it in the future)'); } @@ -1049,6 +754,7 @@ sub additional_filters { $showhidden_status = 'checked="checked" '; } my @currstatuses = &Apache::loncommon::get_env_multiple('form.showcounts'); + my $dc_title = &Apache::lonnet::plaintext('dc'); my ($details_text,$hidden_text,$statusdisplay,$cellborder); my $wasactivedisplay = 'none'; if ($env{'form.showdetails'}) { @@ -1062,11 +768,14 @@ sub additional_filters { $cellborder = 'border-left: 0px'; } if ($env{'form.currcat_0'} eq 'communities::0') { - $details_text = &mt('Show full details for each community (domain staff only)'); - $hidden_text = &mt('Include communities set to be hidden from catalog (domain staff only)'); + $details_text = &mt('Show full details for each community ([_1] only)',$dc_title); + $hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $details_text = &mt('Show full details for each placement test ([_1] only)',$dc_title); + $hidden_text = &mt('Include placement tests set to be hidden from catalog ([_1] only)',$dc_title); } else { - $details_text = &mt('Show full details for each course (domain staff only)'); - $hidden_text = &mt('Include courses set to be hidden from catalog (domain staff only)'); + $details_text = &mt('Show full details for each course ([_1] only)',$dc_title); + $hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title); } if ($is_dc) { $output .= ''. @@ -1181,17 +890,12 @@ sub user_is_dc { } sub canview_all { - my ($knownuser,$codedom) = @_; my $canviewall = 0; my $page = 'coursecatalog'; if (&LONCAPA::lonauthcgi::can_view($page)) { $canviewall = 1; } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) { $canviewall= 1; - } elsif (($knownuser) && ($codedom ne '')) { - if (&Apache::lonnet::allowed('dcd',$codedom)) { - $canviewall = 1; - } } return $canviewall; } @@ -1277,6 +981,8 @@ sub search_courselist { } if ($env{'form.currcat_0'} eq 'communities::0') { $typefilter = 'Community'; + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $typefilter = 'Placement'; } else { $typefilter = '.'; } @@ -1308,7 +1014,9 @@ sub print_course_listing { $output = '

'; if ($env{'form.currcat_0'} eq 'communities::0') { $output .= &mt('The courseID provided does not match a community in this domain.'); - } else { + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $output .= &mt('The courseID provided does not match a placement test in this domain.'); + } else { $output .= &mt('The courseID provided does not match a course in this domain.'); } $output .= '

'; @@ -1324,6 +1032,8 @@ sub print_course_listing { $output = '

'; if ($env{'form.currcat_0'} eq 'communities::0') { $output .= &mt('No communities match the criteria you selected.'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $output .= &mt('No placement tests match the criteria you selected.'); } else { $output .= &mt('No courses match the criteria you selected.'); } @@ -1384,6 +1094,10 @@ sub construct_data_table { if ($env{'form.currcat_0'} eq 'communities::0') { $output .= ''.&mt('Default Access Dates for Members').''. ''.&mt('Member Counts').''; + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $output .= + ''.&mt('Default Access Dates for Students').''. + ''.&mt('Student Counts').''; } else { $output .= ''.&mt('Default Access Dates for Students').''. @@ -1431,7 +1145,7 @@ sub construct_data_table { my (%numbers,%creditsum); my ($showcredits,$defofficial,$defunofficial,$deftextbook); my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); - unless ($env{'form.currcat_0'} eq 'communities::0') { + unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) { if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) { $showcredits = 1; $defofficial = $domdefaults{'officialcredits'}; @@ -1497,6 +1211,8 @@ sub construct_data_table { $lt{'Active'} = &mt('Total current members'); $lt{'Future'} = &mt('Total future members'); $lt{'Previous'} = &mt('Total previous members'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $lt{'courses'} = &mt('Total placement tests'); } my $colspan = 8; if ($showcredits) { @@ -1555,7 +1271,7 @@ sub build_courseinfo_hash { $cleandesc=~s/'/\\'/g; $cleandesc =~ s/^\s+//; my ($cdom,$cnum)=split(/\_/,$course); - my ($instcode,$singleowner,$ttype,$selfenroll_types,$extsyllplain, + my ($instcode,$singleowner,$ttype,$selfenroll_types, $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories); if (ref($courses->{$course}) eq 'HASH') { $descr = $courses->{$course}{'description'}; @@ -1566,7 +1282,6 @@ sub build_courseinfo_hash { $selfenroll_start = $courses->{$course}{'selfenroll_start_date'}; $selfenroll_end = $courses->{$course}{'selfenroll_end_date'}; $categories = $courses->{$course}{'categories'}; - $extsyllplain = $courses->{$course}{'extsyllplain'}; push(@owners,$singleowner); if ($courses->{$course}{'co-owners'} ne '') { foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) { @@ -1610,7 +1325,6 @@ sub build_courseinfo_hash { $courseinfo{$course}{'selfenroll_start'} = $selfenroll_start; $courseinfo{$course}{'selfenroll_end'} = $selfenroll_end; $courseinfo{$course}{'categories'} = $categories; - $courseinfo{$course}{'extsyllplain'} = $extsyllplain; my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); my @classids; @@ -1795,8 +1509,7 @@ sub count_students { sub courseinfo_row { my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_; my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, - $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories, - $extsyllplain); + $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories); if (ref($info) eq 'HASH') { $cdom = $info->{'cdom'}; $cnum = $info->{'cnum'}; @@ -1810,7 +1523,6 @@ sub courseinfo_row { $counts = $info->{'counts'}; $autoenrollment = $info->{'autoenrollment'}; $showsyllabus = $info->{'showsyllabus'}; - $extsyllplain = $info->{'extsyllplain'}; $categories = $info->{'categories'}; } else { $output = ''.&mt('No information available for [_1].', @@ -1838,13 +1550,7 @@ sub courseinfo_row { ''.$xlist_items.''. ''.$title.' '; if ($showsyllabus) { - my $usehttp = 0; - if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { - unless (&Apache::lonnet::uses_sts()) { - $usehttp = 1; - } - } - $output .= ''.&mt('Syllabus').''; + $output .= ''.&mt('Syllabus').''; } else { $output .= ' '; } @@ -1855,7 +1561,7 @@ sub courseinfo_row { $output .= ''.$accessdates.''. ''.$counts.''; - unless ($env{'form.currcat_0'} eq 'communities::0') { + unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) { $output .= ''.$autoenrollment.''; } } else { @@ -1924,32 +1630,27 @@ sub identify_sections { sub get_valid_classes { my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_; my $response; - my (@sections,@xlists,%possclasses,%okclasses,%validations); + my %validations; @{$validations{'sections'}} = (); @{$validations{'xlists'}} = (); my $totalitems = 0; if ($seclist) { - @sections = split(/,\s+/,$seclist); - map { $possclasses{$crscode.$_} = 1; } @sections; - } - if ($xlist_items) { - @xlists = split(/,\s+/,$xlist_items); - map { $possclasses{$_} = 1; } @xlists; - } - my %okclasses = &Apache::lonnet::auto_validate_instclasses($cdom,$cnum,$owners, - \%possclasses); - if (keys(%okclasses)) { - foreach my $sec (@sections) { - if ($okclasses{$crscode.$sec}) { + foreach my $sec (split(/, /,$seclist)) { + my $class = $crscode.$sec; + if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners, + $class) eq 'ok') { if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { push(@{$validations{'sections'}},$sec); $totalitems ++; } } } - foreach my $item (@xlists) { - if ($okclasses{$item}) { - if (!grep(/^\Q$item\E$/,@{$validations{'xlists'}})) { + } + if ($xlist_items) { + 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); $totalitems ++; }