--- loncom/interface/lonrequestcourse.pm	2010/06/08 16:37:20	1.52
+++ loncom/interface/lonrequestcourse.pm	2010/09/10 20:25:51	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.52 2010/06/08 16:37:20 bisitz Exp $
+# $Id: lonrequestcourse.pm,v 1.58 2010/09/10 20:25:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -856,7 +856,7 @@ END
     }
     if ($action eq 'new') {
         my $jsextra;
-        if ($state eq 'courseinfo') {
+        if (($state eq 'courseinfo') || ($state eq 'codepick')) {
             $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
         } elsif ($state eq 'enrollment') {
             if (($env{'form.crstype'} eq 'official') && 
@@ -2534,8 +2534,8 @@ sub print_review {
     if (($env{'form.cloning'}) &&
         ($env{'form.clonecrs'} =~ /^$match_name$/) && 
         ($env{'form.clonedom'} =~ /^$match_domain$/)) {
-        my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
-                           $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
+        my $canclone = &Apache::loncoursequeueadmin::can_clone_course($uname,
+                           $udom,$env{'form.clonecrs'},$env{'form.clonedom'},
                            $env{'form.crstype'});
         if ($canclone) {
             my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
@@ -2783,15 +2783,16 @@ sub clone_form {
     if ($crstype eq 'community') {
         $type = 'Community';
     }
-    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').' '.
-                    &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
     my %lt = &clone_text();
     my $output .= 
-        &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
-        '<input type="text" size="25" name="clonecrs" value=""  />'.
-        '</label>'.&Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
-        $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
+        &Apache::loncommon::select_dom_form($dom,'clonedom').'</label>'.
+        &Apache::lonhtmlcommon::row_closure(1).
+        &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
+        '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();opencrsbrowser('."'$formname','clonecrs','clonedom','','','','','$type'".')" />'.
+        '</label>&nbsp;'.
+        &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type).
+        &Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
         '<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
         '</label><br /><label>'.
@@ -3035,6 +3036,10 @@ sub print_request_outcome {
                         push(@instsections,$sec);
                     }
                     $sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i};
+                    $sections{$i}{'loncapa'} =~ s/\W//g;
+                    if ($sections{$i}{'loncapa'} eq 'none') {
+                        $sections{$i}{'loncapa'} = '';
+                    }
                 }
             }
         }
@@ -3123,10 +3128,7 @@ sub print_request_outcome {
     }
     my $autoadds = 0;
     if ($env{'form.autoadds'}) {
-        $autodrops = $env{'form.autoadds'};
-    }
-    if ($env{'form.autoadds'}) {
-        $autodrops = $env{'form.autoadds'};
+        $autoadds = $env{'form.autoadds'};
     }
     my $instcode = '';
     if (exists($env{'form.instcode'})) {
@@ -3588,6 +3590,9 @@ sub retrieve_settings {
             }
             $env{'form.clonecrs'} = $reqinfo{'clonecrs'};
             $env{'form.clonedom'} = $reqinfo{'clonedom'};
+            if (($reqinfo{'clonecrs'} ne '') && ($reqinfo{'clonedom'} ne '')) {
+                $env{'form.cloning'} = 1;
+            }
             $env{'form.datemode'} = $reqinfo{'datemode'};
             $env{'form.dateshift'} = $reqinfo{'dateshift'};
             if (($reqinfo{'crstype'} eq 'official') && ($reqinfo{'instcode'} ne '')) {