--- loncom/interface/loncreatecourse.pm	2006/08/19 01:21:22	1.97
+++ loncom/interface/loncreatecourse.pm	2007/06/01 18:07:47	1.101.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.97 2006/08/19 01:21:22 raeburn Exp $
+# $Id: loncreatecourse.pm,v 1.101.2.1 2007/06/01 18:07:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,6 @@ use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::loncommon;
-use Apache::lonratedt;
 use Apache::londocs;
 use Apache::lonlocal;
 use Apache::londropadd;
@@ -45,12 +44,13 @@ use LONCAPA;
 
 sub print_course_creation_page {
     my $r=shift;
-    my $crstype = 'Group';
-    if ($env{'form.phase'} eq 'courseone') {
-        $crstype = 'Course';
-    }
+    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 %host_servers = &Apache::lonnet::get_servers($defdom,'library');
     my $course_home = '<select name="course_home" size="1">'."\n";
     foreach my $server (sort(keys(%host_servers))) {
         $course_home .= qq{<option value="$server"};
@@ -567,10 +567,8 @@ ENDDOCUMENT
 
 sub create_course {
     my $r=shift;
-    my $ccuname=$env{'form.ccuname'};
-    my $ccdomain=$env{'form.ccdomain'};
-    $ccuname=~s/\W//g;
-    $ccdomain=~s/\W//g;
+    my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'});
+    my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'});
     my $crstype = 'Group';
     my ($enrollstart,$enrollend,$startaccess,$endaccess);
 
@@ -665,8 +663,8 @@ sub create_course {
 	return;
     }
     # Check the proposed home server for the course
-    my %host_servers = &Apache::loncommon::get_library_servers
-        ($env{'request.role.domain'});
+    my %host_servers = 
+	&Apache::lonnet::get_servers($env{'request.role.domain'},'library');
     if (! exists($host_servers{$env{'form.course_home'}})) {
         $r->print(&mt('Invalid home server for course').': '.
                   $env{'form.course_home'}.&Apache::loncommon::end_page());
@@ -691,7 +689,7 @@ sub create_course {
 # 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">'.
+	      '<p><a href="/adm/createcourse?phase='.lc($crstype).'one">'.
 	      &mt('Create Another [_1]',$crstype).'</a></p>'.
 	      &Apache::loncommon::end_page());
 }
@@ -699,7 +697,7 @@ sub create_course {
 sub print_intro_page {
     my $r = shift;
     my $start_page =
-        &Apache::loncommon::start_page('Create a New Course or Group Space');
+        &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();
@@ -710,11 +708,11 @@ sub print_intro_page {
                      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 => '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 =>
@@ -746,11 +744,11 @@ 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/Group Attributes File','Create_Course',undef,'Create_Courses');
+    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 or groups attributes file').'</h3>');
+    $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" />'.