--- loncom/interface/coursecatalog.pm	2014/04/28 14:23:47	1.83
+++ loncom/interface/coursecatalog.pm	2018/04/29 00:31:25	1.88.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.83 2014/04/28 14:23:47 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.88.2.2 2018/04/29 00:31:25 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) = @_;
@@ -79,15 +80,19 @@ sub handler {
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$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) {
+        if ($knownuser || $canviewall) {
             $cattype = $domconfig{'coursecategories'}{'auth'};
         } else {
             $cattype = $domconfig{'coursecategories'}{'unauth'};
         }
+        if ($cattype eq '') {
+            $cattype = 'std';
+        }
     } else {
         $cathash = {};
         $cattype = 'std';
@@ -98,7 +103,7 @@ sub handler {
         ({href=>"/adm/coursecatalog",
           text=>"Course/Community Catalog"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-        if ($knownuser) {
+        if ($knownuser || $canviewall) {
             $r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>');
         } else {
             if ($domconfig{'coursecategories'}{'auth'} eq 'none') {
@@ -146,8 +151,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());
@@ -246,7 +251,7 @@ function setCourseId(caller) {
 
 ENDSCRIPT
         $catjs .= &courselink_javascript();
-        if (&user_is_dc($codedom)) {
+        if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
 function toggleStatuses() {
@@ -277,10 +282,10 @@ ENDTOGGJS
         }
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
-                                                   $catlinks,$catjs,\@codetitles,$cattype);
+                                                   $catlinks,$catjs,\@codetitles,$cattype,$canviewall);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles));
+                                                \@codetitles,$canviewall));
             }
         } else {
             my (%add_entries);
@@ -290,6 +295,7 @@ ENDTOGGJS
                 if (!$deeper) {
                     $alert = &mt('Choose a category to display');
                 }
+                &js_escape(\$alert);
                 $catjs .= <<ENDJS;
 function check_selected() {
     if (document.coursecats.$selitem.options[document.coursecats.$selitem.selectedIndex].value == "") {
@@ -304,7 +310,7 @@ ENDJS
             if ($env{'form.currcat_0'} ne '') {
                 $r->print('<form name="'.$formname.
                           '" method="post" action="/adm/coursecatalog">'.
-                          &additional_filters($codedom,$has_subcats)."\n");
+                          &additional_filters($codedom,$has_subcats,$canviewall)."\n");
                 $r->print('<input type="hidden" name="catalog_maxdepth" value="'.
                           $deeper.'" />'."\n");
                 for (my $i=0; $i<$deeper; $i++) {
@@ -325,7 +331,8 @@ ENDJS
                           $display_button.'" /></form><br /><br />');
             }
             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));
             }
         }
     }
@@ -386,7 +393,7 @@ sub coursesearch {
     my %lt = &Apache::lonlocal::texthash (
                                            crlk => 'Course look-up',  
                                            code => 'Code',
-                                           ifyo => 'Enter the character code (six letters and numbers)',
+                                           ifyo => 'Enter the course code (six letters and numbers)',
                                            srch => 'Find course',
                                          );
     return <<"END";
@@ -428,7 +435,7 @@ END
 }
 
 sub instcode_course_selector {
-    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype) = @_;
+    my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_;
     my %coursecodes = ();
     my %codes = ();
     my %cat_titles = ();
@@ -448,10 +455,10 @@ sub instcode_course_selector {
              '</script>';
     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'};
@@ -459,7 +466,7 @@ sub instcode_course_selector {
                   '<input type="hidden" name="catalog_maxdepth" value="'.$cat_maxdepth.'" />'."\n".
                   '<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'."\n".
                   '<input type="hidden" name="currcat_0" value="instcode::0" />'.
-                  &additional_filters($codedom));
+                  &additional_filters($codedom,undef,$canviewall));
         if ($numtitles > 0) {
             $r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'.
                       &Apache::courseclassifier::build_instcode_selectors($numtitles,
@@ -680,10 +687,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 = '<div class="LC_left_float">';
-    if ($is_dc) {
+    if ($is_dc || $canviewall) {
         $output .= '<fieldset><legend>'.&mt('Options').'</legend>';
     }
     $output .= '<table><tr><td valign="top">';
@@ -724,7 +731,7 @@ sub additional_filters {
                '<label><input type="checkbox" name="showselfenroll" value="1" '.
                $show_selfenroll_status.'/>'.$selfenroll_text.
                '</label></span><br />';
-    if ($is_dc) {
+    if ($is_dc || $canviewall) {
         my ($titlesref,$orderref) = &get_statustitles('filters');
         my $showdetails_status;
         if ($env{'form.showdetails'}) {
@@ -735,7 +742,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'}) {
@@ -749,17 +755,19 @@ 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">'.
+                       '<label><input type="checkbox" name="showhidden" value="1" '.
+                       $showhidden_status.'/>'.$hidden_text.
+                       '</label></span><br />'."\n";
         }
         $output .= '<span class="LC_nobreak">'.
-                   '<label><input type="checkbox" name="showhidden" value="1" '.
-                   $showhidden_status.'/>'.$hidden_text.
-                   '</label></span><br />'."\n".
-                   '<span class="LC_nobreak">'.
                    '<label><input type="checkbox" name="showdetails" value="1" '.
                    $showdetails_status.'onclick="toggleStatuses();" />'.
                    $details_text.'</label></span></td>'."\n".
@@ -865,6 +873,22 @@ sub user_is_dc {
     return;
 }
 
+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;
+}
+
 sub get_statustitles {
     my ($caller) = @_;
     my @status_order = ('Active','Future','Previous');
@@ -958,12 +982,13 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
+    my $canviewall = &canview_all();
     my $details = $env{'form.coursenum'};
-    if (&user_is_dc($domain)) {
+    if (&user_is_dc($domain) || $canviewall) {
         if ($env{'form.showdetails'}) {
             $details = 1;
         }
@@ -998,7 +1023,7 @@ sub print_course_listing {
             $output .= '</p>';
             return $output;
         }
-        if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) {
+        if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain)) && (!$canviewall)) {
             $output = '<b>'.&mt('Note for students:').'</b> '
                      .&mt('If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.')
                      .'<br /><br />';
@@ -1006,7 +1031,7 @@ sub print_course_listing {
     }
     my $now = time;
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,$trails,$allitems);
+                                     $now,$trails,$allitems,$canviewall);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -1015,7 +1040,7 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -1047,7 +1072,7 @@ sub construct_data_table {
         $output .= '</th>';
     }
     my (@fields,%fieldtitles,$wasactiveon);
-    if ($knownuser) {
+    if ($knownuser || ($canviewall && $details)) {
         if ($details) {
             if ($env{'form.currcat_0'} eq 'communities::0') {
                 $output .= '<th>'.&mt('Default Access Dates for Members').'</th>'.
@@ -1060,7 +1085,7 @@ sub construct_data_table {
             }
             my ($titlesref,$orderref) = &get_statustitles();
             my @statuses;
-            if (&user_is_dc($domain)) {
+            if (&user_is_dc($domain) || $canviewall) {
                 @statuses = &Apache::loncommon::get_env_multiple('form.showcounts');
                 if (grep(/^Previous$/,@statuses)) {
                     if ($env{'form.wasactive'} eq 'date') { 
@@ -1107,7 +1132,7 @@ sub construct_data_table {
             $deftextbook = $domdefaults{'textbookcredits'};
         }
     }
-    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$details,
+    my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$canviewall,$details,
                                             $usersections,\@fields,\%fieldtitles,
                                             $wasactiveon,\%numbers,\%creditsum,
                                             $showcredits,$defofficial,$defunofficial,$deftextbook);
@@ -1141,12 +1166,12 @@ sub construct_data_table {
         foreach my $course (@{$Sortby{$item}}) {
             $output.=&Apache::loncommon::start_data_table_row(); 
             $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,
-                                     \$count,$now,$course,$trails,$allitems,\%numbers);
+                                     \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
-    if (($knownuser) && ($count > 1) && $env{'form.showdetails'}) {
-        if (&user_is_dc($domain)) {
+    if (($knownuser || $canviewall) && ($count > 1) && $env{'form.showdetails'}) {
+        if (&user_is_dc($domain) || $canviewall) {
             my %lt = &Apache::lonlocal::texthash (
                                                      'Active'   => 'Total current students',
                                                      'Future'   => 'Total future students',
@@ -1205,12 +1230,12 @@ sub construct_data_table {
 }
 
 sub build_courseinfo_hash {
-    my ($courses,$knownuser,$domain,$details,$usersections,$fields,$fieldtitles,
+    my ($courses,$knownuser,$domain,$canviewall,$details,$usersections,$fields,$fieldtitles,
         $wasactiveon,$numbers,$creditsum,$showcredits,$defofficial,$defunofficial) = @_;
     my %courseinfo;
     my $now = time;
     my $gettotals;
-    if ((keys(%{$courses}) > 0) && (&user_is_dc($domain)) && ($details)) {
+    if ((keys(%{$courses}) > 0) && (&user_is_dc($domain) || $canviewall) && ($details)) {
         $gettotals = 1;
     }
     my (%uniquecodes,$nocodes,$defcreds);
@@ -1306,7 +1331,7 @@ sub build_courseinfo_hash {
             $defcreds = $courseinfo{$course}{'defaultcredits'};
         }
         if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) ||
-            ($knownuser && ($details == 1))) {
+            (($knownuser || $canviewall) && ($details == 1))) {
             my $milestone;
             if ($wasactiveon eq 'accessend') {
                 if ($coursehash{'default_enrollment_end_date'}) {
@@ -1459,7 +1484,7 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers) = @_;
+    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);
     if (ref($info) eq 'HASH') {
@@ -1508,7 +1533,7 @@ sub courseinfo_row {
     }
     $output .= '</font></td>'.
                '<td>'.$ownerlast.'</td>';
-    if ($knownuser) {
+    if (($knownuser) || ($canviewall && $details)) {
         if ($details) {
             $output .=
                 '<td>'.$accessdates.'</td>'.
@@ -1582,27 +1607,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 ++;
                 }