--- loncom/interface/lonrequestcourse.pm 2020/07/17 20:39:55 1.95.2.2.2.1
+++ loncom/interface/lonrequestcourse.pm 2018/09/02 01:16:59 1.95.2.3
@@ -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.95.2.3 2018/09/02 01:16:59 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',
@@ -2918,7 +2917,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 +2929,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'}.' ';
my $cloneinst = $courseenv{'internal.coursecode'};
if ($cloneinst ne '') {
@@ -2947,14 +2945,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>';
@@ -3183,7 +3173,7 @@ sub clone_form {
if ($crstype eq 'community') {
$type = 'Community';
}
- 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 +3191,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 +3645,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,
@@ -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">';
@@ -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,9 @@ 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 +5042,6 @@ sub process_textbook_request {
} else {
$details->{datemode} = '';
$details->{dateshift} = '';
- $details->{tinyurls} = '';
}
my $lonhost = $r->dir_config('lonHostID');
$r->rflush();