--- loncom/interface/domainprefs.pm	2009/08/22 20:28:29	1.107
+++ loncom/interface/domainprefs.pm	2009/08/23 17:22:54	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.107 2009/08/22 20:28:29 raeburn Exp $
+# $Id: domainprefs.pm,v 1.109 2009/08/23 17:22:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1373,16 +1373,15 @@ sub print_quotas {
     $datatable .= '<tr'.$css_class.'>'.
                   '<td>'.&mt('LON-CAPA Advanced Users').' ';
     if ($context eq 'requestcourses') {
-        $datatable .= &mt('(overrides affiliation, if set)');
-    } else {
-        $datatable .= &mt('(overrides affiliation, if checked)');
-    }
-    $datatable .= '</td>'.
-                  '<td class="LC_left_item" colspan="2">';
-    if ($context eq 'requestcourses') {
-        $datatable .= '<table><tr>';
+        $datatable .= &mt('(overrides affiliation, if set)').
+                      '</td>'.
+                      '<td class="LC_left_item">'.
+                      '<table><tr>';
     } else {
-        $datatable .= '<br />';
+        $datatable .= &mt('(overrides affiliation, if checked)').
+                      '</td>'.
+                      '<td class="LC_left_item" colspan="2">'.
+                      '<br />';
     }
     my %advcell;
     foreach my $item (@usertools) {
@@ -2686,6 +2685,7 @@ sub coursecategories_javascript {
     }
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function reorderCats(form,parent,item,idx) {
     var changedVal;
 $jstext
@@ -2742,6 +2742,7 @@ $jstext
     }
     return;
 }
+// ]]>
 </script>
 
 ENDSCRIPT
@@ -3976,8 +3977,8 @@ sub modify_quotas {
                                                           $env{'user.domain'},
                                                           $item,'reload',$context);
                     if ($context eq 'requestcourses') {
-                        if ($env{'environment.crsrequest.'.$item} ne $newacc) {
-                            $newenv{'environment.crsrequest.'.$item} = $newacc;
+                        if ($env{'environment.canrequest.'.$item} ne $newacc) {
+                            $newenv{'environment.canrequest.'.$item} = $newacc;
                         }
                     } else {
                         if ($env{'environment.availabletools.'.$item} ne $newacc) {