--- loncom/enrollment/Autoenroll.pl	2005/04/12 00:20:01	1.14
+++ loncom/enrollment/Autoenroll.pl	2006/05/16 21:55:56	1.18
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.14 2005/04/12 00:20:01 raeburn Exp $
+# $Id: Autoenroll.pl,v 1.18 2006/05/16 21:55:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,7 +105,7 @@
                         }
                     }
                     foreach my $xlist (@crosslistings) {
-                        if ($xlist =~ m/^(\w+):(\w*)$/) {
+                        if ($xlist =~ m/^([^:]+):(\w*)$/) {
                             my $course_id = $1;
                             my $gp = $2;
                             if (!grep/^$course_id$/,@{$affiliates{$crs}}) {
@@ -153,7 +153,12 @@
                                         $to_notify[0] = $enrollvar{$crs}{notifylist};
                                     }
                                     foreach my $cc (@to_notify) {
-                                        my ($ccname,$ccdom) = split/@/,$cc;
+                                        my ($ccname,$ccdom);
+                                        if ($cc =~ /:/) {
+                                            ($ccname,$ccdom) = split/:/,$cc;
+                                        } elsif ($cc =~ /\@/) {
+                                            ($ccname,$ccdom) = split/\@/,$cc;
+                                        }
                                         my $status =  &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message);
                                     }
                                     if ( ($enrollvar{$crs}{notifylist} eq '') && ($newusermsg ne '') ) {