--- loncom/interface/coursecatalog.pm 2019/07/21 14:04:39 1.99 +++ loncom/interface/coursecatalog.pm 2021/06/15 20:52:26 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.99 2019/07/21 14:04:39 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.105 2021/06/15 20:52:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,6 +59,7 @@ sub handler { my $serverdefdom = &Apache::lonnet::default_login_domain(); my $codedom = $serverdefdom; + my $hostname = $r->hostname(); if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { $codedom = $env{'user.domain'}; @@ -91,24 +92,23 @@ sub handler { $r->print(&Apache::loncommon::end_page()); return OK; } - my %domconfig = - &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); + my $crscats = &Apache::lonnet::get_dom_cats($codedom); + my %domdefaults = &Apache::lonnet::get_domain_defaults($codedom); my $knownuser = &user_is_known(); my $canviewall = &canview_all($knownuser,$codedom); my ($cathash,$cattype); - 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'; - } + if (ref($crscats) eq 'HASH') { + %{$cathash} = %{$crscats}; } else { $cathash = {}; + } + if ($knownuser || $canviewall) { + $cattype = $domdefaults{'catauth'}; + } else { + $cattype = $domdefaults{'catunauth'}; + } + if ($cattype eq '') { $cattype = 'std'; } if ($cattype eq 'none') { @@ -120,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 ($domconfig{'coursecategories'}{'auth'} eq 'none') { + if ($domdefaults{'catauth'} 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).'
'); @@ -130,7 +130,7 @@ sub handler { return OK; } - my $cnum; + my $cnum; if ($cattype eq 'codesrch') { my ($uniquecode,$codemsg,$brtext); if ($env{'form.uniquecode'}) { @@ -139,7 +139,7 @@ sub handler { } my $js = ''."\n"; $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js)); @@ -192,7 +192,8 @@ sub handler { if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { my $usehttp = 0; if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { - unless (&Apache::lonnet::uses_sts()) { + unless ((&Apache::lonnet::uses_sts()) || + (&Apache::lonnet::waf_allssl($hostname))) { $usehttp = 1; } } @@ -251,10 +252,11 @@ sub handler { $toplevelstr =~ s/,$//; $maxdepthstr =~ s/,$//; } - &validate_input($codedom,\@cats,\%maxd,$domconfig{'coursecategories'}); + &validate_input($codedom,\@cats,\%maxd,$cathash); my ($numtitles,@codetitles); if (($env{'form.coursenum'} ne '') && ($knownuser)) { - &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); + &course_details($r,$codedom,$formname,$domdesc,$hostname,\@trails, + \%allitems,\@codetitles); } else { my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); my $wasacctext = &get_wasactive_text(); @@ -282,7 +284,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(); @@ -300,7 +302,7 @@ function setCourseId(caller) { } ENDSCRIPT - $catjs .= &courselink_javascript($r); + $catjs .= &courselink_javascript($hostname); if (&user_is_dc($codedom) || $canviewall) { $catjs .= <print(&print_course_listing($codedom,$numtitles,undef,undef,undef, - \@codetitles,$canviewall)); + \@codetitles,$canviewall,$hostname)); } } else { my (%add_entries); @@ -384,7 +386,7 @@ ENDJS } if ($env{'form.state'} eq 'listing') { $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles, - $canviewall)); + $canviewall,$hostname)); } } } @@ -393,7 +395,7 @@ ENDJS } sub validate_input { - my ($codedom,$cats,$maxd,$configref) = @_; + my ($codedom,$cats,$maxd,$crscatsref) = @_; my $currcat = ''; my $depth = 0; if ($env{'form.catalog_maxdepth'} ne '') { @@ -519,12 +521,8 @@ sub validate_input { 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($configref) eq 'HASH') { - if (ref($configref->{'cats'}) eq 'HASH') { - unless (exists($configref->{'cats'}->{$env{'form.currcat_0'}})) { - delete($env{'form.currcat_0'}); - } - } else { + if (ref($crscatsref) eq 'HASH') { + unless (exists($crscatsref->{$env{'form.currcat_0'}})) { delete($env{'form.currcat_0'}); } } else { @@ -595,7 +593,7 @@ sub validate_input { } if (exists($env{'form.uniquecode'})) { unless ($env{'form.uniquecode'} =~ /^\w{6}$/) { - delete(env{'form.uniquecode'}); + delete($env{'form.uniquecode'}); } } if (exists($env{'form.wasactive'})) { @@ -625,12 +623,8 @@ sub validate_input { foreach my $key (keys(%currcats)) { if ($env{'form.'.$key} eq '') { delete($env{'form.'.$key}); - } elsif (ref($configref) eq 'HASH') { - if (ref($configref->{'cats'}) eq 'HASH') { - unless (exists($configref->{'cats'}->{$env{'form.'.$key}})) { - delete($env{'form.'.$key}); - } - } else { + } elsif (ref($crscatsref) eq 'HASH') { + unless (exists($crscatsref->{$env{'form.'.$key}})) { delete($env{'form.'.$key}); } } else { @@ -644,16 +638,11 @@ sub validate_input { sub get_instcode_allowable { my ($codedom,$possvalref) = @_; return 1 unless (ref($possvalref) eq 'HASH'); - my $caller = 'global'; - my %coursecodes = (); - my %codes = (); - my @codetitles = (); - my %cat_titles = (); - my %cat_order = (); - my $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom); - if ($totcodes > 0) { - if (&Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes, - \%codes,\@codetitles,\%cat_titles,\%cat_order) eq 'ok') { + 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++) { @@ -673,12 +662,12 @@ sub get_instcode_allowable { } sub course_details { - my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; + my ($r,$codedom,$formname,$domdesc,$hostname,$trails,$allitems,$codetitles) = @_; my $output; my %add_entries = (topmargin => "0", marginheight => "0",); my $js = ''."\n"; + &courselink_javascript($hostname).''."\n"; my $start_page = &Apache::loncommon::start_page('Course/Community Catalog',$js, {'add_entries' => \%add_entries, }); @@ -710,7 +699,7 @@ sub course_details { $r->print( &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'). '

'.$textthree.'

'. - &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles). + &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles,undef,$hostname). '
'. '
'. &Apache::lonhtmlcommon::actionbox([ @@ -742,8 +731,7 @@ END } sub courselink_javascript { - my ($r) = @_; - my $hostname = $r->hostname(); + my ($hostname) = @_; return <<"END"; function ToSyllabus(cdom,cnum,usehttp) { @@ -778,13 +766,9 @@ 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 $caller = 'global'; - my $format_reply; + my %cat_items = (); my %add_entries = (topmargin => "0", marginheight => "0",); my ($jscript,$totcodes,$numtitles,$lasttitle) = @@ -1338,7 +1322,7 @@ sub search_courselist { } sub print_course_listing { - my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_; + my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall,$hostname) = @_; my $output; my %courses; my $knownuser = &user_is_known(); @@ -1391,7 +1375,7 @@ sub print_course_listing { } my $now = time; $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef, - $now,$trails,$allitems,$canviewall); + $now,$trails,$allitems,$canviewall,$hostname); $output .= "\n".''. ''. ''. @@ -1400,7 +1384,8 @@ sub print_course_listing { } sub construct_data_table { - my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_; + my ($knownuser,$domain,$courses,$details,$usersections,$now, + $trails,$allitems,$canviewall,$hostname) = @_; my %sortname; if (($details eq '') || ($env{'form.showdetails'})) { $sortname{'Code'} = 'code'; @@ -1526,11 +1511,31 @@ sub construct_data_table { } my $count = 1; my $totalsec = 0; + my %clutteredxlists; + foreach my $course (keys(%courseinfo)) { + if (ref($courseinfo{$course}) eq 'HASH') { + if ($courseinfo{$course}{'xlist'} ne '') { + my $crskey = $courseinfo{$course}{'cnum'}.':'.$courseinfo{$course}{'code'}; + my @xlists = split(/,\s/,$courseinfo{$course}{'xlist'}); + $clutteredxlists{$crskey} = \@xlists; + } + } + } + if (keys(%clutteredxlists)) { + my %reformattedxlists = &Apache::lonnet::auto_instsec_reformat($domain,'declutter',\%clutteredxlists); + foreach my $crskey (keys(%reformattedxlists)) { + if (ref($reformattedxlists{$crskey}) eq 'ARRAY') { + my $course = $domain.'_'.(split(/:/,$crskey))[0]; + $courseinfo{$course}{'xlist'} = join(', ',@{$reformattedxlists{$crskey}}); + } + } + } foreach my $item (@sorted_courses) { foreach my $course (@{$Sortby{$item}}) { $output.=&Apache::loncommon::start_data_table_row(); $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details, - \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall); + \$count,$now,$course,$trails,$allitems, + \%numbers,$canviewall,$hostname); $output.=&Apache::loncommon::end_data_table_row(); } } @@ -1852,7 +1857,8 @@ sub count_students { } sub courseinfo_row { - my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_; + my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems, + $numbers,$canviewall,$hostname) = @_; my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories, $extsyllplain); @@ -1899,7 +1905,8 @@ sub courseinfo_row { if ($showsyllabus) { my $usehttp = 0; if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { - unless (&Apache::lonnet::uses_sts()) { + unless ((&Apache::lonnet::uses_sts()) || + (&Apache::lonnet::waf_allssl($hostname))) { $usehttp = 1; } } @@ -1983,13 +1990,19 @@ sub identify_sections { sub get_valid_classes { my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_; my $response; - my (@sections,@xlists,%possclasses,%okclasses,%validations); + my (@sections,@format_sections,@xlists,%possclasses,%okclasses,%validations); @{$validations{'sections'}} = (); @{$validations{'xlists'}} = (); my $totalitems = 0; if ($seclist) { @sections = split(/,\s+/,$seclist); - map { $possclasses{$crscode.$_} = 1; } @sections; + my $crskey = $cnum.':'.$crscode; + my %formattedsec = &Apache::lonnet::auto_instsec_reformat($cdom,'clutter', + {$crskey => \@sections}); + if (ref($formattedsec{$crskey}) eq 'ARRAY') { + @format_sections = @{$formattedsec{$crskey}}; + map { $possclasses{$crscode.$_} = 1; } @format_sections; + } } if ($xlist_items) { @xlists = split(/,\s+/,$xlist_items); @@ -1998,9 +2011,10 @@ sub get_valid_classes { my %okclasses = &Apache::lonnet::auto_validate_instclasses($cdom,$cnum,$owners, \%possclasses); if (keys(%okclasses)) { - foreach my $sec (@sections) { - if ($okclasses{$crscode.$sec}) { - if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { + for (my $i=0; $i<@sections; $i++) { + if ($okclasses{$crscode.$format_sections[$i]}) { + my $sec = $sections[$i]; + if (!grep(/^\Q$sec\E$/,@{$validations{'sections'}})) { push(@{$validations{'sections'}},$sec); $totalitems ++; } @@ -2021,6 +2035,13 @@ sub get_valid_classes { join(', ',@{$validations{'sections'}}).'
'; } if (@{$validations{'xlists'}}) { + my $crskey = $cnum.':'.$crscode; + my %reformattedxlists = + &Apache::lonnet::auto_instsec_reformat($cdom,'declutter', + {$crskey => $validations{'xlists'}}); + if (ref($reformattedxlists{$crskey}) eq 'ARRAY') { + $validations{'xlists'} = $reformattedxlists{$crskey}; + } $response .= &mt('Courses:').' '. join(', ',@{$validations{'xlists'}}); }