--- loncom/interface/lonrequestcourse.pm	2010/12/02 02:21:35	1.41.2.10
+++ loncom/interface/lonrequestcourse.pm	2010/12/05 17:27:00	1.41.2.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.41.2.10 2010/12/02 02:21:35 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.41.2.11 2010/12/05 17:27:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,7 +151,7 @@ sub generate_page {
     $states{'log'} = ['filter','display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
 
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $states{'new'} = ['courseinfo','review','process'];
         if ($env{'form.concepttest'} eq 'editmyown') {
             push(@{$states{'new'}},'chooseitems','uploadroster','enrolling');
@@ -192,7 +192,7 @@ sub generate_page {
                  enrolling     => 'Completed',
                  done          => 'Completed',
                 );
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $trail{'crstype'} = 'Building a Test';
         $trail{'courseinfo'} = 'Test Information';
     }
@@ -414,7 +414,7 @@ sub get_breadcrumbs {
     my $firstcrumb = 'Pick Action';
     my $crumbtitle = 'Course/Community Requests';
     my $crumbhelp = 'Course_Requests';
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $firstcrumb = 'Building a Test';
         $crumbtitle = 'Create Concept Test';
         $crumbhelp = 'Concept_Test_Creation';
@@ -595,7 +595,7 @@ sub form_elements {
          },
     );
     my %servers = &Apache::lonnet::get_servers($dom,'library');
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         %{$elements{'new'}{'courseinfo'}} = (
                                               cdescr      => 'text',
                                               concepttest => 'radio',
@@ -613,7 +613,7 @@ sub form_elements {
     } else {
         $elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         my %mergedhash = (%{$elements{'new'}{'courseinfo'}},%{$elements{'new'}{'enrollment'}});
         %{$elements{'new'}{'courseinfo'}} = %mergedhash;
     }
@@ -739,7 +739,7 @@ sub print_main_menu {
     }
 
     my $js;
-    unless ($dom eq 'gcitest') {
+    unless ($dom =~ /^\w+citest$/) {
         $js = <<"END";
 
 function nextPage(formname) {
@@ -830,7 +830,7 @@ END
         }
     }
 
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         my $formname = 'requestcrs';
         my $nexttext = &mt('Continue');
         $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
@@ -986,7 +986,7 @@ 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";
+            $js .= "\n".&Apache::londocsgci::builder_javascript($dom)."\n";
         }
         my $title;
         if ($env{'form.crstype'} eq 'community') {
@@ -1775,7 +1775,7 @@ sub print_enrollment_menu {
         $output .= &Apache::lonhtmlcommon::row_headline('Access').
                    '<h3>'.$header.'</h3>'.
                    &Apache::lonhtmlcommon::row_closure(1);
-        if ($dom eq 'gcitest') {
+        if ($dom =~ /^\w+citest$/) {
             my $includeempty = 1;
             my $timezone = &Apache::lonlocal::gettimezone();
             $output .= &Apache::lonhtmlcommon::row_title('Time zone').
@@ -1785,7 +1785,7 @@ sub print_enrollment_menu {
         }
         $output .= $access_dates;
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         return $output;
     } else {
         return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
@@ -1858,7 +1858,7 @@ sub date_setting_table {
     my $hide_timezone;
     if (&Apache::loncommon::needs_gci_custom()) {
         $no_hh_mm_ss = '';
-        if ($dom eq 'gcitest') {
+        if ($dom =~ /^\w+citest$/) {
             if ($prefix eq 'access') {
                 $hide_timezone = 1;
             }
@@ -2394,7 +2394,7 @@ sub print_review {
     }
 
     my %ctxt = &clone_text();
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $inst_headers .= '<th>'.&mt('Test Questions').'</th>';
         my $concepttest;
         if ($env{'form.concepttest'} eq 'defchosen') {
@@ -2409,7 +2409,7 @@ sub print_review {
     if (&show_cloneable()) {
         $inst_headers .= '<th>'.&mt('Copy From').'</th>';
         if ((($env{'form.cloning'}) || 
-             (($dom eq 'gcitest') && ($env{'form.concepttest'} eq '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'},
@@ -2419,7 +2419,7 @@ sub print_review {
                 my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
                               $env{'form.clonecrs'},('description','internal.coursecode'));
                 if (keys(%courseenv) > 0) {
-                    if ($dom eq 'gcitest') {
+                    if ($dom =~ /^\w+citest$/) {
                         $inst_headers .= '<th>'.$ctxt{'ros'}.'</th>';
                     } else {
                         $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
@@ -2429,12 +2429,12 @@ sub print_review {
                     if ($cloneinst ne '') {
                         $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
                     } else {
-                        unless ($dom eq 'gcitest') {
+                        unless ($dom =~ /^\w+citest$/) {
                             $inst_values .= &mt('from').' '.$env{'form.clonedom'};
                         }
                     }
                     $inst_values .= ('&nbsp;'x2).'</td><td>';
-                    if ($dom eq 'gcitest') {
+                    if ($dom =~ /^\w+citest$/) {
                         if ($env{'form.cloneroster'}) {
                             $inst_values .= &mt('Yes');
                         } else {
@@ -2461,7 +2461,7 @@ sub print_review {
         }
     }
     my $tz;
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
             $tz = $env{'form.timezone'};
         } else {
@@ -2472,7 +2472,7 @@ sub print_review {
     $enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
                        '<th>'.&mt('Access Ends').'</th>';
     my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$tz);
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $enroll_values .= '<td>'.$tz.'</td>'; 
     }
     $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart,$tz).'</td>';
@@ -2643,7 +2643,7 @@ function toggleCloning() {
 ENDJS
     my $title = &mt('Brief Course Description');
     my $desctitle = &mt('Description');
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $title = &mt('Concept Test Course Information');
         $desctitle = &mt('Concept Test Title');
     }
@@ -2659,14 +2659,14 @@ ENDJS
                   &Apache::lonhtmlcommon::row_title($desctitle).
                   '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
     my $showclone;
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $showclone = &show_cloneable();
     } else {
         $showclone = 1;
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $output .= &Apache::lonhtmlcommon::row_closure(1).
-                   &concepttest_form($showclone);
+                   &concepttest_form($showclone,$dom);
     }
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
@@ -2677,7 +2677,7 @@ ENDJS
     }
     $output .= $home_server_pick.
                &Apache::lonhtmlcommon::row_closure();
-    if ($showclone && $dom ne 'gcitest') {
+    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" '.
@@ -2693,7 +2693,7 @@ ENDJS
                    &clone_form($dom,$formname,$crstype).
                    &Apache::lonhtmlcommon::end_pick_box().'</div>';
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
         my $invalidcrosslist = [];
         $output .= &print_enrollment_menu($formname,$state,$instcode,$dom,
@@ -2705,7 +2705,7 @@ ENDJS
 }
 
 sub concepttest_form {
-    my ($showclone) = @_;
+    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" /> '.
@@ -2720,7 +2720,7 @@ sub concepttest_form {
                     '<input type="radio" name="concepttest" value="cloning" /> '.
                     &mt('Copied from existing Test: ').
                     '</label>'.&select_oldtest().('&nbsp;' x2).
-                    '<input type="hidden" name="clonedom" value="gcitest" />'.
+                    '<input type="hidden" name="clonedom" value="'.$dom.'" />'.
                     '<label><input type="checkbox" value="1" name="cloneroster" />'.
                     &mt('Copy roster').'</label>';
     }
@@ -2745,7 +2745,7 @@ sub select_oldtest {
     foreach my $item (@sorted_courses) {
         foreach my $course (@{$Sortby{$item}}) {
             my ($cdom,$cnum) = split('_',$course);
-            if (($cdom eq 'gcitest') && (ref($courses{$course}) eq 'HASH')) {
+            if (($cdom =~ /^\w+citest$/) && (ref($courses{$course}) eq 'HASH')) {
                 my $cdesc = $courses{$course}{'description'};
                 $output .= '<option value="'.$cnum.'">'.$cdesc.'</option>';
             }
@@ -3118,11 +3118,11 @@ sub print_request_outcome {
     my $clonecrs = '';
     my $clonedom = '';
     if ((($env{'form.cloning'}) || 
-         (($dom eq 'gcitest') && ($env{'form.concepttest'} eq 'cloning'))) && 
+         (($dom =~ /^\w+citest$/) && ($env{'form.concepttest'} eq 'cloning'))) && 
         ($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
         ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
-        if ($dom eq 'gcitest') {
-            $env{'form.clonedom'} = 'gcitest';
+        if ($dom =~ /^\w+citest$/) {
+            $env{'form.clonedom'} = $dom;
         }
         my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
                                                     $env{'form.clonedom'});
@@ -3162,23 +3162,23 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    if ($dom eq 'gcitest') {
-  
+    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 eq 'gcitest')) {
+            if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
                 $details->{'cloneroster'} = $env{'form.cloneroster'};
-            } else {
-                $details->{'clonedom'} = 'gci';
-                $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+            } elsif ($template) {
+                $details->{'clonedom'} = $dom;
+                $details->{'clonecrs'} = $template;
             }
         } else {
-            $details->{'clonedom'} = 'gci';
-            $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+            $details->{'clonedom'} =  $dom,
+            $details->{'clonecrs'} =  $template,
         }
         $details->{'datemode'} = 'delete';
     }
@@ -3274,7 +3274,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') {
+                if ($dom =~ /^\w+citest$/) {
                     my $caller = 'requestcrs';
                     my $timezone;
                     if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
@@ -3285,7 +3285,7 @@ sub print_request_outcome {
                     &acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
                     my %parmresult =
                         &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
-                    &Apache::londocsgci::setdefaults();
+                    &Apache::londocsgci::setdefaults($dom);
                     my %crsenvhash = (
                                        suppress_tries => 'yes',
                                        timezone       => $timezone,
@@ -3293,7 +3293,7 @@ sub print_request_outcome {
                     my $putresult =  &Apache::lonnet::put('environment',\%crsenvhash,$dom,$cnum);
                     if ($env{'form.concepttest'} eq 'cloning') {
                         &Apache::lonuserstate::readmap($dom.'/'.$cnum);
-                        if (($clonecrs) && ($clonedom eq 'gcitest')) {
+                        if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
                             my $cloneid = $clonedom.'/'.$clonecrs; 
                             my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
                             my $oldcdesc = $clonedesc{'description'};
@@ -4051,5 +4051,14 @@ sub show_cloneable {
     }
 }
 
+sub get_template {
+    my ($cdom) = @_;
+    my %template = (
+                     gcitest  => '8v226795a882b4bcagcil1',
+                     slcitest => '8v226795a882b4bcagcil1',
+                   );
+    return $template{$cdom};
+}
+
 1;