--- loncom/interface/lonrequestcourse.pm	2015/06/22 14:27:13	1.91
+++ loncom/interface/lonrequestcourse.pm	2020/07/17 20:39:55	1.95.2.2.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.91 2015/06/22 14:27:13 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.95.2.2.2.1 2020/07/17 20:39:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -551,6 +551,7 @@ sub form_elements {
                 clonedom         => 'selectbox',
                 datemode         => 'radio',
                 dateshift        => 'text',
+                tinyurls         => 'radio',
             },
             enrollment  => {
                 accessstart_month  => 'selectbox',
@@ -2097,6 +2098,18 @@ sub print_personnel_menu {
         $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);
@@ -2121,9 +2134,14 @@ sub print_personnel_menu {
         }
         $sectionselector .= $newtitle.
             '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'."\n";
-        my $usersrchlinktxt = &mt('Search for user');
-        my $usersrchlink =  &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
-                            $usersrchlinktxt);
+        my $usersrchlink;
+        if ($cansearch) {
+            my $usersrchlinktxt = &mt('Search for user');
+            $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+                                                                $usersrchlinktxt);
+        } else {
+            $usersrchlink = '&nbsp;';
+        }
         my $userchklinktxt = &mt('Check username');
         my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
                             $userchklinktxt,'checkusername');
@@ -2900,7 +2918,7 @@ sub print_review {
         $inst_values .= '<td>'.$env{'form.coursecredits'}.'</td>';
     }
 
-    my %ctxt = &clone_text();
+    my %ctxt = &clone_text($env{'form.crstype'});
     $inst_headers .= '<th>'.&mt('Clone From').'</th>';
     if (($env{'form.cloning'}) &&
         ($env{'form.clonecrs'} =~ /^$match_name$/) && 
@@ -2912,7 +2930,8 @@ 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>';
+                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>'.
+                                 '<th>'.$ctxt{'dpl'}.'</th>';
                 $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
                 my $cloneinst = $courseenv{'internal.coursecode'};
                 if ($cloneinst ne '') {
@@ -2928,6 +2947,14 @@ 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>';
@@ -3156,13 +3183,13 @@ sub clone_form {
     if ($crstype eq 'community') {
         $type = 'Community';
     }
-    my %lt = &clone_text();
+    my %lt = &clone_text($crstype);
     my $output .= 
         &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
         &Apache::loncommon::select_dom_form($dom,'clonedom').'</label>'.
         &Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
-        '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();opencrsbrowser('."'$formname','clonecrs','clonedom','','','','','$type'".')" />'.
+        '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".')" />'.
         '</label>&nbsp;'.
         &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type).
         &Apache::lonhtmlcommon::row_closure(1).
@@ -3174,19 +3201,37 @@ 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 {
-    return &Apache::lonlocal::texthash(
+    my ($crstype) = @_;
+    my %lt = &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 {
@@ -3628,6 +3673,7 @@ sub print_request_outcome {
                     clonecrs       => $clonecrs,
                     datemode       => $env{'form.datemode'},
                     dateshift      => $env{'form.dateshift'},
+                    tinyurls       => $env{'form.tinyurls'},
                     sectotal       => $sectotal,
                     sections       => \%sections,
                     crosslisttotal => $crosslisttotal,
@@ -3667,7 +3713,7 @@ sub process_request {
         }
         $storeresult = 'notpermitted'; 
     } else {
-        my ($disposition,$message,$reqstatus,$coursedesc,%customvalidation);
+        my ($disposition,$message,$reqstatus,$coursedesc,$accessstart,$accessend,%customvalidation);
         my %reqhash = (
                         reqtime   => $now,
                         crstype   => $crstype,
@@ -3679,6 +3725,8 @@ sub process_request {
                                                      $env{'user.domain'});
         if (ref($details) eq 'HASH') {
             $coursedesc = $details->{'cdescr'};
+            $accessstart = $details->{'accessstart'};
+            $accessend = $details->{'accessend'};
         }
         if ($val eq 'autolimit=') {
             $disposition = 'process';
@@ -3757,7 +3805,9 @@ 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 ($logmsg,$newusermsg,$addresult,$enrollcount,$response,
+                $keysmsg,%longroles,$code);
+            my $clonemsg = [];
             my $type = 'Course';
             if ($crstype eq 'community') {
                 $type = 'Community';
@@ -3786,10 +3836,13 @@ sub process_request {
                 $customitems{'_LC_owneremail'} = $owneremail;
             }
             $customitems{'_LC_coursedomainname'} = &Apache::lonnet::domain($dom,'description');
+            $customitems{'_LC_coursedescription'} = $coursedesc;
+            $customitems{'_LC_coursestartdate'} = $accessstart;
+            $customitems{'_LC_courseenddate'} = $accessend;
             my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
-                                          'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
-                                          \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
-                                          \$code,\%customitems);
+                                          'autocreate',$details,\$logmsg,$clonemsg,\$newusermsg,
+                                          \$addresult,\$enrollcount,\$response,\$keysmsg,\%domdefs,
+                                          \%longroles,\$code,\%customitems);
             if (ref($postprocess) eq 'HASH') {
                 $customized = $postprocess->{'createdcustomized'};
             }
@@ -3823,6 +3876,20 @@ 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">';
@@ -4345,6 +4412,7 @@ 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'};
@@ -4549,7 +4617,16 @@ sub print_textbook_form {
         $cc_clone .= $cdom.':'.$cnum.'&';
         unless (exists($cloneable{$cdom.'_'.$cnum})) {
             my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{'one_time' => 1});
-            $cloneable{$cdom.'_'.$cnum} = \%courseinfo;
+            $cloneable{$cdom.'_'.$cnum} = {
+                                               context => $courseinfo{'internal.creationcontext'},
+                                               created => $courseinfo{'internal.created'},
+                                               creator => $courseinfo{'internal.creator'},
+                                               description => $courseinfo{'description'},
+                                               inst_code => $courseinfo{'coursecode'},
+                                               owner => $courseinfo{'internal.courseowner'},
+                                               releaserequired => $courseinfo{'internal.releaserequired'},
+                                               type  => $courseinfo{'type'},
+                                           };
         }
     }
 
@@ -4738,17 +4815,26 @@ sub print_textbook_form {
 #
 # Table of user's current courses (owner and/or course coordinator)
 #
-    my %lt = &clone_text();
+    my %lt = &clone_text('Course');
     if (keys(%cloneable)) {
         $r->print('<div id="showexisting" style="display:none">'.
                   &clone_selection_table($dom,'owned',\%cloneable).
-                  '<p><input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
+                  '<fieldset style="display:inline-block"><legend>'.$lt{'dsh'}.'</legend><label>'.
+                  '<input type="radio" name="owndatemode" value="delete" /> '.$lt{'ncd'}.
                   '</label><br /><label>'.
-                  '<input type="radio" name="datemode" value="preserve" /> '.$lt{'prd'}.
+                  '<input type="radio" name="owndatemode" value="preserve" /> '.$lt{'prd'}.
                   '</label><br /><label>'.
-                  '<input type="radio" name="datemode" value="shift" checked="checked" /> '.
+                  '<input type="radio" name="owndatemode" value="shift" checked="checked" /> '.
                   $lt{'shd'}.'</label>'.
-                  '<input type="text" size="5" name="dateshift" value="365" />'.
+                  '<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>');
     }
 #
@@ -4757,13 +4843,20 @@ sub print_textbook_form {
     if (keys(%domcloneable)) {
         $r->print('<div id="showcolleague" style="display:none">'.
                   &clone_selection_table($dom,'colleague',\%domcloneable).
-                  '<p><input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
+                  '<fieldset style="display:inline-block"><legend>'.$lt{'dsh'}.'</legend><label>'.
+                  '<input type="radio" name="colldatemode" value="delete" /> '.$lt{'ncd'}.
                   '</label><br /><label>'.
-                  '<input type="radio" name="datemode" value="preserve" /> '.$lt{'prd'}.
+                  '<input type="radio" name="colldatemode" value="preserve" /> '.$lt{'prd'}.
                   '</label><br /><label>'.
-                  '<input type="radio" name="datemode" value="shift" checked="checked" /> '.
+                  '<input type="radio" name="colldatemode" value="shift" checked="checked" /> '.
                   $lt{'shd'}.'</label>'.
-                  '<input type="text" size="5" name="dateshift" value="365" />'.
+                  '<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>');
     }
 
@@ -4845,11 +4938,14 @@ sub clone_selection_table {
                 $cleantitle=~s/'/\\'/g;
                 $cleantitle =~ s/^\s+//;
                 my ($namestr,@owners,%ownernames);
-                my $singleowner = $cloneableref->{$cid}{'internal.courseowner'};
-                push(@owners,$singleowner);
+                if ($cloneableref->{$cid}{'owner'} ne '') {
+                    push(@owners,$cloneableref->{$cid}{'owner'});
+                }
                 if ($cloneableref->{$cid}{'co-owners'} ne '') {
-                    foreach my $item (split(/,/,$cloneableref->{$cid}{'internal.co-owners'})) {
-                        push(@owners,$item);
+                    foreach my $item (split(/,/,$cloneableref->{$cid}{'co-owners'})) {
+                        if (($item ne '') && (!grep(/^\Q$item\E$/,@owners))) {
+                            push(@owners,$item);
+                        }
                     }
                 }
                 foreach my $owner (@owners) {
@@ -4983,9 +5079,35 @@ sub process_textbook_request {
                     accessend      => $accessend,
                     personnel      => {},
                   };
-    if ($reqtype eq 'existing') {
-        $details->{datemode} = $env{'form.datemode'};
-        $details->{dateshift} = $env{'form.dateshift'};
+    if (($clonecrs ne '') && ($clonedom ne '')) {
+        if ($reqtype eq 'existing') {
+            $details->{datemode} = $env{'form.owndatemode'};
+            if ($details->{datemode} eq 'shift') {
+                $details->{dateshift} = $env{'form.owndateshift'};
+            } else {
+                $details->{dateshift} = '';
+            }
+            $details->{tinyurls} = $env{'form.owntinyurls'};
+        } elsif ($reqtype eq 'colleague') {
+            $details->{datemode} = $env{'form.colldatemode'};
+            if ($details->{datemode} eq 'shift') {
+                $details->{dateshift} = $env{'form.colldateshift'};
+            } 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;
+        }
+    } else {
+        $details->{datemode} = '';
+        $details->{dateshift} = '';
+        $details->{tinyurls} = '';
     }
     my $lonhost = $r->dir_config('lonHostID');
     $r->rflush();
@@ -5159,7 +5281,7 @@ function validTextbookReq() {
                        if (cloneChoice == 'existing') {
                            alert("$js_lt{'existing'}");
                        } else {
-                           alert("js_$lt{'colleague'}");
+                           alert("$js_lt{'colleague'}");
                        }
                    }
                }