--- loncom/interface/lonrequestcourse.pm	2010/08/10 17:16:05	1.55
+++ loncom/interface/lonrequestcourse.pm	2010/11/19 00:01:25	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.55 2010/08/10 17:16:05 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.59 2010/11/19 00:01:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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'},
@@ -3036,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'} = '';
+                    }
                 }
             }
         }
@@ -3124,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'})) {
@@ -3594,16 +3595,18 @@ sub retrieve_settings {
             }
             $env{'form.datemode'} = $reqinfo{'datemode'};
             $env{'form.dateshift'} = $reqinfo{'dateshift'};
-            if (($reqinfo{'crstype'} eq 'official') && ($reqinfo{'instcode'} ne '')) { 
-                 $env{'form.sectotal'} = $reqinfo{'sectotal'};
-                 $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'};
-                 $env{'form.autoadds'} = $reqinfo{'autoadds'};
-                 $env{'form.autdrops'} = $reqinfo{'autodrops'};
-                 $env{'form.instcode'} = $reqinfo{'instcode'};
-                 my $crscode = { 
-                                 $cnum => $reqinfo{'instcode'},
-                               };
-                 &extract_instcode($dom,'instcode',$crscode,$cnum);
+            if ($reqinfo{'crstype'} eq 'official') {
+                $env{'form.autoadds'} = $reqinfo{'autoadds'};
+                $env{'form.autodrops'} = $reqinfo{'autodrops'};
+                if ($reqinfo{'instcode'} ne '') { 
+                    $env{'form.sectotal'} = $reqinfo{'sectotal'};
+                    $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'};
+                    $env{'form.instcode'} = $reqinfo{'instcode'};
+                    my $crscode = { 
+                                    $cnum => $reqinfo{'instcode'},
+                                  };
+                    &extract_instcode($dom,'instcode',$crscode,$cnum);
+                }
             }
             my @currsec;
             if (ref($reqinfo{'sections'}) eq 'HASH') {