'.
''.
&mt('An error occurred when saving changes to link protection settings, which remain unchanged.').
@@ -1941,6 +1819,22 @@ sub store_changes {
}
}
$displayname = &mt($text);
+ } elsif ($item eq 'lti') {
+ if ($key eq 'lti.lcmenu') {
+ if ($changes->{$item}{$key} eq 'none') {
+ $displayval = &mt('None of the configurable menu items displayed');
+ } else {
+ my %ltititles = <imenu_titles();
+ $displayval = join(', ', map { $ltititles{$_}; } split(/,/,$changes->{$item}{$key}));
+ }
+ } else {
+ if ($changes->{$item}{$key} eq '1') {
+ $displayval = &mt('Yes');
+ } elsif ($changes->{$item}{$key} eq '') {
+ $displayval = &mt('No');
+ }
+ }
+ $displayname = &mt($text);
} elsif ($item eq 'menuitems') {
unless ($changes->{$item}{$key} eq '') {
if ($key eq 'menudefault') {
@@ -2014,7 +1908,20 @@ sub store_changes {
}
} elsif ($changes->{$item}{$key} eq '') {
push(@delkeys,$key);
- if ($item eq 'menuitems') {
+ if ($item eq 'lti') {
+ if (($key eq 'lti.override') || (($key ne 'lti.override') && ($env{'form.lti.override'} ne ''))) {
+ if (($key eq 'lti.lcmenu') &&
+ ((!$env{'form.lti.topmenu'}) && (!$env{'form.lti.inlinemenu'}))) {
+ $output .= ''.&mt('LTI settings for menu items only saved if page header and/or inline menu is set to be displayed').'';
+ } else {
+ $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
+ ''.$displayname.'',
+ "'$displayval'")).'';
+ }
+ } elsif (!exists($changes->{$item}{'lti.override'})) {
+ $output .= ''.&mt('LTI settings only saved if Override is set to "Yes"').'';
+ }
+ } elsif ($item eq 'menuitems') {
if ($key eq 'menudefault') {
$output .= ''.&mt("Default collection of menu items set to: 'Standard' (all menus shown)").'';
} elsif ($key eq 'menucollections') {
@@ -2065,7 +1972,9 @@ sub store_changes {
}
if (($key eq 'description') || ($key eq 'cloners') ||
($key eq 'hidefromcat') || ($key eq 'categories') ||
- ($key eq 'co-owners')) {
+ ($key eq 'co-owners') || ($key eq 'lti.override') ||
+ ($key eq 'lti.topmenu') || ($key eq 'lti.inlinemenu') ||
+ ($key eq 'lti.lcmenu')) {
push(@need_env_update,$key);
}
}
@@ -2152,6 +2061,8 @@ sub update_env {
my @coowners = split(',',$storehash->{'internal.'.$key});
$crsinfo{$env{'request.course.id'}}{'co-owners'} = \@coowners;
$count ++;
+ } elsif ($key =~ /^lti\./) {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash->{$key}});
}
}
if ($count) {
@@ -2280,7 +2191,7 @@ sub get_jscript {
$local_to_standard{$code_order[$i]} = $standardnames[$i];
}
foreach my $cloner (@cloners) {
- if (($cloner !~ /^\Q*:\E$match_domain$/) &&
+ if (($cloner !~ /^\Q*:\E$match_domain$/) &&
($cloner !~ /^$match_username\:$match_domain$/)) {
foreach my $item (split(/\&/,$cloner)) {
my ($key,$val) = split(/\=/,$item);
@@ -2464,70 +2375,11 @@ function toggleAddmenucoll() {
}
ENDSCRIPT
}
- my $linkprotector_js = <<"ENDSCRIPT";
-function toggleLTI(form,num,item) {
- var radioname = '';
- var currdivid = '';
- var newdivid = '';
- if ((document.getElementById('linkprot_divcurr'+item+'_'+num)) &&
- (document.getElementById('linkprot_divchg'+item+'_'+num))) {
- currdivid = document.getElementById('linkprot_divcurr'+item+'_'+num);
- newdivid = document.getElementById('linkprot_divchg'+item+'_'+num);
- radioname = form.elements['linkprot_change'+item+'_'+num];
- if (radioname) {
- if (radioname.length > 0) {
- var setvis;
- for (var i=0; i 0) {
- var setvis;
- for (var i=0; i'."\n".
+ $syllabus_js."\n".$menuitems_js."\n".'//]]>'."\n".
''."\n".$stubrowse_js."\n";
return $jscript;
}
@@ -2707,7 +2559,7 @@ sub print_courseinfo {
&mt('Modification may make assessment data inaccessible!').
'';
$editsyllabus = &mt('[_1]Edit[_2]','',
- '');
+ '');
}
my %items = (
'url' => {
@@ -2788,7 +2640,7 @@ sub print_courseinfo {
next if (!$env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'});
}
unless (($item eq 'cloners') || ($item eq 'rolenames')) {
- $colspan = 2;
+ $colspan = 2;
}
$count ++;
if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
@@ -2832,7 +2684,7 @@ sub print_courseinfo {
$default = '0';
}
$datatable .= &new_cloners_dom_row($cdom,'0',$default);
- }
+ }
} elsif ($settings->{$item} ne '*') {
my @entries = split(/,/,$settings->{$item});
if (@entries > 0) {
@@ -2971,12 +2823,12 @@ sub print_courseinfo {
if ($clonesrc =~ m{/$match_domain/$match_courseid}) {
my %clonesrcinfo = &Apache::lonnet::coursedescription($clonesrc);
if ($clonesrcinfo{'description'}) {
- $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
+ $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
}
}
$datatable .= $clonedfrom;
} elsif ($item eq 'uniquecode') {
- my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
+ my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
if ($code) {
$datatable .= $code;
}
@@ -3023,12 +2875,12 @@ sub print_courseinfo {
} elsif ($uploaded) {
$datatable .= &mt('Uploaded file');
} else {
- $datatable .= &mt('Standard template');
+ $datatable .= &mt('Standard template');
}
$datatable .= (' ' x 2).
&mt('[_1]View[_2]',
'',
- '');
+ '');
} elsif ($item eq 'loncaparev') {
my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
my $showreqd;
@@ -3053,7 +2905,7 @@ sub new_cloners_dom_row {
my ($output,$checkedon,$checkedoff);
if ($newdom ne '') {
if ($num eq $default) {
- $checkedon = 'checked="checked" ';
+ $checkedon = 'checked="checked" ';
} else {
$checkedoff = 'checked="checked" ';
}
@@ -3204,7 +3056,7 @@ ENDSCRIPT
sub display_loncaparev_constraints {
my ($r,$navmap,$loncaparev,$crstype) = @_;
- my ($reqdmajor,$reqdminor);
+ my ($reqdmajor,$reqdminor);
my $cid = $env{'request.course.id'};
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
@@ -3221,116 +3073,160 @@ sub display_loncaparev_constraints {
$Apache::lonrelrequtils::checkcrstypes{$crstype}).'';
}
my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps,
- %byresponsetype,%bysubmission,%fromblocks);
+ %byresponsetype,%bysubmission,%fromblocks,%bycrsrestype);
@scopeorder = ('all','section/group','user');
my $now = time;
my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
if (ref($resourcedata) eq 'HASH') {
foreach my $key (keys(%{$resourcedata})) {
+ my %found;
foreach my $item (keys(%Apache::lonrelrequtils::checkparms)) {
if ($key =~ /(\Q$item\E)$/) {
- if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
- my $value = $resourcedata->{$key};
- if ($item eq 'examcode') {
- if (&Apache::lonnet::validCODE($value)) {
- $value = 'valid';
- } else {
- $value = '';
- }
- } elsif ($item eq 'printstartdate') {
- if ($value =~ /^\d+$/) {
- if ($value > $now) {
- $value = 'future';
- }
- }
- } elsif ($item eq 'printenddate') {
- if ($value =~ /^\d+$/) {
- if ($value < $now) {
- $value = 'past';
- }
- }
-
- }
- my ($middle,$scope,$which,$level,$map,$resource);
- if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
- my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
- my $stdname = &Apache::lonparmset::standard_parameter_names($item);
- my $valname = &get_param_description($stdtype,$value);
- my $rev = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value};
- my $start = $cid.'.';
- if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
- $middle = $1;
- $which = $2;
- $scope = 'user';
- } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
- $middle = $1;
- $which = $2;
- $scope = 'section/group';
- } else {
- $scope = 'all';
- }
- my $what="$stdname=$valname";
- if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
- $level = 'general';
- if ($scope eq 'all') {
- if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
- unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
- push(@{$fromparam{$rev}{$scope}},$what);
- }
- } else {
- push(@{$fromparam{$rev}{$scope}},$what);
- }
- } else {
- if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
- unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
- push(@{$fromparam{$rev}{$scope}{$which}},$what);
- }
- } else {
- push(@{$fromparam{$rev}{$scope}{$which}},$what);
- }
- }
- $rowspan{$rev} ++;
- } elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) {
- $level = 'folder';
- $map = $1;
- if ($scope eq 'all') {
- if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
- unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
- push(@{$bymap{$map}{$rev}{$scope}},$what);
- }
- } else {
- push(@{$bymap{$map}{$rev}{$scope}},$what);
- }
- } else {
- if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
- unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
- push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
- }
- } else {
- push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
- }
- }
- } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
- $level = 'resource';
- $resource = $1;
- if ($scope eq 'all') {
- if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
- unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
- push(@{$byresource{$resource}{$rev}{$scope}},$what);
- }
- } else {
- push(@{$byresource{$resource}{$rev}{$scope}},$what);
- }
- } else {
- if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
- unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
- push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
- }
- } else {
- push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
- }
- }
- }
+ if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
+ my $value = $resourcedata->{$key};
+ if ($item eq 'examcode') {
+ if (&Apache::lonnet::validCODE($value)) {
+ $value = 'valid';
+ } else {
+ $value = '';
+ }
+ } elsif ($item eq 'printstartdate') {
+ if ($value =~ /^\d+$/) {
+ if ($value > $now) {
+ $value = 'future';
+ }
+ }
+ } elsif ($item eq 'printenddate') {
+ if ($value =~ /^\d+$/) {
+ if ($value < $now) {
+ $value = 'past';
+ }
+ }
+ }
+ if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
+ my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+ $found{$item}{'valname'} = &get_param_description($stdtype,$value);
+ $found{$item}{'rev'} = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value.'::'};
+ }
+ }
+ }
+ }
+ foreach my $item (keys(%Apache::lonrelrequtils::checkparmvalsmatch)) {
+ if (ref($Apache::lonrelrequtils::checkparmvalsmatch{$item}) eq 'ARRAY') {
+ my $value = $resourcedata->{$key};
+ foreach my $valuematch (@{$Apache::lonrelrequtils::checkparmvalsmatch{$item}}) {
+ if ($value =~ /$valuematch/) {
+ my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+ $found{$item}{'valname'} = &get_param_description($stdtype,$value,1);
+ $found{$item}{'rev'} =
+ $Apache::lonnet::needsrelease{'parameter:'.$item.'::'.$valuematch.':'};
+ last;
+ }
+ }
+ }
+ }
+ foreach my $item (keys(%Apache::lonrelrequtils::checkparmnamesmatch)) {
+ my $regexp;
+ if ($item eq 'maplevelrecurse') {
+ $regexp = '\.(?:sequence|page)___\(rec\)\.';
+ }
+ if ($regexp ne '') {
+ if ($key =~ /$regexp.*\.(\w+)$/) {
+ my $name = $1;
+ my $value = $resourcedata->{$key};
+ if ($name eq 'type') {
+ last unless (($value eq 'problem') || ($value eq 'practice') || ($value eq 'exam') ||
+ ($value eq 'survey') || ($value eq 'surveycred') || ($value eq 'anonsurvey') ||
+ ($value eq 'anonsurveycred') || ($value eq 'randomizetry') || ($value eq 'library'));
+ }
+ my $stdtype = &Apache::lonparmset::standard_parameter_types($name);
+ $found{$name}{'valname'} = &get_param_description($stdtype,$value);
+ $found{$name}{'extra'} = &mt('Recursive into sub-folders');
+ $found{$name}{'rev'} =
+ $Apache::lonnet::needsrelease{'parameter::::'.$item};
+ }
+ }
+ }
+ foreach my $item (keys(%found)) {
+ my $stdname = &Apache::lonparmset::standard_parameter_names($item);
+ my $rev = $found{$item}{'rev'};
+ my $valname = $found{$item}{'valname'};
+ my $extra = $found{$item}{'extra'};
+ my ($middle,$scope,$which,$level,$map,$resource);
+ my $start = $cid.'.';
+ if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
+ $middle = $1;
+ $which = $2;
+ $scope = 'user';
+ } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
+ $middle = $1;
+ $which = $2;
+ $scope = 'section/group';
+ } else {
+ $scope = 'all';
+ }
+ my $what="$stdname=$valname";
+ if ($extra) {
+ $what .= "
$extra
";
+ }
+ if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
+ $level = 'general';
+ if ($scope eq 'all') {
+ if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+ unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
+ push(@{$fromparam{$rev}{$scope}},$what);
+ }
+ } else {
+ push(@{$fromparam{$rev}{$scope}},$what);
+ }
+ } else {
+ if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
+ unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
+ push(@{$fromparam{$rev}{$scope}{$which}},$what);
+ }
+ } else {
+ push(@{$fromparam{$rev}{$scope}{$which}},$what);
+ }
+ }
+ $rowspan{$rev} ++;
+ } elsif ($key =~ /^\Q$start$middle\E(.+)___\((all|rec)\).\w+\.\Q$item\E$/) {
+ $level = 'folder';
+ $map = $1;
+ if ($scope eq 'all') {
+ if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
+ unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
+ push(@{$bymap{$map}{$rev}{$scope}},$what);
+ }
+ } else {
+ push(@{$bymap{$map}{$rev}{$scope}},$what);
+ }
+ } else {
+ if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
+ unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
+ push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+ }
+ } else {
+ push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+ }
+ }
+ } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
+ $level = 'resource';
+ $resource = $1;
+ if ($scope eq 'all') {
+ if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
+ unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
+ push(@{$byresource{$resource}{$rev}{$scope}},$what);
+ }
+ } else {
+ push(@{$byresource{$resource}{$rev}{$scope}},$what);
+ }
+ } else {
+ if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
+ unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
+ push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+ }
+ } else {
+ push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
}
}
}
@@ -3430,7 +3326,7 @@ sub display_loncaparev_constraints {
if (ref($fromblocks{$type}) eq 'HASH') {
foreach my $rev (keys(%{$fromblocks{$type}})) {
my ($major,$minor) = split(/\./,$rev);
- ($reqdmajor,$reqdminor) =
+ ($reqdmajor,$reqdminor) =
&Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
$output .= &Apache::loncommon::start_data_table_row().
''.$rev.' | '.$lt{$type}.' | ';
@@ -3448,18 +3344,25 @@ sub display_loncaparev_constraints {
if (defined($navmap)) {
my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
- my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
+ my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey::'};
my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum);
- my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry'};
+ my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry::'};
+ my $rev_exttool=$Apache::lonnet::needsrelease{'course:courserestype:exttool'};
my $stdtype=&Apache::lonparmset::standard_parameter_types('type');
my $stdname=&Apache::lonparmset::standard_parameter_names('type');
my $valanon=&get_param_description($stdtype,'anonsurvey');
my $valrandtry=&get_param_description($stdtype,'randomizetry');
my %checkedrev;
- foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+ foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0)) {
my @parts = @{$res->parts()};
my $symb = $res->symb();
my $enclosing_map = &Apache::lonnet::declutter($res->enclosing_map_src());
+ if ($res->is_tool()) {
+ my $rev = $rev_exttool;
+ $bycrsrestype{$symb}{$rev} = &mt('External Tool');
+ $allmaps{$enclosing_map} = 1;
+ next;
+ }
foreach my $part (@parts) {
if (exists($anonsubms{$symb."\0".$part})) {
my $rev = $rev_anonsurv;
@@ -3510,7 +3413,7 @@ sub display_loncaparev_constraints {
&Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
$reqdmajor,$reqdminor);
$checkedrev{$key} = 1;
- }
+ }
push(@{$byresponsetype{$symb}{$rev}},$key);
$allmaps{$enclosing_map} = 1;
}
@@ -3547,6 +3450,10 @@ sub display_loncaparev_constraints {
}
}
}
+ my $suppmap = 'supplemental.sequence';
+ my ($suppcount,$supptools,$errors) = (0,0,0);
+ ($suppcount,$supptools,$errors) = &Apache::loncommon::recurse_supplemental($cnum,$cdom,
+ $suppmap,$suppcount,$supptools,$errors);
my $mapres_header = ''.
&mt('Requirements for specific folders or resources').
'';
@@ -3561,9 +3468,9 @@ sub display_loncaparev_constraints {
$r->print($start_page.$top_header);
if ($output) {
$r->print($output);
- if (defined($navmap)) {
+ if (defined($navmap) || $supptools) {
&show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
- \%byresponsetype,\@scopeorder,\%lt);
+ \%byresponsetype,\%bycrsrestype,\@scopeorder,\%lt,$supptools);
}
$r->print('
');
} else {
@@ -3581,22 +3488,30 @@ sub display_loncaparev_constraints {
sub show_contents_view {
my ($r,$navmap,$cid,$toshow,$bymap,$byresource,$bysubmission,$byresponsetype,
- $scopeorder,$lt) = @_;
- if ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) ||
- (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0)) {
- my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
- my $whitespace = ' ';
- my $icon = ' ';
+ $bycrsrestype,$scopeorder,$lt,$supptools) = @_;
+ my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+ my $whitespace = '';
+ my $showmaincontent;
+ if ((ref($navmap)) &&
+ ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) ||
+ (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0) ||
+ (keys(%{$bycrsrestype}) > 0))) {
+ $showmaincontent = 1;
+ }
+ if ($showmaincontent || $supptools) {
+ $r->print(&Apache::loncommon::start_data_table());
+ }
+ if ($showmaincontent) {
+ my $icon = '';
my $topmap = $env{'course.'.$cid.'.url'};
- $r->print(&Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
+ $r->print(&Apache::loncommon::start_data_table_header_row().
' | '.&mt('Location').' | '.&mt('Release').' | '.
''.&mt('Attribute/Setting').' | '.
&Apache::loncommon::end_data_table_header_row().
&Apache::loncommon::start_data_table_row().
' '.$icon.' '.&mt('Main Content').' | ');
- &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
- $r->print(&Apache::loncommon::end_data_table_row());
+ &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
+ $r->print(&Apache::loncommon::end_data_table_row());
my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
my $curRes;
my $depth = 0;
@@ -3647,6 +3562,9 @@ sub show_contents_view {
if (ref($byresponsetype->{$symb}) eq 'HASH') {
$rowspan += scalar(keys(%{$byresponsetype->{$symb}}));
}
+ if (ref($bycrsrestype->{$symb}) eq 'HASH') {
+ $rowspan += scalar(keys(%{$bycrsrestype->{$symb}}));
+ }
next if (!$rowspan);
$icon = '
';
@@ -3711,10 +3629,37 @@ sub show_contents_view {
$r->print('');
}
$r->print(&Apache::loncommon::end_data_table_row());
+ $newrow = 1;
+ }
+ if (ref($bycrsrestype->{$symb}) eq 'HASH') {
+ foreach my $rev (sort(keys(%{$bycrsrestype->{$symb}}))) {
+ if ($newrow) {
+ $r->print(&Apache::loncommon::continue_data_table_row());
+ }
+ $r->print(''.$rev.' | '.$bycrsrestype->{$symb}{$rev}.' | ');
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}
}
}
+ }
+ if ($supptools) {
+ my $icon = '';
+ $r->print(&Apache::loncommon::start_data_table_header_row().
+ ''.&mt('Location').' | '.&mt('Release').' | '.
+ ''.&mt('Resource Type').' | '.
+ &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_row().
+ ' '.$icon.' '.&mt('Supplemental Content').' | '.
+ ''.
+ $Apache::lonrelrequtils::exttool{'major'}.'.'.
+ $Apache::lonrelrequtils::exttool{'minor'}.
+ ' | '.&mt('[quant,_1,External Tool,External Tools]',
+ $supptools).' | '.
+ &Apache::loncommon::end_data_table_row());
+ }
+ if ($showmaincontent || $supptools) {
$r->print(&Apache::loncommon::end_data_table());
}
return;
@@ -3723,7 +3668,7 @@ sub show_contents_view {
sub releases_by_map {
my ($r,$bymap,$url,$scopeorder,$lt) = @_;
return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
- my $newrow = 0;
+ my $newrow = 0;
if (ref($bymap->{$url}) eq 'HASH') {
foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
if ($newrow) {
@@ -3760,18 +3705,67 @@ sub releases_by_map {
}
sub get_param_description {
- my ($stdtype,$value) = @_;
- my $name = $value;
- my $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
- unless (ref($paramstrings) eq 'ARRAY') {
- return $name;
+ my ($stdtype,$value,$regexp) = @_;
+ my ($name,$parammatches,$paramstrings,@possibles);
+ if ($stdtype =~ /^string/) {
+ $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
+ } elsif ($stdtype eq 'date_interval') {
+ $paramstrings = &Apache::lonparmset::standard_interval_options($stdtype);
+ }
+ if ($regexp) {
+ if ($stdtype =~ /^string/) {
+ $parammatches = &Apache::lonparmset::standard_string_matches($stdtype);
+ } elsif ($stdtype eq 'date_interval') {
+ $parammatches = &Apache::lonparmset::standard_interval_matches($stdtype);
+ }
+ if (ref($parammatches) eq 'ARRAY') {
+ @possibles = @{$parammatches};
+ } else {
+ undef($regexp);
+ $name = $value;
+ }
}
- foreach my $possibilities (@{$paramstrings}) {
+ unless ($regexp) {
+ $name = $value;
+ if (ref($paramstrings) eq 'ARRAY') {
+ @possibles = @{$paramstrings};
+ } else {
+ if (($stdtype eq 'date_start') || ($stdtype eq 'date_end')) {
+ if ($name == 0) {
+ $name = &mt('Never');
+ } elsif (($name ne '') && ($name !~ /\D/)) {
+ $name = &Apache::lonlocal::locallocaltime($name);
+ }
+ }
+ return $name;
+ }
+ }
+ foreach my $possibilities (@possibles) {
next unless (ref($possibilities) eq 'ARRAY');
- my ($thing, $description) = @{ $possibilities };
- if ($thing eq $value) {
- $name = $description;
- last;
+ my $gotregexmatch = '';
+ if ($regexp) {
+ last if ($gotregexmatch);
+ my ($item,$pattern) = @{ $possibilities };
+ if ($value =~ /$pattern/) {
+ if (ref($paramstrings) eq 'ARRAY') {
+ foreach my $possibles (@{$paramstrings}) {
+ next unless (ref($possibles) eq 'ARRAY');
+ my ($thing,$description) = @{$possibles};
+ if ($thing eq $item) {
+ $name = $description;
+ $gotregexmatch = 1;
+ last;
+ }
+ }
+ last if ($gotregexmatch);
+ }
+ }
+ } else {
+ my ($thing,$description) = @{ $possibilities };
+ if ($thing eq $value) {
+ $name = $description;
+ last;
+ }
}
}
return $name;
@@ -3816,7 +3810,7 @@ sub coowner_invitations {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -3880,7 +3874,7 @@ sub manage_coownership {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -3981,7 +3975,7 @@ sub print_localization {
undef,$includeempty,$disabled);
} else {
if ($settings->{$item} eq '') {
- unless ($noedit) {
+ unless ($noedit) {
$datatable .= ''.
&Apache::loncommon::select_language('languages_0','',1);
}
@@ -4011,15 +4005,15 @@ sub print_localization {
}
}
unless ($noedit) {
- $datatable .=
+ $datatable .=
&Apache::loncommon::start_data_table_row().
' | '.
&mt('Additional language:'). '
'.
&Apache::loncommon::select_language('languages_'.$num,'',1).
''.
' | '.&Apache::loncommon::end_data_table_row();
- }
- $datatable .= &Apache::loncommon::end_data_table().'
';
+ }
+ $datatable .= &Apache::loncommon::end_data_table().'
';
}
}
$datatable .= &item_table_row_end();
@@ -4107,7 +4101,7 @@ sub user_table {
if ($currvalue eq '') {
unless ($noedit) {
$output .= &select_recipient($item,'0',$cdom,$sections);
- }
+ }
} else {
my $num = 0;
my @curr = split(/,/,$currvalue);
@@ -4259,6 +4253,20 @@ sub print_discussion {
&mt('(specific user(s))'),
input => 'checkbox',
},
+
+ 'pac.roles.denied' => {
+ text => ''.&mt($itemtext->{'pac.roles.denied'}).''.
+ &Apache::loncommon::help_open_topic("Course_Disable_Anonymous_Discussion").'
'.
+ &mt('(role-based)'),
+ input => 'checkbox',
+ },
+
+ 'pac.users.denied' => {
+ text => ''.&mt($itemtext->{'pac.users.denied'}).'
'.
+ &mt('(specific user(s))'),
+ input => 'checkbox',
+ },
+
'allow_limited_html_in_feedback' => {
text => ''.&mt($itemtext->{'allow_limited_html_in_feedback'}).'',
input => 'radio',
@@ -4291,7 +4299,7 @@ sub print_discussion {
my $colspan;
if ($item eq 'allow_limited_html_in_feedback') {
$colspan = 2;
- }
+ }
$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
if ($item eq 'plc.roles.denied') {
$datatable .= ''.
@@ -4309,6 +4317,14 @@ sub print_discussion {
$datatable .= ' | '.
&user_table($cdom,$item,undef,
$settings->{$item},\%lt,$noedit);
+ } elsif ($item eq 'pac.roles.denied') {
+ $datatable .= ' | '.
+ ''.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
+ ' ';
+ } elsif ($item eq 'pac.users.denied') {
+ $datatable .= ' | '.
+ &user_table($cdom,$item,undef,
+ $settings->{$item},\%lt,$noedit);
} elsif ($item eq 'allow_limited_html_in_feedback') {
$datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
} elsif ($item eq 'allow_discussion_post_editing') {
@@ -4328,7 +4344,7 @@ sub print_discussion {
' | '.&mt('font-size').' | '.
''.&mt('font-weight').' | '.
''.&mt('font-style').' | '.
- ''.&mt('Other css').' | '.
+ ''.&mt('Other css').' | '.
&Apache::loncommon::end_data_table_row().
&set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
&Apache::loncommon::end_data_table().'
';
@@ -4380,7 +4396,7 @@ sub role_checkboxes {
my $count = 0;
my $disabled;
if ($noedit) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
}
foreach my $role (@roles) {
my $checked = '';
@@ -4508,7 +4524,7 @@ sub set_discussion_fonts {
sub discussion_vote_classes {
my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
- my %classtitles = &Apache::lonlocal::texthash(
+ my %classtitles = &Apache::lonlocal::texthash(
'twoplus' => 'Two sigma above mean',
'oneplus' => 'One sigma above mean',
'zero' => 'Within one sigma of mean',
@@ -4574,7 +4590,7 @@ sub print_classlists {
'defaultcredits' => {
text => ''.&mt($itemtext->{'defaultcredits'}).'',
},
-
+
'nothideprivileged' => {
text => ''.&mt($itemtext->{'nothideprivileged'}).'',
input => 'checkbox',
@@ -4681,11 +4697,12 @@ sub print_grading {
input => 'selectbox',
options => {
standard => &mt('Standard: shows points'),
+ categories => &mt('Categories: shows points according to categories'),
external => &mt('External: shows number of completed parts and totals'),
externalnototals => &mt('External: shows only number of completed parts'),
spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'),
},
- order => ['standard','external','externalnototals','spreadsheet'],
+ order => ['standard','categories','external','externalnototals','spreadsheet'],
},
'rndseed' => {
text => ''.&mt($itemtext->{'rndseed'}).''.
@@ -4855,6 +4872,134 @@ sub print_bridgetasks {
return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit);
}
+sub print_lti {
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
+ return;
+ }
+ my @menuitems = ('fullname','coursetitle','role','logout','grades');
+ my %menutitles = <imenu_titles();
+ my ($domdefs,$displaydefs);
+ if ($env{'request.lti.login'}) {
+ my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
+ my @domdefsmenu;
+ if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+ if ($lti{$env{'request.lti.login'}}{'topmenu'}) {
+ $domdefs = &mt('Header shown').', ';
+ }
+ if ($lti{$env{'request.lti.login'}}{'inlinemenu'}) {
+ $domdefs .= &mt('Inline menu shown');
+ }
+ $domdefs =~ s/,\s$//;
+ if (!$domdefs) {
+ $domdefs = &mt('No header or inline menu shown');
+ }
+ $domdefs = ' ('.&mt('Domain default').': '.$domdefs.')';
+ if (ref($lti{$env{'request.lti.login'}}{'lcmenu'}) eq 'ARRAY') {
+ @domdefsmenu = @{$lti{$env{'request.lti.login'}}{'lcmenu'}};
+ }
+ }
+ $displaydefs = &mt('Domain defaults');
+ if (@domdefsmenu) {
+ my @diffs = &Apache::loncommon::compare_arrays(\@menuitems,\@domdefsmenu);
+ if (@diffs) {
+ my $missing;
+ foreach my $item (@menuitems) {
+ unless (grep(/^\Q$item\E$/,@domdefsmenu)) {
+ $missing .= ' '.$menutitles{$item}.',';
+ }
+ }
+ $missing =~ s/,$//;
+ $displaydefs .= ': '.&mt('Not shown').' --'.$missing;
+ } else {
+ $displaydefs .= ': '.&mt('All shown');
+ }
+ } else {
+ $displaydefs .= ': '.&mt('Not shown').' -- '.join(', ', map { $menutitles{$_}; } @menuitems);
+ }
+ } else {
+ $displaydefs = &mt('Domain defaults only available in LTI context');
+ }
+ my %items = (
+ 'lti.override' => {
+ text => ''.&mt($itemtext->{'lti.override'}).''.$domdefs,
+ input => 'radio',
+ },
+ 'lti.topmenu' => {
+ text => ''.&mt($itemtext->{'lti.topmenu'}).'',
+ input => 'radio',
+ },
+ 'lti.inlinemenu' => {
+ text => ''.&mt($itemtext->{'lti.inlinemenu'}).'',
+ input => 'radio',
+ },
+ 'lti.lcmenu' => {
+ text => ''.&mt($itemtext->{'lti.lcmenu'}).'
'.$displaydefs,
+ input => 'custom',
+ },
+ );
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'lti',$noedit);
+}
+
+sub lcmenu_checkboxes {
+ my ($cdom,$caller,$settings,$crstype,$noedit) = @_;
+ my @menuitems = ('fullname','coursetitle','role','logout','grades');
+ my %menutitles = <imenu_titles();
+ my (@current,@domdefs);
+ if ($env{'request.lti.login'}) {
+ my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
+ if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+ if (ref($lti{$env{'request.lti.login'}}{'lcmenu'}) eq 'ARRAY') {
+ @domdefs = @{$lti{$env{'request.lti.login'}}{'lcmenu'}};
+ }
+ }
+ }
+ if (ref($settings) eq 'HASH') {
+ if ($settings->{'lti.lcmenu'}) {
+ unless ($settings->{'lti.lcmenu'} eq 'none') {
+ @current = split(',',$settings->{'lti.lcmenu'});
+ }
+ } else {
+ @current = @domdefs;
+ }
+ } else {
+ @current = @domdefs;
+ }
+ my $numinrow = 3;
+ my $count = 0;
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
+ my $output = '';
+}
+
sub ltimenu_titles {
return &Apache::lonlocal::texthash(
fullname => 'Full name',
@@ -5100,7 +5245,7 @@ sub menucollections_display {
''."\n";
if ($category eq 'text') {
$output .= ''.&mt('Header Text').'
';
- }
+ }
foreach my $field (@{$categories{$category}}) {
if ($field eq 'disc') {
$output .= '
'.&mt('Footer Text').'
';
@@ -5123,7 +5268,7 @@ sub menucollections_display {
}
sub print_linkprotection {
- my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$rowtotal,$crstype,$noedit) = @_;
unless (ref($settings) eq 'HASH') {
return;
}
@@ -5135,22 +5280,9 @@ sub print_linkprotection {
if ($noedit) {
$disabled = ' disabled="disabled"';
}
- my %desc = &linkprot_names();
- my %lt = &Apache::lonlocal::texthash (
- 'requ' => 'Required settings',
- 'opti' => 'Optional settings',
- );
+ my %lt = &linkprot_names();
my $itemcount = 0;
- my $ltiauth;
- if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) {
- $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'};
- } else {
- my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
- $ltiauth = $domdefs{'crsltiauth'};
- }
- my $switchserver = &check_switchserver($cdom,$cnum);
-
if (ref($settings->{'linkprotection'}) eq 'HASH') {
if (keys(%{$settings->{'linkprotection'}})) {
my @current = sort { $a <=> $b } keys(%{$settings->{'linkprotection'}});
@@ -5171,101 +5303,24 @@ sub print_linkprotection {
$datatable .=
'| '.
' | ';
- my ($usersty,$onclickrequser,%checkedrequser);
- if ($ltiauth) {
- $usersty = 'display:none';
- $onclickrequser = ' onclick="toggleLTIReqUser(this.form,'."'requser','optional','1','block','$i'".');"';
- %checkedrequser = (
- no => ' checked="checked"',
- yes => '',
- );
- if ($values{'requser'}) {
- $checkedrequser{'yes'} = $checkedrequser{'no'};
- $checkedrequser{'no'} = '';
- }
- $datatable .= ' | '.
+ ''.$lt{'name'}.
+ ': '.
(' 'x2).
- ''.$desc{'version'}.': |
';
+ ''.$lt{'lifetime'}.':'.
+ '
'.
+ ''.$lt{'key'}.
+ ': '.
+ (' 'x2).
+ ''.$lt{'secret'}.':'.
+ ''.
+ ''.
+ ''.
+ '';
$itemcount ++;
}
}
@@ -5273,132 +5328,34 @@ sub print_linkprotection {
$css_class = $itemcount%2?' class="LC_odd_row"':'';
$datatable .= '| '."\n".
''."\n".
- ''.&mt('Add').' | '."\n".
- '';
- my ($usersty,$onclickrequser,%checkedrequser);
- if ($ltiauth) {
- $usersty = 'display:none';
- $onclickrequser = ' onclick="toggleLTIReqUser(this.form,'."'requser','optional','1','block','add'".');"';
- %checkedrequser = (
- no => ' checked="checked"',
- yes => '',
- );
- $datatable .= ' | '."\n".
+ ''.
+ ''.$lt{'name'}.
+ ': '."\n".
(' 'x2).
- ''.$desc{'version'}.': |
';
+ ''.$lt{'lifetime'}.': '."\n".
+ '
'.
+ ''.$lt{'key'}.': '."\n".
+ (' 'x2).
+ ''.$lt{'secret'}.':'.
+ ' '."\n".
+ '';
$$rowtotal ++;
- return $datatable;
+ return $datatable;;
}
sub linkprot_names {
- return &Apache::lonlocal::texthash(
+ my %lt = &Apache::lonlocal::texthash(
'version' => 'LTI Version',
'key' => 'Key',
'lifetime' => 'Nonce lifetime (s)',
- 'name' => 'Launcher Application',
+ 'name' => 'Launcher Application Name',
'secret' => 'Secret',
- 'requser' => 'Use identity',
- 'email' => 'Email address',
- 'sourcedid' => 'User ID',
- 'other' => 'Other',
- 'auth' => 'Display LON-CAPA login page',
- 'reject' => 'Discontinue launch process',
);
-}
-
-sub check_switchserver {
- my ($cdom,$cnum) = @_;
- my ($allowed,$switchserver);
- my $home = &Apache::lonnet::homeserver($cnum,$cdom);
- unless ($home eq 'no_host') {
- my @ids=&Apache::lonnet::current_machine_ids();
- foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
- if (!$allowed) {
- $switchserver=''.&mt('Switch Server').'';
- }
- }
- return $switchserver;
-}
-
-sub linkprot_options {
- my ($num,$itemcount,$disabled,$current,$desc) = @_;
- my %lt;
- if (ref($desc) eq 'HASH') {
- %lt = %{$desc};
- }
- my $userfieldsty = 'none';
- my (%checked,$userfield);
- $checked{'sourcedid'} = ' checked="checked"';
- $checked{'reject'} = ' checked="checked"';
- if (ref($current) eq 'HASH') {
- if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
- $checked{'sourcedid'} = '';
- if ($current->{'mapuser'} eq 'lis_person_contact_email_primary') {
- $checked{'email'} = ' checked="checked"';
- } else {
- $checked{'other'} = ' checked="checked"';
- $userfield = $current->{'mapuser'};
- $userfieldsty = 'inline-block';
- }
- }
- if (($current->{'notstudent'} ne '') && ($current->{'notstudent'} ne 'reject')) {
- $checked{'reject'} = '';
- $checked{'auth'} = ' checked="checked"';
- }
- }
- my $onclickuser = ' onclick="toggleLTIReqUser(this.form,'."'mapuser','userfield','other','inline-block','$num'".');"';
- my $output = ''.
- &mt('Source of LON-CAPA username in LTI request').': ';
- foreach my $option ('sourcedid','email','other') {
- $output .= ''.
- ($option eq 'other' ? '' : (' 'x2) );
- }
- $output .= '
'.
- ''.
- '
';
- $output .= '
'.
- ''.
- &mt('Action when username is not for an enrolled student').': ';
- foreach my $option ('reject','auth') {
- $output .= ''.
- ($option eq 'auth' ? '' : (' 'x2) );
- }
- $output .= '
';
- return $output;
+ return %lt;
}
sub print_other {
@@ -5592,6 +5549,8 @@ sub make_item_rows {
$datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype,$noedit);
} elsif ($item eq 'print_header_format') {
$datatable .= &print_hdrfmt_row($item,$settings,$noedit);
+ } elsif ($item eq 'lti.lcmenu') {
+ $datatable .= &lcmenu_checkboxes($cdom,$item,$settings,$crstype,$noedit);
} elsif ($items->{$item}{input} eq 'dates') {
my $disabled;
if ($noedit) {
@@ -5609,6 +5568,8 @@ sub make_item_rows {
}
$valueyes = "1";
$valueno = "0";
+ } elsif (($item eq 'lti.topmenu') || ($item eq 'lti.inlinemenu')) {
+ $valueyes = '1';
}
$datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
} elsif ($items->{$item}{input} eq 'selectbox') {
@@ -5656,7 +5617,7 @@ sub nothidepriv_row {
}
}
if ($settings->{'checkforpriv'}) {
- @checkdoms = split(/,/,$settings->{'checkforpriv'});
+ @checkdoms = split(/,/,$settings->{'checkforpriv'});
}
}
push(@checkdoms,$cdom);
@@ -5670,7 +5631,7 @@ sub nothidepriv_row {
if ($end == -1 || $start == -1) {
next;
}
- foreach my $dom (@checkdoms) {
+ foreach my $dom (@checkdoms) {
if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
unless (grep(/^\Q$user\E$/,@privusers)) {
push(@privusers,$user);
@@ -5746,7 +5707,7 @@ sub checkforpriv_row {
my $domdesc = &Apache::lonnet::domain($currdom,'description');
if ($domdesc eq '') {
$domdesc = $currdom;
- }
+ }
$datatable .=
&Apache::loncommon::start_data_table_row().
''.
@@ -5758,13 +5719,13 @@ sub checkforpriv_row {
&mt('Delete').' | '.
&Apache::loncommon::end_data_table_row();
$num ++;
- unless (grep(/^\Q$currdom\E$/,@excdoms)) {
+ unless (grep(/^\Q$currdom\E$/,@excdoms)) {
push(@excdoms,$currdom);
}
}
}
if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
- $datatable .=
+ $datatable .=
&Apache::loncommon::start_data_table_row().
''.
&mt('Additional domain:'). '
'.
@@ -5877,8 +5838,8 @@ ENDJS
$output .= '';
}
}
- my $pos = $currnum+1;
- unless ($noedit) {
+ my $pos = $currnum+1;
+ unless ($noedit) {
$output .=
' | '.
'| '.
|