--- loncom/interface/loncreatecourse.pm	2003/11/12 21:37:07	1.39
+++ loncom/interface/loncreatecourse.pm	2006/05/15 19:11:40	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.39 2003/11/12 21:37:07 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.88 2006/05/15 19:11:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,20 +25,8 @@
 #
 # http://www.lon-capa.org/
 #
-# (My Desk
-#
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1 Gerd Kortemeyer)
-#
-# 2/14,2/16,2/17,7/6 Gerd Kortemeyer
-#
+###
+
 package Apache::loncreatecourse;
 
 use strict;
@@ -48,20 +36,39 @@ use Apache::loncommon;
 use Apache::lonratedt;
 use Apache::londocs;
 use Apache::lonlocal;
+use Apache::londropadd;
+use lib '/home/httpd/lib/perl';
 
 # ================================================ Get course directory listing
 
+my @output=();
+
 sub crsdirlist {
     my ($courseid,$which)=@_;
-    unless ($which) { $which=''; }
+    @output=();
+    return &innercrsdirlist($courseid,$which);
+}
+
+sub innercrsdirlist {
+    my ($courseid,$which,$path)=@_;
+    my $dirptr=16384;
+    unless ($which) { $which=''; } else { $which.='/'; }
+    unless ($path)  { $path=''; } else { $path.='/'; }
     my %crsdata=&Apache::lonnet::coursedescription($courseid);
     my @listing=&Apache::lonnet::dirlist
 	($which,$crsdata{'domain'},$crsdata{'num'},
 	 &Apache::loncommon::propath($crsdata{'domain'},$crsdata{'num'}));
-    my @output=();
     foreach (@listing) {
 	unless ($_=~/^\./) {
-	    push (@output,(split(/\&/,$_))[0]);
+	    my @unpackline = split (/\&/,$_);
+	    if ($unpackline[3]&$dirptr) {
+# is a directory, recurse
+		&innercrsdirlist($courseid,$which.$unpackline[0],
+				            $path.$unpackline[0]);
+	    } else { 
+# is a file, put into output
+		push (@output,$path.$unpackline[0]);
+	    }
 	}
     }
     return @output;
@@ -79,11 +86,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);
 }
 
@@ -115,7 +121,9 @@ sub copyfile {
                      &readfile($origcrsid,$which),
 	    (
        '/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'
-    => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/'
+    => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/',
+       '/public/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'
+    => '/public/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/'
             )));
     }
 }
@@ -129,6 +137,9 @@ sub copydb {
     my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid);
     my %data=&Apache::lonnet::dump
 	($which,$origcrsdata{'domain'},$origcrsdata{'num'});
+    foreach my $key (keys(%data)) {
+	if ($key=~/^internal./) { delete($data{$key}); }
+    }
     return &Apache::lonnet::put
 	($which,\%data,$newcrsdata{'domain'},$newcrsdata{'num'});
 }
@@ -148,6 +159,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) {
@@ -181,8 +200,14 @@ sub copyresourcedb {
 	my $thiskey=$_;
 	$thiskey=~s/^$origcrsid/$newcrsid/;
 	$newdata{$thiskey}=$data{$_};
-	if ($data{$_.'.type'}=~/^date/) {
-	    $newdata{$thiskey}=$newdata{$thiskey}+$delta;
+	if ($data{$_.'.type'}=~/^date_(start|end)$/) {
+	    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
@@ -194,18 +219,26 @@ sub copyresourcedb {
 sub copyuserfiles {
     my ($origcrsid,$newcrsid)=@_;
     foreach (&crsdirlist($origcrsid,'userfiles')) {
-	&copyfile($origcrsid,$newcrsid,$_);
+	if ($_ !~m|^scantron_|) {
+	    &copyfile($origcrsid,$newcrsid,$_);
+	}
     }
 }
 # ========================================================== Copy all userfiles
 
 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)/) {
 		 &copydb($origcrsid,$newcrsid,$_);
+		 my $histfile=$_;
+		 $histfile=~s/\.db$/\.hist/;
+		 &copyfile($origcrsid,$newcrsid,$histfile);
 	     }
 	}
     }
@@ -224,7 +257,7 @@ sub copycoursefiles {
 
 sub print_course_creation_page {
     my $r=shift;
-    my $defdom=$ENV{'request.role.domain'};
+    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))) {
@@ -236,16 +269,89 @@ 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','Help on Creating Courses');
+    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();
-    $r->print(<<ENDDOCUMENT);
-<html>
-<script language="JavaScript" type="text/javascript">
+    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);
+    my %lt=&Apache::lonlocal::texthash(
+		    'cinf' => "Course Information",
+                    'ctit' => "Course Title",
+                    'chsr' => "Course Home Server",
+                    'cidn' => "Course ID/Number",
+                    'opt'  => "optional",
+                    'iinf' => "Institutional Information",
+                    '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",
+                    '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",
+                    'crco' => "Course Content",
+                    'cncr' => "Completely new course",
+                    'cecr' => "Clone an existing course", 
+                    'map'  => "Map",
+                    'smap' => "Select Map",
+                    'sacr' => "Do NOT generate as standard course",
+                    'ocik' => "only check if you know what you are doing",
+                    'fres' => "First Resource",
+                    'stco' => "standard courses only",
+                    'blnk' => "Blank",
+                    'sllb' => "Syllabus",
+                    'navi' => "Navigate",
+                    'cid'  => "Course ID",
+                    'dmn'  => "Domain",
+                    'asov' => "Additional settings, if specified below, will override cloned settings",
+                    'assp' => "Assessment Parameters",
+                    'oaas' => "Open all assessments",
+                    'mssg' => "Messaging",
+                    'scpf' => "Set course policy feedback to Course Coordinator",
+                    'scfc' => "Set content feedback to Course Coordinator",
+                    'cmmn' => "Communication",
+                    'dsrd' => "Disable student resource discussion",
+                    'dsuc' => "Disable student use of chatrooms",
+                    'acco' => "Access Control",
+                    'snak' => "Students need access key to enter course",
+		    'kaut' => 
+		    '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",
+                    'yes'  => "Yes",
+                    'no'   => "No",
+                    'audr' => "Automated drops",
+                    'dacu' => "Duration of automated classlist updates",
+                    'dacc' => "Default start and end dates for student access",
+                    'psam' => "Please select the authentication mechanism",
+                    '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"
+				       );
+    my $js = <<END;
+<script type="text/javascript">
 var editbrowser = null;
 function openbrowser(formname,elementname) {
     var url = '/res/?';
@@ -263,93 +369,222 @@ function openbrowser(formname,elementnam
     editbrowser = open(url,title,options,'1');
     editbrowser.focus();
 }
+$javascript_validations
 </script>
 $coursebrowserjs
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-$bodytag
+END
+
+    my $start_page = 
+        &Apache::loncommon::start_page('Create a New Course',$js);
+    my $end_page = 
+        &Apache::loncommon::end_page();
+
+    $r->print(<<ENDDOCUMENT);
+$start_page
 $helplink
 <form action="/adm/createcourse" method="post" name="ccrs">
-<h2>Course Information</h2>
+<h2>$lt{'cinf'}</h2>
 <p>
-<b>Course Title:</b>
-<input type="text" size="50" name="title">
+<label><b>$lt{'ctit'}:</b>
+<input type="text" size="50" name="title" /></label>
+</p><p>
+<label>
+    <b>$lt{'chsr'}:</b>$course_home
+</label>
 </p><p>
-<b>Course Home Server:</b>$course_home
+<label>
+    <b>$lt{'cidn'} ($lt{'opt'})</b>
+    <input type="text" size="30" name="crsid" />
+</label>
 </p><p>
-<b>Course ID/Number (optional)</b>
-<input type="text" size="30" name="crsid">
+<h2>$lt{'iinf'}</h2>
+<p>
+$lt{'stat'}
+</p><p>
+<label>
+    <b>$lt{'ccod'}</b>
+    <input type="text" size="30" name="crscode" />
+</label>
+<br/>
+($lt{'toin'})
+</p><p>
+<label>
+    <b>$lt{'snid'}</b>
+    <input type="text" size="30" name="crssections" />
+</label>
+<br/>
+($lt{'csli'})
+</p><p>
+<label>
+    <b>$lt{'crcs'}</b>
+    <input type="text" size="30" name="crsxlist" />
+</label>
+<br/>
+($lt{'cscs'})
 </p>
-<h2>Course Content</h2>
+<h2>$lt{'crco'}</h2>
 <table border="2">
-<tr><th>Completely new course</th><th>Clone an existing course</th></tr>
+<tr><th>$lt{'cncr'}</th><th>$lt{'cecr'}</th></tr>
 <tr><td>
 <p>
-<b>Map:</b>
-<input type="text" size="50" name="topmap">
-<a href="javascript:openbrowser('ccrs','topmap')">Select Map</a>
+<label>
+    <b>$lt{'map'}:</b>
+    <input type="text" size="50" name="topmap" />
+</label>
+<a href="javascript:openbrowser('ccrs','topmap')">$lt{'smap'}</a>
 </p><p>
-<b>Do NOT generate as standard course</b><br /> 
-(only check if you know what you are doing):
-<input type="checkbox" name="nonstandard">
-</p>
-<p>
-<b>First Resource</b><br />(standard courses only):
-<input type="radio" name="firstres" value="blank">Blank
+<label for="nonstd"><b>$lt{'sacr'}</b></label>
+<br />
+($lt{'ocik'}):
+<input id="nonstd" type="checkbox" name="nonstandard" />
+</p><p>
+<b>$lt{'fres'}</b><br />($lt{'stco'}):
+<label>
+    <input type="radio" name="firstres" value="blank" />$lt{'blnk'}
+</label>
 &nbsp;
-<input type="radio" name="firstres" value="syl" checked>Syllabus
+<label>
+    <input type="radio" name="firstres" value="syl" checked />$lt{'sllb'}
+</label>
 &nbsp;
-<input type="radio" name="firstres" value="nav">Navigate
+<label>
+    <input type="radio" name="firstres" value="nav" />$lt{'navi'}
+</label>
 </p>
 </td><td>
-Course ID: <input input type="text" size="25" name="clonecourse" value="" />
+<label>
+    $lt{'cid'}: <input type="text" size="25" name="clonecourse" value="" />
+</label>
 <br />
-Domain: 
-$cloneform<br />&nbsp;<br />
-Additional settings, if specified below, will override cloned settings.
+<label>
+    $lt{'dmn'}: $cloneform
+</label>
+<br />
+&nbsp;<br />
+$lt{'asov'}.
 </td></tr>
 </table>
-<h2>Assessment Parameters</h2>
+<h2>$lt{'assp'}</h2>
 <p>
-<b>Open all assessments: </b>
-<input type="checkbox" name="openall" checked>
+<label>
+    <b>$lt{'oaas'}: </b>
+    <input type="checkbox" name="openall" />
+</label>
 </p>
-<h2>Messaging</h2>
+<h2>$lt{'mssg'}</h2>
 <p>
-<b>Set course policy feedback to Course Coordinator: </b>
-<input type="checkbox" name="setpolicy" checked>
-</p><p>
-<b>Set content feedback to Course Coordinator: </b>
-<input type="checkbox" name="setcontent" checked>
+<label>
+    <b>$lt{'scpf'}: </b>
+    <input type="checkbox" name="setpolicy" checked />
+</label>
+<br />
+<label>
+    <b>$lt{'scfc'}: </b>
+    <input type="checkbox" name="setcontent" checked />
+</label>
 </p>
-<h2>Communication</h2>
+<h2>$lt{'cmmn'}</h2>
 <p>
-<b>Disable student resource discussion: </b>
-<input type="checkbox" name="disresdis" /> <br />
-<b>Disable student use of chatrooms: </b>
-<input type="checkbox" name="disablechat" />
+<label>
+    <b>$lt{'dsrd'}: </b>
+    <input type="checkbox" name="disresdis" />
+</label>
+<br />
+<label>
+    <b>$lt{'dsuc'}: </b>
+    <input type="checkbox" name="disablechat" />
+</label>
 </p>
-<h2>Access Control</h2>
+<h2>$lt{'acco'}</h2>
 <p>
-<b>Students need access key to enter course: </b>
-<input type="checkbox" name="setkeys" />
+<label>
+    <b>$lt{'snak'}: </b>
+    <input type="checkbox" name="setkeys" />
+</label>
+<br />
+<label>
+    <b>$lt{'kaut'}: </b>
+    <input type="text" size="30" name="keyauth" />
+</label>
 </p>
-<h2>Course Coordinator</h2>
+<h2>$lt{'rshm'}</h2>
 <p>
-<b>Username:</b> <input type="text" size="15" name="ccuname" />
+<label>
+    <b>$lt{'rshm'}: </b>
+    <input type="text" name="reshome" size="30" value="/res/$defdom/" />
+</label>
+</p>
+<p>
+<h2>$lt{'aens'}</h2>
+$lt{'aesc'}
+</p>
+<p>
+<b>$lt{'aadd'}</b>
+<label><input type="radio" name="autoadds" value="1" />$lt{'yes'}</label> 
+<label><input type="radio" name="autoadds" value="0" checked="true" />$lt{'no'}
+</label>
+</p><p>
+<b>$lt{'audr'}</b>
+<label><input type="radio" name="autodrops" value="1" />$lt{'yes'}</label> 
+<label><input type="radio" name="autodrops" value="0" checked="true" />$lt{'no'}</label>
+</p><p>
+<b>$lt{'dacu'}</b>
+$enroll_table
 </p><p>
-<b>Domain:</b> $domform
+<b>$lt{'dacc'}</b>
+$access_table
+<p></p>
+<b>$lt{'psam'}.</b><br />
+$lt{'pcda'}.
 </p><p>
-<b>Immediately expire own role as Course Coordinator:</b>
-<input type="checkbox" name="expireown" checked>
+$krbform
+<br />
+$intform
+<br />
+$locform
+</p><p>
+<b>$lt{'nech'}</b><br />
+$lt{'nccl'}<br/>
+<label>
+    <input type="radio" name="notify_owner" value="1" />$lt{'yes'}
+</label> 
+<label>
+    <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>
+<label>
+    <input type="radio" name="showphotos" value="1" />$lt{'yes'}
+</label> 
+<label>
+    <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
+</label>
+</p>
+<hr />
+<h2>$lt{'cc'}</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="phase" value="two" />
-<input type="submit" value="Open Course">
+<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}" />
 </p>
 </form>
-</body>
-</html>
+$end_page
 ENDDOCUMENT
 }
 
@@ -357,103 +592,332 @@ ENDDOCUMENT
 
 sub create_course {
     my $r=shift;
-    my $topurl='/res/'.&Apache::lonnet::declutter($ENV{'form.topmap'});
-    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 $cdescr=$ENV{'form.title'};
-    my $curl=$ENV{'form.topmap'};
-    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 $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');
+
+    my $autharg;
+    my $authtype;
+
+    if ($env{'form.login'} eq 'krb') {
+        $authtype = 'krb';
+        $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'};
+        }
+    } elsif ($env{'form.login'} eq 'loc') {
+        $authtype = 'localauth';
+        if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
+            $autharg = $env{'form.locarg'};
+        }
+    }
+
+    my $logmsg;
+    my $start_page=&Apache::loncommon::start_page('Create a New Course');
+    $r->print($start_page);
+
+    my $args = {
+               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_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'}
+               };
+
     #
     # Verify data
     #
     # Check the veracity of the course coordinator
     if (&Apache::lonnet::homeserver($ccuname,$ccdomain) eq 'no_host') {
-        $r->print('No such user '.$ccuname.' at '.$ccdomain.'</body></html>');
+	$r->print('<form action="/adm/createuser" method="post" name="crtuser">');
+        $r->print(&mt('No such user').' '.$ccuname.' '.&mt('at').' '.$ccdomain.'.<br />');
+	$r->print(&mt("Please click Back on your browser and select another user, or "));
+	$r->print('
+	    <input type="hidden" name="phase" value="get_user_info" />
+            <input type="hidden" name="ccuname" value="'.$ccuname.'" />
+            <input type="hidden" name="ccdomain" value="'.$ccdomain.'" />
+            <input name="userrole" type="submit" value="'.
+		  &mt('Create User').'" />
+	</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'}})) {
-        $r->print('Invalid home server for course: '.
-                  $ENV{'form.course_home'}.'</body></html>');
+        ($env{'request.role.domain'});
+    if (! exists($host_servers{$env{'form.course_home'}})) {
+        $r->print(&mt('Invalid home server for course').': '.
+                  $env{'form.course_home'}.&Apache::loncommon::end_page());
         return;
     }
+    my ($courseid,$crsudom,$crsunum);
+    $r->print(&construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum,$env{'user.domain'},$env{'user.name'}));
+
+#
+# Make the requested user a course coordinator
+#
+   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'}) {
+        $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>'.
+	      '<p><a href="/adm/createcourse">'.
+	      &mt('Create Another Course').'</a></p>'.
+	      &Apache::loncommon::end_page());
+}
+
+sub construct_course {
+    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
+    my $outcome;
+
 #
 # Open course
 #
     my %cenv=();
-    my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'},
-                                               $cdescr,$curl,
-                                               $ENV{'form.course_home'},
-                                               $ENV{'form.nonstandard'});
+    $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
+                                               $args->{'cdescr'},
+                                               $args->{'curl'},
+                                               $args->{'course_home'},
+                                               $args->{'nonstandard'},
+                                               $args->{'crscode'},
+                                               $args->{'ccuname'});
 
     # 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.
-    $r->print('New LON-CAPA Course ID: '.$courseid.'<br>');
+    $outcome .= 'New LON-CAPA Course ID: '.$$courseid.'<br>';
 #
 # Check if created correctly
 #
-    my ($crsudom,$crsunum)=($courseid=~/^\/(\w+)\/(\w+)$/);
-    my $crsuhome=&Apache::lonnet::homeserver($crsunum,$crsudom);
-    $r->print('Created on: '.$crsuhome.'<br>');
+    ($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/);
+    my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
+    $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
 #
 # Are we cloning?
 #
     my $cloneid='';
-    if (($ENV{'form.clonecourse'}) && ($ENV{'form.clonedomain'})) {
-	$cloneid='/'.$ENV{'form.clonedomain'}.'/'.$ENV{'form.clonecourse'};
+    if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
         my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/);
 	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
 	if ($clonehome eq 'no_host') {
-	    $r->print(
-    '<br /><font color="red">Attempting to clone non-existing course '.$cloneid.'</font>');
+	    $outcome .=
+    '<br /><font color="red">'.&mt('Attempting to clone non-existing course').' '.$cloneid.'</font>';
 	} else {
-	    $r->print(
-    '<br /><font color="green">Cloning course from '.$clonehome.'</font>');
-	    my %oldcenv=&Apache::lonnet::dump('environment',$crsudom,$crsunum);
+	    $outcome .= 
+    '<br /><font color="green">'.&mt('Cloning course from').' '.$clonehome.'</font>';
+	    my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
 # Copy all files
-	    &copycoursefiles($cloneid,$courseid);
+	    &copycoursefiles($cloneid,$$courseid);
 # Restore URL
 	    $cenv{'url'}=$oldcenv{'url'};
 # Restore title
 	    $cenv{'description'}=$oldcenv{'description'};
+# restore grading mode
+	    if (defined($oldcenv{'grading'})) {
+		$cenv{'grading'}=$oldcenv{'grading'};
+	    }
 # Mark as cloned
 	    $cenv{'clonedfrom'}=$cloneid;
+	    delete($cenv{'default_enrollment_start_date'});
+	    delete($cenv{'default_enrollment_end_date'});
 	}
     }
 #
 # Set environment (will override cloned, if existing)
 #
-    if ($ENV{'form.crsid'}) {
-        $cenv{'courseid'}=$ENV{'form.crsid'};
+    my @sections = ();
+    my @xlists = ();
+    if ($args->{'crsid'}) {
+        $cenv{'courseid'}=$args->{'crsid'};
+    }
+    if ($args->{'crscode'}) {
+        $cenv{'internal.coursecode'}=$args->{'crscode'};
+    }
+    if ($args->{'ccuname'}) {
+        $cenv{'internal.courseowner'} = $args->{'ccuname'};
+    } else {
+        $cenv{'internal.courseowner'} = $args->{'curruser'};
+    }
+
+    my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
+    if ($args->{'crssections'}) {
+        $cenv{'internal.sectionnums'} = '';
+        if ($args->{'crssections'} =~ m/,/) {
+            @sections = split/,/,$args->{'crssections'};
+        } else {
+            $sections[0] = $args->{'crssections'};
+        }
+        if (@sections > 0) {
+            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'});
+                $cenv{'internal.sectionnums'} .= $item.',';
+                unless ($addcheck eq 'ok') {
+                    push @badclasses, $class;
+                }
+            }
+            $cenv{'internal.sectionnums'} =~ s/,$//;
+        }
+    }
+# do not hide course coordinator from staff listing, 
+# even if privileged
+    $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+# add crosslistings
+    if ($args->{'crsxlist'}) {
+        $cenv{'internal.crosslistings'}='';
+        if ($args->{'crsxlist'} =~ m/,/) {
+            @xlists = split/,/,$args->{'crsxlist'};
+        } else {
+            $xlists[0] = $args->{'crsxlist'};
+        }
+        if (@xlists > 0) {
+            foreach my $item (@xlists) {
+                my ($xl,$gp) = split/:/,$item;
+                my $addcheck =  &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});
+                $cenv{'internal.crosslistings'} .= $item.',';
+                unless ($addcheck eq 'ok') {
+                    push @badclasses, $xl;
+                }
+            }
+            $cenv{'internal.crosslistings'} =~ s/,$//;
+        }
+    }
+    if ($args->{'autoadds'}) {
+        $cenv{'internal.autoadds'}=$args->{'autoadds'};
+    }
+    if ($args->{'autodrops'}) {
+        $cenv{'internal.autodrops'}=$args->{'autodrops'};
     }
-    if (($ccdomain) && ($ccuname)) {
-       if ($ENV{'form.setpolicy'}) {
-           $cenv{'policy.email'}=$ccuname.':'.$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(
+                'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course.  However, if automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA course',
+                'dnhr' => 'does not have rights to access enrollment in these classes',
+                'adby' => 'as determined by the policies of your institution on access to official classlists'
+        );
+        $outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n";
+        foreach (@badclasses) {
+            $outcome .= "<li>$_</li>\n";
+        }
+        $outcome .= "</ul><br /><br /></font>\n";
+    }
+    if ($args->{'no_end_date'}) {
+        $args->{'endaccess'} = 0;
+    }
+    $cenv{'internal.autostart'}=$args->{'enrollstart'};
+    $cenv{'internal.autoend'}=$args->{'enrollend'};
+    $cenv{'default_enrollment_start_date'}=$args->{'startaccess'};
+    $cenv{'default_enrollment_end_date'}=$args->{'endaccess'};
+    if ($args->{'showphotos'}) {
+      $cenv{'internal.showphotos'}=$args->{'showphotos'};
+    }
+    $cenv{'internal.authtype'} = $args->{'authtype'};
+    $cenv{'internal.autharg'} = $args->{'autharg'}; 
+    if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) {
+        if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'}  eq '') {
+            $outcome .= '<font color="red" size="+1">'.
+                      &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>';
+        }
+    }
+    if (($args->{'ccdomain'}) && ($args->{'ccuname'})) {
+       if ($args->{'setpolicy'}) {
+           $cenv{'policy.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
        }
-       if ($ENV{'form.setcontent'}) {
-           $cenv{'question.email'}=$ccuname.':'.$ccdomain;
+       if ($args->{'setcontent'}) {
+           $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
        }
     }
-    if ($ENV{'form.setkeys'}) {
+    if ($args->{'reshome'}) {
+	$cenv{'reshome'}=$args->{'reshome'}.'/';
+	$cenv{'reshome'}=~s/\/+$/\//;
+    }
+#
+# course has keyed access
+#
+    if ($args->{'setkeys'}) {
        $cenv{'keyaccess'}='yes';
     }
-    if ($ENV{'form.disresdis'}) {
+# if specified, key authority is not course, but user
+# only active if keyaccess is yes
+    if ($args->{'keyauth'}) {
+	$args->{'keyauth'}=~s/[^\w\@]//g;
+	if ($args->{'keyauth'}) {
+	    $cenv{'keyauth'}=$args->{'keyauth'};
+	}
+    }
+
+    if ($args->{'disresdis'}) {
         $cenv{'pch.roles.denied'}='st';
     }
-    if ($ENV{'form.disablechat'}) {
+    if ($args->{'disablechat'}) {
         $cenv{'plc.roles.denied'}='st';
     }
 
@@ -464,66 +928,52 @@ ENDENHEAD
     # Use new Randomseed
     #
     $cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();;
+    $cenv{'receiptalg'}=&Apache::lonnet::latest_receipt_algorithm_id();;
+    #
+    # The encryption code and receipt prefix for this course
+    #
+    $cenv{'internal.encseed'}=$Apache::lonnet::perlvar{'lonReceipt'}.$$.time.int(rand(9999));
+    $cenv{'internal.encpref'}=100+int(9*rand(99));
     #
     # By default, use standard grading
-    $cenv{'grading'} = 'standard';
+    if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
 
-    $r->print('<br />Setting environment: '.                 
-          &Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'<br>');
+    $outcome .= ('<br />'.&mt('Setting environment').': '.                 
+          &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>');
 #
 # Open all assignments
 #
-    if ($ENV{'form.openall'}) {
-       my $storeunder=$crsudom.'_'.$crsunum.'.0.opendate';
+    if ($args->{'openall'}) {
+       my $storeunder=$$crsudom.'_'.$$crsunum.'.0.opendate';
        my %storecontent = ($storeunder         => time,
                            $storeunder.'.type' => 'date_start');
        
-       $r->print('Opening all assignments: '.&Apache::lonnet::cput
-                 ('resourcedata',\%storecontent,$crsudom,$crsunum).'<br>');
+       $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput
+                 ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>';
    }
 #
 # Set first page
 #
-    unless (($ENV{'form.nonstandard'}) || ($ENV{'form.firstres'} eq 'blank')) {
-	$r->print('Setting first resource: ');
+    unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')
+	    || ($cloneid)) {
+	$outcome .= &mt('Setting first resource').': ';
         my ($errtext,$fatal)=
-           &Apache::londocs::mapread($crsunum,$crsudom,'default.sequence');
-        $r->print(($fatal?$errtext:'read ok').' - ');
+           &Apache::londocs::mapread($$crsunum,$$crsudom,'default.sequence');
+        $outcome .= ($fatal?$errtext:'read ok').' - ';
         my $title; my $url;
-        if ($ENV{'form.firstres'} eq 'syl') {
+        if ($args->{'firstres'} eq 'syl') {
 	    $title='Syllabus';
-            $url='/public/'.$crsudom.'/'.$crsunum.'/syllabus';
+            $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
         } else {
             $title='Navigate Contents';
             $url='/adm/navmaps';
         }
         $Apache::lonratedt::resources[1]=$title.':'.$url.':false:start:res';
         ($errtext,$fatal)=
-           &Apache::londocs::storemap($crsunum,$crsudom,'default.sequence');
-        $r->print(($fatal?$errtext:'write ok').'<br>');
-  }
-#
-# Make current user course adminstrator
-#
-    my $end=undef;
-    my $addition='';
-    if ($ENV{'form.expireown'}) { $end=time+5; $addition='expired'; }
-    $r->print('Assigning '.$addition.' role of course coordinator to self: '.
-    &Apache::lonnet::assignrole(
-     $ENV{'user.domain'},$ENV{'user.name'},$courseid,'cc',$end).'<br>');
-#
-# Make additional user course administrator
-#
-   if (($ccdomain) && ($ccuname)) {
-    $r->print('Assigning role of course coordinator to '.
-               $ccuname.' at '.$ccdomain.': '.
-    &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'<p>');
-   }
-    if ($ENV{'form.setkeys'}) {
-	$r->print(
- '<p><a href="/adm/managekeys?cid='.$crsudom.'_'.$crsunum.'">Manage Access Keys</a></p>');
+           &Apache::londocs::storemap($$crsunum,$$crsudom,'default.sequence');
+        $outcome .= ($fatal?$errtext:'write ok').'<br>';
     }
-    $r->print('<p>Roles will be active at next login.</p></body></html>');
+    return $outcome;
 }
 
 # ===================================================================== Handler
@@ -536,17 +986,17 @@ 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') {
+       if ($env{'form.phase'} eq 'two') {
            &create_course($r);
        } else {
 	   &print_course_creation_page($r);
        }
    } else {
-      $ENV{'user.error.msg'}=
+      $env{'user.error.msg'}=
         "/adm/createcourse:ccc:0:0:Cannot create courses";
       return HTTP_NOT_ACCEPTABLE; 
    }