--- loncom/interface/selfenroll.pm	2008/05/14 20:06:51	1.3
+++ loncom/interface/selfenroll.pm	2008/06/23 15:52:52	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow users to self-enroll in a course
 #
-# $Id: selfenroll.pm,v 1.3 2008/05/14 20:06:51 raeburn Exp $
+# $Id: selfenroll.pm,v 1.5 2008/06/23 15:52:52 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,7 +171,7 @@ END
             $r->print('<li>'.&mt('Otherwise:').'<br />');
             my $count = 0;
             foreach my $type ('sso','login','email') { 
-                if ($count> 0) {
+                if (($count > 0) && ($count <@cancreate)) {
                     $r->print('&nbsp;, '.&mt('or').'<br />');
                 }
                 if (grep(/^$type$/,@cancreate)) {
@@ -431,7 +431,7 @@ sub print_selfenroll_types {
                     }
                 }
             } else {
-                $output = &mt('Self-enrollment in this course is only available to users in the following domains (with the following status): ').'<ul>';
+                $output = &mt('Self-enrollment in this course is only available to users in the following domains (with the following status):').' <ul>';
                 foreach my $selfdom (sort(keys(%{$longtypes}))) {
                     if (ref($longtypes->{$selfdom}) eq 'ARRAY') {
                         $output .= '<li>'.$selfdom.': '.join(', ',@{$longtypes->{$selfdom}}).'</li>';
@@ -440,7 +440,7 @@ sub print_selfenroll_types {
                 $output .= '</ul>';
             }
         } else {
-            $output = &mt('Self-enrollment is not currently available in this course');
+            $output = &mt('Self-enrollment is not currently available for this course.');
         }
     }
     return $output;