[LON-CAPA-cvs] cvs: loncom(version_2_2_X) /interface loncreatecourse.pm

albertel lon-capa-cvs@mail.lon-capa.org
Wed, 19 Jul 2006 10:08:27 -0000


albertel		Wed Jul 19 06:08:27 2006 EDT

  Modified files:              (Branch: version_2_2_X)
    /loncom/interface	loncreatecourse.pm 
  Log:
  - backport 1.94
  
  
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.93.2.2 loncom/interface/loncreatecourse.pm:1.93.2.3
--- loncom/interface/loncreatecourse.pm:1.93.2.2	Thu Jun 29 13:47:19 2006
+++ loncom/interface/loncreatecourse.pm	Wed Jul 19 06:08:26 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.93.2.2 2006/06/29 17:47:19 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.93.2.3 2006/07/19 10:08:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -833,7 +833,7 @@
                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 +918,14 @@
     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 +989,8 @@
         $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 +1049,7 @@
     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'}) {