--- loncom/interface/lonrequestcourse.pm	2010/12/05 17:27:00	1.41.2.11
+++ loncom/interface/lonrequestcourse.pm	2010/02/21 23:38:51	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.41.2.11 2010/12/05 17:27:00 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.44 2010/02/21 23:38:51 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()
@@ -128,21 +126,13 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        ['action','showdom','cnum','state','crstype']);
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    my $action = $env{'form.reqaction'};
-    my $state = $env{'form.state'};
-    my $context;
-    &generate_page($r,$action,$state,$context);
-    return OK;
-}
 
-sub generate_page {
-    my ($r,$action,$state,$context) = @_;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['action','showdom','cnum','state','crstype']);
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $dom = &get_course_dom();
+    my $action = $env{'form.action'};
+    my $state = $env{'form.state'};
     my (%states,%stored);
     my ($jscript,$uname,$udom,$result,$warning);
 
@@ -151,19 +141,8 @@ sub generate_page {
     $states{'log'} = ['filter','display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
 
-    if ($dom =~ /^\w+citest$/) {
-        $states{'new'} = ['courseinfo','review','process'];
-        if ($env{'form.concepttest'} eq 'editmyown') {
-            push(@{$states{'new'}},'chooseitems','uploadroster','enrolling');
-        } elsif (($env{'form.concepttest'} eq 'defchosen') || 
-                 (($env{'form.concepttest'} eq 'cloning') && (!$env{'form.cloneroster'}))) {
-            push(@{$states{'new'}},'uploadroster','enrolling');
-        } else {
-            push(@{$states{'new'}},'done');
-        }
-    }
     if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
-        unless ($state eq 'crstype') {
+        unless ($env{'form.state'} eq 'crstype') {
             unshift(@{$states{'new'}},'codepick');
         }
     }
@@ -182,20 +161,12 @@ sub generate_page {
                  enrollment    => 'Access Dates',
                  personnel     => 'Personnel',
                  review        => 'Review',
-                 process       => 'Request Outcome',
+                 process       => 'Result',
                  pick_request  => 'Display Summary',
                  details       => 'Request Details',
                  cancel        => 'Cancel Request',
                  removal       => 'Outcome',
-                 chooseitems   => 'Saved Test',
-                 uploadroster  => 'Upload Roster',
-                 enrolling     => 'Completed',
-                 done          => 'Completed',
                 );
-    if ($dom =~ /^\w+citest$/) {
-        $trail{'crstype'} = 'Building a Test';
-        $trail{'courseinfo'} = 'Test Information';
-    }
 
     if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
         $trail{'enrollment'} = 'Enrollment';
@@ -205,7 +176,6 @@ sub generate_page {
         &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';
@@ -301,12 +271,9 @@ sub generate_page {
             $env{'form.clonedom'} = $dom;
         }
         if ($state eq 'crstype') {
-            $jscript = &mainmenu_javascript($action);
+            $jscript = &mainmenu_javascript();
         } else {
             $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
-            if ($state eq 'courseinfo') {
-                $jscript .= &cloning_javascript();
-            }
         }
     }
 
@@ -314,7 +281,7 @@ sub generate_page {
         $jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
     }
 
-    my $loaditems = &onload_action($action,$state,$dom);
+    my $loaditems = &onload_action($action,$state);
 
     my (%can_request,%request_domains);
     my $canreq = 
@@ -329,10 +296,6 @@ sub generate_page {
                                         $jscript,$loaditems,$crumb,$newinstcode,
                                         $codechk,$checkedcode,$description,
                                         \@invalidcrosslist);
-                if ($state eq 'chooseitems' || $state eq 'uploadroster' || 
-                    $state eq 'enrolling') {
-                    return $canreq;
-                }
             }
         } else {
             $r->print(&header('Course/Community Requests').$crumb.
@@ -363,11 +326,10 @@ sub generate_page {
     } else {
         &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\%request_domains);
     }
-    return;
+    return OK;
 }
 
 sub mainmenu_javascript {
-    my ($action) = @_;
     return <<"END";
 function setType(courseForm) {
     for (var i=0; i<courseForm.crstype.length; i++) {
@@ -380,27 +342,11 @@ function setType(courseForm) {
 }
 
 function setAction(courseForm) {
-    for (var i=0; i<courseForm.reqaction.length; i++) {
-        if (courseForm.reqaction.options[i].value == "$action") {
-            courseForm.reqaction.options[i].selected = true;
+    for (var i=0; i<courseForm.action.length; i++) {
+        if (courseForm.action.options[i].value == "$env{'form.action'}") {
+            courseForm.action.options[i].selected = true;
         } else {
-            courseForm.reqaction.options[i].selected = false;
-        }
-    }
-}
-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";;
-                }
-            }
+            courseForm.action.options[i].selected = false;
         }
     }
 }
@@ -411,14 +357,6 @@ 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 =~ /^\w+citest$/) {
-        $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;
@@ -456,24 +394,11 @@ sub get_breadcrumbs {
                     }
                 }
             }
-            my %forms = (
-                          chooseitems  => 'requestcrs',
-                          uploadroster => 'studentform',
-                          enrolling    => 'requestcrs',
-                          done         => 'requestcrs',
-                        );
-            my $lastidx;
-            for (my $i=0; $i<@{$states->{$action}}; $i++) {
-                if ($$state eq $states->{$action}[$i]) {
-                    $lastidx = $i;
-                    last;
-                }
-            }
             for (my $i=0; $i<@{$states->{$action}}; $i++) {
                 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')) {
@@ -483,43 +408,22 @@ sub get_breadcrumbs {
                             }
                         );
                     } else {
-                        if (($$state eq 'chooseitems') || ($$state eq 'uploadroster') ||
-                            ($$state eq 'enrolling') || ($$state eq 'done')) {
-                            if (($states->{$action}[$i] ne 'process') &&
-                                ($states->{$action}[$i] ne 'chooseitems') &&
-                                ($states->{$action}[$i] ne 'uploadroster') &&
-                                ($states->{$action}[$i] ne 'enrolling') &&
-                                ($states->{$action}[$i] ne 'done')) {
-                                &Apache::lonhtmlcommon::add_breadcrumb(
-                                   { href => '/adm/requestcourse',
-                                     text => "$trail->{$states->{$action}[$i]}",
-                                   }
-                                );
-                            } else {
-                                my $diff = $i-$lastidx;
-                                &Apache::lonhtmlcommon::add_breadcrumb(
-     { href => "javascript:history.go($diff)",
-       text => "$trail->{$states->{$action}[$i]}", }
-                               );
-                            }
-                        } else {
-                            &Apache::lonhtmlcommon::add_breadcrumb(
+                        &Apache::lonhtmlcommon::add_breadcrumb(
      { href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')",
        text => "$trail->{$states->{$action}[$i]}", }
-                           );
-                        }
-                    }
-                }
-            }
+                       );
+                   }
+               }
+           }
         } 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);
 }
@@ -535,13 +439,11 @@ sub header {
         if (ref($args) eq 'HASH') {
             my %loadhash = (
                              'add_entries' => $loaditems,
-                             'function'    => 'norole',
                            );
             my %arghash = (%loadhash,%{$args});
-            $args = \%arghash;
+            $args = \%arghash;                  
         } else {
-            $args = {'add_entries' => $loaditems,
-                     'function'    => 'norole'};
+            $args = {'add_entries' => $loaditems,};
         }
     }
     return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args);
@@ -559,7 +461,6 @@ sub form_elements {
             },
             courseinfo => {
                 cdescr           => 'text',
-                cloning          => 'radio',
                 clonecrs         => 'text',
                 clonedom         => 'selectbox',
                 datemode         => 'radio',
@@ -595,28 +496,12 @@ sub form_elements {
          },
     );
     my %servers = &Apache::lonnet::get_servers($dom,'library');
-    if ($dom =~ /^\w+citest$/) {
-        %{$elements{'new'}{'courseinfo'}} = (
-                                              cdescr      => 'text',
-                                              concepttest => 'radio',
-                                            );
-        $elements{'new'}{'enrollment'}{'timezone'} = 'selectbox';
-        if (&show_cloneable()) {
-            $elements{'new'}{'courseinfo'}{'clonecrs'} = 'selectbox';
-            $elements{'new'}{'courseinfo'}{'clonedom'} = 'hidden';
-            $elements{'new'}{'courseinfo'}{'cloneroster'} = 'checkbox';
-        }
-    }
     my $numlib = keys(%servers);
     if ($numlib > 1) {
         $elements{'new'}{'courseinfo'}{'chome'} = 'selectbox';
     } else {
         $elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
     }
-    if ($dom =~ /^\w+citest$/) {
-        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);
@@ -711,7 +596,7 @@ 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)';
         }
     }
     return \%loaditems;
@@ -738,13 +623,11 @@ sub print_main_menu {
         }
     }
 
-    my $js;
-    unless ($dom =~ /^\w+citest$/) {
-        $js = <<"END";
+    my $js = <<"END";
 
 function nextPage(formname) {
     var crschoice = document.mainmenu_coursetype.crstype.value;
-    var actionchoice = document.mainmenu_action.reqaction.value;
+    var actionchoice = document.mainmenu_action.action.value;
     if (check_can_request(crschoice,actionchoice) == true) {
         if ((actionchoice == 'new') && (crschoice == 'official')) {
             nextstate = 'codepick';
@@ -752,7 +635,7 @@ function nextPage(formname) {
 $nextstate_setter 
         }
         formname.crstype.value = crschoice;
-        formname.reqaction.value = actionchoice; 
+        formname.action.value = actionchoice; 
         formname.state.value= nextstate;
         formname.submit();
     }
@@ -764,20 +647,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'}");
@@ -785,9 +668,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') {
@@ -799,14 +682,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'})) {
@@ -829,41 +711,6 @@ END
             $domaintitle = &mt('Course/Community Domain');
         }
     }
-
-    if ($dom =~ /^\w+citest$/) {
-        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:').
-            '<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, or').
-            '<br />'.&mt('(c) copy one of your existing tests (including optional copying of the student roster)').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' e-mail addresses must 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="reqaction" 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})) {
@@ -898,7 +745,7 @@ END
     my $nexttext = &mt('Next');
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
 <form name="mainmenu_action" method="post" action=""> 
-<select size="1" name="reqaction" >
+<select size="1" name="action" >
  <option value="new">'.&mt('New request').'</option>
  <option value="view">'.&mt('View/Modify/Cancel pending requests').'</option>
  <option value="log">'.&mt('View request history').'</option>
@@ -936,7 +783,7 @@ END
               '<input type="hidden" name="state" value="crstype" />'."\n".
               '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
               '<input type="hidden" name="crstype" value="" />'."\n".
-              '<input type="hidden" name="reqaction" value="" />'."\n".
+              '<input type="hidden" name="action" value="" />'."\n".
               '<input type="button" name="next" value="'.$nexttext.
               '" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
               '</form></div>');
@@ -962,13 +809,8 @@ END
     if (($action eq 'new') || ($action eq 'view')) {
         $js .= <<END;   
 
-function backPage(formname,prevstate,currstate) {
+function backPage(formname,prevstate) {
     formname.state.value = prevstate;
-    if (currstate == "enrolling") {
-        if (prevstate == "chooseitems" || prevstate == "uploadroster") {
-            formname.action = "/adm/createuser";
-        }
-    } 
     formname.submit();
 }
 
@@ -985,20 +827,14 @@ 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($dom)."\n";
         }
         my $title;
         if ($env{'form.crstype'} eq 'community') {
             $title = 'Request a community';
-        } elsif (&Apache::loncommon::needs_gci_custom()) {
-            $title = 'Create a new Concept Test';
         } else {
             $title = 'Request a course';
         }
         $r->print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb);
-        return if (($state eq 'chooseitems') || ($state eq 'uploadroster') || 
-                   ($state eq 'enrolling'));
         &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
                             $codechk,$checkedcode,$description,$invalidcrosslist);
     } elsif ($action eq 'view') {
@@ -1035,7 +871,7 @@ END
                 $title = &mt('Pending course/community requests'); 
             }
             $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
-                      &print_request_status($dom,$action,$state).'</form></div>');
+                      &print_request_status($dom).'</form></div>');
         } elsif ($state eq 'details') {
             my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
             my $origcnum = $env{'form.cnum'};
@@ -1121,7 +957,7 @@ END
             }
             $r->print('<h3>'.&mt('Request Cancellation').'</h3><div>'."\n".$form."\n".
                       '<input type="hidden" name="state" value="'.$state.'" />'."\n".
-                      '<input type="hidden" name="reqaction" value="'.$action.'" />'."\n".
+                      '<input type="hidden" name="action" value="'.$action.'" />'."\n".
                       '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
                       '<input type="hidden" name="orignum" value="'.$cnum.'" />'."\n");
             if ($result eq 'ok') {
@@ -1404,29 +1240,29 @@ sub print_request_form {
                           &Apache::lonhtmlcommon::end_pick_box().'</div>');
             } else {
                 $next = $states->{$action}[$page+2];
-                $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
+                $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
             }
         } else {
             if ($crstype eq 'official') {
                 $next = $states->{$action}[$page+2];
             }
-            $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
+            $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
         }
     } elsif ($prev eq 'codepick') {
         if ($instcode eq '') {
             $prev = $states->{$action}[$page-2];
         }
-        $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next,$description));
+        $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
     } elsif ($state eq 'enrollment') {
         if ($crstype eq 'official') {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        $r->print(&print_enrollment_menu($formname,$state,$instcode,$dom,\@codetitles,
+        $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
                                          \%cat_titles,\%cat_order,\@code_order,
                                          $invalidcrosslist));
     } elsif ($state eq 'personnel') {
-        $r->print(&print_personnel_menu($dom,$formname,$state,$crstype,$invalidcrosslist));
+        $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
     } elsif ($state eq 'review') {
         my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg);
         my $now = time;
@@ -1521,13 +1357,13 @@ sub print_request_form {
         } else {
             $navtxt{'next'} = &mt('Submit course request');
         }
-    } elsif ($state eq 'process') {
+    }  elsif ($state eq 'process') {
         if ($crstype eq 'official') {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles,
-                                                           \@code_order,$formname);
+        my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+                                                           \@code_order);
         $r->print($result);
         if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
             $r->print('<p>');
@@ -1535,13 +1371,9 @@ 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;
         }
-    } elsif ($state eq 'uploadroster') {
-         &roster_upload_form($r,$output,$formname);
     }
     my @excluded = &get_excluded_elements($dom,$states,$action,$state);
     if ($state eq 'personnel') {
@@ -1576,39 +1408,12 @@ sub print_request_form {
     if ($state eq 'enrollment') {
         push(@excluded,'crosslisttotal');
     }
-    if ($state eq 'done') {
-        $r->print(&done_display());
-    } else {
-        $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded));
-        &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
-                            $navtxt{'next'},$state);
-    }
-    $r->print('</form>');
+    $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
+    &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+                        $navtxt{'next'},$state);
     return;
 }
 
-sub done_display {
-    return '<h3>'.&mt('Concept Test creation is complete').'</h3>'.
-           '<p>'.&mt('The following management tools are available via the "[_1]Manage Tests[_2]" tab, or from the toolbar on the [_3]Concept Test Contents[_4] page.[_5]',
-           '<a href="/adm/menu">','</a>','<a href="/adm/navmaps">','</a>','<br />').
-           '<dl class="LC_GCI_Menu">'.
-           '<dt>'.&mt('Concept Test Contents').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/nav.png\');">'.&mt('Display the Table of Contents for your Concept Test.').'</dd>'.
-           '<dt>'.&mt('Assemble Concept Test').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/docs.png\');">'.&mt('If no students have attempted the Concept Test you will be able to modify it. You can also change the start and end date of the test itself.').'</dd></dl>'.
-           '<dl class="LC_GCI_Menu">'.
-           '<dt>'.&mt('Enrollment and Student Activity').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/cprv.png\');">'.&mt('Display or download a course roster, and view information about completion status and last login. You can also add new students, or change access dates for existing students.').'</dd>'.
-           '<dt>'.&mt("What's New?").'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/new.png\');">'.&mt('View information about changes in your Concept Test course.').'</dd></dl>'.
-           '<dl class="LC_GCI_Menu">'.
-           '<dt>'.&mt('Prepare Printable Concept Test').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/prnt.png\');">'.&mt('Create a PDF which you can send to a printer to create a hardcopy of the Concept Test.').'</dd>'.
-           '<dt>'.&mt('Concept Test Statistics').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/chrt.png\');">'.&mt('After the closing date of the Concept Test you can view and download statistics for the test, as well as anonymized submission data.').'</dd>'.
-           '</dl></p>';
-}
-
 sub get_cancreate_status {
     my ($persondom,$personname,$dom) = @_;
     my ($rules,$ruleorder) =
@@ -1673,25 +1478,16 @@ sub get_excluded_elements {
     if (grep(/^instcode_/,@excluded)) {
         push(@excluded,'instcode');
     }
-    if ($env{'form.initmap'}) {
-        push(@excluded,'initmap');
-    }
-    if ($env{'form.output'}) {
-        push(@excluded,'output');
-    }
     return @excluded;
 }
 
 sub print_enrollment_menu {
-    my ($formname,$state,$instcode,$dom,$codetitles,$cat_titles,$cat_order,
-        $code_order,$invalidcrosslist) =@_;
+    my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
+        $invalidcrosslist) =@_;
     my ($sections,$autoenroll,$access_dates,$output,$hasauto);
     my $starttime = time;
-    my $diff = 6*30*24*60*60; # 6 months from now, approx
-    if (&Apache::loncommon::needs_gci_custom()) {
-        $diff = 7*24*60*60; # 7 days from now, approx
-    }
-    my $endtime = $starttime+$diff;
+    my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+
     my %accesstitles = (
                           'start' => 'Default start access',
                            'end'   => 'Default end access',
@@ -1728,7 +1524,7 @@ sub print_enrollment_menu {
                     &Apache::lonhtmlcommon::row_title(&mt('Add another')).
                     '<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
                     '<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
-                    ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
+                    ' 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>'.
@@ -1739,25 +1535,26 @@ sub print_enrollment_menu {
             $autoenroll = 
                 &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autoadd').'&nbsp;'.&mt('Add registered students automatically')).
                 '<span class="LC_nobreak"><label>'.
-                '<input type="radio" name="autoadds" value="1" />'.
+                '<input type="radio" name="autoadds" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
-                '<input type="radio" name="autoadds" value="0" checked="checked" />'.
+                '<input type="radio" name="autoadds" value="0" checked="checked">'.
                 &mt('No').'</label></span>'.
                 &Apache::lonhtmlcommon::row_closure(1).
                 &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autodrop').'&nbsp;'.&mt('Drop unregistered students automatically')).
                 '<span class="LC_nobreak"><label>'.
-                '<input type="radio" name="autodrops" value="1" />'.
+                '<input type="radio" name="autodrops" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
-                '<input type="radio" name="autodrops" value="0" checked="checked" />'.
+                '<input type="radio" name="autodrops" value="0" checked="checked">'.
                 &mt('No').'</label></span>'. 
                 &Apache::lonhtmlcommon::row_closure(1).
                 &date_setting_table($starttime,$endtime,$formname,'enroll',
-                                    $hasauto,$dom,%enrolltitles);
+                                    $hasauto,%enrolltitles);
         }
     }
     my $access_dates = 
         &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
-                            $dom,%accesstitles);
+                            %accesstitles);
+    $output .= &Apache::lonhtmlcommon::start_pick_box();
     if ($sections) {
         $output .=  $sections;
     }
@@ -1774,23 +1571,11 @@ sub print_enrollment_menu {
         }
         $output .= &Apache::lonhtmlcommon::row_headline('Access').
                    '<h3>'.$header.'</h3>'.
-                   &Apache::lonhtmlcommon::row_closure(1);
-        if ($dom =~ /^\w+citest$/) {
-            my $includeempty = 1;
-            my $timezone = &Apache::lonlocal::gettimezone();
-            $output .= &Apache::lonhtmlcommon::row_title('Time zone').
-                       &Apache::loncommon::select_timezone('timezone',$timezone,
-                                                           undef,$includeempty).
-                       &Apache::lonhtmlcommon::row_closure(1);
-        }
-        $output .= $access_dates;
-    }
-    if ($dom =~ /^\w+citest$/) {
-        return $output;
-    } else {
-        return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
-               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+                   &Apache::lonhtmlcommon::row_closure(1).
+                   $access_dates
     }
+    return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+           &Apache::lonhtmlcommon::end_pick_box().'</div>';
 }
 
 sub show_invalid_crosslists {
@@ -1852,29 +1637,17 @@ sub inst_section_selector {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$formname,$prefix,$hasauto,$dom,%datetitles) = @_;
+    my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_;
     my ($perpetual,$table);
-    my $no_hh_mm_ss = 1;
-    my $hide_timezone;
-    if (&Apache::loncommon::needs_gci_custom()) {
-        $no_hh_mm_ss = '';
-        if ($dom =~ /^\w+citest$/) {
-            if ($prefix eq 'access') {
-                $hide_timezone = 1;
-            }
-        }
-    }
     my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
-                                                        $starttime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
+                                                        $starttime,'','','',1,'','','',1);
     my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
-                                                      $endtime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
+                                                      $endtime,'','','',1,'','','',1);
     my $closure = '';
     if ($prefix eq 'access') {
-        unless (&Apache::loncommon::needs_gci_custom()) {
-            $perpetual = ' <span class="LC_nobreak"><label>'.
-                         '<input type="checkbox" name="no_end_date" />'.
-                         &mt('No end date').'</label></span>';
-        }
+        $perpetual = ' <span class="LC_nobreak"><label>'.
+                     '<input type="checkbox" name="no_end_date" />'.
+                     &mt('No end date').'</label></span>';
         $closure = '1';
     }
 
@@ -1903,7 +1676,7 @@ sub date_setting_table {
 }
 
 sub print_personnel_menu {
-    my ($dom,$formname,$state,$crstype,$invalidcrosslist) = @_;
+    my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
     my $output;
     if ($crstype eq 'official') {
         if (&Apache::lonnet::auto_run('',$dom)) {
@@ -2016,7 +1789,7 @@ sub print_personnel_menu {
     $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')).
                '<input name="persontotal" type="hidden" value="'.$persontotal.'" />'.
                '<input name="addperson" type="checkbox" value="'.$persontotal.'"'.
-               ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
+               ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
                "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
                &Apache::lonhtmlcommon::end_pick_box().'</div>';
     if ($crstype eq 'community') {
@@ -2045,7 +1818,7 @@ sub current_lc_sections {
 }
 
 sub print_request_status {
-    my ($dom,$action,$state) = @_;
+    my ($dom) = @_;
     my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
                                            $env{'user.name'},'^status:'.$dom);
     my ($output,$formname,%queue_by_date);
@@ -2088,9 +1861,9 @@ sub print_request_status {
     }
     $formname = 'requestcrs';
     my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
-    $output = '<input type="hidden" name="reqaction" value="'.$action.'" />'."\n".
+    $output = '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
 
-              '<input type="hidden" name="state" value="'.$state.'" />'."\n".
+              '<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
               '<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n".
               '<input type="hidden" name="showdom" value="" />'."\n".
               '<input type="hidden" name="cnum" value="" />'."\n";
@@ -2237,7 +2010,7 @@ sub viewdetails_javascript {
 function nextPage(formname,nextstate) {
     if (nextstate == "modify") { 
         formname.state.value = "personnel";
-        formname.reqaction.value = "new";
+        formname.action.value = "new";
     } else {
         formname.state.value = nextstate;
     }
@@ -2394,92 +2167,50 @@ sub print_review {
     }
 
     my %ctxt = &clone_text();
-    if ($dom =~ /^\w+citest$/) {
-        $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';
-        } elsif ($env{'form.concepttest'} eq 'cloning') {
-            $concepttest = 'Copied from existing test';
-        }
-        $inst_values .= '<td>'.$concepttest.('&nbsp;'x2).'</td>';
-    }
-    if (&show_cloneable()) {
-        $inst_headers .= '<th>'.&mt('Copy From').'</th>';
-        if ((($env{'form.cloning'}) || 
-             (($dom =~ /^\w+citest$/) && ($env{'form.concepttest'} eq 'cloning'))) &&
-            ($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.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) {
-                    if ($dom =~ /^\w+citest$/) {
-                        $inst_headers .= '<th>'.$ctxt{'ros'}.'</th>';
-                    } else {
-                        $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 {
-                        unless ($dom =~ /^\w+citest$/) {
-                            $inst_values .= &mt('from').' '.$env{'form.clonedom'};
-                        }
-                    }
-                    $inst_values .= ('&nbsp;'x2).'</td><td>';
-                    if ($dom =~ /^\w+citest$/) {
-                        if ($env{'form.cloneroster'}) {
-                            $inst_values .= &mt('Yes');
-                        } else {
-                            $inst_values .= &mt('No');
-                        }
-                    } else {
-                        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>';
-        }
-    }
-    my $tz;
-    if ($dom =~ /^\w+citest$/) {
-        if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
-            $tz = $env{'form.timezone'};
-        } else {
-            $tz = &Apache::lonlocal::gettimezone();
-        }
-        $enroll_headers .= '<th>'.&mt('Time Zone').'</th>';
+         } 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>';
-    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$tz);
-    if ($dom =~ /^\w+citest$/) {
-        $enroll_values .= '<td>'.$tz.'</td>'; 
-    }
-    $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart,$tz).'</td>';
+    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+    $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart).'</td>';
     if ($accessend == 0) {
         $enroll_values .= '<td>'.&mt('No end date').'</td>';
     } else {
-        $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend,$tz).'</td>';
+        $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend).'</td>';
     }
 
     my $container = 'Course';
@@ -2590,9 +2321,9 @@ sub print_review {
 }
 
 sub dates_from_form {
-    my ($startname,$endname,$timezone) = @_;
-    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname,$timezone);
-    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname,$timezone);
+    my ($startname,$endname) = @_;
+    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
+    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname);
     if ($endname eq 'accessend') {
         if (exists($env{'form.no_end_date'}) ) {
             $enddate = 0;
@@ -2602,7 +2333,7 @@ sub dates_from_form {
 }
 
 sub courseinfo_form {
-    my ($dom,$formname,$state,$crstype,$next,$description) = @_;
+    my ($dom,$formname,$crstype,$next,$description) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 official => 'You must provide a (brief) course description.',
                 community => 'You must provide a (brief) community description.'
@@ -2619,55 +2350,22 @@ 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 =~ /^\w+citest$/) {
-        $title = &mt('Concept Test Course Information');
-        $desctitle = &mt('Concept Test Title');
-    }
-    my $clonetitle = &mt('Copy content and settings from an existing course?');
+    my $clonetitle = &mt('Clone content and settings from an existing course?');
     if ($crstype eq 'community') {
         $title = &mt('Brief Community Description');
-        $clonetitle = &mt('Copy content and settings from an existing community?');
+        $clonetitle = &mt('Clone content and settings from an existing community?');
     }
-    my $output .= $js_validate."\n".&Apache::lonhtmlcommon::start_pick_box().
+    my $output .= $js_validate."\n".'<div>'.&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).
-                  '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
-    my $showclone;
-    if ($dom =~ /^\w+citest$/) {
-        $showclone = &show_cloneable();
-    } else {
-        $showclone = 1;
-    }
-    if ($dom =~ /^\w+citest$/) {
-        $output .= &Apache::lonhtmlcommon::row_closure(1).
-                   &concepttest_form($showclone,$dom);
-    }
+                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
+                 '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
                                                   'default','hide');
@@ -2676,82 +2374,12 @@ ENDJS
                    &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
     }
     $output .= $home_server_pick.
-               &Apache::lonhtmlcommon::row_closure();
-    if ($showclone && $dom !~ /^\w+citest$/) {
-        $output .= &Apache::lonhtmlcommon::row_headline().
-                   '<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" checked="checked"'.
-                   'onclick="javascript:toggleCloning()" />'.&mt('No').'</label>'.
-                   '</h3>'.
-                   &Apache::lonhtmlcommon::row_closure(1).
-                   &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>';
-    }
-    if ($dom =~ /^\w+citest$/) {
-        my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
-        my $invalidcrosslist = [];
-        $output .= &print_enrollment_menu($formname,$state,$instcode,$dom,
-                       \@codetitles,\%cat_titles,\%cat_order,
-                       \@code_order,$invalidcrosslist);
-    }
-    $output .= &Apache::lonhtmlcommon::end_pick_box()."\n";
-    return $output;
-}
-
-sub concepttest_form {
-    my ($showclone,$dom) = @_;
-    my $output = &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
-                 '<label>'.
-                 '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
-                 &mt('Chosen by you from Concept Inventory').
-                 '</label><br />'.
-                 '<label>'.
-                 '<input type="radio" name="concepttest" value="defchosen" /> '.
-                 &mt('Automatically selected by WebCenter').
-                 '</label>';
-    if ($showclone) {
-        $output .=  '<br /><span class="LC_nobreak"><label>'.
-                    '<input type="radio" name="concepttest" value="cloning" /> '.
-                    &mt('Copied from existing Test: ').
-                    '</label>'.&select_oldtest().('&nbsp;' x2).
-                    '<input type="hidden" name="clonedom" value="'.$dom.'" />'.
-                    '<label><input type="checkbox" value="1" name="cloneroster" />'.
-                    &mt('Copy roster').'</label>';
-    }
-    return $output;
-}
-
-sub select_oldtest {
-    my $output = '<select name="clonecrs"><option value="" selected="selected">'.
-                 '</option>';
-    my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
-    my %Sortby;
-    foreach my $course (sort(keys(%courses))) {
-        next unless (ref($courses{$course}) eq 'HASH');
-        my $clean_title = $courses{$course}{'description'};
-        $clean_title =~ s/\W+//g;
-        if ($clean_title eq '') {
-            $clean_title = $courses{$course}{'description'};
-        }
-        push(@{$Sortby{$clean_title}},$course);
-    }
-    my @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
-    foreach my $item (@sorted_courses) {
-        foreach my $course (@{$Sortby{$item}}) {
-            my ($cdom,$cnum) = split('_',$course);
-            if (($cdom =~ /^\w+citest$/) && (ref($courses{$course}) eq 'HASH')) {
-                my $cdesc = $courses{$course}{'description'};
-                $output .= '<option value="'.$cnum.'">'.$cdesc.'</option>';
-            }
-        }
-    }
-    $output .= '</select>';
+               &Apache::lonhtmlcommon::row_closure().
+               &Apache::lonhtmlcommon::row_headline().
+               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.'</h3>'. 
+               &Apache::lonhtmlcommon::row_closure(1).
+               &clone_form($dom,$formname,$crstype).
+               &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
     return $output;
 }
 
@@ -2788,9 +2416,8 @@ sub clone_text {
                'dmn'  => 'Domain',
                'dsh'  => 'Date Shift',
                'ncd'  => 'Do not clone date parameters',
-               'prd'  => 'Copy date parameters as-is',
+               'prd'  => 'Clone date parameters as-is',
                'shd'  => 'Shift date parameters by number of days',
-               'ros'  => 'Copy Roster',
         );
 }
 
@@ -2977,7 +2604,7 @@ sub display_navbuttons {
 }
 
 sub print_request_outcome {
-    my ($r,$dom,$codetitles,$code_order,$formname) = @_;
+    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'};
@@ -3014,10 +2641,6 @@ 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'} = '';
-                    }
                 }
             }
         }
@@ -3099,7 +2722,7 @@ sub print_request_outcome {
             push(@baduname,$uname.':'.$udom);
         }
     }
-    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$env{'form.timezone'});
+    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
     my $autodrops = 0;
     if ($env{'form.autodrops'}) {
         $autodrops = $env{'form.autodrops'}; 
@@ -3117,16 +2740,11 @@ sub print_request_outcome {
     }
     my $clonecrs = '';
     my $clonedom = '';
-    if ((($env{'form.cloning'}) || 
-         (($dom =~ /^\w+citest$/) && ($env{'form.concepttest'} eq 'cloning'))) && 
-        ($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
+    if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
         ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
-        if ($dom =~ /^\w+citest$/) {
-            $env{'form.clonedom'} = $dom;
-        }
         my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
                                                     $env{'form.clonedom'});
-        if ($clonehome ne 'no_host') {
+        if ($clonehome ne 'no_host') {  
             my $canclone =  
                 &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
                         $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
@@ -3162,28 +2780,10 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    if ($dom =~ /^\w+citest$/) {
-        my $template = &get_template($dom);
-        if ($env{'form.concepttest'} eq 'editmyown') {
-            $details->{'firstres'} = 'nav'; 
-        } else {
-            $details->{'firstres'} = 'blank';
-        }
-        if ($env{'form.concepttest'} eq 'cloning') {
-            if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
-                $details->{'cloneroster'} = $env{'form.cloneroster'};
-            } elsif ($template) {
-                $details->{'clonedom'} = $dom;
-                $details->{'clonecrs'} = $template;
-            }
-        } else {
-            $details->{'clonedom'} =  $dom,
-            $details->{'clonecrs'} =  $template,
-        }
-        $details->{'datemode'} = 'delete';
-    }
-    my (@inststatuses,$storeresult,$creationresult,$donedisplay);
-    my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
+    my (@inststatuses,$storeresult,$creationresult);
+    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.');
@@ -3274,78 +2874,7 @@ sub print_request_outcome {
                 } else {
                     $output = '<p>'.&mt('Your course request has been processed and the course has been created.');
                 }
-                if ($dom =~ /^\w+citest$/) {
-                    my $caller = 'requestcrs';
-                    my $timezone;
-                    if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
-                        $timezone = $env{'form.timezone'};
-                    } else {
-                        $timezone = Apache::lonlocal::gettimezone();
-                    }
-                    &acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
-                    my %parmresult =
-                        &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
-                    &Apache::londocsgci::setdefaults($dom);
-                    my %crsenvhash = (
-                                       suppress_tries => 'yes',
-                                       timezone       => $timezone,
-                                     );
-                    my $putresult =  &Apache::lonnet::put('environment',\%crsenvhash,$dom,$cnum);
-                    if ($env{'form.concepttest'} eq 'cloning') {
-                        &Apache::lonuserstate::readmap($dom.'/'.$cnum);
-                        if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
-                            my $cloneid = $clonedom.'/'.$clonecrs; 
-                            my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
-                            my $oldcdesc = $clonedesc{'description'};
-                            $output .= '<br />'.&mt('A concept test has been copied from your existing test: [_1].','<b>'.$oldcdesc.'</b>').'</p>';
-                            if ($env{'form.cloneroster'}) {
-                                $output .= '<br />'.&mt('You requested copying of the old student roster to the new course.');
-                                if ($logmsg =~ /\Q\0\E/) {
-                                    my @logging = split("\0",$logmsg);
-                                    if (@logging) {
-                                        $output .= '<p>'.$logging[-1].'</p>';
-                                    }
-                                }
-                                $output .= '<ul>'.
-                                           '<li>'.&mt('Access starts:').' '.
-                                                  &Apache::lonlocal::locallocaltime($accessstart,$timezone).'</li>'.
-                                           '<li>'.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend,$timezone).'</li>'.
-                                           '</ul><br />';
-                                $r->print($output);
-                                $output = '';
-                                $donedisplay = 1;
-                            } else {
-                                &roster_upload_form($r,$output,$formname);
-                                $output = '';
-                            }
-                        } else {
-                            $output .= '</p>';
-                            &roster_upload_form($r,$output,$formname);
-                            $output = '';
-                        }
-                    } elsif ($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>';
-                        &roster_upload_form($r,$output,$formname);
-                        $output = '';
-                    } else {
-                        $output .= '</p></form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'<br /></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">';
@@ -3404,26 +2933,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>';
@@ -3433,13 +2945,13 @@ 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 '') {
-        if ($donedisplay) {
-            $r->print('<br />'.&done_display());
-        }
         return ($creationresult,$output);
     } else {
         return ($storeresult,$output);
@@ -3581,138 +3093,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 roster_upload_form {
-    my ($r,$output,$formname,$titletext) = @_;
-    my $title = &mt('Request Processed');
-    if ($titletext ne '') {
-        $title = $titletext;
-    }
-    $r->print(<<"ENDJS");
-<script type="text/javascript">
-// <![CDATA['
-
-function toggleRosterUpload() {
-    var willupload;
-    if (document.$formname.roster.length > 1) {
-        for (var i=0; i<document.$formname.roster.length; i++) {
-            if (document.$formname.roster[i].checked) {
-                willupload = document.$formname.roster[i].value;
-            }
-        }
-    }
-    if (willupload == 1) {
-        document.getElementById('rosterupload').style.display="block";
-        document.getElementById('norosterupload').style.display="none";
-    } else {
-        document.getElementById('rosterupload').style.display="none";
-        document.getElementById('norosterupload').style.display="block";
-    }
-    return;
-}
-// ]]
-</script>
-
-ENDJS
-    $r->print('<h3>'.$title.'</h3>'.$output.
-              '<h4>'.&mt('Course roster file upload').'</h4>');
-    $r->print('<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 later with the [_1]"Enrollment/Activity"[_2] utility in the management toolbar.','<i>','</i>').'</p>'.
-    &mt('Upload roster file now?').'&nbsp;'.
-    '<label><input type="radio" name="roster" value="1" '.
-    'onclick="javascript:toggleRosterUpload()" />'.
-    &mt('Yes').('&nbsp;'x2).'</label><label>'.
-    '<input type="radio" name="roster" value="0" checked="checked"'.
-    'onclick="javascript:toggleRosterUpload()" />'.&mt('No').'</label><br />'.
-    '<div id="norosterupload"><input type="submit" value="'.&mt('Next').'" name="norostersub" />'.
-    '<input type="hidden" name="reqaction" value="new" />'.
-    '<input type="hidden" name="state" value="done" /></div></form>'.
-    '<div id="rosterupload" style="display: none"><form name="studentform" method="post" enctype="multipart/form-data" '.
-    ' action="/adm/createuser">'."\n");
-    &Apache::lonuserutils::print_first_users_upload_form($r,'course','noheader','requestcrs');
-    $r->print('<input type="hidden" name="concepttest" value="'.$env{'form.concepttest'}.'" />'.
-              '</div></form>');
-}
-
 sub notification_information {
     my ($disposition,$req_notifylist,$cnum,$now) = @_;
     my %emails = &Apache::loncommon::getemails();
@@ -3744,100 +3124,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'},
@@ -4040,25 +3332,5 @@ sub generate_date_items {
     return;
 }
 
-sub show_cloneable {
-    my $showclone;
-    if (&Apache::loncommon::needs_gci_custom()) {
-        my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
-        my $numcourses = scalar(keys(%courses));
-        return $numcourses;
-    } else {
-        return 1;
-    }
-}
-
-sub get_template {
-    my ($cdom) = @_;
-    my %template = (
-                     gcitest  => '8v226795a882b4bcagcil1',
-                     slcitest => '8v226795a882b4bcagcil1',
-                   );
-    return $template{$cdom};
-}
-
 1;