--- loncom/interface/lonrequestcourse.pm	2010/03/19 13:23:05	1.48
+++ loncom/interface/lonrequestcourse.pm	2011/01/11 04:28:52	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.48 2010/03/19 13:23:05 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.61 2011/01/11 04:28:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,7 +128,7 @@ sub handler {
     }
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        ['action','showdom','cnum','state','crstype']);
+        ['action','showdom','cnum','state','crstype','queue']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $dom = &get_course_dom();
     my $action = $env{'form.action'};
@@ -179,7 +179,8 @@ sub handler {
         if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
             if ($env{'form.cnum'} ne '') {
                 my $cnum = $env{'form.cnum'};
-                my $reqkey = $cnum.'_approval';
+                my $queue = $env{'form.queue'};
+                my $reqkey = $cnum.'_'.$queue;
                 my $namespace = 'courserequestqueue';
                 my $domconfig = &Apache::lonnet::get_domainconfiguser($dom);
                 my %queued =
@@ -317,7 +318,7 @@ sub handler {
     } elsif ($action eq 'display') {
         if ($warning ne '') {
             my $args = { only_body => 1 };
-            $r->print(&header('Course/Community Requests','','',$args).$crumb.
+            $r->print(&header('Course/Community Requests','','' ,'',$args).$crumb.
                       '<h3>'.&mt('Course/Community Request Details').'</h3>'.
                       '<div class="LC_warning">'.$warning.'</div>'.
                       &close_popup_form());
@@ -555,7 +556,6 @@ sub form_elements {
     }
     if (&Apache::lonnet::auto_run('',$dom)) {
         my %extras = (
-                       sectotal           => 'hidden',
                        enrollstart_month  => 'selectbox',
                        enrollstart_hour   => 'selectbox',
                        enrollend_month    => 'selectbox',
@@ -571,12 +571,30 @@ sub form_elements {
                        addcrosslist       => 'checkbox',
                        autoadds           => 'radio',
                        autodrops          => 'radio',
-                     );
-        if ($env{'form.sectotal'} > 0) {
-            for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
-                $extras{'sec_'.$i} = 'radio';
-                $extras{'secnum_'.$i} = 'text';
-                $extras{'loncapasec_'.$i} = 'text';
+        );
+        my ($instcode,$titlescount) = &get_instcode($dom);
+        if ($instcode) {
+            my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);
+            if (@sections) {
+                $extras{'sectotal'} = 'hidden';
+                if ($env{'form.sectotal'} > 0) {
+                    for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+                        $extras{'sec_'.$i} = 'radio';
+                        $extras{'secnum_'.$i} = 'text';
+                        $extras{'loncapasec_'.$i} = 'text';
+                    }
+                }
+            } else {
+                $extras{'addsection'} = 'checkbox';
+                my $sectotal = $env{'form.sectotal'};
+                if ($env{'form.addsection'}) {
+                    $sectotal ++;
+                }
+                for (my $i=0; $i<$sectotal; $i++) {
+                    $extras{'sec_'.$i} = 'checkbox';
+                    $extras{'secnum_'.$i} = 'text',
+                    $extras{'loncapasec_'.$i} = 'text',
+                }
             }
         }
         my $crosslisttotal = $env{'form.crosslisttotal'};
@@ -586,7 +604,6 @@ sub form_elements {
         if (!$crosslisttotal) {
             $crosslisttotal = 1;
         }
-
         for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
             if ($numtitles) {
                 $extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
@@ -646,11 +663,7 @@ sub onload_action {
 sub print_main_menu {
     my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$request_domains) = @_;
     my ($types,$typename) = &Apache::loncommon::course_types();
-    my $onchange;
-    unless ($env{'form.interface'} eq 'textual') {
-        $onchange = 'this.form.submit()';
-    }
-
+    my $onchange = 'this.form.submit()';
     my $nextstate_setter = "\n";
     if (ref($states) eq 'HASH') {
         foreach my $key (keys(%{$states})) {
@@ -699,7 +712,7 @@ END
         official => 'You are not permitted to request creation of an official course in this domain.',
         unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',
         community => 'You are not permitted to request creation of a community this domain.',
-        all => 'You must choose a specific course type when making a new course request.\\nAll types is not allowed.',
+        all => 'You must choose a specific course type when making a new course request.\\n\"All types\" is not allowed.',
     ); 
     $js .= <<END;
     if (crschoice == 'official') {
@@ -859,7 +872,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') && 
@@ -1325,16 +1338,38 @@ sub print_request_form {
                             }
                             if ($skipuser) {
                                 push(@disallowed,$i);
-                                $disallowmsg{$i} = &mt('[_1] was excluded because new users need be from the course domain','<tt>'.$personname.':'.$persondom.'</tt>');
+                                $disallowmsg{$i} = &mt('[_1] was excluded because new users need to be from the course domain','<tt>'.$personname.':'.$persondom.'</tt>');
                                 next;
                             }
                         }
-                        if (&get_cancreate_status($persondom,$personname,$dom)) {
-                            my ($allowed,$msg) = 
+                        my $usertype = &get_usertype($persondom,$personname,\%curr_rules,\%got_rules);
+                        if (&Apache::lonuserutils::can_create_user($dom,'requestcrs',$usertype)) {
+                            my ($allowed,$msg,$authtype,$authparam) = 
                                 &check_newuser_rules($persondom,$personname,
                                     \%alerts,\%rulematch,\%inst_results,
                                     \%curr_rules,\%got_rules);
                             if ($allowed) {
+                                my %domdefaults = &Apache::lonnet::get_domain_defaults($persondom);
+                                if ($usertype eq 'official') {
+                                    if ($authtype eq '') {
+                                        $authtype = $domdefaults{'auth_def'};
+                                        $authparam = $domdefaults{'auth_arg_def'};
+                                    }
+                                } elsif ($usertype eq 'unofficial') {
+                                    if ($authtype eq '') {
+                                        $authtype = 'internal';
+                                        $authparam = '';
+                                    }
+                                } else {
+                                    $authtype = $domdefaults{'auth_def'};
+                                    $authparam = $domdefaults{'auth_arg_def'};
+                                }
+                                if (($authtype eq '') ||
+                                    (($authtype =~/^krb/) && ($authparam eq ''))) {
+                                    push(@disallowed,$i);
+                                    $disallowmsg{$i} = &mt('[_1] was excluded because institutional information is incomplete for this new user.','<tt>'.$personname.':'.$persondom.'</tt>');
+                                    next;
+                                }
                                 if (ref($inst_results{$personname.':'.$persondom}) eq 'HASH') {
                                     if ($inst_results{$personname.':'.$persondom}{'lastname'} ne '') {
                                         $env{'form.person_'.$i.'_lastname'} = $inst_results{$personname.':'.$persondom}{'lastname'};
@@ -1449,7 +1484,7 @@ sub print_request_form {
         }
     }
     if ($state eq 'enrollment') {
-        push(@excluded,'crosslisttotal');
+        push(@excluded,('sectotal','crosslisttotal'));
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
     &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
@@ -1457,13 +1492,13 @@ sub print_request_form {
     return;
 }
 
-sub get_cancreate_status {
-    my ($persondom,$personname,$dom) = @_;
+sub get_usertype {
+    my ($persondom,$personname,$curr_rules,$got_rules) = @_;
     my ($rules,$ruleorder) =
         &Apache::lonnet::inst_userrules($persondom,'username');
     my $usertype = &Apache::lonuserutils::check_usertype($persondom,$personname,
-                                                         $rules);
-    return &Apache::lonuserutils::can_create_user($dom,'requestcrs',$usertype);
+                                                         $rules,$curr_rules,$got_rules);
+    return $usertype;
 }
 
 sub check_newuser_rules {
@@ -1471,7 +1506,7 @@ sub check_newuser_rules {
         $got_rules) = @_;
     my $allowed = 1;
     my $newuser = 1;
-    my ($checkhash,$userchkmsg);
+    my ($checkhash,$userchkmsg,$authtype,$authparam);
     my $checks = { 'username' => 1 };
     $checkhash->{$personname.':'.$persondom} = { 'newuser' => $newuser };
     &Apache::loncommon::user_rule_check($checkhash,$checks,$alerts,$rulematch,
@@ -1493,7 +1528,22 @@ sub check_newuser_rules {
             }
         }
     }
-    return ($allowed,$userchkmsg);
+    if ($allowed) {
+        if (ref($rulematch) eq 'HASH') {
+            if (ref($rulematch->{$personname.':'.$persondom}) eq 'HASH') {
+                my $matchedrule = $rulematch->{$personname.':'.$persondom}{'username'};
+                my ($rules,$ruleorder) =
+                    &Apache::lonnet::inst_userrules($persondom,'username');
+                if (ref($rules) eq 'HASH') {
+                    if (ref($rules->{$matchedrule}) eq 'HASH') {
+                        $authtype = $rules->{$matchedrule}{'authtype'};
+                        $authparam = $rules->{$matchedrule}{'authparm'};
+                    }
+                }
+            }
+        }
+    }
+    return ($allowed,$userchkmsg,$authtype,$authparam);
 }
 
 sub get_excluded_elements {
@@ -1543,7 +1593,29 @@ sub print_enrollment_menu {
         if (&Apache::lonnet::auto_run('',$dom)) {
             $output = &show_invalid_crosslists($invalidcrosslist);
             my ($section_form,$crosslist_form);
-            $section_form = &inst_section_selector($dom,$instcode);
+            if ($instcode ne '') {
+                $section_form = &inst_section_selector($dom,$instcode);
+                if ($section_form eq '') {
+                    my $sectotal = $env{'form.sectotal'};
+                    if (!$sectotal) {
+                        $sectotal = 1;
+                    }
+                    if ($env{'form.addsection'}) {
+                        $sectotal ++;
+                    }
+                    for (my $i=0; $i<$sectotal; $i++) {
+                        $section_form .= &sections_form($dom,$instcode,$i);
+                    }
+                    if ($section_form) {
+                        $section_form .=
+                    &Apache::lonhtmlcommon::row_title(&mt('Add another')).
+                    '<input name="sectotal" type="hidden" value="'.$sectotal.'" />'.
+                    '<input name="addsection" type="checkbox" value="'.$sectotal.'"'.
+                    ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
+                   "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
+                    }
+                }
+            }
             if ($section_form) {
                 $sections = &Apache::lonhtmlcommon::row_headline().
                             '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Sections').
@@ -1570,7 +1642,7 @@ sub print_enrollment_menu {
                     ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
                    "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
                 $sections .=  &Apache::lonhtmlcommon::row_headline.
-                              '<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
+                              '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Crosslist').'&nbsp;'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
                               &Apache::lonhtmlcommon::row_closure(1).
                               $crosslist_form;
             }
@@ -1861,7 +1933,20 @@ sub current_lc_sections {
 }
 
 sub sorted_request_history {
-    my ($dom,$action,$after,$before) = @_;
+    my ($dom,$action,$curr_req) = @_;
+    my ($after,$before,$statusfilter,$crstypefilter);
+    if ($env{'form.status'} ne '') {
+        $statusfilter = $env{'form.status'};
+    }
+    if ($env{'form.crstype'} ne '') {
+        $crstypefilter = $env{'form.crstype'};
+    }
+    if (ref($curr_req) eq 'HASH') {
+        $after = $curr_req->{'requested_after_date'},
+        $before = $curr_req->{'requested_before_date'};
+        $statusfilter = $curr_req->{'status'};
+        $crstypefilter = $curr_req->{'crstype'};
+    }
     my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
                                            $env{'user.name'},'^status:'.$dom);
     my %queue_by_date;
@@ -1870,8 +1955,8 @@ sub sorted_request_history {
         if ($action eq 'view') {
             next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending'));
         } else {
-            next unless (($env{'form.status'} eq 'any') ||
-                          ($env{'form.status'} eq $statusinfo{$key}));
+            next unless (($statusfilter eq 'any') ||
+                          ($statusfilter eq $statusinfo{$key}));
         }
         (undef,my($cdom,$cnum)) = split(':',$key);
         next if ($cdom ne $dom);   
@@ -1890,8 +1975,8 @@ sub sorted_request_history {
             } else {
                 next if (($reqtime < $after) || ($reqtime > $before));
             }
-            next unless (($env{'form.crstype'} eq 'any') || 
-                         ($env{'form.crstype'} eq $crstype));
+            next unless (($crstypefilter eq 'any') || 
+                         ($crstypefilter eq $crstype));
             if ($action eq 'view') {
                 next unless (($disposition eq 'approval') || 
                              ($disposition eq 'pending'));
@@ -2154,9 +2239,7 @@ sub print_request_logs {
     my ($statuses,$statusnames) = &reqstatus_names($curr{'crstype'});
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
               &requestlog_display_filter($formname,\%curr));
-    my %queue_by_date = &sorted_request_history($dom,$env{'form.action'},
-                                                $curr{'requested_after_date'},
-                                                $curr{'requested_before_date'});
+    my %queue_by_date = &sorted_request_history($dom,$env{'form.action'},\%curr);
     my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
     my $showntablehdr = 0;
     my $tablehdr = &Apache::loncommon::start_data_table().
@@ -2302,7 +2385,7 @@ sub reqstatus_names {
     my @statuses = qw(created approval pending rejected cancelled);
     my %statusnames =
             &Apache::lonlocal::texthash (
-                        created   => 'Course/Community created',
+                        created   => 'Created',
                         approval  => 'Queued pending approval',
                         pending   => 'Queued pending validation',
                         rejected  => 'Request rejected',
@@ -2526,8 +2609,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'},
@@ -2756,7 +2839,7 @@ ENDJS
                '<label><input type="radio" name="cloning" value="1" '.
                'onclick="javascript:toggleCloning()" />'.
                &mt('Yes').('&nbsp;'x2).'</label><label>'.
-               '<input type="radio" name="cloning" value="0" '.
+               '<input type="radio" name="cloning" value="0" checked="checked" '.
                'onclick="javascript:toggleCloning()" />'.&mt('No').'</label>'.
                '</h3>'.
                &Apache::lonhtmlcommon::row_closure(1).
@@ -2775,15 +2858,16 @@ sub clone_form {
     if ($crstype eq 'community') {
         $type = 'Community';
     }
-    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').'&nbsp;'.
-                    &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>'.
@@ -2816,7 +2900,6 @@ sub coursecode_form {
                    );
     my %helpitem = ( 
                      instcode => 'Course_Request_Category',
-                     crosslist => 'Course_Request_Crosslist',
                    );
     if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH') && 
         (ref($cat_order))) {
@@ -2833,7 +2916,11 @@ sub coursecode_form {
             my $lastitem = pop(@{$codetitles});
             my $lastinput = '<input type="text" size="5" name="'.$sel.'_'.                                            $lastitem.'" />';
             if (@{$codetitles} > 0) {
-                $output = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($helpitem{$context}).'&nbsp;'.$rowtitle{$context}).
+                my $helplink;
+                if (defined($helpitem{$context})) {
+                    $helplink = &Apache::loncommon::help_open_topic($helpitem{$context}).'&nbsp;';
+                }
+                $output = &Apache::lonhtmlcommon::row_title($helplink.$rowtitle{$context}).
                           '<table><tr>';
                 if ($context eq 'crosslist') {
                     $output .= '<td>'.&mt('Include?').'<br />'.
@@ -2898,6 +2985,26 @@ sub coursecode_form {
     return $output;
 }
 
+sub sections_form {
+    my ($dom,$instcode,$num) = @_;
+    my $rowtitle;
+    if ($instcode eq '') {
+        $rowtitle = &mt('Sections');
+    } else {
+        $rowtitle = &mt('Sections of [_1]',$instcode);
+    }
+    return &Apache::lonhtmlcommon::row_title($rowtitle).
+           '<table><tr><td align="center">'.
+           '<span class="LC_nobreak">'.&mt('Include?').
+           '<input type="checkbox" name="sec_'.$num.'" value="1" /></span>'.
+           '</td><td align="center">'.&mt('Institutional section').'<br />'.
+           '<input type="text" size="10" name="secnum_'.$num.'" />'.
+           '</td><td align="center">'.&mt('LON-CAPA section').'<br />'.
+           '<input type="text" size="10" name="loncapasec_'.$num.'" />'.
+           '</td></tr></table>'.
+           &Apache::lonhtmlcommon::row_closure(1);
+}
+
 sub get_course_dom {
     my $codedom = &Apache::lonnet::default_login_domain();
     if ($env{'form.showdom'} ne '') {
@@ -3027,6 +3134,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'} = '';
+                    }
                 }
             }
         }
@@ -3052,6 +3163,7 @@ sub print_request_outcome {
         $enrollstart = '';
         $enrollend = '';
     }
+    my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg);
     for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
         my $uname = $env{'form.person_'.$i.'_uname'};
         my $udom = $env{'form.person_'.$i.'_dom'};
@@ -3063,6 +3175,51 @@ sub print_request_outcome {
                              lastname     => $env{'form.person_'.$i.'_lastname'},
                              emailaddr    => $env{'form.person_'.$i.'_emailaddr'},
                                                    };
+                    my $usertype = &get_usertype($udom,$uname,\%curr_rules,\%got_rules);
+                    if (&Apache::lonuserutils::can_create_user($udom,'requestcrs',$usertype)) {
+                        my ($allowed,$msg,$authtype,$authparam) =
+                            &check_newuser_rules($udom,$uname,\%alerts,\%rulematch,
+                                                 \%inst_results,\%curr_rules,\%got_rules);
+                        if ($allowed) {
+                            my %domdefaults = &Apache::lonnet::get_domain_defaults($udom);
+                            if ($usertype eq 'official') {
+                                if ($authtype eq '') {
+                                    $authtype = $domdefaults{'auth_def'};
+                                    $authparam = $domdefaults{'auth_arg_def'};
+                                } else {
+                                    if ($authtype eq 'loc') {
+                                        $authtype = 'localauth';
+                                    } elsif ($authtype eq 'int') {
+                                        $authtype = 'internal';
+                                    }
+                                    if ($authtype !~ /^(krb4|krb5|internal|localauth)$/) {
+                                        $authtype = $domdefaults{'auth_def'};
+                                        $authparam = $domdefaults{'auth_arg_def'};
+                                    }
+                                }
+                            } elsif ($usertype eq 'unofficial') {
+                                if ($authtype eq '') {
+                                    $authtype = 'internal';
+                                    $authparam = '';
+                                }
+                            } else {
+                                $authtype = $domdefaults{'auth_def'};
+                                $authparam = $domdefaults{'auth_arg_def'};
+                            }
+                            if (($authtype eq '') ||
+                                (($authtype =~/^krb(4|5)$/) && ($authparam eq '')) ||
+                                ($authtype !~ /^(krb4|krb5|internal|localauth)$/)) {
+                                next;
+                            } else {
+                                $personnel{$uname.':'.$udom}{'authtype'} = $authtype;
+                                $personnel{$uname.':'.$udom}{'autharg'} = $authparam;
+                            }
+                        } else {
+                            next;
+                        }
+                    } else {
+                        next;
+                    }
                 }
                 my $role = $env{'form.person_'.$i.'_role'};
                 unless ($role eq '') {
@@ -3115,10 +3272,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'})) {
@@ -3286,6 +3440,9 @@ sub print_request_outcome {
                                             description => $env{'form.cdescr'}, 
                                           },
                           };
+            if ($crstype eq 'official') {
+                $request->{$requestid}->{'instcode'} = $instcode;
+            }
             my $statuskey = 'status:'.$dom.':'.$cnum;
             my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
                                                    $env{'user.domain'},$env{'user.name'});
@@ -3577,18 +3734,23 @@ 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 '')) { 
-                 $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') {