--- loncom/interface/loncreatecourse.pm	2005/01/20 16:30:52	1.75
+++ loncom/interface/loncreatecourse.pm	2006/07/20 22:10:22	1.93.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.75 2005/01/20 16:30:52 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.93.2.4 2006/07/20 22:10:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,9 @@ use Apache::lonratedt;
 use Apache::londocs;
 use Apache::lonlocal;
 use Apache::londropadd;
+use LONCAPA::batchcreatecourse;
 use lib '/home/httpd/lib/perl';
+use LONCAPA;
 
 # ================================================ Get course directory listing
 
@@ -57,7 +59,7 @@ sub innercrsdirlist {
     my %crsdata=&Apache::lonnet::coursedescription($courseid);
     my @listing=&Apache::lonnet::dirlist
 	($which,$crsdata{'domain'},$crsdata{'num'},
-	 &Apache::loncommon::propath($crsdata{'domain'},$crsdata{'num'}));
+	 &propath($crsdata{'domain'},$crsdata{'num'}));
     foreach (@listing) {
 	unless ($_=~/^\./) {
 	    my @unpackline = split (/\&/,$_);
@@ -86,11 +88,10 @@ sub readfile {
 # ============================================================ Write a userfile
 
 sub writefile {
-    (my $courseid, my $which,$ENV{'form.output'})=@_;
+    (my $courseid, my $which,$env{'form.output'})=@_;
     my %crsdata=&Apache::lonnet::coursedescription($courseid);
     return &Apache::lonnet::finishuserfileupload(
 					  $crsdata{'num'},$crsdata{'domain'},
-					  $crsdata{'home'},
 					  'output',$which);
 }
 
@@ -160,6 +161,14 @@ sub copyresourcedb {
     my %newdata=();
     undef %newdata;
     my $startdate=$data{$origcrsid.'.0.opendate'};
+    if (!$startdate) {
+	# now global start date for assements try the enrollment start
+	my %start=&Apache::lonnet::get('environment',
+				   ['default_enrollment_start_date'],
+				   $origcrsdata{'domain'},$origcrsdata{'num'});
+
+	$startdate = $start{'default_enrollment_start_date'};
+    }
     my $today=time;
     my $delta=0;
     if ($startdate) {
@@ -194,7 +203,13 @@ sub copyresourcedb {
 	$thiskey=~s/^$origcrsid/$newcrsid/;
 	$newdata{$thiskey}=$data{$_};
 	if ($data{$_.'.type'}=~/^date_(start|end)$/) {
-	    $newdata{$thiskey}=$newdata{$thiskey}+$delta;
+	    if ($delta > 0) {
+		$newdata{$thiskey}=$newdata{$thiskey}+$delta;
+	    } else {
+		# no delta, it's unlikely we want the old dates and times
+		delete($newdata{$thiskey});
+		delete($newdata{$thiskey.'.type'});
+	    }
 	}
     }
     return &Apache::lonnet::put
@@ -215,10 +230,13 @@ sub copyuserfiles {
 
 sub copydbfiles {
     my ($origcrsid,$newcrsid)=@_;
+
+    my ($origcrs_discussion) = ($origcrsid=~m|^/(.*)|);
+    $origcrs_discussion=~s|/|_|g;
     foreach (&crsdirlist($origcrsid)) {
 	if ($_=~/\.db$/) {
 	    unless 
-             ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata)/) {
+             ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata|\Q$origcrs_discussion\E|slots|slot_reservations|gradingqueue|reviewqueue|CODEs|groupmembership)/) {
 		 &copydb($origcrsid,$newcrsid,$_);
 	     }
 	}
@@ -238,7 +256,12 @@ sub copycoursefiles {
 
 sub print_course_creation_page {
     my $r=shift;
-    my $defdom=$ENV{'request.role.domain'};
+    my $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";
     foreach my $server (sort(keys(%host_servers))) {
@@ -250,27 +273,45 @@ sub print_course_creation_page {
     }
     $course_home .= "\n</select>\n";
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
-    my $bodytag=&Apache::loncommon::bodytag('Create a New Course');
-    my $helplink=&Apache::loncommon::help_open_topic('Create_Course',&mt('Help on Creating Courses'));
     my $cloneform=&Apache::loncommon::select_dom_form
-	($ENV{'request.role.domain'},'clonedomain').
+	($env{'request.role.domain'},'clonedomain').
 		     &Apache::loncommon::selectcourse_link
-		     ('ccrs','clonecourse','clonedomain');
-    my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'});
-    my $starttime = time;
-    my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
-    my $enroll_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_enrolldates');
-    my $access_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_defaultdates');
-    my ($krbdef,$krbdefdom) =
-    &Apache::loncommon::get_kerberos_defaults($defdom);
-    my $javascript_validations=&Apache::londropadd::javascript_validations('createcourse',$krbdefdom);
-    my %param = ( formname => 'document.ccrs',
-                   kerb_def_dom => $krbdefdom,
-                   kerb_def_auth => $krbdef
-                );
-    my $krbform = &Apache::loncommon::authform_kerberos(%param);
-    my $intform = &Apache::loncommon::authform_internal(%param);
-    my $locform = &Apache::loncommon::authform_local(%param);
+	     ('ccrs','clonecourse','clonedomain',undef,undef,undef,$crstype);
+    my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'});
+    my ($enroll_table,$access_table,$krbdef,$krbdefdom,$krbform,$intform,$locform,
+        $javascript_validations);
+    if ($crstype eq 'Course') {
+        my $starttime = time;
+        my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+        $enroll_table = &Apache::londropadd::date_setting_table($starttime,
+                                                $endtime,'create_enrolldates');
+        $access_table = &Apache::londropadd::date_setting_table($starttime,
+                                               $endtime,'create_defaultdates');
+        ($krbdef,$krbdefdom) =
+        &Apache::loncommon::get_kerberos_defaults($defdom);
+        $javascript_validations=&Apache::londropadd::javascript_validations(
+                                                    'createcourse',$krbdefdom);
+        my %param = ( formname      => 'document.ccrs',
+                      kerb_def_dom  => $krbdefdom,
+                      kerb_def_auth => $krbdef
+                    );
+        $krbform = &Apache::loncommon::authform_kerberos(%param);
+        $intform = &Apache::loncommon::authform_internal(%param);
+        $locform = &Apache::loncommon::authform_local(%param);
+    } else {
+        $javascript_validations = qq|
+function validate(formname) {
+    if (formname.title == '') {
+        alert("A group title is required");
+        return;
+    }
+    if (formname.ccuname == '') {
+        alert("The username of the group coordinator is required");
+    }
+    formname.submit();
+}
+        |;
+    }
     my %lt=&Apache::lonlocal::texthash(
 		    'cinf' => "Course Information",
                     'ctit' => "Course Title",
@@ -281,10 +322,10 @@ sub print_course_creation_page {
                     'stat' => "The following entries will be used to identify the course according to the naming scheme adopted by your institution. Your choices will be used to map an internal LON-CAPA course ID to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution. This mapping is required if you choose to employ automatic population of class lists.",
                     'ccod' => "Course Code",
                     'toin' => "to interface with institutional data, e.g., fs03glg231 for Fall 2003 Geology 231",
-                    'snid' => "Section Numbers and corresponding LON-CAPA section/group IDs",
-                    'csli' => "a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section/group ID to be used in LON-CAPA e.g., 001:1,002:2",
+                    'snid' => "Section Numbers and corresponding LON-CAPA section IDs",
+                    'csli' => "a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section ID to be used in LON-CAPA e.g., 001:1,002:2",
                     'crcs' => "Crosslisted courses",
-                    'cscs' => "a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) groupID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2",
+                    'cscs' => "a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) sectionID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2",
                     'crco' => "Course Content",
                     'cncr' => "Completely new course",
                     'cecr' => "Clone an existing course", 
@@ -314,7 +355,6 @@ sub print_course_creation_page {
 		    'Key authority (<tt>id@domain</tt>) if other than course',
                     'cc'   => "Course Coordinator",
                     'user' => "Username",
-                    'ierc' => "Immediately expire own role as Course Coordinator",
                     'aens' => "Automated enrollment settings",
                     'aesc' => "The following settings control automatic enrollment of students in this class based on information available for this specific course from your institution's official classlists.",
                     'aadd' => "Automated adds",
@@ -327,13 +367,37 @@ sub print_course_creation_page {
                     'pcda' => "Please choose the default authentication method to be used by new users added to this LON-CAPA domain by the automated enrollment process",
                     'nech' => "Notification of enrollment changes",
                     'nccl' => "Notification to course coordinator via LON-CAPA message when enrollment changes occur during the automated update?",
+                    'ndcl' => "Notification to domain coordinator via LON-CAPA message when enrollment changes occur during the automated update?",
                     'irsp' => "Include retrieval of student photographs?",
 		    'rshm' => 'Resource Space Home',
-                    'opco' => "Open Course"
+                    'cgrs' => "Course Group Settings",
+                    'cgrq' => "Set a quota for the total disk space available for storage of course group portfolio files.",
+                    'opco' => "Open Course",
+                    'ginf' => "Group Information",
+                    'gtit' => "Group Title",
+                    'ghsr' => "Group Home Server",
+                    'gidn' => "Group ID/Number",
+                    'grco' => "Group Content",
+                    'cngr' => "Completely new group",
+                    'cegr' => "Clone an existing group",
+                    'sagr' => "Do NOT generate as standard group",
+                    'stgo' => "standard groups only",
+                    'sgpf' => "Set group policy feedback to Group Coordinator",
+                    'scfg' => "Set content feedback to Group Coordinator",
+                    'dmrd' => "Disable member resource discussion",
+                    'dmuc' => "Disable member use of chatrooms",
+                    'mnak' => "Members need access key to enter group",
+                    'kaug' =>
+                    'Key authority (<tt>id@domain</tt>) if other than group',
+                    'gc'   => "Group Coordinator",
+                    'gid'  => "Group ID",
+                    'crgr' => "Create Group",
+                    'grts' => "Group Teams Settings",
+                    'grtq' => "Set a quota for the total disk space available for storage of group team portfolio files.",
+
 				       );
-    $r->print(<<ENDDOCUMENT);
-<html>
-<script language="JavaScript" type="text/javascript">
+    my $js = <<END;
+<script type="text/javascript">
 var editbrowser = null;
 function openbrowser(formname,elementname) {
     var url = '/res/?';
@@ -354,11 +418,23 @@ function openbrowser(formname,elementnam
 $javascript_validations
 </script>
 $coursebrowserjs
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-$bodytag
-$helplink
+END
+
+    my %titles = &Apache::lonlocal::texthash(
+                  courseone => 'Create a New Course',
+                  groupone => 'Create a New Group',
+    );  
+    my $start_page = 
+        &Apache::loncommon::start_page($titles{$env{'form.phase'}},$js);
+    my $end_page = 
+        &Apache::loncommon::end_page();
+    my $crumbs = 
+	&Apache::lonhtmlcommon::breadcrumbs($crstype.' Information',
+					    'Create_Course',undef,
+					    'Create_Courses');
+    $r->print($start_page.$crumbs);
+    if ($crstype eq 'Course') {
+        $r->print(<<ENDDOCUMENT);
 <form action="/adm/createcourse" method="post" name="ccrs">
 <h2>$lt{'cinf'}</h2>
 <p>
@@ -523,10 +599,18 @@ $locform
 <b>$lt{'nech'}</b><br />
 $lt{'nccl'}<br/>
 <label>
-    <input type="radio" name="notify" value="1" />$lt{'yes'}
+    <input type="radio" name="notify_owner" value="1" />$lt{'yes'}
 </label> 
 <label>
-    <input type="radio" name="notify" value="0" checked="true" />$lt{'no'}
+    <input type="radio" name="notify_owner" value="0" checked="true" />$lt{'no'}
+</label>
+<br />
+$lt{'ndcl'}<br/>
+<label>
+    <input type="radio" name="notify_dc" value="1" />$lt{'yes'}
+</label>
+<label>
+    <input type="radio" name="notify_dc" value="0" checked="true" />$lt{'no'}
 </label>
 </p><p>
 <b>$lt{'irsp'}</b>
@@ -537,6 +621,11 @@ $lt{'nccl'}<br/>
     <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
 </label>
 </p>
+<p>
+<h2>$lt{'cgrs'}</h2>
+$lt{'cgrq'}
+<input type="text" name="crsquota" value="20" size="6" />Mb 
+</p>
 <hr />
 <h2>$lt{'cc'}</h2>
 <p>
@@ -547,100 +636,227 @@ $lt{'nccl'}<br/>
 <label>
     <b>$lt{'dmn'}:</b> $domform
 </label>
+</p>
+<p>
+<input type="hidden" name="prevphase" value="courseone" />
+<input type="hidden" name="phase" value="coursetwo" />
+<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}" />
+</p>
+</form>
+ENDDOCUMENT
+    } elsif ($crstype eq 'Group') {
+        $r->print(<<ENDDOCUMENT);
+<form action="/adm/createcourse" method="post" name="ccrs">
+<h2>$lt{'ginf'}</h2>
+<p>
+<label><b>$lt{'gtit'}:</b>
+<input type="text" size="50" name="title" /></label>
+</p><p>
+<label>
+    <b>$lt{'ghsr'}:</b>$course_home
+</label>
 </p><p>
 <label>
-    <b>$lt{'ierc'}:</b>
-    <input type="checkbox" name="expireown" checked />
+    <b>$lt{'gidn'} ($lt{'opt'})</b>
+    <input type="text" size="30" name="crsid" />
 </label>
 </p>
+<h2>$lt{'grco'}</h2>
+<table border="2">
+<tr><th>$lt{'cngr'}</th><th>$lt{'cegr'}</th></tr>
+<tr><td>
 <p>
-<input type="hidden" name="phase" value="two" />
-<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}" />
+<label>
+    <b>$lt{'map'}:</b>
+    <input type="text" size="50" name="topmap" />
+</label>
+<a href="javascript:openbrowser('ccrs','topmap')">$lt{'smap'}</a>
+</p><p>
+<label for="nonstd"><b>$lt{'sagr'}</b></label>
+<br />
+($lt{'ocik'}):
+<input id="nonstd" type="checkbox" name="nonstandard" />
+</p><p>
+<b>$lt{'fres'}</b><br />($lt{'stgo'}):
+<label>
+    <input type="radio" name="firstres" value="blank" />$lt{'blnk'}
+</label>
+&nbsp;
+<label>
+    <input type="radio" name="firstres" value="syl" checked />$lt{'sllb'}
+</label>
+&nbsp;
+<label>
+    <input type="radio" name="firstres" value="nav" />$lt{'navi'}
+</label>
+</p>
+</td><td>
+<label>
+    $lt{'gid'}: <input type="text" size="25" name="clonecourse" value="" />
+</label>
+<br />
+<label>
+    $lt{'dmn'}: $cloneform
+</label>
+<br />
+&nbsp;<br />
+$lt{'asov'}.
+</td></tr>
+</table>
+</p>
+<p>
+<h2>$lt{'mssg'}</h2>
+<p>
+<label>
+    <b>$lt{'sgpf'}: </b>
+    <input type="checkbox" name="setpolicy" checked />
+</label>
+<br />
+<label>
+    <b>$lt{'scfg'}: </b>
+    <input type="checkbox" name="setcontent" checked />
+</label>
+</p>
+<h2>$lt{'cmmn'}</h2>
+<p>
+<label>
+    <b>$lt{'dmrd'}: </b>
+    <input type="checkbox" name="disresdis" />
+</label>
+<br />
+<label>
+    <b>$lt{'dmuc'}: </b>
+    <input type="checkbox" name="disablechat" />
+</label>
+</p>
+<h2>$lt{'acco'}</h2>
+<p>
+<label>
+    <b>$lt{'mnak'}: </b>
+    <input type="checkbox" name="setkeys" />
+</label>
+<br />
+<label>
+    <b>$lt{'kaug'}: </b>
+    <input type="text" size="30" name="keyauth" />
+</label>
+</p>
+<h2>$lt{'rshm'}</h2>
+<p>
+<label>
+    <b>$lt{'rshm'}: </b>
+    <input type="text" name="reshome" size="30" value="/res/$defdom/" />
+</label>
+</p>
+<p>
+<h2>$lt{'grts'}</h2>
+$lt{'grtq'}
+<input type="text" name="crsquota" value="20" />Mb
+</p>
+<hr />
+<h2>$lt{'gc'}</h2>
+<p>
+<label>
+    <b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
+</label>
+</p><p>
+<label>
+    <b>$lt{'dmn'}:</b> $domform
+</label>
+</p>
+<p>
+<input type="hidden" name="prevphase" value="groupone" />
+<input type="hidden" name="phase" value="grouptwo" />
+<input type="button" onClick="validate(this.form)" value="$lt{'crgr'}" />
 </p>
 </form>
-</body>
-</html>
 ENDDOCUMENT
+    }
+    $r->print($end_page);
 }
 
 # ====================================================== Phase two: make course
 
 sub create_course {
     my $r=shift;
-    my $ccuname=$ENV{'form.ccuname'};
-    my $ccdomain=$ENV{'form.ccdomain'};
+    my $ccuname=$env{'form.ccuname'};
+    my $ccdomain=$env{'form.ccdomain'};
     $ccuname=~s/\W//g;
     $ccdomain=~s/\W//g;
+    my $crstype = 'Group';
+    my ($enrollstart,$enrollend,$startaccess,$endaccess);
 
-    my $enrollstart = &Apache::lonhtmlcommon::get_date_from_form('startenroll');
-    my $enrollend   = &Apache::lonhtmlcommon::get_date_from_form('endenroll');
-    my $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess');
-    my $endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess');
+    if ($env{'form.phase'} eq 'coursetwo') {
+        $crstype='Course';
+        $enrollstart=&Apache::lonhtmlcommon::get_date_from_form('startenroll');
+        $enrollend=&Apache::lonhtmlcommon::get_date_from_form('endenroll');
+
+    }
+    $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess');
+    $endaccess   = &Apache::lonhtmlcommon::get_date_from_form('endaccess');
 
     my $autharg;
     my $authtype;
 
-    if ($ENV{'form.login'} eq 'krb') {
+    if ($env{'form.login'} eq 'krb') {
         $authtype = 'krb';
-        $authtype .=$ENV{'form.krbver'};
-        $autharg = $ENV{'form.krbarg'};
-    } elsif ($ENV{'form.login'} eq 'int') {
+        $authtype .=$env{'form.krbver'};
+        $autharg = $env{'form.krbarg'};
+    } elsif ($env{'form.login'} eq 'int') {
         $authtype ='internal';
-        if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
-            $autharg = $ENV{'form.intarg'};
+        if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
+            $autharg = $env{'form.intarg'};
         }
-    } elsif ($ENV{'form.login'} eq 'loc') {
+    } elsif ($env{'form.login'} eq 'loc') {
         $authtype = 'localauth';
-        if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
-            $autharg = $ENV{'form.locarg'};
+        if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
+            $autharg = $env{'form.locarg'};
         }
     }
-
     my $logmsg;
-    my $bodytag=&Apache::loncommon::bodytag('Create a New Course');
-    $r->print(<<ENDENHEAD);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-$bodytag
-ENDENHEAD
+    my $start_page=&Apache::loncommon::start_page('Create a New '.$crstype);
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses');
+
+    $r->print($start_page.$crumbs);
 
     my $args = {
+               crstype => $crstype,
                ccuname => $ccuname,
                ccdomain => $ccdomain,
-               cdescr => $ENV{'form.title'},
-               curl => $ENV{'form.topmap'},
-               course_domain => $ENV{'request.role.domain'},
-               course_home =>  $ENV{'form.course_home'},
-               nonstandard => $ENV{'form.nonstandard'},
-               crscode => $ENV{'form.crscode'},
-               clonecourse => $ENV{'form.clonecourse'},
-               clonedomain => $ENV{'form.clonedomain'},
-               crsid => $ENV{'form.crsid'},
-               curruser => $ENV{'user.name'},
-               crssections => $ENV{'form.crssections'},
-               crsxlist => $ENV{'form.crsxlist'},
-               autoadds => $ENV{'form.autoadds'},
-               autodrops => $ENV{'form.autodrops'},
-               notify => $ENV{'form.notify'},
-               no_end_date => $ENV{'form.no_end_date'},
-               showphotos => $ENV{'form.showphotos'},
+               cdescr => $env{'form.title'},
+               curl => $env{'form.topmap'},
+               course_domain => $env{'request.role.domain'},
+               course_home =>  $env{'form.course_home'},
+               nonstandard => $env{'form.nonstandard'},
+               crscode => $env{'form.crscode'},
+               crsquota => $env{'form.crsquota'},
+               clonecourse => $env{'form.clonecourse'},
+               clonedomain => $env{'form.clonedomain'},
+               crsid => $env{'form.crsid'},
+               curruser => $env{'user.name'}.':'.$env{'user.domain'},
+               crssections => $env{'form.crssections'},
+               crsxlist => $env{'form.crsxlist'},
+               autoadds => $env{'form.autoadds'},
+               autodrops => $env{'form.autodrops'},
+               notify_owner => $env{'form.notify_owner'},
+               notify_dc => $env{'form.notify_dc'},
+               no_end_date => $env{'form.no_end_date'},
+               showphotos => $env{'form.showphotos'},
                authtype => $authtype,
                autharg => $autharg,
                enrollstart => $enrollstart,
                enrollend => $enrollend,
                startaccess => $startaccess,
                endaccess => $endaccess,
-               setpolicy => $ENV{'form.setpolicy'},
-               setcontent => $ENV{'form.setcontent'},
-               reshome => $ENV{'form.reshome'},
-               setkeys => $ENV{'form.setkeys'},
-               keyauth => $ENV{'form.keyauth'},
-               disresdis => $ENV{'form.disresdis'},
-               disablechat => $ENV{'form.disablechat'},
-               openall => $ENV{'form.openall'},
-               firstres => $ENV{'form.firstres'}
+               setpolicy => $env{'form.setpolicy'},
+               setcontent => $env{'form.setcontent'},
+               reshome => $env{'form.reshome'},
+               setkeys => $env{'form.setkeys'},
+               keyauth => $env{'form.keyauth'},
+               disresdis => $env{'form.disresdis'},
+               disablechat => $env{'form.disablechat'},
+               openall => $env{'form.openall'},
+               firstres => $env{'form.firstres'}
                };
 
     #
@@ -657,67 +873,65 @@ ENDENHEAD
             <input type="hidden" name="ccdomain" value="'.$ccdomain.'" />
             <input name="userrole" type="submit" value="'.
 		  &mt('Create User').'" />
-	</form></body></html>');
+	</form>'.&Apache::loncommon::end_page());
 	return;
     }
     # Check the proposed home server for the course
     my %host_servers = &Apache::loncommon::get_library_servers
-        ($ENV{'request.role.domain'});
-    if (! exists($host_servers{$ENV{'form.course_home'}})) {
+        ($env{'request.role.domain'});
+    if (! exists($host_servers{$env{'form.course_home'}})) {
         $r->print(&mt('Invalid home server for course').': '.
-                  $ENV{'form.course_home'}.'</body></html>');
+                  $env{'form.course_home'}.&Apache::loncommon::end_page());
         return;
     }
     my ($courseid,$crsudom,$crsunum);
-    $r->print(&construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum));
+    $r->print(&construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum,$env{'user.domain'},$env{'user.name'}));
 
 #
-# Make current user course adminstrator
-#
-    my $end=undef;
-    my $addition='';
-    if ($ENV{'form.expireown'}) { $end=time+5; $addition='expired'; }
-    $r->print(&mt('Assigning').' '.$addition.' '.&mt('role of course coordinator to self').': '.
-    &Apache::lonnet::assignrole(
-     $ENV{'user.domain'},$ENV{'user.name'},$courseid,'cc',$end).'<br>');
+# Make the requested user a course coordinator or group coordinator
 #
-# Make additional user course administrator
-#
-   if (($ccdomain) && ($ccuname)) {
-    $r->print(&mt('Assigning role of course coordinator to').' '.
-               $ccuname.' at '.$ccdomain.': '.
-    &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'<p>');
-   }
-    if ($ENV{'form.setkeys'}) {
+    if (($ccdomain) && ($ccuname)) {
+        $r->print(&mt('Assigning role of [_1] Coordinator to [_2] at [_3]:',
+                     $crstype,$ccuname,$ccdomain).
+                  &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,
+                                              'cc').'<p>');
+    }
+    if ($env{'form.setkeys'}) {
         $r->print(
  '<p><a href="/adm/managekeys?cid='.$crsudom.'_'.$crsunum.'">'.&mt('Manage Access Keys').'</a></p>');
     }
 # Flush the course logs so reverse user roles immediately updated
     &Apache::lonnet::flushcourselogs();
-    $r->print('<p>'.&mt('Roles will be active at next login').'.</p></body></html>');
+    $r->print('<p>'.&mt('Roles will be active at next login').'.</p>'.
+	      '<p><a href="/adm/createcourse">'.
+	      &mt('Create Another [_1]',$crstype).'</a></p>'.
+	      &Apache::loncommon::end_page());
 }
 
 sub construct_course {
-    my ($args,$logmsg,$courseid,$crsudom,$crsunum) = @_;
+    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
     my $outcome;
 
 #
 # Open 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->{'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
     # if anyone ever decides to not show this, and Utils::Course::new
     # will need to be suitably modified.
-    $outcome .= 'New LON-CAPA Course ID: '.$$courseid.'<br>';
+    $outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid);
 #
 # Check if created correctly
 #
@@ -734,10 +948,10 @@ sub construct_course {
 	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
 	if ($clonehome eq 'no_host') {
 	    $outcome .=
-    '<br /><font color="red">'.&mt('Attempting to clone non-existing course').' '.$cloneid.'</font>';
+    '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
 	} else {
 	    $outcome .= 
-    '<br /><font color="green">'.&mt('Cloning course from').' '.$clonehome.'</font>';
+    '<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>';
 	    my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
 # Copy all files
 	    &copycoursefiles($cloneid,$$courseid);
@@ -760,14 +974,23 @@ sub construct_course {
 #
     my @sections = ();
     my @xlists = ();
+    if ($args->{'crstype'}) {
+        $cenv{'type'}=$args->{'crstype'};
+    }
     if ($args->{'crsid'}) {
         $cenv{'courseid'}=$args->{'crsid'};
     }
     if ($args->{'crscode'}) {
         $cenv{'internal.coursecode'}=$args->{'crscode'};
     }
+    if ($args->{'crsquota'} ne '') {
+        $cenv{'internal.coursequota'}=$args->{'crsquota'};
+    } else {
+        $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'};
     }
@@ -784,7 +1007,7 @@ sub construct_course {
             foreach my $item (@sections) {
                 my ($sec,$gp) = split/:/,$item;
                 my $class = $args->{'crscode'}.$sec;
-                my $addcheck = &Apache::lonnet::auto_new_course($crsunum,$crsudom,$class,$cenv{'internal.courseowner'});
+                my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
                 $cenv{'internal.sectionnums'} .= $item.',';
                 unless ($addcheck eq 'ok') {
                     push @badclasses, $class;
@@ -822,10 +1045,26 @@ sub construct_course {
     if ($args->{'autodrops'}) {
         $cenv{'internal.autodrops'}=$args->{'autodrops'};
     }
-    if ($args->{'notify'}) {
-      if ($args->{'ccuname'}) {
-        $cenv{'internal.notifylist'} = $args->{'ccuname'}.'@'.$args->{'ccdomain'};
-      }
+# check for notification of enrollment changes
+    my @notified = ();
+    if ($args->{'notify_owner'}) {
+        if ($args->{'ccuname'} ne '') {
+            push(@notified,$args->{'ccuname'}.':'.$args->{'ccdomain'});
+        }
+    }
+    if ($args->{'notify_dc'}) {
+        if ($uname ne '') { 
+            push(@notified,$uname.'@'.$udom);
+        }
+    }
+    if (@notified > 0) {
+        my $notifylist;
+        if (@notified > 1) {
+            $notifylist = join(',',@notified);
+        } else {
+            $notifylist = $notified[0];
+        }
+        $cenv{'internal.notifylist'} = $notifylist;
     }
     if (@badclasses > 0) {
         my %lt=&Apache::lonlocal::texthash(
@@ -946,6 +1185,107 @@ sub construct_course {
     return $outcome;
 }
 
+sub print_intro_page {
+    my $r = shift;
+    my $start_page =
+        &Apache::loncommon::start_page('Create a New Course');
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Options','Create_Course',undef,'Create_Courses');
+    my $end_page =
+        &Apache::loncommon::end_page();
+    my $helplink=&Apache::loncommon::help_open_topic('Create_Course_GroupSpace',&mt('Help on Creating Courses and Groups'));
+
+    my @choices = ({ internal_name => 'courseone',
+                     name => &mt('Create a single course'),
+                     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 => 'batchone',
+                     name => &mt('Create courses/groups by uploading an attributes file'),
+                     short_description =>
+    &mt('Upload an attributes file containing specifications for one or more courses or groups in XML format'),
+                 },
+    );
+    my $options;
+    foreach my $choice (@choices) {
+        $options .='    <h3><a href="/adm/createcourse?phase='.
+            $choice->{'internal_name'}.'" >'.
+            $choice->{'name'}."</a></h3>\n";
+        $options .= '    '.('&nbsp;'x8).$choice->{'short_description'}.
+            "\n";
+    }
+
+    $r->print(<<ENDDOCUMENT);
+$start_page
+$crumbs
+$options
+$end_page
+ENDDOCUMENT
+}
+
+sub upload_batchfile {
+    my $r = shift;
+    my $start_page =
+        &Apache::loncommon::start_page('Create a New Course or Group Space');
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course Attributes File','Create_Course',undef,'Create_Courses');
+    my $end_page =
+        &Apache::loncommon::end_page();
+    $r->print($start_page.$crumbs);
+    $r->print('<h3>'.&mt('Upload a courses attributes file').'</h3>');
+    $r->print('<form name="batchcreate" method="post" '.
+                'enctype="multipart/form-data" action="/adm/createcourse">'.
+              '<input type="file" name="coursecreatorxml" />'.
+              '<input type="hidden" name="phase" value="batchtwo"><br /><br />'.
+              '<input type="submit" name="batchsubmit" '.
+              'value="Create Courses/Groups" /></form>');
+    $r->print($end_page);
+    return;
+}
+
+sub process_batchfile {
+    my $r = shift;
+    my $start_page =
+        &Apache::loncommon::start_page('Create a New Course or Group Space');
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses');
+    my $end_page =
+        &Apache::loncommon::end_page();
+    my $defdom=$env{'request.role.domain'};
+    my $batchfilepath=&Apache::lonnet::userfileupload('coursecreatorxml',undef,
+                                                      'batchupload',undef,undef,
+                                                       undef,undef,$defdom);
+    my ($batchdir,$filename) = ($batchfilepath =~ m-^(.+)/pending/([^/]+)$-);
+    my ($result,$logmsg);
+    if (-e "$batchfilepath") {
+        open(FILE,"<$batchfilepath");
+        my @buffer = <FILE>;
+        close(FILE);
+        if ((defined($filename)) && (defined($batchdir))) {
+            my @requests = ($filename);
+            my %courseids = ();
+            ($result,$logmsg) = &LONCAPA::batchcreatecourse::create_courses(
+                                        \@requests,\%courseids,'web',$defdom,
+                                        $env{'user.name'},$env{'user.domain'});
+            if ($result) {
+                if (!-e "$batchdir/processed") {
+                    mkdir("$batchdir/processed", 0755);
+                    open(FILE,">$batchdir/processed/$filename");
+                    print FILE @buffer;
+                    close(FILE);
+                    if (-e "$batchdir/processed/$filename") {
+                        unlink("$batchdir/pending/$filename");
+                    }
+                }
+            }
+        }
+    }
+    $r->print($start_page.$crumbs.$result.$end_page);
+ 
+}
+
 # ===================================================================== Handler
 sub handler {
     my $r = shift;
@@ -956,22 +1296,61 @@ sub handler {
        return OK;
     }
 
-    if (&Apache::lonnet::allowed('ccc',$ENV{'request.role.domain'})) {
+    if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
        &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
 
-       if ($ENV{'form.phase'} eq 'two') {
+       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['phase']);
+       &Apache::lonhtmlcommon::clear_breadcrumbs();
+       &Apache::lonhtmlcommon::add_breadcrumb
+          ({href=>"/adm/createcourse",
+            text=>"Creation Options",
+            faq=>79,bug=>'Dom Coord Interface',});
+       if (($env{'form.phase'} eq 'coursetwo') ||
+           ($env{'form.phase'} eq 'grouptwo')) {
+           &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=$env{'form.prevphase'}",
+                   text=>&mt('[_1] Creation Settings',),
+                   faq=>9,bug=>'Dom Coord Interface',});
+          &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=$env{'form.phase'}",
+                   text=>"Creation Outcome",
+                   faq=>9,bug=>'Dom Coord Interface',});
            &create_course($r);
-       } else {
+       } elsif (($env{'form.phase'} eq 'courseone') || 
+                ($env{'form.phase'} eq 'groupone')) {
+           &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=$env{'form.phase'}",
+                   text=>&mt('[_1] Creation Settings',),
+                   faq=>9,bug=>'Dom Coord Interface',});
 	   &print_course_creation_page($r);
+       } elsif ($env{'form.phase'} eq 'batchone') {
+           &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=$env{'form.phase'}",
+                   text=>"Upload Description File",
+                   faq=>9,bug=>'Dom Coord Interface',});
+           &upload_batchfile($r);
+       } elsif ($env{'form.phase'} eq 'batchtwo') {
+           &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=$env{'form.prevphase'}",
+                   text=>"Upload Description File",
+                   faq=>9,bug=>'Dom Coord Interface',});
+           &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=$env{'form.phase'}",
+                   text=>"Creation Outcome",
+                   faq=>9,bug=>'Dom Coord Interface',});
+           &process_batchfile($r);
+       } else {
+           &print_intro_page($r);
        }
    } else {
-      $ENV{'user.error.msg'}=
-        "/adm/createcourse:ccc:0:0:Cannot create courses";
+      $env{'user.error.msg'}=
+        "/adm/createcourse:ccc:0:0:Cannot create courses or groups";
       return HTTP_NOT_ACCEPTABLE; 
    }
    return OK;
-} 
+}
 
 1;
 __END__