--- loncom/interface/lonrequestcourse.pm	2010/02/25 05:01:25	1.41.2.5
+++ loncom/interface/lonrequestcourse.pm	2010/02/25 08:18:32	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.41.2.5 2010/02/25 05:01:25 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.45 2010/02/25 08:18:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -94,8 +94,6 @@ described at http://www.lon-capa.org.
 
 =item print_request_outcome()
 
-=item get_processtype()
-
 =item check_autolimit()
 
 =item retrieve_settings()
@@ -143,10 +141,6 @@ sub handler {
     $states{'log'} = ['filter','display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
 
-    if ($dom eq 'gcitest') {
-        $states{'new'} = ['courseinfo','review','process'];
-    }
-
     if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
         unless ($env{'form.state'} eq 'crstype') {
             unshift(@{$states{'new'}},'codepick');
@@ -173,10 +167,6 @@ sub handler {
                  cancel        => 'Cancel Request',
                  removal       => 'Outcome',
                 );
-    if ($dom eq 'gcitest') {
-        $trail{'crstype'} = 'Building a Test';
-        $trail{'courseinfo'} = 'Test Information';
-    }
 
     if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
         $trail{'enrollment'} = 'Enrollment';
@@ -186,7 +176,6 @@ sub handler {
         &get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
     if ($action eq 'display') {
         if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
-            my $namespace = 'courserequestqueue';
             if ($env{'form.cnum'} ne '') {
                 my $cnum = $env{'form.cnum'};
                 my $reqkey = $cnum.'_approval';
@@ -285,6 +274,9 @@ sub handler {
             $jscript = &mainmenu_javascript();
         } else {
             $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
+            if ($state eq 'courseinfo') {
+                $jscript .= &cloning_javascript();
+            }
         }
     }
 
@@ -364,18 +356,26 @@ function setAction(courseForm) {
 END
 }
 
+sub cloning_javascript {
+    return <<"END";
+function setCloneDisplay(courseForm) {
+    if (courseForm.cloning.length > 1) {    
+        for (var i=0; i<courseForm.cloning.length; i++) {
+            if (courseForm.cloning[i].checked) {
+                if (courseForm.cloning[i].value == 1) {
+                    document.getElementById('cloneoptions').style.display="block";;
+                }
+            }
+        }
+    }
+}
+END
+}
+
 sub get_breadcrumbs {
     my ($dom,$action,$state,$states,$trail) = @_;
     my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
     my $page = 0;
-    my $firstcrumb = 'Pick Action';
-    my $crumbtitle = 'Course/Community Requests';
-    my $crumbhelp = 'Course_Requests';
-    if ($dom eq 'gcitest') {
-        $firstcrumb = 'Building a Test';
-        $crumbtitle = 'Create Concept Test';
-        $crumbhelp = 'Concept_Test_Creation';
-    }
     if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
         if (defined($action)) {
             my $done = 0;
@@ -417,7 +417,7 @@ sub get_breadcrumbs {
                 if ($$state eq $states->{$action}[$i]) {
                     &Apache::lonhtmlcommon::add_breadcrumb(
                        {text=>"$trail->{$$state}"});
-                    $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
+                    $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
                     last;
                 } else {
                     if (($$state eq 'process') || ($$state eq 'removal')) {
@@ -436,13 +436,13 @@ sub get_breadcrumbs {
            }
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb(
-                    {text=>$firstcrumb});
-            $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
+                    {text=>'Pick Action'});
+            $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
         }
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb(
-                {text=>$firstcrumb});
-        $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
+                {text=>'Pick Action'});
+        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
     }
     return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
 }
@@ -480,6 +480,7 @@ sub form_elements {
             },
             courseinfo => {
                 cdescr           => 'text',
+                cloning          => 'radio', 
                 clonecrs         => 'text',
                 clonedom         => 'selectbox',
                 datemode         => 'radio',
@@ -515,22 +516,12 @@ sub form_elements {
          },
     );
     my %servers = &Apache::lonnet::get_servers($dom,'library');
-    if ($dom eq 'gcitest') {
-        %{$elements{'new'}{'courseinfo'}} = (
-                                              cdescr      => 'text',
-                                              concepttest => 'radio', 
-                                            );
-    }
     my $numlib = keys(%servers);
     if ($numlib > 1) {
         $elements{'new'}{'courseinfo'}{'chome'} = 'selectbox';
     } else {
         $elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
     }
-    if ($dom eq 'gcitest') {
-        my %mergedhash = (%{$elements{'new'}{'courseinfo'}},%{$elements{'new'}{'enrollment'}});
-        %{$elements{'new'}{'courseinfo'}} = %mergedhash;
-    }
     my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
     &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                              \%cat_order,\@code_order);
@@ -625,10 +616,10 @@ sub onload_action {
         if ($state eq 'crstype') {
             $loaditems{'onload'} = 'javascript:setAction(document.mainmenu_action);javascript:setType(document.mainmenu_coursetype)';
         } else {
-            $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
+            $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs);';
         }
-        if (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
-            $loaditems{'onload'} = 'javascript:setInitialVisibility()';
+        if ($state eq 'courseinfo') {
+            $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);';
         }
     }
     return \%loaditems;
@@ -655,9 +646,7 @@ sub print_main_menu {
         }
     }
 
-    my $js;
-    unless ($dom eq 'gcitest') {
-        $js = <<"END";
+    my $js = <<"END";
 
 function nextPage(formname) {
     var crschoice = document.mainmenu_coursetype.crstype.value;
@@ -681,20 +670,20 @@ function check_can_request(crschoice,act
     var unofficial = '';
     var community = '';    
 END
-        if (ref($can_request) eq 'HASH') {
-            foreach my $item (keys(%{$can_request})) {
-                    $js .= " 
-            $item = 1;
+    if (ref($can_request) eq 'HASH') {
+        foreach my $item (keys(%{$can_request})) {
+                $js .= " 
+        $item = 1;
 ";
-            }
         }
-        my %lt = &Apache::lonlocal::texthash(
-            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.',
-        ); 
-        $js .= <<END;
+    }
+    my %lt = &Apache::lonlocal::texthash(
+        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.',
+    ); 
+    $js .= <<END;
     if (crschoice == 'official') {
         if (official != 1) {
             alert("$lt{'official'}");
@@ -702,9 +691,9 @@ END
         }
     } else {
         if (crschoice == 'unofficial') {
-           if (unofficial != 1) {
-               alert("$lt{'unofficial'}");
-               return false;
+            if (unofficial != 1) {
+                alert("$lt{'unofficial'}");
+                return false;
             }
         } else {
             if (crschoice == 'community') {
@@ -716,14 +705,13 @@ END
                 if (actionchoice == 'new') {
                     alert("$lt{'all'}");
                     return false;
-                }
+                }               
             }
         }
     }
     return true;
 }
 END
-    }
     my ($pagetitle,$pageinfo,$domaintitle);
     if (ref($can_request) eq 'HASH') {
         if (($can_request->{'official'}) || ($can_request->{'unofficial'})) {
@@ -746,40 +734,6 @@ END
             $domaintitle = &mt('Course/Community Domain');
         }
     }
-
-    if ($dom eq 'gcitest') {
-        my $formname = 'requestcrs';
-        my $nexttext = &mt('Continue');
-        $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
-            '<p>'.&mt('Deployment of a Concept Test requires completion of the following three steps:').'<ol>'.
-            '<li>'.&mt('Creation of a course "container" and setting of access dates').'</li>'.
-            '<li>'.&mt('Assembly of a valid test from Concept Inventory questions').'</li>'.
-            '<li>'.&mt('Enrollment of students').'</li>'.
-            '</ol></p><p>'.&mt('When assembling a test you may either:').
-            '<br />'.&mt('(a) have a valid test built automatically by the WebCenter, or').'<br />'.&mt('(b) select the questions to include by combining questions chosen from eleven bins with four mandatory questions.').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' full e-mail addresses should be used as their usernames to ensure uniqueness.").'</p><div>'.
-            '<form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
-            '<input type="hidden" name="state" value="courseinfo" />'."\n".
-            '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
-            '<input type="hidden" name="crstype" value="unofficial" />'."\n".
-            '<input type="hidden" name="action" value="new" />'."\n".
-            '<input type="button" name="next" value="'.$nexttext.
-            '" onclick="this.form.submit();" />'."\n".
-            '</form></div>'.
-             &Apache::loncommon::end_page());
-        return;
-    }
-
-    if (!$onchange) {
-        $r->print('&nbsp;<input type="submit" name="godom" value="'.
-                   &mt('Change').'" />');
-    }
-    unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) {
-        $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n".
-                  &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
-                  &Apache::loncommon::end_page());
-        return;
-    }
-
     my @incdoms;
     if (ref($request_domains) eq 'HASH') {
         foreach my $item (keys(%{$request_domains})) {
@@ -896,8 +850,6 @@ END
             }
         } elsif ($state eq 'personnel') {
             $js .= "\n".&section_check_javascript()."\n".&personnel_lcsec_js();
-        } elsif (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
-            $js .= "\n".&Apache::londocsgci::builder_javascript()."\n";
         }
         my $title;
         if ($env{'form.crstype'} eq 'community') {
@@ -1433,7 +1385,7 @@ sub print_request_form {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles,
+        my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
                                                            \@code_order);
         $r->print($result);
         if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
@@ -1442,9 +1394,7 @@ sub print_request_form {
                 $r->print('<a href="/adm/requestcourse?action=view&state=details&showdom='.$dom.'&cnum='. $env{'form.cnum'}.'">'.
                           &mt('Modify this request').'</a>'.('&nbsp;'x4));
             }
-            unless ($env{'form.concepttest'}) {
-                $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
-            }
+            $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
             return;
         }
     }
@@ -1627,6 +1577,7 @@ sub print_enrollment_menu {
     my $access_dates = 
         &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
                             %accesstitles);
+    $output .= &Apache::lonhtmlcommon::start_pick_box();
     if ($sections) {
         $output .=  $sections;
     }
@@ -1646,12 +1597,8 @@ sub print_enrollment_menu {
                    &Apache::lonhtmlcommon::row_closure(1).
                    $access_dates
     }
-    if ($dom eq 'gcitest') {
-        return $output;
-    } else {
-        return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
-               &Apache::lonhtmlcommon::end_pick_box().'</div>';
-    }
+    return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+           &Apache::lonhtmlcommon::end_pick_box().'</div>';
 }
 
 sub show_invalid_crosslists {
@@ -2243,52 +2190,42 @@ sub print_review {
     }
 
     my %ctxt = &clone_text();
-    if ($dom eq 'gcitest') {
-        $inst_headers .= '<th>'.&mt('Test Questions').'</th>';
-        my $concepttest;
-        if ($env{'form.concepttest'} eq 'defchosen') {
-            $concepttest = 'Auto-generated';
-        } elsif ($env{'form.concepttest'} eq 'editmyown') {
-            $concepttest = 'Manually selected';
-        }
-        $inst_values .= '<td>'.$concepttest.'</td>';
-    } else {
-        $inst_headers .= '<th>'.&mt('Clone From').'</th>';
-        if (($env{'form.clonecrs'} =~ /^$match_name$/) && 
-            ($env{'form.clonedom'} =~ /^$match_domain$/)) {
-            my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+    $inst_headers .= '<th>'.&mt('Clone From').'</th>';
+    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'},
                            $env{'form.crstype'});
-            if ($canclone) {
-                my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+        if ($canclone) {
+            my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
                               $env{'form.clonecrs'},('description','internal.coursecode'));
-                if (keys(%courseenv) > 0) {
-                    $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
-                    $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
-                    my $cloneinst = $courseenv{'internal.coursecode'};
-                    if ($cloneinst ne '') {
-                        $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
-                    } else {
-                        $inst_values .= &mt('from').' '.$env{'form.clonedom'};
-                    }
-                    $inst_values .= '</td><td>';
-                    if ($env{'form.datemode'} eq 'preserve') {
-                        $inst_values .= $ctxt{'prd'}; 
-                    } elsif ($env{'form.datemode'} eq 'shift') {
-                        $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
-                    } else {
-                        $inst_values .= $ctxt{'ncd'};
-                    }
-                    $inst_values .= '</td>';
-                 } else {
-                     $inst_values .= '<td>'.&mt('Unknown').'</td>';
-                 }
+            if (keys(%courseenv) > 0) {
+                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
+                $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
+                my $cloneinst = $courseenv{'internal.coursecode'};
+                if ($cloneinst ne '') {
+                    $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
+                } else {
+                    $inst_values .= &mt('from').' '.$env{'form.clonedom'};
+                }
+                $inst_values .= '</td><td>';
+                if ($env{'form.datemode'} eq 'preserve') {
+                    $inst_values .= $ctxt{'prd'}; 
+                } elsif ($env{'form.datemode'} eq 'shift') {
+                    $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
+                } else {
+                    $inst_values .= $ctxt{'ncd'};
+                }
+                $inst_values .= '</td>';
              } else {
-                 $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
+                 $inst_values .= '<td>'.&mt('Unknown').'</td>';
              }
-        } else {
-            $inst_values .= '<td>'.&mt('None').'</td>';
-        }
+         } else {
+             $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
+         }
+    } else {
+        $inst_values .= '<td>'.&mt('None').'</td>';
     }
     $enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
                        '<th>'.&mt('Access Ends').'</th>';
@@ -2437,31 +2374,40 @@ function validateForm() {
     }
     nextPage(document.$formname,'$next');
 }
+
+function toggleCloning() {
+    var willclone;
+    if (document.$formname.cloning.length > 1) {
+        for (var i=0; i<document.$formname.cloning.length; i++) {
+            if (document.$formname.cloning[i].checked) {
+                willclone = document.$formname.cloning[i].value;
+            }
+        }
+    }
+    if (willclone == 1) {
+        document.getElementById('cloneoptions').style.display="block";
+    } else {
+        document.getElementById('cloneoptions').style.display="none";
+        document.$formname.clonecrs.value = '';
+    }
+}
+
 // ]]
 </script>
 
 ENDJS
     my $title = &mt('Brief Course Description');
-    my $desctitle = &mt('Description');
-    if ($dom eq 'gcitest') {
-        $title = &mt('Concept Test Course Information');
-        $desctitle = &mt('Concept Test Title');
-    }
     my $clonetitle = &mt('Clone content and settings from an existing course?');
     if ($crstype eq 'community') {
         $title = &mt('Brief Community Description');
         $clonetitle = &mt('Clone content and settings from an existing community?');
     }
-    my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
+    my $output .= $js_validate."\n".&Apache::lonhtmlcommon::start_pick_box().
                   &Apache::lonhtmlcommon::row_headline().
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').'&nbsp;'.$title.'</h3>'.
                   &Apache::lonhtmlcommon::row_closure(1).
-                  &Apache::lonhtmlcommon::row_title($desctitle).
+                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
                  '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
-    if ($dom eq 'gcitest') {
-        $output .= &Apache::lonhtmlcommon::row_closure(1).
-                   &concepttest_form();
-    }
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
                                                   'default','hide');
@@ -2470,34 +2416,25 @@ ENDJS
                    &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
     }
     $output .= $home_server_pick.
-               &Apache::lonhtmlcommon::row_closure();
-    if ($dom eq 'gcitest') {
-        my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
-        my $invalidcrosslist = [];
-        $output .= &print_enrollment_menu($formname,$instcode,$dom,
-                       \@codetitles,\%cat_titles,\%cat_order,
-                       \@code_order,$invalidcrosslist);
-    } else {
-        $output .= 
+               &Apache::lonhtmlcommon::row_closure().
                &Apache::lonhtmlcommon::row_headline().
-               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.'</h3>'. 
+               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.
+               '<label><input type="radio" name="cloning" value="1" '.
+               'onclick="javascript:toggleCloning()" />'.
+               &mt('Yes').('&nbsp;'x2).'</label><label>'.
+               '<input type="radio" name="cloning" value="0" '.
+               'onclick="javascript:toggleCloning()" />'.&mt('No').'</label>'.
+               '</h3>'.
                &Apache::lonhtmlcommon::row_closure(1).
-               &clone_form($dom,$formname,$crstype);
-    }
-    $output .= &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+               &Apache::lonhtmlcommon::row_headline().
+               '<div id="cloneoptions" style="display: none" >'.
+               &Apache::lonhtmlcommon::start_pick_box().
+               &clone_form($dom,$formname,$crstype).
+               &Apache::lonhtmlcommon::end_pick_box().'</div>'.
+               &Apache::lonhtmlcommon::end_pick_box()."\n";
     return $output;
 }
 
-sub concepttest_form {
-     return &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
-            '<input type="radio" name="concepttest" value="defchosen" /> '.
-            &mt('Automatically selected by WebCenter').
-            '</label><br /><label>'.
-            '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
-            &mt('Chosen by you from Concept Inventory').
-            '</label><br /><label>';
-}
-
 sub clone_form {
     my ($dom,$formname,$crstype) = @_;
     my $type = 'Course';
@@ -2719,7 +2656,7 @@ sub display_navbuttons {
 }
 
 sub print_request_outcome {
-    my ($r,$dom,$codetitles,$code_order) = @_;
+    my ($dom,$codetitles,$code_order) = @_;
     my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
         %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
     my $sectotal = $env{'form.sectotal'};
@@ -2855,7 +2792,8 @@ sub print_request_outcome {
     }
     my $clonecrs = '';
     my $clonedom = '';
-    if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
+    if (($env{'form.cloning'}) &&
+        ($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
         ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
         my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
                                                     $env{'form.clonedom'});
@@ -2895,18 +2833,10 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    if ($dom eq 'gcitest') {
-        if ($env{'form.concepttest'} eq 'editmyown') {
-            $details->{'firstres'} = 'nav'; 
-        } else {
-            $details->{'firstres'} = 'blank';
-        }
-        $details->{'clonedom'} = 'gci';
-        $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
-        $details->{'datemode'} = 'delete';
-    }
     my (@inststatuses,$storeresult,$creationresult);
-    my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
+    my $val = 
+        &Apache::loncoursequeueadmin::get_processtype($env{'user.name'},$env{'user.domain'},
+            $env{'user.adv'},$dom,$crstype,\@inststatuses,\%domconfig);
     if ($val eq '') {
         if ($crstype eq 'official') {
             $output = &mt('You are not permitted to request creation of official courses.');
@@ -2997,45 +2927,7 @@ sub print_request_outcome {
                 } else {
                     $output = '<p>'.&mt('Your course request has been processed and the course has been created.');
                 }
-                if ($dom eq 'gcitest') {
-                    my $caller = 'requestcrs';
-                    &acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
-                    my %parmresult =
-                        &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
-                    &Apache::londocsgci::setdefaults();
-                    my %crsenvhash = (
-                                       suppress_tries => 'yes',
-                                     );
-                    my $putresult =  &Apache::lonnet::put('environment',\%crsenvhash,$dom,$cnum);
-                    if ($env{'form.concepttest'} eq 'defchosen') {
-                        $output .= '<br />';
-                        my $error = &Apache::londocsgci::store($caller,$dom,$cnum);
-                        if ($error) {
-                            $output .= '<span class="LC_error">'.
-                                       &mt('An error occurred saving an auto-generated concept test: [_1].',$error).
-                                       '</span>';
-                        } else {
-                            &Apache::lonuserstate::readmap($dom.'/'.$cnum);
-                            $output .= &mt('A concept test has also been generated.');
-                        }
-                        $output .= '</p>'.
-    '<p>'.&mt('If you have a text file available containing student e-mail addresses and initial passwords, you may upload it now.').'<br />'.
-    &mt('You may also enroll students at a later date by visiting the [_1]"Menu"[_2] page and choosing: [_1]"Manage Enrollment"[_2].','<i>','</i>').'</p>'.
-    '</form><form name="studentform" method="post" enctype="multipart/form-data" '.
-    ' action="/adm/createuser">'."\n";
-                        $r->print($output); 
-                        &Apache::lonuserutils::print_first_users_upload_form($r,'course');
-                        $r->print('</form>');
-                        $output = '';
-                    } else {
-                        $output .= '</form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'</p>';
-                        $r->print($output);
-                        &Apache::londocsgci::editor($r,'requestcrs',$dom,$cnum);
-                        $output = '';
-                    }
-                } else {
-                    $output .= '<br />'.$role_result.'</p>';
-                }
+                $output .= '<br />'.$role_result.'</p>';
                 $creationresult = 'created';
             } else {
                 $output = '<span class="LC_error">';
@@ -3094,26 +2986,9 @@ sub print_request_outcome {
                 }
             }
         }
-        my ($statusresult);
-        if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
-            $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
-                                                           'courserequests');
-            if ($storeresult eq 'ok') {
-                my %status = (
-                                 'status:'.$dom.':'.$cnum => $reqstatus,
-                             );
-                $statusresult = &Apache::lonnet::put('courserequests',\%status);
-            }
-        } else {
-            $storeresult = 'error: invalid requestkey format'; 
-        }
-        if ($storeresult ne 'ok') {
-            $output .=  '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'</span><br />';
-            &Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
-        } elsif ($statusresult ne 'ok') {
-            $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'</span><br />';
-            &Apache::lonnet::logthis("Error saving course request status for  $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
-        }
+        ($storeresult,my $updateresult) = 
+            &Apache::loncoursequeueadmin::update_coursereq_status(\%reqhash,$dom,
+                $cnum,$reqstatus,'request');
         if ($modified && $queued && $storeresult eq 'ok') {
             if ($crstype eq 'community') {
                 $output .= '<p>'.&mt('Your community request has been updated').'</p>';
@@ -3123,7 +2998,10 @@ sub print_request_outcome {
             $output .= &notification_information($disposition,$req_notifylist,$cnum,$now);
         }
         if ($validationerror ne '') {
-            $output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
+            $output .= '<p class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
+        }
+        if ($updateresult) {
+            $output .= $updateresult;
         }
     }
     if ($creationresult ne '') {
@@ -3268,86 +3146,6 @@ sub update_requestors_roles {
     return $output;
 }
 
-sub acquire_cc_role {
-    my ($cdom,$cnum,$trolecode,$csec) = @_;
-    my %coursegroups = &Apache::lonnet::get_active_groups(
-                        $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
-    my $cgrps = join(':',keys(%coursegroups));
-    if ($env{'environment.recentroles'}) {
-        my %frozen_roles =
-            &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
-        &Apache::lonhtmlcommon::store_recent('roles',$trolecode,' ',
-                                            $frozen_roles{$trolecode});
-    }
-
-    &Apache::lonnet::appenv({"request.course.id"   => '',
-                             "request.course.fn"   => '',
-                             "request.course.uri"  => '',
-                             "request.course.sec"  => '',
-                             "request.role"        => 'cm',
-                             "request.role.adv"    => $env{'user.adv'},
-                             "request.role.domain" => $env{'user.domain'}});
-
-    &Apache::lonnet::log($env{'user.domain'},
-                         $env{'user.name'},
-                         $env{'user.home'},
-                         "Role ".$trolecode);
-
-    &Apache::lonnet::appenv(
-                            {'request.role'        => $trolecode,
-                             'request.role.domain' => $cdom,
-                             'request.course.sec'  => $csec,
-                             'request.course.groups' => $cgrps});
-    my ($furl,$ferr) = &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-    my $tadv;
-    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
-    return;
-}
-
-sub store_crsparms {
-    my ($cdom,$cnum,$now,$accessstart,$accessend) = @_;
-    my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence';
-    my %crsparms = (
-                      buttonshide => {
-                                       value => 'yes',
-                                       type  => 'string_yesno',
-                                     },
-                      opendate    => {
-                                       value => $accessstart,
-                                       type  => 'date_start',
-                                     },
-                      duedate     => {
-                                       value => $accessend,
-                                       type  => 'date_end',
-                                     },
-                      problemstatus => {
-                                           value => 'no',
-                                           type  => 'string_problemstatus',
-                                       },
-                      maxtries      => {
-                                           value => '1',
-                                           type  => 'intpos',
-                                       },
-                      discussend    => {
-                                           value => $now,
-                                           type  => 'date_end',
-                                       },
-                      discusshide   => { 
-                                           value => 'yes',
-                                           type  => 'string_yesno',
-                                       }
-    );
-    my %parmresult;
-    foreach my $item (keys(%crsparms)) {
-        $parmresult{$item} =
-            &Apache::lonparmset::storeparm_by_symb($topsymb,
-                                   '0_'.$item,14,$crsparms{$item}{'value'},
-                                   $crsparms{$item}{'type'},undef,$cdom);
-    }
-    return %parmresult;
-}
-
 sub notification_information {
     my ($disposition,$req_notifylist,$cnum,$now) = @_;
     my %emails = &Apache::loncommon::getemails();
@@ -3379,100 +3177,12 @@ sub notification_information {
                    '</div>';
     } else {
         $output .= '<div class="LC_warning">'.
-                   &mt('Your request status is: [_1].',$disposition). 
-                   '</div>'
+                   &mt('Your request status is: [_1].',$disposition).
+                   '</div>';
     }
     return $output;
 }
 
-sub get_processtype {
-    my ($dom,$crstype,$inststatuses,$domconfig) = @_;
-    return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
-    my (%userenv,%settings,$val);
-    my @options = ('autolimit','validate','approval');
-    if ($dom eq $env{'user.domain'}) {
-        %userenv = 
-            &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
-                'requestcourses.'.$crstype,'inststatus');
-        if ($userenv{'requestcourses.'.$crstype}) {
-            $val = $userenv{'requestcourses.'.$crstype};
-            @{$inststatuses} = ('_custom_');
-        } else {
-            my ($task,%alltasks);
-            if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
-                %settings = %{$domconfig->{'requestcourses'}};
-                if (ref($settings{$crstype}) eq 'HASH') {
-                    if (($env{'user.adv'}) && ($settings{$crstype}{'_LC_adv'} ne '')) {
-                        $val = $settings{$crstype}{'_LC_adv'};
-                        @{$inststatuses} = ('_LC_adv_');
-                    } else {
-                        if ($userenv{'inststatus'} ne '') {
-                            @{$inststatuses} = split(',',$userenv{'inststatus'});
-                        } else {
-                            @{$inststatuses} = ('default');
-                        }
-                        foreach my $status (@{$inststatuses}) {
-                            if (exists($settings{$crstype}{$status})) {
-                                my $value = $settings{$crstype}{$status};
-                                next unless ($value); 
-                                unless (exists($alltasks{$value})) {
-                                    if (ref($alltasks{$value}) eq 'ARRAY') {
-                                        unless(grep(/^\Q$status\E$/,@{$alltasks{$value}})) {
-                                            push(@{$alltasks{$value}},$status); 
-                                        }
-                                    } else {
-                                        @{$alltasks{$value}} = ($status);
-                                    }
-                                }
-                            }
-                        }
-                        my $maxlimit = 0;
-                        
-                        foreach my $key (sort(keys(%alltasks))) {
-                            if ($key =~ /^autolimit=(\d*)$/) {
-                                if ($1 eq '') {
-                                    $val ='autolimit=';
-                                    last;
-                                } elsif ($1 > $maxlimit) {
-                                    $maxlimit = $1; 
-                                }
-                            }
-                        }
-                        if ($maxlimit) {
-                            $val = 'autolimit='.$maxlimit;
-                        } else {
-                            foreach my $option (@options) {
-                                if ($alltasks{$option}) {
-                                    $val = $option;
-                                    last;  
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    } else {
-        %userenv = &Apache::lonnet::userenvironment($env{'user.domain'},
-                      $env{'user.name'},'reqcrsotherdom.'.$env{'form.crstype'});
-        if ($userenv{'reqcrsotherdom.'.$crstype}) {
-            my @doms = split(',',$userenv{'reqcrsotherdom.'.$crstype});
-            my $optregex = join('|',@options);
-            foreach my $item (@doms) {
-                my ($extdom,$extopt) = split(':',$item);
-                if ($extdom eq $dom) {  
-                    if ($extopt =~ /^($optregex)(=?\d*)$/) {
-                        $val = $1.$2;
-                    }
-                    last;
-                }
-            }
-            @{$inststatuses} = ('_external_');
-        }
-    }
-    return $val;
-}
-
 sub check_autolimit {
     my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
     my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},