[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;
my %add_entries = (topmargin => "0",
marginheight => "0",);
my $js = ''."\n";
+ &courselink_javascript($r).''."\n";
my $start_page =
&Apache::loncommon::start_page('Course/Community Catalog',$js,
{'add_entries' => \%add_entries, });
@@ -412,9 +523,11 @@ END
}
sub courselink_javascript {
+ my ($r) = @_;
+ my $hostname = $r->hostname();
return <<"END";
-function ToSyllabus(cdom,cnum) {
+function ToSyllabus(cdom,cnum,usehttp) {
if (cdom == '' || cdom == null) {
return;
}
@@ -422,6 +535,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();
}
@@ -1275,7 +1395,7 @@ sub build_courseinfo_hash {
$cleandesc=~s/'/\\'/g;
$cleandesc =~ s/^\s+//;
my ($cdom,$cnum)=split(/\_/,$course);
- my ($instcode,$singleowner,$ttype,$selfenroll_types,
+ my ($instcode,$singleowner,$ttype,$selfenroll_types,$extsyllplain,
$selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories);
if (ref($courses->{$course}) eq 'HASH') {
$descr = $courses->{$course}{'description'};
@@ -1286,6 +1406,7 @@ sub build_courseinfo_hash {
$selfenroll_start = $courses->{$course}{'selfenroll_start_date'};
$selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
$categories = $courses->{$course}{'categories'};
+ $extsyllplain = $courses->{$course}{'extsyllplain'};
push(@owners,$singleowner);
if ($courses->{$course}{'co-owners'} ne '') {
foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) {
@@ -1329,6 +1450,7 @@ sub build_courseinfo_hash {
$courseinfo{$course}{'selfenroll_start'} = $selfenroll_start;
$courseinfo{$course}{'selfenroll_end'} = $selfenroll_end;
$courseinfo{$course}{'categories'} = $categories;
+ $courseinfo{$course}{'extsyllplain'} = $extsyllplain;
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
my @classids;
@@ -1513,7 +1635,8 @@ sub count_students {
sub courseinfo_row {
my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_;
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
- $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories);
+ $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories,
+ $extsyllplain);
if (ref($info) eq 'HASH') {
$cdom = $info->{'cdom'};
$cnum = $info->{'cnum'};
@@ -1527,6 +1650,7 @@ sub courseinfo_row {
$counts = $info->{'counts'};
$autoenrollment = $info->{'autoenrollment'};
$showsyllabus = $info->{'showsyllabus'};
+ $extsyllplain = $info->{'extsyllplain'};
$categories = $info->{'categories'};
} else {
$output = '| '.&mt('No information available for [_1].',
@@ -1554,7 +1678,13 @@ sub courseinfo_row {
' | '.$xlist_items.' | '.
''.$title.' ';
if ($showsyllabus) {
- $output .= ''.&mt('Syllabus').'';
+ my $usehttp = 0;
+ if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) {
+ unless (&Apache::lonnet::uses_sts()) {
+ $usehttp = 1;
+ }
+ }
+ $output .= ''.&mt('Syllabus').'';
} else {
$output .= ' ';
}
@@ -1634,27 +1764,32 @@ sub identify_sections {
sub get_valid_classes {
my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
my $response;
- my %validations;
+ my (@sections,@xlists,%possclasses,%okclasses,%validations);
@{$validations{'sections'}} = ();
@{$validations{'xlists'}} = ();
my $totalitems = 0;
if ($seclist) {
- foreach my $sec (split(/, /,$seclist)) {
- my $class = $crscode.$sec;
- if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
- $class) eq 'ok') {
+ @sections = split(/,\s+/,$seclist);
+ map { $possclasses{$crscode.$_} = 1; } @sections;
+ }
+ if ($xlist_items) {
+ @xlists = split(/,\s+/,$xlist_items);
+ map { $possclasses{$_} = 1; } @xlists;
+ }
+ 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'}})) {
push(@{$validations{'sections'}},$sec);
$totalitems ++;
}
}
}
- }
- if ($xlist_items) {
- foreach my $item (split(/, /,$xlist_items)) {
- if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
- $item) eq 'ok') {
- if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) {
+ foreach my $item (@xlists) {
+ if ($okclasses{$item}) {
+ if (!grep(/^\Q$item\E$/,@{$validations{'xlists'}})) {
push(@{$validations{'xlists'}},$item);
$totalitems ++;
}
|