--- loncom/interface/loncreatecourse.pm	2006/06/28 19:31:48	1.93.2.1
+++ loncom/interface/loncreatecourse.pm	2006/07/20 22:09:36	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.93.2.1 2006/06/28 19:31:48 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.95 2006/07/20 22:09:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,7 +236,7 @@ sub copydbfiles {
     foreach (&crsdirlist($origcrsid)) {
 	if ($_=~/\.db$/) {
 	    unless 
-             ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata|\Q$origcrs_discussion\E|slots|slot_reservations|gradingqueue|reviewqueue|CODEs)/) {
+             ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata|\Q$origcrs_discussion\E|slots|slot_reservations|gradingqueue|reviewqueue|CODEs|groupmembership)/) {
 		 &copydb($origcrsid,$newcrsid,$_);
 	     }
 	}
@@ -256,11 +256,10 @@ sub copycoursefiles {
 
 sub print_course_creation_page {
     my $r=shift;
-    my $crstype = 'Course';
-#    my $crstype = 'Group';
-#    if ($env{'form.phase'} eq 'courseone') {
-#        $crstype = 'Course';
-#    }
+    my $crstype = 'Group';
+    if ($env{'form.phase'} eq 'courseone') {
+        $crstype = 'Course';
+    }
     my $defdom=$env{'request.role.domain'};
     my %host_servers = &Apache::loncommon::get_library_servers($defdom);
     my $course_home = '<select name="course_home" size="1">'."\n";
@@ -833,7 +832,7 @@ sub create_course {
                clonecourse => $env{'form.clonecourse'},
                clonedomain => $env{'form.clonedomain'},
                crsid => $env{'form.crsid'},
-               curruser => $env{'user.name'},
+               curruser => $env{'user.name'}.':'.$env{'user.domain'},
                crssections => $env{'form.crssections'},
                crsxlist => $env{'form.crsxlist'},
                autoadds => $env{'form.autoadds'},
@@ -918,13 +917,14 @@ sub construct_course {
     my $crstype = lc($args->{'crstype'});
     my %cenv=();
     $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
-                                               $args->{'cdescr'},
-                                               $args->{'curl'},
-                                               $args->{'course_home'},
-                                               $args->{'nonstandard'},
-                                               $args->{'crscode'},
-                                               $args->{'ccuname'},
-                                               $args->{'crstype'});
+                                             $args->{'cdescr'},
+                                             $args->{'curl'},
+                                             $args->{'course_home'},
+                                             $args->{'nonstandard'},
+                                             $args->{'crscode'},
+                                             $args->{'ccuname'}.':'.
+                                             $args->{'ccdomain'},
+                                             $args->{'crstype'});
 
     # Note: The testing routines depend on this being output; see 
     # Utils::Course. This needs to at least be output as a comment
@@ -988,7 +988,8 @@ sub construct_course {
         $cenv{'internal.coursequota'}=$args->{'crsquota'} = 20;
     }
     if ($args->{'ccuname'}) {
-        $cenv{'internal.courseowner'} = $args->{'ccuname'};
+        $cenv{'internal.courseowner'} = $args->{'ccuname'}.
+                                        ':'.$args->{'ccdomain'};
     } else {
         $cenv{'internal.courseowner'} = $args->{'curruser'};
     }
@@ -1047,7 +1048,7 @@ sub construct_course {
     my @notified = ();
     if ($args->{'notify_owner'}) {
         if ($args->{'ccuname'} ne '') {
-            push(@notified,$args->{'ccuname'}.'@'.$args->{'ccdomain'});
+            push(@notified,$args->{'ccuname'}.':'.$args->{'ccdomain'});
         }
     }
     if ($args->{'notify_dc'}) {
@@ -1197,11 +1198,11 @@ sub print_intro_page {
                      short_description =>
     &mt('Create a new course by completing an online form.'),
                  },
-#                   { internal_name => 'groupone',
-#                     name => &mt('Create a single collaborative group space '),
-#                     short_description =>
-#    &mt('Create a new group space for non-course use by completing an online form .'),
-#                 },
+                   { internal_name => 'groupone',
+                     name => &mt('Create a single collaborative group space '),
+                     short_description =>
+    &mt('Create a new group space for non-course use by completing an online form .'),
+                 },
                    { internal_name => 'batchone',
                      name => &mt('Create courses/groups by uploading an attributes file'),
                      short_description =>