--- loncom/interface/loncreatecourse.pm	2001/02/17 22:25:19	1.2
+++ loncom/interface/loncreatecourse.pm	2002/08/08 20:37:37	1.10
@@ -1,5 +1,30 @@
 # The LearningOnline Network
 # Create a course
+#
+# $Id: loncreatecourse.pm,v 1.10 2002/08/08 20:37:37 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (My Desk
 #
 # (Internal Server Error Handler
@@ -12,7 +37,7 @@
 #
 # 3/1 Gerd Kortemeyer)
 #
-# 2/14,2/16,2/17 Gerd Kortemeyer
+# 2/14,2/16,2/17,7/6 Gerd Kortemeyer
 #
 package Apache::loncreatecourse;
 
@@ -22,27 +47,68 @@ use Apache::lonnet;
 
 # ===================================================== Phase one: fill-in form
 
-sub phase_one {
+sub print_course_creation_page {
     my $r=shift;
-
+    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">
+var editbrowser = null;
+function openbrowser(formname,elementname) {
+    var url = '/res/?';
+    if (editbrowser == null) {
+        url += 'launch=1&';
+    }
+    url += 'catalogmode=interactive&';
+    url += 'mode=edit&';
+    url += 'form=' + formname + '&';
+    url += 'element=' + elementname + '&';
+    url += 'only=sequence' + '';
+    var title = 'Browser';
+    var options = 'scrollbars=1,resizable=1,menubar=0';
+    options += ',width=700,height=600';
+    editbrowser = open(url,title,options,'1');
+    editbrowser.focus();
+}
+</script>
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
 <body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif">
 <h1>Create a new Course</h1>
-<form action=/adm/createcourse method=post>
-<h3>Course Title</h3>
-<input type=text size=40 name=title>
-<h3>Top-level Map</h3>
-<input type=text size=40 name=topmap>
-<h3>Course Cooordinator</h3>
-Username: <input type=text size=15 name=ccuname><br>
-Domain: <input type=text size=15 name=ccdomain>
-<input type=hidden name=phase value=two><p>
-<input type=submit value="Open Course">
+<form action="/adm/createcourse" method="post" name="ccrs">
+<h2>Course Information</h2>
+<p>
+<b>Course Title:</b>
+<input type="text" size="50" name="title">
+</p><p>
+<b>Top-level Map:</b>
+<input type="text" size="50" name="topmap">
+<a href="javascript:openbrowser('ccrs','topmap')">Browse</a>
+</p><p>
+<b>Course Home Server:</b>$course_home
+</p><p>
+<b>Course ID/Number (optional)</b>
+<input type="text" size="30" name="crsid">
+</p><p>
+<h2>Course Coordinator</h2>
+<p>
+Username: <input type="text" size="15" name="ccuname" />
+</p><p>
+Domain:   $domform
+</p><p>
+<input type="hidden" name="phase" value="two" />
+<input type="submit" value="Open Course">
+</p>
 </form>
 </body>
 </html>
@@ -51,7 +117,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'};
@@ -69,21 +135,43 @@ 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);
+        $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);
-
-    $r->print('New Course ID: '.$courseid.'<br>');
+    my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'},
+                                               $cdescr,$curl,
+                                               $ENV{'form.course_home'});
+
+    $r->print('New LON-CAPA Course ID: '.$courseid.'<br>');
+#
+# Set optional courseid
+#
+    my ($crsudom,$crsunum)=($courseid=~/^\/(\w+)\/(\w+)$/);
+    my $crsuhome=&Apache::lonnet::homeserver($crsunum,$crsudom);
+    $r->print('Created on: '.$crsuhome.'<br>');
+    if ($ENV{'form.crsid'}) {
+       $r->print('Setting optional Course ID/Number: '.                 
+           &Apache::lonnet::reply('put:'.$crsudom.':'.
+                                  $crsunum.':environment:courseid='.
+                                  &Apache::lonnet::escape($ENV{'form.crsid'}),
+                                  $crsuhome).'<br>');
+    }
 #
 # Make current user course adminstrator
 #
@@ -95,8 +183,8 @@ ENDENHEAD
 #
     $r->print('Assigning role of course coordinator to '.
                $ccuname.' at '.$ccdomain.': '.
-    &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'<br>');
-    $r->print('</body></html>');
+    &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'<p>');
+    $r->print('Roles will be active at next login.</body></html>');
 }
 
 # ===================================================================== Handler
@@ -109,14 +197,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'}=