--- loncom/html/adm/helper/course.initialization.helper	2007/09/03 20:23:57	1.18
+++ loncom/html/adm/helper/course.initialization.helper	2009/06/15 11:18:06	1.26
@@ -57,9 +57,9 @@
       </message>
     </state>
 
-  <state name="COURSE_DESCRIPTION" title="Course Description">
+  <state name="COURSE_DESCRIPTION" title="Course Title">
     <message nextstate="FORBID_CHAT">
-      The &quot;Course Description&quot; is the name of the course that will be
+      The &quot;Course Title&quot; is the name of the course that will be
       seen by the students.  You may now modify the description and hit 
       <nobr>&quot;<b>Next -&gt;</b>&quot;</nobr> to continue.<br />
       </message>
@@ -76,10 +76,10 @@
       </string>
     </state>
 
-  <state name="FORBID_CHAT" title="Chat Participation">
+  <state name="FORBID_CHAT" title="Chat Room Participation">
     <message nextstate="FORBID_DISCUSSION">
-      <p>LON-CAPA has live chat functionality.  This course will receive
-         its own chat room.  You may deny students, TAs, or instructors
+      <p>LON-CAPA has chat room functionality. This course will receive
+         its own chat room. You may deny students, TAs, or instructors
          the right to access the chat room.</p>
       </message>
     <choices variable="BANNED_CHAT_ROLES" multichoice="1" allowempty='1'>
@@ -105,10 +105,10 @@
                 $denied =~ s/,([^,]*)$/, and\1/;
             }
             if ($denied) {
-                $denied = substr($denied, 1) . ' not allowed to participate in live chatroom.';
+                $denied = substr($denied, 1) . ' not allowed to participate in chat room.';
                 $denied = ucfirst($denied);
             } else {
-                $denied = 'Everyone can participate in live chatroom.';
+                $denied = 'Everyone can participate in chat room.';
             }
             return $denied;
         } else {
@@ -197,7 +197,7 @@
       who will receive the feedback, such as a different instructor or a
       TA. Please enter their LON-CAPA address below, in the
       form <b>user:domain</b>, where &quot;user&quot; and &quot;domain&quot;
-      are both the LON-CAPA username and LON-CAPA domain, not an email
+      are both the LON-CAPA username and LON-CAPA domain, not an e-mail
       address.</p> 
       </message>
     <eval>return &mt('<p>Your current LON-CAPA domain is &quot;<b>[_1]</b>&quot;.</p>',"$helper->{DATA}->{DOM}"); 
@@ -251,28 +251,28 @@
       } else {
           $cloners[0] = $val;
       }
-      my @alldoms = &Apache::lonnet::all_domains();
       foreach my $item (@cloners) {
-          if ($item ne '*') {
-              my ($clname,$cldom) = split(/:/,$item);
-              if ($clname eq '*') {
-                  if ($cldom =~ /^$match_dom$/) {
-                      if (!grep(/^\Q$cldom\E$/,@alldoms)) {
-                          $disallowed{'domain'} .= $item.',';
-                      }
-                  } else {
-                      $disallowed{'format'} .= $item.',';
-                  }
-              } elsif ($item !~/^($match_uname)\:($match_dom)$/) {
-                  $disallowed{'format'} .= $item.',';
-              } else {
-                  if (!grep(/^\Q$cldom\E$/,@alldoms)) {
-                      $disallowed{'domain'} .= $item.','; 
-                  } elsif (&Apache::lonnet::homeserver($clname,$cldom) eq 'no_host') {
-                      $disallowed{'newuser'} .= $item.',';
-                  }
-              }
-          }
+	  next if ($item =~ /^\s*$/);
+	  next if ($item eq '*');
+       
+	  my ($clname,$cldom) = split(/:/,$item);
+	  if ($clname eq '*') {
+	      if ($cldom =~ /^$match_dom$/) {
+		  if (!&Apache::lonnet::domain($cldom)) {
+		      $disallowed{'domain'} .= $item.',';
+		  }
+	      } else {
+		  $disallowed{'format'} .= $item.',';
+	      }
+	  } elsif ($item !~/^($match_uname)\:($match_dom)$/) {
+	      $disallowed{'format'} .= $item.',';
+	  } else {
+	      if (!&Apache::lonnet::domain($cldom)) {
+		  $disallowed{'domain'} .= $item.','; 
+	      } elsif (&Apache::lonnet::homeserver($clname,$cldom) eq 'no_host') {
+		  $disallowed{'newuser'} .= $item.',';
+	      }
+	  }
       }
       foreach my $key (keys(%disallowed)) {
           $disallowed{$key} =~ s/,$//;
@@ -291,7 +291,7 @@
               $output .= '<li>LON-CAPA user(s) do(es) not exist: '.
                          '<b>'.$disallowed{'newuser'}.'</b></li>';
           }
-          $output .= '.</ul>';
+          $output .= '</ul>';
       }
       return $output;
     </validator>
@@ -312,12 +312,12 @@
    </message>
   </state>
   <state name="FINAL" title="Completed">
-    <message>Your course is now set up. Please select the <b>Finish Course 
-      Initialization</b> button to re-intialize the course with your chosen
+    <message>Your course is now set up. Please select the <b>Save</b>
+      button to re-intialize the course with your chosen
       settings.
 
       <p>Remember that all of these settings can be modified in the <b>PARMS</b>
-         screen, by pushing the <b>Course Environment</b> button.</p>
+         screen (<b>Course Configuration</b>).</p>
       </message>
     <condition>
       <clause>$env{'course.'.$env{'request.course.id'}.'.clonedfrom'}</clause>