--- loncom/interface/loncreateuser.pm	2008/08/26 23:20:22	1.249.2.6
+++ loncom/interface/loncreateuser.pm	2008/08/27 20:59:56	1.260
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.249.2.6 2008/08/26 23:20:22 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.260 2008/08/27 20:59:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1448,7 +1448,7 @@ sub personal_data_display {
                     $row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
                 } else {
                     if ($context eq 'selfcreate') {
-                        if ($canmodify{$item}) {
+                        if ($canmodify{$item}) { 
                             $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
                             $editable ++;
                         } else {
@@ -1859,9 +1859,9 @@ sub update_user_data {
             if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
                 $env{'form.cid'} = $userenv{'id'};
                 $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')
-                                    .'<br />'
-                                    .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
-                                    .'<br />'."\n";        
+                                   .'<br />'
+                                   .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
+                                   .'<br />'."\n";
             }
         }
         if ($env{'form.cid'} ne $userenv{'id'}) {
@@ -3609,7 +3609,7 @@ sub visible_in_cat {
                    dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
                    dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
     );
-    $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/parmset?action=crsenv">','</a>');
+    $visactions{'unhide'} = &mt('Use "[_1]Set course environment[_2]" to change the "Exclude from course catalog" setting.','<a href="/adm/parmset?action=crsenv">','</a>');
     $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','<a href="/adm/parmset?action=crsenv">','</a>');
     $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','<a href="/adm/parmset?action=crsenv">','</a>');
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
@@ -3621,16 +3621,16 @@ sub visible_in_cat {
         }
         $cathash = $domconf{'coursecategories'}{'cats'};
     }
-    if ($settable{'togglecats'} && $settable{'categories'}) {
-        $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
+    if ($settable{'togglecats'} && $settable{'categorize'}) {
+        $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');   
     } elsif ($settable{'togglecats'}) {
-        $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.');
-    } elsif ($settable{'categories'}) {
-        $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');
+        $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.'); 
+    } elsif ($settable{'categorize'}) {
+        $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');  
     } else {
-        $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.');
+        $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.'); 
     }
-
+     
     my %currsettings =
         &Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'],
                              $cdom,$cnum);
@@ -3640,7 +3640,7 @@ sub visible_in_cat {
             $cathash = $domconf{'coursecategories'}{'cats'};
             if (ref($cathash) eq 'HASH') {
                 if ($cathash->{'instcode::0'} eq '') {
-                    push(@vismsgs,'dc_addinst');
+                    push(@vismsgs,'dc_addinst'); 
                 } else {
                     $visible = 1;
                 }
@@ -3679,7 +3679,7 @@ sub visible_in_cat {
                         }
                     }
                     if (!$matched) {
-                        if ($settable{'categories'}) {
+                        if ($settable{'categorize'}) { 
                             push(@vismsgs,'chgcat');
                         } else {
                             push(@vismsgs,'dc_chgcat');
@@ -3690,9 +3690,9 @@ sub visible_in_cat {
         }
     } else {
         if (ref($cathash) eq 'HASH') {
-            if ((keys(%{$cathash}) > 1) ||
+            if ((keys(%{$cathash}) > 1) || 
                 (keys(%{$cathash}) == 1) && ($cathash->{'instcode::0'} eq '')) {
-                if ($settable{'categories'}) {
+                if ($settable{'categorize'}) {
                     push(@vismsgs,'addcat');
                 } else {
                     push(@vismsgs,'dc_addcat');
@@ -4885,7 +4885,7 @@ sub update_selfenroll_config {
             }
             $r->print($cansetvis);
         }
-    }
+    } 
     return;
 }