--- loncom/interface/courseclassifier.pm	2014/07/31 15:45:27	1.19
+++ loncom/interface/courseclassifier.pm	2017/01/18 21:07:31	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utilities for classifying courses based on institutional code
 #
-# $Id: courseclassifier.pm,v 1.19 2014/07/31 15:45:27 musolffc Exp $
+# $Id: courseclassifier.pm,v 1.25 2017/01/18 21:07:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -148,7 +148,7 @@ sub build_code_selections {
     for (my $i=1; $i<@{$codetitles}; $i++) {
         %{$idarrays{$$codetitles[$i]}} = ();
     }
-    foreach my $cid (sort keys %{$codes}) {
+    foreach my $cid (sort(keys(%{$codes}))) {
         &recurse_list($cid,$codetitles,$codes,0,\%idarrays);
     }
     for (my $num=0; $num<@{$codetitles}; $num++) {
@@ -169,7 +169,7 @@ sub build_code_selections {
         } elsif ($num == 1) {
             %{$$idlist{$$codetitles[1]}} = ();
             %{$$idlist_titles{$$codetitles[1]}} = ();
-            foreach my $key_a (keys %{$idarrays{$$codetitles[1]}}) {
+            foreach my $key_a (keys(%{$idarrays{$$codetitles[1]}})) {
                 my @sorted_a = ();
                 my @sorted_a_titles = ();
                 &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[1]}{$key_a}},\@sorted_a);
@@ -187,10 +187,10 @@ sub build_code_selections {
         } elsif ($num == 2) {
             %{$$idlist{$$codetitles[2]}} = ();
             %{$$idlist_titles{$$codetitles[2]}} = ();
-            foreach my $key_a (keys %{$idarrays{$$codetitles[2]}}) {
+            foreach my $key_a (keys(%{$idarrays{$$codetitles[2]}})) {
                 %{$$idlist{$$codetitles[2]}{$key_a}} = ();
                 %{$$idlist_titles{$$codetitles[2]}{$key_a}} = ();
-                foreach my $key_b (keys %{$idarrays{$$codetitles[2]}{$key_a}}) {
+                foreach my $key_b (keys(%{$idarrays{$$codetitles[2]}{$key_a}})) {
                     my @sorted_b = ();
                     my @sorted_b_titles = ();
                     &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[2]}{$key_a}{$key_b}},\@sorted_b);
@@ -208,11 +208,11 @@ sub build_code_selections {
             }
         } elsif ($num == 3) {
             %{$$idlist{$$codetitles[3]}} = ();
-            foreach my $key_a (keys %{$idarrays{$$codetitles[3]}}) {
+            foreach my $key_a (keys(%{$idarrays{$$codetitles[3]}})) {
                 %{$$idlist{$$codetitles[3]}{$key_a}} = ();
-                foreach my $key_b (keys %{$idarrays{$$codetitles[3]}{$key_a}}) {
+                foreach my $key_b (keys(%{$idarrays{$$codetitles[3]}{$key_a}})) {
                     %{$$idlist{$$codetitles[3]}{$key_a}{$key_b}} = ();
-                    foreach my $key_c (keys %{$idarrays{$$codetitles[3]}{$key_a}{$key_b}}) {
+                    foreach my $key_c (keys(%{$idarrays{$$codetitles[3]}{$key_a}{$key_b}})) {
                         my @sorted_c = ();
                         my @sorted_c_titles = ();
                         &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[3]}{$key_a}{$key_b}{$key_c}},\@sorted_c);
@@ -231,13 +231,13 @@ sub build_code_selections {
             }
         } elsif ($num == 4) {
             %{$$idlist{$$codetitles[4]}} = ();
-            foreach my $key_a (keys %{$idarrays{$$codetitles[4]}}) {
+            foreach my $key_a (keys(%{$idarrays{$$codetitles[4]}})) {
                 %{$$idlist{$$codetitles[4]}{$key_a}} = ();
-                foreach my $key_b (keys %{$idarrays{$$codetitles[4]}{$key_a}}) {
+                foreach my $key_b (keys(%{$idarrays{$$codetitles[4]}{$key_a}})) {
                     %{$$idlist{$$codetitles[4]}{$key_a}{$key_b}} = ();
-                    foreach my $key_c (keys %{$idarrays{$$codetitles[4]}{$key_a}{$key_b}}) {
+                    foreach my $key_c (keys(%{$idarrays{$$codetitles[4]}{$key_a}{$key_b}})) {
                         %{$$idlist{$$codetitles[4]}{$key_a}{$key_b}{$key_c}} = ();
-                        foreach my $key_d (keys %{$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}}) {
+                        foreach my $key_d (keys(%{$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}})) {
                             my @sorted_d = ();
                             my @sorted_d_titles = ();
                             &sort_cats($num,$cat_order,$codetitles,$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d},\@sorted_d);
@@ -260,7 +260,9 @@ sub build_code_selections {
 }
 
 sub javascript_code_selections {
-    my ($formname,@codetitles) = @_;
+    my ($formname,$codetitlesref) = @_;
+    return unless (ref($codetitlesref) eq 'ARRAY');
+    my @codetitles = @{$codetitlesref};
     my $numtitles = @codetitles;
     my %lt = &Apache::lonlocal::texthash(
                       Select => 'Select',
@@ -575,15 +577,22 @@ function setElements() {
 }
 
 sub build_instcode_selectors {
-    my ($numtitles,$lasttitle,$cat_items,$codetitles,$cat_titles,$cat_order) = @_;
+    my ($numtitles,$lasttitle,$cat_items,$codetitles,$cat_titles,$cat_order,$official,$class,$id,$noedit) = @_;
     my $output;
     my @standardnames = &Apache::loncommon::get_standard_codeitems();
     if ($numtitles > 0) {
         my $style;
-        if ($env{'form.official'} eq 'off') {
+        if ($official eq 'off') {
             $style = ' style="display: none"';
         }
-        $output .= '<div id="instcodes"'.$style.'><table><tr>';
+        if ($id eq '') {
+            $id = 'instcodes';
+        }
+        my $disabled;
+        if ($noedit) {
+            $disabled = ' disabled="disabled"';
+        }
+        $output .= '<div id="'.$id.'"'.$style.'><table><tr>';
         for (my $k=0; $k<$lasttitle-1; $k++) {
             my (@items,@unsorted);
             if (ref($cat_items->{$codetitles->[$k]}) eq 'ARRAY') {
@@ -599,8 +608,11 @@ sub build_instcode_selectors {
                 @longitems = @items;
             }
             $output .= '<td align="center">'.$codetitles->[$k].'<br />'."\n".
-                       '<select name="'.$standardnames[$k].'" onchange="courseSet(this)"'.
-                       '>'."\n".'<option value="0">'.&mt('All').'</option>'."\n";
+                       '<select name="'.$standardnames[$k].'" onchange="courseSet(this)"';
+            if ($class) {
+                $output .= ' class="'.$class.'"';
+            }
+            $output .= $disabled.'>'."\n".'<option value="0">'.&mt('All').'</option>'."\n";
             for (my $i=0; $i<@items; $i++) {
                 if ($longitems[$i] eq '') {
                     $longitems[$i] = $items[$i];
@@ -610,14 +622,18 @@ sub build_instcode_selectors {
             $output .= '</select></td>';
         }
         $output .= '<td align="center">'.$codetitles->[$lasttitle-1].'<br />'."\n".
-                   '<select name="'.$standardnames[$lasttitle-1].'">'."\n".
+                   '<select name="'.$standardnames[$lasttitle-1].'"';
+        if ($class) {
+            $output .= ' class="'.$class.'"';
+        }
+        $output .= $disabled.'>'."\n".
                    '<option value="0">'.&mt('All')."\n".
                    '</option>'."\n".'</select>'."\n".
                    '</td></tr></table>'."\n";
         if ($numtitles > 4) {
             $output .= '<br /><br />'.$codetitles->[$numtitles-1].'<br />'."\n".
                        '<input type="text" name="'.$standardnames[$numtitles-1].
-                       '" /><br />'."\n";
+                       '"'.$disabled.' /><br />'."\n";
         }
         $output .= '</div>';
     }
@@ -644,7 +660,7 @@ sub instcode_selectors {
                    '<input type="radio" name="official" value="off"'.$unofficial.
                    ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
                    &build_instcode_selectors($numtitles,$lasttitle,\%cat_items,$codetitles,
-                                             \%cat_titles,\%cat_order)."\n".
+                                             \%cat_titles,\%cat_order,$env{'form.official'})."\n".
                    '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
                    '<input type="hidden" name="state" value="listing" />'."\n";
     }
@@ -687,7 +703,8 @@ sub build_javascript {
     my ($by_year,$by_sem,$by_dept,$cat_order,$codetitles) = @_;
     my @unsorted = keys(%{$by_year});
     my @sorted_yrs;
-    &sort_cats('0',$cat_order,$codetitles,\@unsorted,\@sorted_yrs);    my $output = 'var idcse_by_yr_year = new Array("'.join('","',@sorted_yrs).'");'."\n".
+    &sort_cats('0',$cat_order,$codetitles,\@unsorted,\@sorted_yrs);
+    my $output = 'var idcse_by_yr_year = new Array("'.join('","',@sorted_yrs).'");'."\n".
                  'var idcse_by_yr_dept = new Array('.scalar(@sorted_yrs).');'."\n".
                  'var idcse_by_yr_num = new Array('.scalar(@sorted_yrs).');'."\n";
     for (my $i=0; $i<@sorted_yrs; $i++) {