--- loncom/interface/lonpopulate.pm	2005/11/04 21:25:34	1.29
+++ loncom/interface/lonpopulate.pm	2005/11/07 15:43:31	1.33
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.29 2005/11/04 21:25:34 albertel Exp $
+# $Id: lonpopulate.pm,v 1.33 2005/11/07 15:43:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -485,8 +485,8 @@ ENDTWO
                   </form>
 ENDTWO
   } elsif ($action eq "notify") {
-      my @notified = split(/,/,$enrollvar{notifylist});
       my $notifycount = 0;
+      my @notified = split(/,/,$enrollvar{notifylist});
       foreach  (@notified) {
 	  unless ($_ eq '') { $notifycount ++; } 
       }
@@ -664,7 +664,7 @@ ENDTWO
           for (my $i=0; $i<@xlists; $i++) {
               my $xl = '&nbsp;';
               my $gp = '&nbsp;';
-              if ($xlists[$i] =~ /(\w+):?(.*)$/) {
+              if ($xlists[$i] =~ /^([^:]+):?(.*)$/) {
                   $xl = $1;
                   $gp = $2;
               }               
@@ -2104,7 +2104,7 @@ sub print_update_result () {
 	
 	if (@currxlists > 0) {
 	    foreach (@currxlists) {
-		if (m/^(\w+):(\w*)$/) {
+		if (m/^([^:]+):(\w*)$/) {
 		    unless (grep/^$1$/,@allcourses) { 
 			push @allcourses,$1;
 			$LC_code{$1} = $2;