--- loncom/interface/coursecatalog.pm 2014/05/17 23:14:41 1.85
+++ loncom/interface/coursecatalog.pm 2021/04/30 18:19:41 1.104
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.85 2014/05/17 23:14:41 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.104 2021/04/30 18:19:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,7 @@ use Apache::lonlocal;
use Apache::courseclassifier;
use Apache::lonacc;
use LONCAPA;
+use LONCAPA::lonauthcgi;
sub handler {
my ($r) = @_;
@@ -56,7 +57,9 @@ 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;
+ my $hostname = $r->hostname();
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
$codedom = $env{'user.domain'};
@@ -73,26 +76,39 @@ sub handler {
$env{'form.showdom'} = '';
}
}
- my $domdesc = &Apache::lonnet::domain($codedom,'description');
+ my $domdesc = &Apache::lonnet::domain($serverdefdom,'description');
&Apache::lonhtmlcommon::clear_breadcrumbs();
-
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['coursecategories'],$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 $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) {
- $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') {
@@ -101,10 +117,10 @@ sub handler {
({href=>"/adm/coursecatalog",
text=>"Course/Community Catalog"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
- if ($knownuser) {
+ 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).'
');
@@ -114,7 +130,7 @@ sub handler {
return OK;
}
- my $cnum;
+ my $cnum;
if ($cattype eq 'codesrch') {
my ($uniquecode,$codemsg,$brtext);
if ($env{'form.uniquecode'}) {
@@ -123,7 +139,7 @@ sub handler {
}
my $js = ''."\n";
$r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
@@ -149,8 +165,8 @@ sub handler {
my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.',
$cnum,undef,undef,'.',1);
if (keys(%courses)) {
- $env{'form.coursenum'} = $cnum;
- my %courseinfo = &build_courseinfo_hash(\%courses,$knownuser,$codedom);
+ $env{'form.coursenum'} = $cnum;
+ my %courseinfo = &build_courseinfo_hash(\%courses,$knownuser,$codedom,$canviewall);
undef($env{'form.coursenum'});
if (ref($courseinfo{$codedom.'_'.$cnum}) eq 'HASH') {
$r->print(&Apache::lonhtmlcommon::start_pick_box());
@@ -174,8 +190,15 @@ 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()) ||
+ (&Apache::lonnet::waf_allssl($hostname))) {
+ $usehttp = 1;
+ }
+ }
$r->print(' '.
- ''.
+ ''.
&mt('Syllabus').'');
}
}
@@ -205,33 +228,64 @@ 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($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();
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;
@@ -248,8 +302,8 @@ function setCourseId(caller) {
}
ENDSCRIPT
- $catjs .= &courselink_javascript();
- if (&user_is_dc($codedom)) {
+ $catjs .= &courselink_javascript($hostname);
+ if (&user_is_dc($codedom) || $canviewall) {
$catjs .= <print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
- \@codetitles));
+ \@codetitles,$canviewall,$hostname));
}
} else {
my (%add_entries);
@@ -293,6 +347,7 @@ ENDTOGGJS
if (!$deeper) {
$alert = &mt('Choose a category to display');
}
+ &js_escape(\$alert);
$catjs .= <print('
');
}
if ($env{'form.state'} eq 'listing') {
- $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles));
+ $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles,
+ $canviewall,$hostname));
}
}
}
@@ -336,13 +394,280 @@ ENDJS
return OK;
}
+sub validate_input {
+ my ($codedom,$cats,$maxd,$crscatsref) = @_;
+ 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;
+
+ 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 ($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, });
@@ -354,9 +679,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()",
@@ -364,20 +698,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:')).
- '
'.
- &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
+ ''.$textthree.'
'.
+ &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles,undef,$hostname).
'
'.
'');
@@ -405,9 +731,10 @@ END
}
sub courselink_javascript {
+ my ($hostname) = @_;
return <<"END";
-function ToSyllabus(cdom,cnum) {
+function ToSyllabus(cdom,cnum,usehttp) {
if (cdom == '' || cdom == null) {
return;
}
@@ -415,6 +742,13 @@ function ToSyllabus(cdom,cnum) {
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();
}
@@ -431,14 +765,10 @@ END
}
sub instcode_course_selector {
- my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype) = @_;
- my %coursecodes = ();
- my %codes = ();
+ my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_;
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) =
@@ -451,10 +781,10 @@ sub instcode_course_selector {
'';
if ($totcodes) {
if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
- $add_entries{'onLoad'} = 'setElements();';
+ $add_entries{'onload'} = 'setElements();';
}
- if (&user_is_dc($codedom)) {
- $add_entries{'onLoad'} .= ' toggleStatuses();toggleWasActive();'
+ if (&user_is_dc($codedom) || $canviewall) {
+ $add_entries{'onload'} .= ' toggleStatuses();toggleWasActive();'
}
&cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
my $cat_maxdepth = $env{'form.catalog_maxdepth'};
@@ -462,7 +792,7 @@ sub instcode_course_selector {
''."\n".
''."\n".
''.
- &additional_filters($codedom));
+ &additional_filters($codedom,undef,$canviewall));
if ($numtitles > 0) {
$r->print(''.&mt('Choose which course(s) to list.').'
'.
&Apache::courseclassifier::build_instcode_selectors($numtitles,
@@ -501,6 +831,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) {
@@ -554,6 +886,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';
@@ -658,6 +993,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;
}
@@ -683,10 +1020,10 @@ sub get_depth_values {
}
sub additional_filters {
- my ($codedom,$has_subcats) = @_;
+ my ($codedom,$has_subcats,$canviewall) = @_;
my $is_dc = &user_is_dc($codedom);
my $output = '';
- if ($is_dc) {
+ if ($is_dc || $canviewall) {
$output .= '