--- loncom/interface/coursecatalog.pm 2018/04/29 00:31:25 1.88.2.2 +++ loncom/interface/coursecatalog.pm 2019/07/19 13:18:27 1.88.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.88.2.2 2018/04/29 00:31:25 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.88.2.4 2019/07/19 13:18:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -207,21 +207,31 @@ sub handler { $r->print('
'.&Apache::loncommon::end_page()); return OK; } else { - if ($env{'form.coursenum'}) { - $cnum = $env{'form.coursenum'}; + if ($env{'form.coursenum'} ne '') { + if ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) { + $cnum = $env{'form.coursenum'}; + } else { + delete($env{'form.coursenum'}); + } } } - if ($env{'form.catalog_maxdepth'} ne '') { - $env{'form.catalog_maxdepth'} =~ s{\D}{}g; - } - - my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats); + my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats,%maxd, + $toplevelstr,$maxdepthstr); if ($env{'form.withsubcats'}) { $subcats = \%subcathash; } &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, - \%idx,\@jsarray,$subcats); + \%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(\@cats,\%maxd); my ($numtitles,@codetitles); if (($env{'form.coursenum'} ne '') && ($knownuser)) { &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); @@ -231,9 +241,29 @@ sub handler { my $catjs = <<"ENDSCRIPT"; function setCatDepth(depth) { - document.coursecats.catalog_maxdepth.value = depth; - if (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.currcat_0.value = ''; + document.coursecats.catalog_maxdepth.value = ''; } document.coursecats.submit(); return; @@ -340,6 +370,67 @@ ENDJS return OK; } +sub validate_input { + my ($cats,$maxd) = @_; + my $currcat = ''; + my $depth = 0; + if ($env{'form.catalog_maxdepth'} ne '') { + $env{'form.catalog_maxdepth'} =~ s{\D}{}g; + } + if ((ref($cats) eq 'ARRAY') && (ref($maxd) eq 'HASH')) { + if (ref($cats->[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; + return; +} + sub course_details { my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; my $output; @@ -1623,7 +1714,6 @@ 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);