--- loncom/interface/lonrequestcourse.pm	2020/07/17 20:39:55	1.95.2.2.2.1
+++ loncom/interface/lonrequestcourse.pm	2016/04/04 01:09:48	1.98
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.95.2.2.2.1 2020/07/17 20:39:55 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.98 2016/04/04 01:09:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -551,7 +551,6 @@ sub form_elements {
                 clonedom         => 'selectbox',
                 datemode         => 'radio',
                 dateshift        => 'text',
-                tinyurls         => 'radio',
             },
             enrollment  => {
                 accessstart_month  => 'selectbox',
@@ -761,6 +760,7 @@ function check_can_request(crschoice,act
     var unofficial = '';
     var community = '';
     var textbook = '';
+    var placement = '';
 END
     if (ref($can_request) eq 'HASH') {
         foreach my $item (keys(%{$can_request})) {
@@ -774,6 +774,7 @@ END
         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 in this domain.',
         textbook => 'You are not permitted to request creation of a textbook course in this domain',
+        placement => 'You are not permitted to request creation of a placement test in this domain',
         all => 'You must choose a specific course type when making a new course request.',
         allt => '"All types" is not allowed.',
     ); 
@@ -803,9 +804,16 @@ END
                         return false;
                     }
                 } else {
-                    if (actionchoice == 'new') {
-                        alert('$js_lt{'all'}'+'\\n'+'$js_lt{'allt'}');
-                        return false;
+                    if (crschoice == 'placement') {
+                        if (placement != 1) {
+                            alert("$js_lt{'placement'}");
+                            return false;
+                        }
+                    } else {
+                        if (actionchoice == 'new') {
+                            alert('$js_lt{'all'}'+'\\n'+'$js_lt{'allt'}');
+                            return false;
+                        }
                     }
                 }
             }
@@ -816,7 +824,7 @@ END
 END
     my ($pagetitle,$pageinfo,$domaintitle,$earlyout);
     if (ref($can_request) eq 'HASH') {
-        if (($can_request->{'official'}) || ($can_request->{'unofficial'}) || $can_request->{'textbook'}) {
+        if (($can_request->{'official'}) || ($can_request->{'unofficial'}) || ($can_request->{'textbook'}) || ($can_request->{'placement'})) {
             if ($can_request->{'community'}) {
                 $pagetitle = 'Course/Community Requests';
                 $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.');
@@ -993,6 +1001,8 @@ END
                 $title = &mt('Pending requests for unofficial courses');
             } elsif ($env{'form.crstype'} eq 'textbook') {
                 $title = &mt('Pending requests for textbook courses');
+            } elsif ($env{'form.crstype'} eq 'textbook') {
+                $title = &mt('Pending requests for placement tests'); 
             } else {
                 $title = &mt('Pending course/community requests'); 
             }
@@ -2094,22 +2104,11 @@ sub print_personnel_menu {
             official => 'Requestor is automatically assigned Course Coordinator role.',
         );
         $lt{'unofficial'} = $lt{'official'};
-        $lt{'textbook'} = $lt{'textbook'};
+        $lt{'textbook'} = $lt{'official'};
+        $lt{'placement'} = $lt{'official'};
         $output .= &Apache::lonhtmlcommon::row_headline().
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').'&nbsp;'.$lt{$crstype}.' '.&mt('Include other personnel?').'</h3>';
     }
-    my $cansearch = 1;
-    my @alldoms = &Apache::lonnet::all_domains();
-    if (@alldoms == 1) {
-        my %domsrch = &Apache::lonnet::get_dom('configuration',
-                                               ['directorysrch'],$alldoms[0]);
-        if (ref($domsrch{'directorysrch'}) eq 'HASH') {
-            if ((!$domsrch{'directorysrch'}{'available'}) &&
-                ($domsrch{'directorysrch'}{'lcavailable'} eq '0')) {
-                $cansearch = 0;
-            }
-        }
-    }
     for (my $i=0; $i<$persontotal; $i++) { 
         my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
         my $linkargstr = join("','",@linkargs);
@@ -2134,14 +2133,9 @@ sub print_personnel_menu {
         }
         $sectionselector .= $newtitle.
             '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'."\n";
-        my $usersrchlink;
-        if ($cansearch) {
-            my $usersrchlinktxt = &mt('Search for user');
-            $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
-                                                                $usersrchlinktxt);
-        } else {
-            $usersrchlink = '&nbsp;';
-        }
+        my $usersrchlinktxt = &mt('Search for user');
+        my $usersrchlink =  &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+                            $usersrchlinktxt);
         my $userchklinktxt = &mt('Check username');
         my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
                             $userchklinktxt,'checkusername');
@@ -2522,7 +2516,7 @@ sub print_request_logs {
         if (ref($domconfig{'requestcourses'}) eq 'HASH') {
             if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
                 if ($curr{'crstype'} eq 'any') {
-                    my @types = qw(official unofficial community textbook);
+                    my @types = qw(official unofficial community textbook placement);
                     foreach my $type (@types) {
                         if ($domconfig{'requestcourses'}{'uniquecode'}{$type}) {
                             $showuniquecode = 1;
@@ -2690,7 +2684,7 @@ sub reqstatus_names {
                         rejected  => 'Request rejected',
                         cancelled => 'Request cancelled',
             );
-    if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) {
+    if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook') || ($crstype eq 'placement')) {
         $statusnames{'created'} = &mt('Course created');
     } elsif ($crstype eq 'community') {
         $statusnames{'created'} = &mt('Community created');
@@ -2918,7 +2912,7 @@ sub print_review {
         $inst_values .= '<td>'.$env{'form.coursecredits'}.'</td>';
     }
 
-    my %ctxt = &clone_text($env{'form.crstype'});
+    my %ctxt = &clone_text();
     $inst_headers .= '<th>'.&mt('Clone From').'</th>';
     if (($env{'form.cloning'}) &&
         ($env{'form.clonecrs'} =~ /^$match_name$/) && 
@@ -2930,8 +2924,7 @@ sub print_review {
             my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
                               $env{'form.clonecrs'},('description','internal.coursecode'));
             if (keys(%courseenv) > 0) {
-                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>'.
-                                 '<th>'.$ctxt{'dpl'}.'</th>';
+                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
                 $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
                 my $cloneinst = $courseenv{'internal.coursecode'};
                 if ($cloneinst ne '') {
@@ -2947,14 +2940,6 @@ sub print_review {
                 } else {
                     $inst_values .= $ctxt{'ncd'};
                 }
-                $inst_values .= '</td><td>';
-                if ($env{'form.tinyurls'} eq 'delete') {
-                    $inst_values .= $ctxt{'nsl'};
-                } elsif ($env{'form.tinyurls'} eq 'transfer') {
-                    $inst_values .= $ctxt{'tsl'};
-                } else {
-                    $inst_values .= $ctxt{'csl'};
-                }
                 $inst_values .= '</td>';
              } else {
                  $inst_values .= '<td>'.&mt('Unknown').'</td>';
@@ -3103,6 +3088,7 @@ sub courseinfo_form {
     &js_escape(\%js_lt);
     $js_lt{'unofficial'} = $js_lt{'official'};
     $js_lt{'textbook'} = $js_lt{'official'};
+    $js_lt{'placement'} = $js_lt{'official'};
     my $js_validate = <<"ENDJS";
 <script type="text/javascript">
 // <![CDATA['
@@ -3182,8 +3168,10 @@ sub clone_form {
     my $type = 'Course';
     if ($crstype eq 'community') {
         $type = 'Community';
+    } elsif ($crstype eq 'placement') {
+        $type = 'Placement'; 
     }
-    my %lt = &clone_text($crstype);
+    my %lt = &clone_text();
     my $output .= 
         &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
         &Apache::loncommon::select_dom_form($dom,'clonedom').'</label>'.
@@ -3201,37 +3189,19 @@ sub clone_form {
         '<input type="radio" name="datemode" value="shift" checked="checked" /> '.
         $lt{'shd'}.'</label>'.
         '<input type="text" size="5" name="dateshift" value="365" />'.
-        &Apache::lonhtmlcommon::row_closure(1).
-        &Apache::lonhtmlcommon::row_title($lt{'dpl'}).'<label>'.
-        '<input type="radio" name="tinyurls" value="delete" /> '.$lt{'nsl'}.
-        '</label><br /><label>'.
-        '<input type="radio" name="tinyurls" value="transfer" /> '.$lt{'tsl'}.
-        '</label><br /><label>'.
-        '<input type="radio" name="tinyurls" value="create" checked="checked" /> '.$lt{'csl'}.
-        '</label>'.
         &Apache::lonhtmlcommon::row_closure(1);
     return $output;
 }
 
 sub clone_text {
-    my ($crstype) = @_;
-    my %lt = &Apache::lonlocal::texthash(
+    return &Apache::lonlocal::texthash(
                'cid'  => 'Course ID',
                'dmn'  => 'Domain',
                'dsh'  => 'Date Shift',
                'ncd'  => 'Do not clone date parameters',
                'prd'  => 'Clone date parameters as-is',
                'shd'  => 'Shift date parameters by number of days',
-               'dpl'  => 'URL shortcuts (for deep linking)',
-               'nsl'  => 'Do not clone URL shortcuts',
-               'tsl'  => 'Transfer URL shortcuts from existing course to new course',
-               'csl'  => 'Create new URL shortcuts in new course',
-    );
-    if ($crstype eq 'Community') {
-        $lt{'tsl'} = &mt('Transfer URL shortcuts from existing course to new community');
-        $lt{'csl'} = &mt('Create new URL shortcuts in new course');
-    }
-    return %lt;
+        );
 }
 
 sub coursecode_form {
@@ -3673,7 +3643,6 @@ sub print_request_outcome {
                     clonecrs       => $clonecrs,
                     datemode       => $env{'form.datemode'},
                     dateshift      => $env{'form.dateshift'},
-                    tinyurls       => $env{'form.tinyurls'},
                     sectotal       => $sectotal,
                     sections       => \%sections,
                     crosslisttotal => $crosslisttotal,
@@ -3690,7 +3659,7 @@ sub print_request_outcome {
                                                         $instcode,$req_notifylist,\@instsections,\%domconfig);
     return ($result,$output,$customized);
 }
-    
+
 sub process_request {
     my ($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,
         $domconfig) = @_; 
@@ -3708,6 +3677,8 @@ sub process_request {
             $output = &mt('You are not permitted to request creation of communities');
         } elsif ($crstype eq 'textbook') {
             $output = &mt('You are not permitted to request creation of textbook courses');
+        } elsif ($crstype eq 'placement') {
+            $output = &mt('You are not permitted to request creation of placement tests');
         } else {
             $output = &mt('Unrecognized course type: [_1]',$crstype);
         }
@@ -3805,9 +3776,7 @@ sub process_request {
             $storeresult = 'rejected';
         } elsif ($disposition eq 'process') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
-            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,
-                $keysmsg,%longroles,$code);
-            my $clonemsg = [];
+            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles,$code);
             my $type = 'Course';
             if ($crstype eq 'community') {
                 $type = 'Community';
@@ -3840,9 +3809,9 @@ sub process_request {
             $customitems{'_LC_coursestartdate'} = $accessstart;
             $customitems{'_LC_courseenddate'} = $accessend;
             my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
-                                          'autocreate',$details,\$logmsg,$clonemsg,\$newusermsg,
-                                          \$addresult,\$enrollcount,\$response,\$keysmsg,\%domdefs,
-                                          \%longroles,\$code,\%customitems);
+                                          'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+                                          \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
+                                          \$code,\%customitems);
             if (ref($postprocess) eq 'HASH') {
                 $customized = $postprocess->{'createdcustomized'};
             }
@@ -3876,20 +3845,6 @@ sub process_request {
                     $output .= '<br />'.$role_result;
                 }
                 $output .= '</p>';
-                if ($logmsg) {
-                    $output .= '<p>'.$logmsg.'</p>';
-                }
-                if ((ref($clonemsg) eq 'ARRAY') && (@{$clonemsg})) {
-                    $output .= '<p class="LC_info">';
-                    my $user_lh = &Apache::loncommon::user_lang($env{'user.name'},$env{'user.domain'});
-                    foreach my $item (@{$clonemsg}) {
-                        if (ref($item) eq 'HASH') {
-                            $output .= &mt_user($user_lh,$item->{mt},
-                                                @{$item->{args}}).'<br />'."\n";
-                        }
-                    }
-                    $output .= '</p>'."\n";
-                }
                 $creationresult = 'created';
             } else {
                 $output = '<span class="LC_error">';
@@ -4361,7 +4316,7 @@ sub check_autolimit {
             if (($crstype eq 'community') && 
                 (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
                 $count ++;
-            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) &&
+            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook') || ($crstype eq 'placement')) &&
                      (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
                 $count ++;
             }
@@ -4412,7 +4367,6 @@ sub retrieve_settings {
             }
             $env{'form.datemode'} = $reqinfo{'datemode'};
             $env{'form.dateshift'} = $reqinfo{'dateshift'};
-            $env{'form.tinyurls'} = $reqinfo{'tinyurls'};
             if ($reqinfo{'crstype'} eq 'official') {
                 $env{'form.autoadds'} = $reqinfo{'autoadds'};
                 $env{'form.autodrops'} = $reqinfo{'autodrops'};
@@ -4815,26 +4769,17 @@ sub print_textbook_form {
 #
 # Table of user's current courses (owner and/or course coordinator)
 #
-    my %lt = &clone_text('Course');
+    my %lt = &clone_text();
     if (keys(%cloneable)) {
         $r->print('<div id="showexisting" style="display:none">'.
                   &clone_selection_table($dom,'owned',\%cloneable).
-                  '<fieldset style="display:inline-block"><legend>'.$lt{'dsh'}.'</legend><label>'.
-                  '<input type="radio" name="owndatemode" value="delete" /> '.$lt{'ncd'}.
+                  '<p><input type="radio" name="owndatemode" value="delete" /> '.$lt{'ncd'}.
                   '</label><br /><label>'.
                   '<input type="radio" name="owndatemode" value="preserve" /> '.$lt{'prd'}.
                   '</label><br /><label>'.
                   '<input type="radio" name="owndatemode" value="shift" checked="checked" /> '.
                   $lt{'shd'}.'</label>'.
                   '<input type="text" size="5" name="owndateshift" value="365" />'.
-                  '</fieldset><fieldset style="display:inline-block">'.
-                  '<legend>'.$lt{'dpl'}.'</legend><label>'.
-                  '<input type="radio" name="owntinyurls" value="delete" />'.$lt{'nsl'}.
-                  '</label><br /><label>'.
-                  '<input type="radio" name="owntinyurls" value="transfer" />'.$lt{'tsl'}.
-                  '</label><br /><label>'.
-                  '<input type="radio" name="owntinyurls" value="create" checked="checked" />'.$lt{'csl'}.
-                  '</label></fieldset>'.
                   '</div>');
     }
 #
@@ -4843,20 +4788,13 @@ sub print_textbook_form {
     if (keys(%domcloneable)) {
         $r->print('<div id="showcolleague" style="display:none">'.
                   &clone_selection_table($dom,'colleague',\%domcloneable).
-                  '<fieldset style="display:inline-block"><legend>'.$lt{'dsh'}.'</legend><label>'.
-                  '<input type="radio" name="colldatemode" value="delete" /> '.$lt{'ncd'}.
+                  '<p><input type="radio" name="colldatemode" value="delete" /> '.$lt{'ncd'}.
                   '</label><br /><label>'.
                   '<input type="radio" name="colldatemode" value="preserve" /> '.$lt{'prd'}.
                   '</label><br /><label>'.
                   '<input type="radio" name="colldatemode" value="shift" checked="checked" /> '.
                   $lt{'shd'}.'</label>'.
                   '<input type="text" size="5" name="colldateshift" value="365" />'.
-                  '</fieldset><fieldset style="display:inline-block">'.
-                  '<legend>'.$lt{'dpl'}.'</legend><label>'.
-                  '<input type="radio" name="colltinyurls" value="delete" />'.$lt{'nsl'}.
-                  '</label><br /><label>'.
-                  '<input type="radio" name="colltinyurls" value="create" checked="checked" />'.$lt{'csl'}.
-                  '</label></fieldset>'.
                   '</div>');
     }
 
@@ -5087,7 +5025,6 @@ sub process_textbook_request {
             } else {
                 $details->{dateshift} = '';
             }
-            $details->{tinyurls} = $env{'form.owntinyurls'};
         } elsif ($reqtype eq 'colleague') {
             $details->{datemode} = $env{'form.colldatemode'};
             if ($details->{datemode} eq 'shift') {
@@ -5095,11 +5032,6 @@ sub process_textbook_request {
             } else {
                 $details->{dateshift} = '';
             }
-            $details->{tinyurls} = $env{'form.colltinyurls'};
-        } elsif (($reqtype eq 'textbook') || ($reqtype eq 'template')) {
-            $details->{datemode} = 'delete';
-            $details->{dateshift} = '';
-            $details->{tinyurls} = '';
         }
         if ($details->{dateshift} ne '') {
             $details->{dateshift} =~ s/[^\d\.]+//g;
@@ -5107,7 +5039,6 @@ sub process_textbook_request {
     } else {
         $details->{datemode} = '';
         $details->{dateshift} = '';
-        $details->{tinyurls} = '';
     }
     my $lonhost = $r->dir_config('lonHostID');
     $r->rflush();