--- loncom/interface/loncreatecourse.pm	2002/03/25 19:28:41	1.7
+++ loncom/interface/loncreatecourse.pm	2002/08/18 21:43:59	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.7 2002/03/25 19:28:41 matthew Exp $
+# $Id: loncreatecourse.pm,v 1.11 2002/08/18 21:43:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,10 +47,17 @@ use Apache::lonnet;
 
 # ===================================================== Phase one: fill-in form
 
-sub phase_one {
+sub print_course_creation_page {
     my $r=shift;
-
-    my $defdom=$ENV{'user.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))) {
+        $course_home .= 
+          qq{<option value="$server">$server $host_servers{$server}</option>};
+    }
+    $course_home .= "\n</select>\n";
+    my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
     $r->print(<<ENDDOCUMENT);
 <html>
 <script language="JavaScript" type="text/javascript">
@@ -79,18 +86,46 @@ function openbrowser(formname,elementnam
 <img align="right" src="/adm/lonIcons/lonlogos.gif">
 <h1>Create a new Course</h1>
 <form action="/adm/createcourse" method="post" name="ccrs">
-<h3>Course Title</h3>
+<h2>Course Information</h2>
+<p>
+<b>Course Title:</b>
 <input type="text" size="50" name="title">
-<h3>Top-level Map</h3>
+</p><p>
+<b>Map:</b>
 <input type="text" size="50" name="topmap">
 <a href="javascript:openbrowser('ccrs','topmap')">Browse</a>
-<h3>Course ID/Number (optional)</h3>
+</p><p>
+<b>Do NOT generate as standard course</b> 
+(only check if you know what you are doing):
+<input type="checkbox" name="nonstandard">
+</p><p>
+<b>Course Home Server:</b>$course_home
+</p><p>
+<b>Course ID/Number (optional)</b>
 <input type="text" size="30" name="crsid">
-<h3>Course Cooordinator</h3>
-Username: <input type="text" size="15" name="ccuname" /><br>
-Domain:   <input type="text" size="15" name="ccdomain" value="$defdom" />
-<input type="hidden" name="phase" value="two" /><p>
+</p><p>
+<b>Open all assessments: </b>
+<input type="checkbox" name="openall" checked>
+</p><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>
+</p>
+
+<h2>Course Coordinator</h2>
+<p>
+<b>Username:</b> <input type="text" size="15" name="ccuname" />
+</p><p>
+<b>Domain:</b> $domform
+</p><p>
+<b>Immediately expire own role as Course Coordinator:</b>
+<input type="checkbox" name="expireown" checked>
+</p><p>
+<input type="hidden" name="phase" value="two" />
 <input type="submit" value="Open Course">
+</p>
 </form>
 </body>
 </html>
@@ -99,7 +134,7 @@ ENDDOCUMENT
 
 # ====================================================== Phase two: make course
 
-sub phase_two {
+sub create_course {
     my $r=shift;
     my $topurl='/res/'.&Apache::lonnet::declutter($ENV{'form.topmap'});
     my $ccuname=$ENV{'form.ccuname'};
@@ -117,19 +152,29 @@ sub phase_two {
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 <h1>Create a new Course</h1>
 ENDENHEAD
-#
-# Verify data
-#
+    #
+    # 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>');
 	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>');
+        return;
+    }
 #
 # Open course
 #
-    my $courseid=&Apache::lonnet::createcourse($ENV{'user.domain'},
-                                               $cdescr,$curl);
+    my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'},
+                                               $cdescr,$curl,
+                                               $ENV{'form.course_home'},
+                                               $ENV{'form.nonstandard'});
 
     $r->print('New LON-CAPA Course ID: '.$courseid.'<br>');
 #
@@ -170,14 +215,14 @@ sub handler {
        return OK;
     }
 
-    if (&Apache::lonnet::allowed('ccc',$ENV{'user.domain'})) {
+    if (&Apache::lonnet::allowed('ccc',$ENV{'request.role.domain'})) {
        $r->content_type('text/html');
        $r->send_http_header;
 
        if ($ENV{'form.phase'} eq 'two') {
-           &phase_two($r);
+           &create_course($r);
        } else {
-	   &phase_one($r);
+	   &print_course_creation_page($r);
        }
    } else {
       $ENV{'user.error.msg'}=
