--- loncom/enrollment/Autoenroll.pl	2005/04/07 06:56:21	1.13
+++ loncom/enrollment/Autoenroll.pl	2006/07/21 17:47:36	1.22
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.13 2005/04/07 06:56:21 albertel Exp $
+# $Id: Autoenroll.pl,v 1.22 2006/07/21 17:47:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,8 @@
     use Apache::lonnet;
     use Apache::loncoursedata;
     use Apache::lonmsg;
+    use Apache::longroup;
+    use Apache::loncommon;
     use HTML::Entities;
 
 # Determine the library server's domain and hostID
@@ -50,7 +52,7 @@
         if (! &localenroll::run($dom)) { next; }
         $env{'user.domain'} = $dom;
     # Determine the courses
-        my %courses = &Apache::lonnet::courseiddump($dom,'.',1,'.','.',1,\@hostids); 
+        my %courses = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',1,\@hostids,'Course'); 
         my %affiliates = ();
         my %enrollvar = ();
         my %reply = ();
@@ -105,7 +107,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 +155,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 '') ) {