--- loncom/interface/coursecatalog.pm 2017/02/18 23:39:15 1.91
+++ loncom/interface/coursecatalog.pm 2018/02/01 04:51:02 1.95
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.91 2017/02/18 23:39:15 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.95 2018/02/01 04:51:02 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -57,7 +57,8 @@ 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;
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
$codedom = $env{'user.domain'};
@@ -74,9 +75,22 @@ sub handler {
$env{'form.showdom'} = '';
}
}
- my $domdesc = &Apache::lonnet::domain($codedom,'description');
+ my $domdesc = &Apache::lonnet::domain($serverdefdom,'description');
&Apache::lonhtmlcommon::clear_breadcrumbs();
-
+
+ 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 %domconfig =
&Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
my $knownuser = &user_is_known();
@@ -125,7 +139,7 @@ sub handler {
}
my $js = ''."\n";
$r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
@@ -254,7 +268,7 @@ function setCourseId(caller) {
}
ENDSCRIPT
- $catjs .= &courselink_javascript();
+ $catjs .= &courselink_javascript($r);
if (&user_is_dc($codedom) || $canviewall) {
$catjs .= < "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, });
@@ -416,6 +430,8 @@ END
}
sub courselink_javascript {
+ my ($r) = @_;
+ my $hostname = $r->hostname();
return <<"END";
function ToSyllabus(cdom,cnum,usehttp) {
@@ -427,6 +443,10 @@ function ToSyllabus(cdom,cnum,usehttp) {
}
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();
@@ -1649,27 +1669,33 @@ 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)) {
+ @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) {
my $class = $crscode.$sec;
- if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
- $class) eq 'ok') {
+ 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 ++;
}