[LON-CAPA-cvs] cvs: loncom /interface lonmodifycourse.pm
raeburn
raeburn at source.lon-capa.org
Mon Sep 4 23:42:31 EDT 2023
raeburn Tue Sep 5 03:42:31 2023 EDT
Modified files:
/loncom/interface lonmodifycourse.pm
Log:
- Remove trailing whitespace. No code changes.
-------------- next part --------------
Index: loncom/interface/lonmodifycourse.pm
diff -u loncom/interface/lonmodifycourse.pm:1.102 loncom/interface/lonmodifycourse.pm:1.103
--- loncom/interface/lonmodifycourse.pm:1.102 Thu Aug 3 15:57:23 2023
+++ loncom/interface/lonmodifycourse.pm Tue Sep 5 03:42:31 2023
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.102 2023/08/03 15:57:23 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.103 2023/09/05 03:42:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -104,7 +104,7 @@
my ($cdom,$cnum) = @_;
my ($internals,$accessdates) = &autoenroll_keys();
my @items;
- if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
+ if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
@items = map { 'internal.'.$_; } (@{$internals});
push(@items,@{$accessdates});
}
@@ -445,7 +445,7 @@
);
}
if ($type eq 'Community') {
- if ($permission->{'setparms'} eq 'edit') {
+ if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Community Settings';
$linktext{'setparms'} = 'View/Modify community owner, self-enrollment and table lifetime';
$linktext{'catsettings'} = 'View/Modify catalog settings for community';
@@ -455,7 +455,7 @@
$linktext{'catsettings'} = 'View catalog settings for community';
}
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
- $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
+ $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
} else {
if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Course Settings';
@@ -481,7 +481,7 @@
$extendedtype = ucfirst(&Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings));
}
my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.');
- my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.');
+ my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.');
my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.');
my $ltiauth_text = &mt('Override default for requirement for re-authentication for LTI-limited launch of deep-linked item.');
my $exttool_text = &mt('Override default permissions for external tools use for this specific course.');
@@ -615,9 +615,9 @@
}
$selectrole = 1;
} elsif ($permission->{'adhocrole'} eq 'custom') {
- my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
+ my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
if (ref($okroles) eq 'ARRAY') {
- my $possrole = $env{'form.adhocrole'};
+ my $possrole = $env{'form.adhocrole'};
if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) {
my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
$newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
@@ -817,7 +817,7 @@
my %settings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
my $threshold = $settings{'internal.anonsurvey_threshold'};
if ($threshold eq '') {
- my %domconfig =
+ my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
$threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
@@ -832,7 +832,7 @@
my $hidden_elements = &hidden_form_elements();
my ($disabled,$submit);
if ($readonly) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
} else {
$submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
}
@@ -872,11 +872,11 @@
if ($postsubmit eq '') {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- $postsubmit = 1;
+ $postsubmit = 1;
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
- $postsubmit = 0;
+ $postsubmit = 0;
}
}
}
@@ -910,7 +910,7 @@
<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
<form action="/adm/modifycourse" method="post" name="setpostsubmit" onsubmit="return verify_postsubmit();">
<p>
-$helpitem $lt{'disa'}:
+$helpitem $lt{'disa'}:
<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" $disabled />
$lt{'yes'}</label>
<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" $disabled />
@@ -933,7 +933,7 @@
sub domain_postsubtimeout {
my ($cdom,$type,$settings) = @_;
- return unless (ref($settings) eq 'HASH');
+ return unless (ref($settings) eq 'HASH');
my $lctype = &get_lctype($type,$settings);
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
@@ -993,14 +993,14 @@
if ($readonly) {
$disabled = ' disabled="disabled"';
}
- my %currsettings =
+ my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
if (grep(/^togglecats$/, at cat_params)) {
my $excludeon = '';
my $excludeoff = ' checked="checked" ';
if ($currsettings{'hidefromcat'} eq 'yes') {
$excludeon = $excludeoff;
- $excludeoff = '';
+ $excludeoff = '';
}
$r->print('<br /><h4>'.$lt{'visi'}.'</h4>'.
'<p>'.
@@ -1083,7 +1083,7 @@
'gobt' => "Save",
'sett' => 'Setting',
'domd' => 'Domain default',
- 'whom' => 'Who configures',
+ 'whom' => 'Who configures',
);
my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled);
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
@@ -1117,11 +1117,11 @@
$cc_status{$uname.':'.$udom} = $lt{'actv'};
}
}
- if (($enrollvar{'courseowner'} ne '') &&
+ if (($enrollvar{'courseowner'} ne '') &&
(!grep(/^$enrollvar{'courseowner'}$/, at local_ccs))) {
push(@local_ccs,$enrollvar{'courseowner'});
my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
- $pname{$enrollvar{'courseowner'}} =
+ $pname{$enrollvar{'courseowner'}} =
&Apache::loncommon::plainname($owneruname,$ownerdom);
my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
$cdom,$cnum,$ccrole);
@@ -1151,7 +1151,7 @@
} else {
$ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
}
- $ownertable .=
+ $ownertable .=
'<td>'.$pname{$cc}.'</td>'."\n".
'<td>'.$cc.'</td>'."\n".
'<td>'.$cc_status{$cc}.' '.$ccname.'</td>'."\n".
@@ -1228,7 +1228,7 @@
'<th>'.$lt{'whom'}.'</th>'.
&Apache::loncommon::end_data_table_header_row()."\n");
my %optionname;
- $optionname{''} = &mt('Use domain default');
+ $optionname{''} = &mt('Use domain default');
$optionname{'0'} = $dctitle;
$optionname{'1'} = $cctitle;
foreach my $item (@{$selfenrollrows}) {
@@ -1243,12 +1243,12 @@
$checked{'1'} = ' checked="checked"';
} else {
$checked{''} = ' checked="checked"';
- }
+ }
$r->print(&Apache::loncommon::start_data_table_row()."\n".
'<td>'.$selfenrolltitles->{$item}.'</td>'."\n".
'<td>'.&mt('[_1] configures',$default).'</td>'."\n".
'<td>');
- foreach my $option ('','0','1') {
+ foreach my $option ('','0','1') {
$r->print('<span class="LC_nobreak"><label>'.
'<input type="radio" name="selfenrollmgr_'.$item.'" '.
'value="'.$option.'"'.$checked{$option}.$disabled.' />'.
@@ -1317,7 +1317,7 @@
my ($domdef,$checkeddom,$checkedcrs,$domdefdisplay,$divsty,$authok,$authno);
$domdef = 0;
$checkeddom = ' checked="checked"';
- $domdefdisplay = $lt{'logi'};
+ $domdefdisplay = $lt{'logi'};
$divsty = 'display:none';
$authno = ' checked="checked"';
my %domconfig =
@@ -1409,7 +1409,7 @@
} elsif ($domdef) {
$domdefdisplay = $titles{'crs'};
} elsif ($domdefdom) {
- $domdefdisplay = $titles{'dom'};
+ $domdefdisplay = $titles{'dom'};
} else {
$domdefdisplay = $titles{'none'};
}
@@ -1420,14 +1420,14 @@
dom => '',
crs => '',
none => '',
- );
+ );
if ($crsexttool ne '') {
$checkedcrs = $checkeddom;
$checkeddom = '';
$divsty = 'display:inline-block';
foreach my $option ('both','dom','crs','none') {
if ($crsexttool eq $option) {
- $crschecked{$option} = ' checked="checked"';
+ $crschecked{$option} = ' checked="checked"';
} else {
$crschecked{$option} = '';
}
@@ -1577,7 +1577,7 @@
unless ($curr_authtype eq '') {
$curr_authfield = $curr_authtype.'arg';
}
- my $javascript_validations =
+ my $javascript_validations =
&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,
$curr_authtype,$curr_authfield);
my %param = ( formname => 'document.'.$env{'form.phase'},
@@ -1611,7 +1611,7 @@
unless (($type eq 'Community') || ($type eq 'Placement')) {
push(@items,('internal.coursecode','internal.authtype','internal.autharg',
'internal.sectionnums','internal.crosslistings'));
- if (&showcredits($cdom)) {
+ if (&showcredits($cdom)) {
push(@items,'internal.defaultcredits');
}
my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
@@ -1734,7 +1734,7 @@
$newattr{'courseowner'}=$env{'form.courseowner'};
unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
$changed{'owner'} = 1;
- }
+ }
}
if ($changed{'owner'} || $changed{'code'} || $changed{'passwd'}) {
@@ -1801,7 +1801,7 @@
} else {
if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
my %newenv;
- map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
+ map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
&Apache::lonnet::appenv(\%newenv);
}
foreach my $attr (@modifiable_params) {
@@ -1860,7 +1860,6 @@
if ($course_check eq 'ok') {
my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
unless ($outcome eq 'ok') {
-
push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
}
} else {
@@ -1924,7 +1923,7 @@
$nochgresponse .= "</ul><br/><br/>";
}
my ($warning,$numwarnings);
- my $numwarnings = scalar(@warnings);
+ my $numwarnings = scalar(@warnings);
if ($numwarnings) {
$warning = &mt('The following [quant,_1,warning was,warnings were] generated when applying your changes to automated enrollment:',$numwarnings).'<p><ul>';
foreach my $warn (@warnings) {
@@ -2156,7 +2155,7 @@
$showresult{$item} = 1;
}
} else {
- if ($item eq 'coursequota') {
+ if ($item eq 'coursequota') {
$r->print(&mt('The proposed group portfolio quota contained invalid characters, so the quota is unchanged.').'<br />');
} else {
$r->print(&mt('The proposed quota for content uploaded via the Content Editor contained invalid characters, so the quota is unchanged.').'<br />');
@@ -2169,7 +2168,7 @@
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
$cnum);
foreach my $key (sort(keys(%showresult))) {
- if (($oldsettings{'internal.'.$key} eq '') &&
+ if (($oldsettings{'internal.'.$key} eq '') &&
($env{'form.'.$key} == $default{$key})) {
if ($key eq 'uploadquota') {
if ($type eq 'Community') {
@@ -2179,7 +2178,7 @@
$r->print(&mt('The disk space allocated for files uploaded to this course via the Content Editor is the default quota for this domain: [_1] MB.',
$default{$key}).'<br />');
}
- } else {
+ } else {
if ($type eq 'Community') {
$r->print(&mt('The disk space allocated for group portfolio files in this community is the default quota for this domain: [_1] MB.',
$default{$key}).'<br />');
@@ -2239,7 +2238,7 @@
my %oldsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
- my $defaultthreshold;
+ my $defaultthreshold;
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
$defaultthreshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
if ($defaultthreshold eq '') {
@@ -2306,14 +2305,14 @@
$r->print('<h3>'.$lt{'subb'}.'</h3>'."\n".
'<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
'<form action="/adm/modifycourse" method="post" name="processpostsubmit"><p>'."\n");
- my %oldsettings =
+ my %oldsettings =
&Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout','internal.coursecode','internal.textbook'],$cdom,$cnum);
my $postsubmit = $env{'form.postsubmit'};
if ($postsubmit eq '1') {
my $postsubtimeout = $env{'form.postsubtimeout'};
$postsubtimeout =~ s/[^\d\.]+//g;
if (($oldsettings{'internal.postsubmit'} eq $postsubmit) && ($oldsettings{'internal.postsubtimeout'} eq $postsubtimeout)) {
- $r->print($lt{'unch'});
+ $r->print($lt{'unch'});
} else {
my %cenv = (
'internal.postsubmit' => $postsubmit,
@@ -2329,12 +2328,12 @@
} else {
$r->print($lt{'erro'});
}
- } else {
+ } else {
$cenv{'internal.postsubtimeout'} = $postsubtimeout;
my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
if ($putreply eq 'ok') {
if ($postsubtimeout eq '0') {
- $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.'));
+ $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.'));
} else {
$r->print(&mt('Submit button will be disabled after student submission for [quant,_1,second].',$postsubtimeout));
}
@@ -2348,7 +2347,7 @@
$r->print($lt{'unch'});
} else {
if (exists($oldsettings{'internal.postsubtimeout'})) {
- &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
+ &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
}
my %cenv = (
'internal.postsubmit' => $postsubmit,
@@ -2393,7 +2392,7 @@
my (%cenv, at changes, at nochanges);
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
- my (@newcategories,%showitem);
+ my (@newcategories,%showitem);
if (grep(/^togglecats$/, at cat_params)) {
if ($currsettings{'hidefromcat'} ne $env{'form.hidefromcat'}) {
push(@changes,'hidefromcat');
@@ -2439,9 +2438,9 @@
foreach my $cat (@newcategories) {
if (!grep(/^\Q$cat\E$/, at currcategories)) {
$catchg = 1;
- last;
- }
- }
+ last;
+ }
+ }
}
} else {
if (@newcategories > 0) {
@@ -2540,7 +2539,7 @@
$change = 1;
}
} elsif ($env{'form.ltiauthset'} eq 'course') {
- if ($env{'form.ltiauth'} =~ /^0|1$/) {
+ if ($env{'form.ltiauth'} =~ /^0|1$/) {
$newltiauth = $env{'form.ltiauth'};
}
if ($oldltiauth == $newltiauth) {
@@ -2808,7 +2807,7 @@
&js_escape(\$alert);
my $regexp = ' /^\s*\d+\s*$/';
- $js .= <<"ENDSCRIPT";
+ $js .= <<"ENDSCRIPT";
function verify_postsubmit() {
var optionsElement = document.setpostsubmit.postsubmit;
@@ -2840,7 +2839,7 @@
}
} else {
if (currval == 0) {
- verified = 'ok';
+ verified = 'ok';
} else {
alert('$invalid');
return false;
@@ -2858,7 +2857,7 @@
var optionsElement = document.setpostsubmit.postsubmit;
if (document.getElementById(caller)) {
var divitem = document.getElementById(caller);
- var optionsElement = document.setpostsubmit.postsubmit;
+ var optionsElement = document.setpostsubmit.postsubmit;
if (optionsElement.length) {
var currval;
for (var i=0; i<optionsElement.length; i++) {
@@ -3055,7 +3054,7 @@
}
sub hidden_form_elements {
- my $hidden_elements =
+ my $hidden_elements =
&Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
@@ -3185,7 +3184,7 @@
$choose_text = "Choose a placement test";
} else {
$choose_text = "Choose a course";
- }
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$firstform,'')",
text=>"Course/Community search"},
@@ -3200,7 +3199,7 @@
if ($type eq 'Community') {
$enter_text = 'Enter community';
} elsif ($type eq 'Placement') {
- $enter_text = 'Enter placement test';
+ $enter_text = 'Enter placement test';
} else {
$enter_text = 'Enter course';
}
@@ -3223,11 +3222,11 @@
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
my ($readonly,$linktext);
if ($permission->{$phase} eq 'view') {
- $readonly = 1;
+ $readonly = 1;
}
if (($phase eq 'setquota') && ($permission->{'setquota'})) {
if ($permission->{'setquota'} eq 'view') {
- $linktext = 'Set quota';
+ $linktext = 'Set quota';
} else {
$linktext = 'Display quota';
}
@@ -3235,7 +3234,7 @@
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>$linktext});
&print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
+ } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setquota')",
text=>"Set quota"});
@@ -3314,7 +3313,7 @@
if (!exists($env{'form.state'})) {
&print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly);
} elsif ($env{'form.state'} eq 'done') {
- &Apache::lonhtmlcommon::add_breadcrumb
+ &Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_selfenrollconfig($r,$type,$cdesc,$coursehash);
More information about the LON-CAPA-cvs
mailing list