version 1.95, 2018/02/01 04:51:02
|
version 1.100, 2019/07/21 14:26:02
|
Line 192 sub handler {
|
Line 192 sub handler {
|
if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { |
if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { |
my $usehttp = 0; |
my $usehttp = 0; |
if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { |
if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { |
$usehttp = 1; |
unless (&Apache::lonnet::uses_sts()) { |
|
$usehttp = 1; |
|
} |
} |
} |
$r->print(' <font size="-2">'. |
$r->print(' <font size="-2">'. |
'<a href="javascript:ToSyllabus('."'$codedom','$cnum','$usehttp'".')">'. |
'<a href="javascript:ToSyllabus('."'$codedom','$cnum','$usehttp'".')">'. |
Line 225 sub handler {
|
Line 227 sub handler {
|
$r->print('<br />'.&Apache::loncommon::end_page()); |
$r->print('<br />'.&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} else { |
} else { |
if ($env{'form.coursenum'}) { |
if ($env{'form.coursenum'} ne '') { |
$cnum = $env{'form.coursenum'}; |
if ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) { |
|
$cnum = $env{'form.coursenum'}; |
|
} else { |
|
delete($env{'form.coursenum'}); |
|
} |
} |
} |
} |
} |
|
|
if ($env{'form.catalog_maxdepth'} ne '') { |
my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats,%maxd, |
$env{'form.catalog_maxdepth'} =~ s{\D}{}g; |
$toplevelstr,$maxdepthstr); |
} |
|
|
|
my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats); |
|
if ($env{'form.withsubcats'}) { |
if ($env{'form.withsubcats'}) { |
$subcats = \%subcathash; |
$subcats = \%subcathash; |
} |
} |
&Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, |
&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,$domconfig{'coursecategories'}); |
my ($numtitles,@codetitles); |
my ($numtitles,@codetitles); |
if (($env{'form.coursenum'} ne '') && ($knownuser)) { |
if (($env{'form.coursenum'} ne '') && ($knownuser)) { |
&course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); |
&course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); |
Line 249 sub handler {
|
Line 261 sub handler {
|
my $catjs = <<"ENDSCRIPT"; |
my $catjs = <<"ENDSCRIPT"; |
|
|
function setCatDepth(depth) { |
function setCatDepth(depth) { |
document.coursecats.catalog_maxdepth.value = depth; |
var depth = parseInt(depth); |
if (depth == '') { |
if (depth !== NaN) { |
document.coursecats.currcat_0.value = ''; |
if (depth > 0) { |
|
var possmaxd = 0; |
|
var toplevel = new Array($toplevelstr); |
|
var maxdepths = new Array($maxdepthstr); |
|
if (toplevel.length) { |
|
for (var i=0; i<toplevel.length; i++) { |
|
var item = unescape(toplevel[i]); |
|
if (item == document.coursecats.currcat_0.value) { |
|
possmaxd = maxdepths[i]; |
|
break; |
|
} |
|
} |
|
} |
|
if (depth > possmaxd) { |
|
depth = possmaxd; |
|
} |
|
} |
|
document.coursecats.catalog_maxdepth.value = depth; |
|
} else { |
|
document.coursecats.currcat_0.value = ''; |
|
document.coursecats.catalog_maxdepth.value = ''; |
} |
} |
document.coursecats.submit(); |
document.coursecats.submit(); |
return; |
return; |
Line 360 ENDJS
|
Line 392 ENDJS
|
return OK; |
return OK; |
} |
} |
|
|
|
sub validate_input { |
|
my ($codedom,$cats,$maxd,$configref) = @_; |
|
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($configref) eq 'HASH') { |
|
if (ref($configref->{'cats'}) eq 'HASH') { |
|
unless (exists($configref->{'cats'}->{$env{'form.currcat_0'}})) { |
|
delete($env{'form.currcat_0'}); |
|
} |
|
} else { |
|
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($configref) eq 'HASH') { |
|
if (ref($configref->{'cats'}) eq 'HASH') { |
|
unless (exists($configref->{'cats'}->{$env{'form.'.$key}})) { |
|
delete($env{'form.'.$key}); |
|
} |
|
} else { |
|
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 $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 @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 { |
sub course_details { |
my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; |
my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; |
my $output; |
my $output; |
Line 1587 sub courseinfo_row {
|
Line 1899 sub courseinfo_row {
|
if ($showsyllabus) { |
if ($showsyllabus) { |
my $usehttp = 0; |
my $usehttp = 0; |
if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { |
if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { |
$usehttp = 1; |
unless (&Apache::lonnet::uses_sts()) { |
|
$usehttp = 1; |
|
} |
} |
} |
$output .= '<a href="javascript:ToSyllabus('."'$cdom','$cnum','$usehttp'".')">'.&mt('Syllabus').'</a>'; |
$output .= '<a href="javascript:ToSyllabus('."'$cdom','$cnum','$usehttp'".')">'.&mt('Syllabus').'</a>'; |
} else { |
} else { |
Line 1685 sub get_valid_classes {
|
Line 1999 sub get_valid_classes {
|
\%possclasses); |
\%possclasses); |
if (keys(%okclasses)) { |
if (keys(%okclasses)) { |
foreach my $sec (@sections) { |
foreach my $sec (@sections) { |
my $class = $crscode.$sec; |
|
if ($okclasses{$crscode.$sec}) { |
if ($okclasses{$crscode.$sec}) { |
if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { |
if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { |
push(@{$validations{'sections'}},$sec); |
push(@{$validations{'sections'}},$sec); |