--- loncom/interface/coursecatalog.pm 2019/08/02 00:24:02 1.88.2.7 +++ loncom/interface/coursecatalog.pm 2018/09/18 02:18:43 1.96 @@ -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.96 2018/09/18 02:18:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,7 +57,8 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['sortby','showdom']); - my $codedom = &Apache::lonnet::default_login_domain(); + my $serverdefdom = &Apache::lonnet::default_login_domain(); + my $codedom = $serverdefdom; if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { $codedom = $env{'user.domain'}; @@ -74,26 +75,40 @@ sub handler { $env{'form.showdom'} = ''; } } - my $domdesc = &Apache::lonnet::domain($codedom,'description'); + my $domdesc = &Apache::lonnet::domain($serverdefdom,'description'); &Apache::lonhtmlcommon::clear_breadcrumbs(); - - my $crscats = &Apache::lonnet::get_dom_cats($codedom); - my %domdefaults = &Apache::lonnet::get_domain_defaults($codedom); + + unless (($serverdefdom eq $codedom) || + (&Apache::lonnet::will_trust('catalog',$serverdefdom,$codedom))) { + my $serverdomdesc = &Apache::lonnet::domain($serverdefdom,'description'); + $r->print(&Apache::loncommon::start_page('Course/Community Catalog')); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursecatalog", + text=>"Course/Community Catalog"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); + $r->print('
'.&mt('Access to catalog LON-CAPA courses/communities unavailable for: "[_1]" on servers run by: "[_2]".', + $domdesc,$serverdomdesc).'
'); + $r->print(&Apache::loncommon::end_page()); + return OK; + } + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); my $knownuser = &user_is_known(); my $canviewall = &canview_all($knownuser,$codedom); 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 +120,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 +130,7 @@ sub handler { return OK; } - my $cnum; + my $cnum; if ($cattype eq 'codesrch') { my ($uniquecode,$codemsg,$brtext); if ($env{'form.uniquecode'}) { @@ -177,9 +192,7 @@ sub handler { if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { my $usehttp = 0; if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { - unless (&Apache::lonnet::uses_sts()) { - $usehttp = 1; - } + $usehttp = 1; } $r->print(' '. ''. @@ -236,7 +249,7 @@ sub handler { $toplevelstr =~ s/,$//; $maxdepthstr =~ s/,$//; } - &validate_input($codedom,\@cats,\%maxd,$cathash); + &validate_input(\@cats,\%maxd); my ($numtitles,@codetitles); if (($env{'form.coursenum'} ne '') && ($knownuser)) { &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); @@ -267,7 +280,7 @@ function setCatDepth(depth) { } document.coursecats.catalog_maxdepth.value = depth; } else { - document.coursecats.currcat_0.value = ''; + document.coursecats.currcat_0.value = ''; document.coursecats.catalog_maxdepth.value = ''; } document.coursecats.submit(); @@ -354,6 +367,8 @@ ENDJS my $display_button; if ($env{'form.currcat_0'} eq 'communities::0') { $display_button = &mt('Display communities'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $display_button = &mt('Display placement tests'); } else { $display_button = &mt('Display courses'); } @@ -376,7 +391,7 @@ ENDJS } sub validate_input { - my ($codedom,$cats,$maxd,$crscatsref) = @_; + my ($cats,$maxd) = @_; my $currcat = ''; my $depth = 0; if ($env{'form.catalog_maxdepth'} ne '') { @@ -433,215 +448,9 @@ sub validate_input { } $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; @@ -660,9 +469,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 +488,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']). '
'); @@ -712,7 +522,7 @@ END sub courselink_javascript { my ($r) = @_; - my $hostname = $r->hostname(); + my $hostname = $r->hostname(); return <<"END"; function ToSyllabus(cdom,cnum,usehttp) { @@ -747,9 +557,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 +626,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 +681,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 +788,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 +852,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)'); } @@ -1064,6 +887,9 @@ sub additional_filters { 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)'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $details_text = &mt('Show full details for each placement test (domain staff only)'); + $hidden_text = &mt('Include placement tests set to be hidden from catalog (domain staff only)'); } 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)'); @@ -1277,6 +1103,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 +1136,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 +1154,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 +1216,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 +1267,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 +1333,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) { @@ -1840,9 +1678,7 @@ sub courseinfo_row { if ($showsyllabus) { my $usehttp = 0; if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { - unless (&Apache::lonnet::uses_sts()) { - $usehttp = 1; - } + $usehttp = 1; } $output .= ''.&mt('Syllabus').''; } else { @@ -1855,7 +1691,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 { @@ -1940,6 +1776,7 @@ sub get_valid_classes { \%possclasses); if (keys(%okclasses)) { foreach my $sec (@sections) { + my $class = $crscode.$sec; if ($okclasses{$crscode.$sec}) { if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { push(@{$validations{'sections'}},$sec);