--- loncom/interface/loncreatecourse.pm	2003/12/11 17:31:23	1.46
+++ loncom/interface/loncreatecourse.pm	2005/01/20 16:30:52	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.46 2003/12/11 17:31:23 sakharuk Exp $
+# $Id: loncreatecourse.pm,v 1.75 2005/01/20 16:30:52 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;
@@ -50,21 +38,37 @@ use Apache::londocs;
 use Apache::lonlocal;
 use Apache::londropadd;
 use lib '/home/httpd/lib/perl';
-use localenroll;
 
 # ================================================ 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;
@@ -118,7 +122,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'}.'/'
             )));
     }
 }
@@ -132,6 +138,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'});
 }
@@ -184,7 +193,7 @@ sub copyresourcedb {
 	my $thiskey=$_;
 	$thiskey=~s/^$origcrsid/$newcrsid/;
 	$newdata{$thiskey}=$data{$_};
-	if ($data{$_.'.type'}=~/^date/) {
+	if ($data{$_.'.type'}=~/^date_(start|end)$/) {
 	    $newdata{$thiskey}=$newdata{$thiskey}+$delta;
 	}
     }
@@ -197,7 +206,9 @@ sub copyresourcedb {
 sub copyuserfiles {
     my ($origcrsid,$newcrsid)=@_;
     foreach (&crsdirlist($origcrsid,'userfiles')) {
-	&copyfile($origcrsid,$newcrsid,$_);
+	if ($_ !~m|^scantron_|) {
+	    &copyfile($origcrsid,$newcrsid,$_);
+	}
     }
 }
 # ========================================================== Copy all userfiles
@@ -245,10 +256,11 @@ sub print_course_creation_page {
 	($ENV{'request.role.domain'},'clonedomain').
 		     &Apache::loncommon::selectcourse_link
 		     ('ccrs','clonecourse','clonedomain');
-    my $coursebrowserjs=&Apache::loncommon::coursebrowser_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 $date_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'createcourse');
+    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);
@@ -272,7 +284,7 @@ sub print_course_creation_page {
                     '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:bot2", 
+                    '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", 
@@ -298,6 +310,8 @@ sub print_course_creation_page {
                     '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",
@@ -308,11 +322,13 @@ sub print_course_creation_page {
                     '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?",
                     'irsp' => "Include retrieval of student photographs?",
+		    'rshm' => 'Resource Space Home',
                     'opco' => "Open Course"
 				       );
     $r->print(<<ENDDOCUMENT);
@@ -346,28 +362,41 @@ $helplink
 <form action="/adm/createcourse" method="post" name="ccrs">
 <h2>$lt{'cinf'}</h2>
 <p>
-<b>$lt{'ctit'}:</b>
-<input type="text" size="50" name="title">
+<label><b>$lt{'ctit'}:</b>
+<input type="text" size="50" name="title" /></label>
 </p><p>
-<b>$lt{'chsr'}:</b>$course_home
-</p><p>
-<b>$lt{'cidn'} ($lt{'opt'})</b>
-<input type="text" size="30" name="crsid">
+<label>
+    <b>$lt{'chsr'}:</b>$course_home
+</label>
+</p><p>
+<label>
+    <b>$lt{'cidn'} ($lt{'opt'})</b>
+    <input type="text" size="30" name="crsid" />
+</label>
 </p><p>
 <h2>$lt{'iinf'}</h2>
 <p>
 $lt{'stat'}
 </p><p>
-<b>$lt{'ccod'}</b>
-<input type="text" size="30" name="crscode" /><br/>
+<label>
+    <b>$lt{'ccod'}</b>
+    <input type="text" size="30" name="crscode" />
+</label>
+<br/>
 ($lt{'toin'})
 </p><p>
-<b>$lt{'snid'}</b>
- <input type="text" size="30" name="crssections" /><br/>
+<label>
+    <b>$lt{'snid'}</b>
+    <input type="text" size="30" name="crssections" />
+</label>
+<br/>
 ($lt{'csli'})
 </p><p>
-<b>$lt{'crcs'}</b>
-<input type="text" size="30" name="crsxlist" /><br/>
+<label>
+    <b>$lt{'crcs'}</b>
+    <input type="text" size="30" name="crsxlist" />
+</label>
+<br/>
 ($lt{'cscs'})
 </p>
 <h2>$lt{'crco'}</h2>
@@ -375,77 +404,113 @@ $lt{'stat'}
 <tr><th>$lt{'cncr'}</th><th>$lt{'cecr'}</th></tr>
 <tr><td>
 <p>
-<b>$lt{'map'}:</b>
-<input type="text" size="50" name="topmap">
+<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>$lt{'sacr'}</b><br /> 
+<label for="nonstd"><b>$lt{'sacr'}</b></label>
+<br />
 ($lt{'ocik'}):
-<input type="checkbox" name="nonstandard">
-</p>
-<p>
+<input id="nonstd" type="checkbox" name="nonstandard" />
+</p><p>
 <b>$lt{'fres'}</b><br />($lt{'stco'}):
-<input type="radio" name="firstres" value="blank">$lt{'blnk'}
+<label>
+    <input type="radio" name="firstres" value="blank" />$lt{'blnk'}
+</label>
 &nbsp;
-<input type="radio" name="firstres" value="syl" checked>$lt{'sllb'}
+<label>
+    <input type="radio" name="firstres" value="syl" checked />$lt{'sllb'}
+</label>
 &nbsp;
-<input type="radio" name="firstres" value="nav">$lt{'navi'}
+<label>
+    <input type="radio" name="firstres" value="nav" />$lt{'navi'}
+</label>
 </p>
 </td><td>
-$lt{'cid'}: <input input type="text" size="25" name="clonecourse" value="" />
+<label>
+    $lt{'cid'}: <input type="text" size="25" name="clonecourse" value="" />
+</label>
+<br />
+<label>
+    $lt{'dmn'}: $cloneform
+</label>
 <br />
-$lt{'dmn'}: 
-$cloneform<br />&nbsp;<br />
+&nbsp;<br />
 $lt{'asov'}.
 </td></tr>
 </table>
 <h2>$lt{'assp'}</h2>
 <p>
-<b>$lt{'oaas'}: </b>
-<input type="checkbox" name="openall" checked>
+<label>
+    <b>$lt{'oaas'}: </b>
+    <input type="checkbox" name="openall" />
+</label>
 </p>
 <h2>$lt{'mssg'}</h2>
 <p>
-<b>$lt{'scpf'}: </b>
-<input type="checkbox" name="setpolicy" checked>
-</p><p>
-<b>$lt{'scfc'}: </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>$lt{'cmmn'}</h2>
 <p>
-<b>$lt{'dsrd'}: </b>
-<input type="checkbox" name="disresdis" /> <br />
-<b>$lt{'dsuc'}: </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>$lt{'acco'}</h2>
 <p>
-<b>$lt{'snak'}: </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>$lt{'rshm'}</h2>
+<p>
+<label>
+    <b>$lt{'rshm'}: </b>
+    <input type="text" name="reshome" size="30" value="/res/$defdom/" />
+</label>
 </p>
-<h2>$lt{'cc'}</h2>
 <p>
-<b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
-</p><p>
-<b>$lt{'dmn'}:</b> $domform
-</p><p>
-<b>$lt{'ierc'}:</b>
-<input type="checkbox" name="expireown" checked>
-</p><p>
 <h2>$lt{'aens'}</h2>
 $lt{'aesc'}
 </p>
 <p>
 <b>$lt{'aadd'}</b>
-<input type="radio" name="autoadds" value="1" />$lt{'yes'} <input type="radio" name="autoadds" value="0" checked="true" />$lt{'no'}
+<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>
-<input type="radio" name="autodrops" value="1" />$lt{'yes'} <input type="radio" name="autodrops" value="0" checked="true" />$lt{'no'}
+<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>
-$date_table
+$enroll_table
 </p><p>
+<b>$lt{'dacc'}</b>
+$access_table
+<p></p>
 <b>$lt{'psam'}.</b><br />
 $lt{'pcda'}.
 </p><p>
@@ -457,13 +522,40 @@ $locform
 </p><p>
 <b>$lt{'nech'}</b><br />
 $lt{'nccl'}<br/>
-<input type="radio" name="notify" value="1" />$lt{'yes'} <input type="radio" name="notify"
-value="0" checked="true" />$lt{'no'}
-</p><p>
-<b>$lt{'irsp'}</b> <input type="radio" name="showphotos" value="1" />$lt{'yes'} <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
-</p><p>
+<label>
+    <input type="radio" name="notify" value="1" />$lt{'yes'}
+</label> 
+<label>
+    <input type="radio" name="notify" 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>
+<label>
+    <b>$lt{'ierc'}:</b>
+    <input type="checkbox" name="expireown" checked />
+</label>
+</p>
+<p>
 <input type="hidden" name="phase" value="two" />
-<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}">
+<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}" />
 </p>
 </form>
 </body>
@@ -475,13 +567,36 @@ 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'};
     $ccuname=~s/\W//g;
     $ccdomain=~s/\W//g;
-    my $cdescr=$ENV{'form.title'};
-    my $curl=$ENV{'form.topmap'};
+
+    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 $bodytag=&Apache::loncommon::bodytag('Create a New Course');
     $r->print(<<ENDENHEAD);
 <html>
@@ -490,12 +605,59 @@ sub create_course {
 </head>
 $bodytag
 ENDENHEAD
+
+    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 => $ENV{'form.notify'},
+               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(&mt('No such user').' '.$ccuname.' '.&mt('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></body></html>');
 	return;
     }
     # Check the proposed home server for the course
@@ -506,170 +668,226 @@ ENDENHEAD
                   $ENV{'form.course_home'}.'</body></html>');
         return;
     }
+    my ($courseid,$crsudom,$crsunum);
+    $r->print(&construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum));
+
+#
+# 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 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'}) {
+        $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>');
+}
+
+sub construct_course {
+    my ($args,$logmsg,$courseid,$crsudom,$crsunum) = @_;
+    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(&mt('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">'.&mt('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">'.&mt('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)
 #
-    my @affiliates = ();  # Used to accumulate sections and crosslistings
-    if ($ENV{'form.crsid'}) {
-        $cenv{'courseid'}=$ENV{'form.crsid'};
-    }
-    if ($ENV{'form.crscode'}) {
-        $cenv{'internal.coursecode'}=$ENV{'form.crscode'};
-    }
-    if ($ENV{'form.crssections'}) {
-        $cenv{'internal.sectionnums'}=$ENV{'form.crssections'};
-        my @sections = ();
-        if ($cenv{'internal.sectionnums'} =~ m/,/) {
-            @sections = split/,/,$cenv{'internal.sectionnums'};
+    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] = $cenv{'internal.sectionnums'};
+            $sections[0] = $args->{'crssections'};
         }
         if (@sections > 0) {
-            foreach (@sections) {
-                my ($sec,$gp) = split/:/,$_; 
-                push @affiliates,$ENV{'form.crscode'}.$sec;
+            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/,$//;
         }
     }
-    if ($ENV{'form.crsxlist'}) {
-       $cenv{'internal.crosslistings'}=$ENV{'form.crsxlist'};
-       my @xlists = ();
-        if ($cenv{'internal.crosslistings'} =~ m/,/) {
-            @xlists = split/,/,$cenv{'internal.crosslistings'};
+# 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] = $cenv{'internal.crosslistings'};
+            $xlists[0] = $args->{'crsxlist'};
         }
         if (@xlists > 0) {
-            foreach (@xlists) {
-                my ($xl,$gp) = split/:/,$_;
-                push @affiliates,$xl;
+            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 ($ENV{'form.autoadds'}) {
-        $cenv{'internal.autoadds'}=$ENV{'form.autoadds'};
+    if ($args->{'autoadds'}) {
+        $cenv{'internal.autoadds'}=$args->{'autoadds'};
     }
-    if ($ENV{'form.autodrops'}) {
-        $cenv{'internal.autodrops'}=$ENV{'form.autodrops'};
+    if ($args->{'autodrops'}) {
+        $cenv{'internal.autodrops'}=$args->{'autodrops'};
     }
-    if ($ENV{'form.notify'}) {
-      if ($ccuname) {
-        $cenv{'internal.notifylist'} = $ccuname;
+    if ($args->{'notify'}) {
+      if ($args->{'ccuname'}) {
+        $cenv{'internal.notifylist'} = $args->{'ccuname'}.'@'.$args->{'ccdomain'};
       }
     }
-    if ($ccuname) {
-        $cenv{'internal.courseowner'} = $ccuname;
-    } else {
-        $cenv{'internal.courseowner'} = $ENV{'user.name'};
-    }
-    if (@affiliates > 0) {
-        my @badclasses = ();
-        foreach my $class (@affiliates) {
-            my $addcheck =  &localenroll::new_course($class,$cenv{'internal.courseowner'});
-            unless ($addcheck eq 'ok') {
-                push @badclasses, $class; 
-            }
-        }
-        if (@badclasses > 0) {
-            $r->print('<font color="red">'.
-                      "The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course. 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 ($cenv{'internal.courseowner'}) - does not have rights to access enrollment in these classes (as determined by your instititution's policies on access to official classlists).<br/><ul>\n");
-            foreach (@badclasses) {
-                $r->print("<li>$_</li>\n");
-            }
-            $r->print ("</ul><br/><br/></font>\n");
-        }
-    }
-    my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
-    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form('enddate');
-    if ($ENV{'form.no_end_date'}) {
-      $enddate = 0;
-    }
-    $cenv{'internal.autostart'}=$startdate;
-    $cenv{'internal.autoend'}=$enddate;
-    if ($ENV{'form.showphotos'}) {
-      $cenv{'internal.showphotos'}=$ENV{'form.showphotos'};
-    }
-    if ($ENV{'form.login'} eq 'krb') {
-        $cenv{'internal.authtype'} = 'krb';
-        $cenv{'internal.authtype'} .=$ENV{'form.krbver'};
-        $cenv{'internal.autharg'} = $ENV{'form.krbarg'};
-    } elsif ($ENV{'form.login'} eq 'int') {
-        $cenv{'internal.authtype'} ='internal';
-        if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
-            $cenv{'internal.autharg'} = $ENV{'form.intarg'};
-        }
-    } elsif ($ENV{'form.login'} eq 'loc') {
-        $cenv{'internal.authtype'} = 'localauth';
-        if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
-            $cenv{'internal.autharg'} = $ENV{'form.locarg'};
-        }
+    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 '') {
-            $r->print('<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>');
+            $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 (($ccdomain) && ($ccuname)) {
-       if ($ENV{'form.setpolicy'}) {
-           $cenv{'policy.email'}=$ccuname.':'.$ccdomain;
+    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';
     }
 
@@ -680,66 +898,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 />'.&mt('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(&mt('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(&mt('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(&mt('Assigning').' '.$addition.' '.&mt('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(&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>');
+           &Apache::londocs::storemap($$crsunum,$$crsudom,'default.sequence');
+        $outcome .= ($fatal?$errtext:'write ok').'<br>';
     }
-    $r->print('<p>'.&mt('Roles will be active at next login').'.</p></body></html>');
+    return $outcome;
 }
 
 # ===================================================================== Handler