--- loncom/interface/loncreatecourse.pm	2007/06/29 14:32:43	1.102
+++ loncom/interface/loncreatecourse.pm	2007/08/23 21:54:40	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.102 2007/06/29 14:32:43 raeburn Exp $
+# $Id: loncreatecourse.pm,v 1.104 2007/08/23 21:54:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -581,33 +581,6 @@ sub create_course {
 
     my $autharg;
     my $authtype;
-    my ($clonecourse,$clonedomain,$clonemsg);
-
-    if (($env{'form.clonecourse'} ne '') && ($env{'form.clonedomain'} ne '')) {
-        my $clonehome=&Apache::lonnet::homeserver($env{'form.clonecourse'},$env{'form.clonedomain'});
-        if ($clonehome eq 'no_host') {
-            $clonemsg = &mt('The new course was not cloned from an existing course because the requested course from which to create the clone does not appear to be a valid course.');
-        } else {
-            my %clonedesc = &Apache::lonnet::coursedescription($env{'form.clonedomain'}.'_'.$env{'form.clonecourse'},{'one_time' => 1});
-            if ($env{'request.role.domain'} eq $env{'form.clonedomain'}) {
-                $clonecourse = $env{'form.clonecourse'};
-                $clonedomain = $env{'form.clonedomain'};
-            } else {
-                my %clonehash = &Apache::lonnet::get('environment',['cloners'],
-                            $env{'form.clonedomain'},$env{'form.clonecourse'});
-                my @cloners = split(/,/,$clonehash{'cloners'});
-                my %roleshash = 
-                    &Apache::lonnet::get_my_roles($ccuname,$ccdomain,'userroles',
-                                     ['active'],['cc'],[$env{'form.clonedomain'}]);
-                if (($roleshash{$env{'form.clonecourse'}.':'.$env{'form.clonedomain'}.':cc'}) || (grep(/^\Q$ccuname\E:\Q$ccdomain\E$/,@cloners))) {
-                    $clonecourse = $env{'form.clonecourse'};
-                    $clonedomain = $env{'form.clonedomain'};
-                } else {
-                    $clonemsg = &mt('The new course was not cloned from an existing course because the course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$ccuname.':'.$ccdomain,$clonedesc{'description'});
-                }
-            }
-        }
-    }
 
     if ($env{'form.login'} eq 'krb') {
         $authtype = 'krb';
@@ -641,8 +614,8 @@ sub create_course {
                nonstandard => $env{'form.nonstandard'},
                crscode => $env{'form.crscode'},
                crsquota => $env{'form.crsquota'},
-               clonecourse => $clonecourse,
-               clonedomain => $clonedomain,
+               clonecourse => $env{'form.clonecourse'},
+               clonedomain => $env{'form.clonedomain'},
                crsid => $env{'form.crsid'},
                curruser => $env{'user.name'}.':'.$env{'user.domain'},
                crssections => $env{'form.crssections'},
@@ -695,29 +668,32 @@ sub create_course {
                   $env{'form.course_home'}.&Apache::loncommon::end_page());
         return;
     }
-    if ($clonemsg ne '') {
-        $r->print('<p>'.$clonemsg.'</p>');
-    }
     my ($courseid,$crsudom,$crsunum);
-    $r->print(&Apache::loncommon::construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum,$env{'user.domain'},$env{'user.name'}));
-
-#
-# Make the requested user a course coordinator or group coordinator
-#
-    if (($ccdomain) && ($ccuname)) {
-        $r->print(&mt('Assigning role of [_1] Coordinator to [_2] at [_3]:',
-                     $crstype,$ccuname,$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?phase='.lc($crstype).'one">'.
+    my ($success,$output) = 
+	&Apache::loncommon::construct_course($args,\$logmsg,\$courseid,
+					     \$crsudom,\$crsunum,
+					     $env{'user.domain'},
+					     $env{'user.name'});
+    $r->print($output);
+    if ($success) {
+        #
+	# Make the requested user a course coordinator or group coordinator
+        #
+	if (($ccdomain) && ($ccuname)) {
+	    $r->print(&mt('Assigning role of [_1] Coordinator to [_2] at [_3]: ',
+			  $crstype,$ccuname,$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>');
+    }
+    $r->print('<p><a href="/adm/createcourse?phase='.lc($crstype).'one">'.
 	      &mt('Create Another [_1]',$crstype).'</a></p>'.
 	      &Apache::loncommon::end_page());
 }
@@ -823,7 +799,8 @@ sub process_batchfile {
             }
         }
     }
-    $r->print($start_page.$crumbs.$result.$end_page);
+    $r->print($start_page.$crumbs.$logmsg.$result.'<br /><a href="/adm/createcourse">'.
+              &mt('Creation options menu').'</a>'.$end_page);
  
 }