--- loncom/interface/coursecatalog.pm	2015/06/09 21:22:55	1.88
+++ 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 2015/06/09 21:22:55 damieng Exp $
+# $Id: coursecatalog.pm,v 1.88.2.4 2019/07/19 13:18:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,7 +80,7 @@ sub handler {
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
     my $knownuser = &user_is_known();
-    my $canviewall = &canview_all();
+    my $canviewall = &canview_all($knownuser,$codedom);
     
     my ($cathash,$cattype);
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -207,21 +207,31 @@ sub handler {
         $r->print('<br />'.&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<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();
     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;
@@ -742,7 +833,6 @@ sub additional_filters {
             $showhidden_status = 'checked="checked" ';
         }
         my @currstatuses = &Apache::loncommon::get_env_multiple('form.showcounts');
-        my $dc_title = &Apache::lonnet::plaintext('dc');
         my ($details_text,$hidden_text,$statusdisplay,$cellborder);
         my $wasactivedisplay = 'none';
         if ($env{'form.showdetails'}) {
@@ -756,11 +846,11 @@ sub additional_filters {
             $cellborder = 'border-left: 0px';
         }
         if ($env{'form.currcat_0'} eq 'communities::0') {
-            $details_text = &mt('Show full details for each community ([_1] only)',$dc_title);
-            $hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title);
+            $details_text = &mt('Show full details for each community (domain staff only)');
+            $hidden_text = &mt('Include communities set to be hidden from catalog (domain staff only)');
         } else {
-            $details_text = &mt('Show full details for each course ([_1] only)',$dc_title);
-            $hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title);
+            $details_text = &mt('Show full details for each course (domain staff only)');
+            $hidden_text = &mt('Include courses set to be hidden from catalog (domain staff only)');
         }
         if ($is_dc) {
             $output .= '<span class="LC_nobreak">'.
@@ -875,12 +965,17 @@ sub user_is_dc {
 }
 
 sub canview_all {
+    my ($knownuser,$codedom) = @_;
     my $canviewall = 0;
     my $page = 'coursecatalog';
     if (&LONCAPA::lonauthcgi::can_view($page)) {
         $canviewall = 1;
     } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
         $canviewall= 1;
+    } elsif (($knownuser) && ($codedom ne '')) {
+        if (&Apache::lonnet::allowed('dcd',$codedom)) {
+            $canviewall = 1;
+        }
     }
     return $canviewall;
 }
@@ -1603,27 +1698,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 ++;
                 }