--- loncom/interface/courseprefs.pm 2023/12/29 19:44:06 1.49.2.28.2.19
+++ loncom/interface/courseprefs.pm 2016/11/13 15:16:40 1.83
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.49.2.28.2.19 2023/12/29 19:44:06 raeburn Exp $
+# $Id: courseprefs.pm,v 1.83 2016/11/13 15:16:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,16 +52,12 @@ This module is used for configuration of
=item process_changes()
-=item process_linkprot()
-
=item get_sec_str()
=item check_clone()
=item store_changes()
-=item store_linkprot()
-
=item update_env()
=item display_disallowed()
@@ -116,7 +112,7 @@ This module is used for configuration of
=item item_table_row_end()
-=item yesno_radio()
+=item yes_no_radio()
=item select_from_options()
@@ -224,8 +220,6 @@ use Apache::lonparmset;
use Apache::courseclassifier;
use Apache::lonlocal;
use LONCAPA qw(:DEFAULT :match);
-use Crypt::CBC;
-use Time::HiRes qw( sleep );
my $registered_cleanup;
my $modified_courses;
@@ -294,7 +288,7 @@ sub handler {
excc => 'Exclude from community catalog',
clon => 'Users allowed to clone community',
rept => 'Replacement titles for standard community roles',
- time => 'Time Zone where the community is located',
+ time => 'Timezone where the community is located',
date => 'Locale used for community calendar',
coco => 'Community Content',
copo => 'Community Policy',
@@ -316,14 +310,14 @@ sub handler {
idnu => 'Course ID or number',
unco => 'Unique code',
desc => 'Course Description',
- cred => 'Student credits',
+ cred => 'Student credits',
ownr => 'Course Owner',
cown => 'Course Co-owners',
catg => 'Categorize course',
excc => 'Exclude from course catalog',
clon => 'Users allowed to clone course',
rept => 'Replacement titles for standard course roles',
- time => 'Time Zone in which the course takes place',
+ time => 'Timezone in which the course takes place',
date => 'Locale used for course calendar',
coco => 'Course Content',
copo => 'Course Policy',
@@ -371,55 +365,17 @@ sub handler {
}
my %values=&Apache::lonnet::dump('environment',$cdom,$cnum);
- my %linkprot=&Apache::lonnet::dump('lti',$cdom,$cnum,undef,undef,undef,1);
- my %ltienc = &Apache::lonnet::dump('nohist_ltienc',$cdom,$cnum,undef,undef,undef,1);
- my %ltitools = &Apache::lonnet::dump('ltitools',$cdom,$cnum,undef,undef,undef,1);
- my %ltitoolsenc = &Apache::lonnet::dump('nohist_toolsenc',$cdom,$cnum,undef,undef,undef,1);
- foreach my $id (keys(%linkprot)) {
- if (ref($linkprot{$id}) eq 'HASH') {
- if (ref($ltienc{$id}) eq 'HASH') {
- $values{'linkprot'}{$id} = { %{$linkprot{$id}}, %{$ltienc{$id}} };
- } else {
- $values{'linkprot'}{$id} = $linkprot{$id};
- }
- }
- unless ($phase eq 'process') {
- if (ref($values{'linkprot'}{$id}) eq 'HASH') {
- delete($values{'linkprot'}{$id}{'secret'});
- }
- }
- }
- if ($linkprot{'lock'}) {
- delete($linkprot{'lock'});
- }
- foreach my $id (keys(%ltitools)) {
- if (ref($ltitools{$id}) eq 'HASH') {
- if (ref($ltitoolsenc{$id}) eq 'HASH') {
- $values{'ltitools'}{$id} = { %{$ltitools{$id}}, %{$ltitoolsenc{$id}} };
- } else {
- $values{'ltitools'}{$id} = $ltitools{$id};
- }
- }
- unless ($phase eq 'process') {
- if (ref($values{'ltitools'}{$id}) eq 'HASH') {
- delete($values{'ltitools'}{$id}{'secret'});
- }
- }
- }
- if ($ltitools{'lock'}) {
- delete($ltitools{'lock'});
- }
my @prefs_order = ('courseinfo','localization','feedback','discussion',
'classlists','appearance','grading','printouts',
- 'menuitems','ltitools','linkprot','spreadsheet',
- 'bridgetasks','other');
+ 'spreadsheet','bridgetasks','other');
+
my %prefs = (
'courseinfo' =>
{ text => $lt{'gens'},
help => 'Course_Prefs_General',
ordered => ['owner','co-owners','loncaparev','description',
'clonedfrom','courseid','uniquecode','categories',
- 'hidefromcat','syllabus','cloners','url',
+ 'hidefromcat','externalsyllabus','cloners','url',
'rolenames'],
itemtext => {
'owner' => $lt{'ownr'},
@@ -430,7 +386,7 @@ sub handler {
'categories' => $lt{'catg'},
'hidefromcat' => $lt{'excc'},
'cloners' => $lt{'clon'},
- 'syllabus' => 'Syllabus status',
+ 'externalsyllabus' => 'Syllabus status',
'url' => 'Top Level Map',
'rolenames' => $lt{'rept'},
'loncaparev' => $lt{'lcrv'},
@@ -463,6 +419,7 @@ sub handler {
{ text => 'Discussion and Chat',
help => 'Course_Prefs_Discussions',
ordered => ['pch.roles.denied','pch.users.denied',
+ 'pac.roles.denied','pac.users.denied',
'plc.roles.denied','plc.users.denied',
'allow_limited_html_in_feedback',
'allow_discussion_post_editing',
@@ -472,6 +429,8 @@ sub handler {
'pch.users.denied' => 'No Resource Discussion',
'plc.roles.denied' => 'No Chat room use',
'plc.users.denied' => 'No Chat room use',
+ 'pac.roles.denied' => 'No Anonymous Resource Discussion',
+ 'pac.users.denied' => 'No Anonymous Resource Discussion',
allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
allow_discussion_post_editing => 'Users can edit/delete own discussion posts',
discussion_post_fonts => 'Discussion post fonts based on likes/unlikes',
@@ -508,8 +467,7 @@ sub handler {
help => 'Course_Prefs_Display',
ordered => ['default_xml_style','pageseparators',
'disable_receipt_display','texengine',
- 'tthoptions','uselcmath','usejsme',
- 'inline_chem','extresource'],
+ 'tthoptions','uselcmath','usejsme'],
itemtext => {
default_xml_style => 'Default XML style file',
pageseparators => 'Visibly Separate Items on Pages',
@@ -518,8 +476,6 @@ sub handler {
tthoptions => 'Default set of options to pass to tth/m when converting TeX',
uselcmath => 'Student formula entry uses inline preview, not DragMath pop-up',
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
- inline_chem => 'Chemical reaction response uses inline preview, not pop-up',
- extresource => 'Display of external resources',
},
},
'grading' =>
@@ -540,7 +496,7 @@ sub handler {
help => 'Course_Prefs_Printouts',
ordered => ['problem_stream_switch','suppress_tries',
'default_paper_size','print_header_format',
- 'disableexampointprint'],
+ 'disableexampointprint','canuse_pdfforms'],
itemtext => {
problem_stream_switch => 'Allow problems to be split over pages',
suppress_tries => 'Suppress number of tries in printing',
@@ -574,37 +530,6 @@ sub handler {
suppress_embed_prompt => 'Hide upload references prompt if uploading file to portfolio',
},
},
- 'menuitems' =>
- {
- text => 'Menu display',
- help => 'Course_Prefs_Menus',
- header => [{col1 => 'Default Menu',
- col2 => 'Value',},
- {col1 => 'Menu collections',
- col2 => 'Settings',
- }],
- ordered => ['menudefault','menucollections'],
- itemtext => {
- menudefault => 'Choose default collection of menu items for course',
- menucollections => 'Menu collections',
- },
- },
- 'linkprot' =>
- {
- text => 'Link protection',
- help => 'Course_Prefs_Linkprotection',
- header => [{col1 => 'Item',
- col2 => 'Settings',
- }],
- },
- 'ltitools' =>
- {
- text => 'External tools',
- help => 'Course_Prefs_ExternalTools',
- header => [{col1 => 'Item',
- col2 => 'Settings',
- }],
- },
'other' =>
{ text => 'Other settings',
help => 'Course_Prefs_Other',
@@ -615,25 +540,15 @@ sub handler {
);
if (($phase eq 'process') && ($parm_permission->{'process'})) {
my @allitems = &get_allitems(%prefs);
- my $result = &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
- \@prefs_order,\%prefs,\%values,
- $cnum,undef,\@allitems,
- 'coursepref',$parm_permission);
- if ((ref($result) eq 'HASH') && (keys(%{$result}))) {
- $r->rflush();
- &devalidate_remote_courseprefs($cdom,$cnum,$result);
- }
+ &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
+ \@prefs_order,\%prefs,\%values,
+ $cnum,undef,\@allitems,
+ 'coursepref',$parm_permission);
} elsif (($phase eq 'display') && ($parm_permission->{'display'})) {
- my $noedit;
- if (ref($parm_permission) eq 'HASH') {
- unless ($parm_permission->{'process'}) {
- $noedit = 1;
- }
- }
- my $jscript = &get_jscript($cid,$cdom,$phase,$crstype,\%values,$noedit);
+ my $jscript = &get_jscript($cid,$cdom,$phase,$crstype,\%values);
my @allitems = &get_allitems(%prefs);
&Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
- \@prefs_order,\%prefs,\%values,$cnum,$jscript,\@allitems,$crstype,
+ \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,
'coursepref',$parm_permission);
} else {
&Apache::lonconfigsettings::display_choices($r,$phase,$context,
@@ -679,8 +594,6 @@ sub get_allitems {
if ($item eq 'feedback') {
push(@allitems,(map { $_.'.text'; } @{$prefs{$item}{'ordered'}}));
}
- } elsif (($item eq 'linkprot') || ($item eq 'ltitools')) {
- push(@allitems,$item);
}
}
}
@@ -688,7 +601,7 @@ sub get_allitems {
}
sub print_config_box {
- my ($r,$cdom,$cnum,$phase,$action,$item,$settings,$allitems,$crstype,$parm_permission) = @_;
+ my ($r,$cdom,$phase,$action,$item,$settings,$allitems,$crstype,$parm_permission) = @_;
my $ordered = $item->{'ordered'};
my $itemtext = $item->{'itemtext'};
my $noedit;
@@ -709,7 +622,7 @@ sub print_config_box {
}
$output .= ''."\n".
'';
- if (($action eq 'feedback') || ($action eq 'classlists') || ($action eq 'menuitems')) {
+ if (($action eq 'feedback') || ($action eq 'classlists')) {
$output .= '
@@ -734,8 +647,6 @@ sub print_config_box {
$output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
} elsif ($action eq 'classlists') {
$output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
- } elsif ($action eq 'menuitems') {
- $output .= &print_menuitems('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
}
$output .= '
@@ -807,23 +718,13 @@ sub print_config_box {
} elsif ($action eq 'appearance') {
$output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'grading') {
- $output .= &print_grading($cdom,$cnum,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'printouts') {
$output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'spreadsheet') {
$output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'bridgetasks') {
$output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
- } elsif ($action eq 'ltitools') {
- my $currtools = {};
- if ((ref($settings) eq 'HASH') && (ref($settings->{'ltitools'}))) {
- $currtools = $settings->{'ltitools'};
- }
- $output .= &print_ltitools($cdom,$cnum,$currtools,\$rowtotal,$crstype,$noedit,'course');
- } elsif ($action eq 'menuitems') {
- $output .= &print_menuitems('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
- } elsif ($action eq 'linkprot') {
- $output .= &print_linkprotection($cdom,$cnum,$settings,\$rowtotal,$crstype,$noedit,'course');
} elsif ($action eq 'other') {
$output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype,$noedit);
}
@@ -836,8 +737,8 @@ sub print_config_box {
}
sub process_changes {
- my ($cdom,$cnum,$action,$values,$item,$changes,$allitems,$disallowed,$crstype,$lastactref) = @_;
- my (%newvalues,$errors);
+ my ($cdom,$action,$values,$item,$changes,$allitems,$disallowed,$crstype) = @_;
+ my %newvalues;
if (ref($item) eq 'HASH') {
if (ref($changes) eq 'HASH') {
my @ordered;
@@ -854,18 +755,6 @@ sub process_changes {
}
}
}
- } elsif (($action eq 'linkprot') || ($action eq 'ltitools')) {
- if (ref($values->{$action}) eq 'HASH') {
- foreach my $id (keys(%{$values->{$action}})) {
- if ($id =~ /^\d+$/) {
- push(@ordered,$id);
- }
- }
- }
- @ordered = sort { $a <=> $b } @ordered;
- if (($env{'form.'.$action.'_add'}) && ($env{'form.'.$action.'_maxnum'} =~ /^\d+$/)) {
- push(@ordered,$env{'form.'.$action.'_maxnum'});
- }
} elsif (ref($item->{'ordered'}) eq 'ARRAY') {
if ($action eq 'courseinfo') {
my ($can_toggle_cat,$can_categorize) =
@@ -877,8 +766,7 @@ sub process_changes {
(!$can_categorize));
next if (($entry eq 'loncaparev') ||
($entry eq 'owner') ||
- ($entry eq 'clonedfrom') ||
- ($entry eq 'syllabus'));
+ ($entry eq 'clonedfrom'));
push(@ordered,$entry);
}
} elsif ($action eq 'classlists') {
@@ -928,91 +816,6 @@ sub process_changes {
$changes->{$ext_entry} = $newvalues{$ext_entry};
}
}
- } elsif ($action eq 'menuitems') {
- my (%current,@colls);
- my $next = 1;
- if ($values->{'menucollections'}) {
- foreach my $item (split(/;/,$values->{'menucollections'})) {
- my ($num,$value) = split(/\%/,$item);
- if ($num =~ /^\d+$/) {
- unless (grep(/^$num$/,@colls)) {
- push(@colls,$num);
- }
- my @entries = split(/\&/,$value);
- foreach my $entry (@entries) {
- my ($name,$fields) = split(/=/,$entry);
- $current{$num}{$name} = $fields;
- }
- }
- }
- }
- if (@colls) {
- @colls = sort { $a <=> $b } @colls;
- $next += $colls[-1];
- }
- if ($env{'form.menucollections_add'} eq $next) {
- push(@colls,$next);
- }
- my $currdef = $values->{'menudefault'};
- my $possdef = $env{'form.menudefault'};
- if (($possdef =~ /^\d+$/) && (grep(/^$possdef$/,@colls))) {
- if ($currdef ne $possdef) {
- $changes->{'menudefault'} = $possdef;
- }
- } elsif ($currdef) {
- $changes->{'menudefault'} = '';
- }
- my $menucoll;
- if (@colls) {
- my ($ordered,$cats) = &menuitems_categories();
- my %shortcats = &menuitems_abbreviations();
- foreach my $num (@colls) {
- my ($entry,%include);
- map { $include{$_}= 1; } &Apache::loncommon::get_env_multiple('form.menucollections_'.$num);
- foreach my $item (@{$ordered}) {
- if ($item eq 'shown') {
- foreach my $type (@{$cats->{$item}}) {
- $entry .= $type.'=';
- if ($include{$type}) {
- $entry .= 'y';
- } else {
- $entry .= 'n';
- }
- $entry .= '&';
- }
- } else {
- $entry .= $shortcats{$item}.'=';
- foreach my $type (@{$cats->{$item}}) {
- if ($include{$type}) {
- $entry .= $type.',';
- }
- }
- $entry =~ s/,$//;
- $entry .= '&';
- }
- }
- $entry =~ s/\&$//;
- if ($menucoll) {
- $menucoll .= ';';
- }
- $menucoll .= $num.'%'.$entry;
- }
- if ($menucoll ne $values->{'menucollections'}) {
- $changes->{'menucollections'} = $menucoll;
- }
- } elsif ($values->{'menucollections'}) {
- $changes->{'menucollections'} = '';
- }
- } elsif ($action eq 'linkprot') {
- if (ref($values) eq 'HASH') {
- $errors = &process_linkprot($cdom,$cnum,$values->{$action},$changes,'course',$lastactref);
- }
- } elsif ($action eq 'ltitools') {
- if (ref($values) eq 'HASH') {
- my $switchserver = &check_switchserver($cdom,$cnum,'course','/adm/courseprefs');
- $errors = &process_ltitools('',$cdom,$cnum,$values->{$action},$changes,'course',$lastactref,
- 'ok','','ok');
- }
} else {
foreach my $entry (@ordered) {
if ($entry eq 'cloners') {
@@ -1053,7 +856,7 @@ sub process_changes {
my $clonedom = $env{'form.cloners_newdom'};
if (&check_clone($clonedom,$disallowed) eq 'ok') {
my $newdom = '*:'.$env{'form.cloners_newdom'};
- if (@clonedoms) {
+ if (@clonedoms) {
if (!grep(/^\Q$newdom\E$/,@clonedoms)) {
$newvalues{$entry} .= ','.$newdom;
}
@@ -1142,9 +945,7 @@ sub process_changes {
$autocoowner = $domconf{'autoenroll'}{'co-owners'};
}
}
- if ($autocoowner) {
- $newvalues{'co-owners'} = $values->{'internal.co-owners'};
- } else {
+ unless ($autocoowner) {
my @keepcoowners = &Apache::loncommon::get_env_multiple('form.coowners');
my @pendingcoowners = &Apache::loncommon::get_env_multiple('form.pendingcoowners');
my @invitecoowners = &Apache::loncommon::get_env_multiple('form.invitecoowners');
@@ -1168,19 +969,19 @@ sub process_changes {
my $udom = $env{'user.domain'};
my $pendingcoowners = $values->{'internal.pendingco-owners'};
my @pendingcoown = split(',',$pendingcoowners);
- if ($env{'form.pending_coowner'}) {
+ if ($env{'form.pending_coowoner'}) {
foreach my $item (@pendingcoown) {
unless ($item eq $uname.':'.$udom) {
push(@newpending,$item);
}
}
@newcoown = @currcoown;
- if ($env{'form.pending_coowner'} eq 'accept') {
+ if ($env{'form.pending_coowoner'} eq 'accept') {
unless (grep(/^\Q$uname\E:\Q$udom\E$/,@currcoown)) {
push(@newcoown,$uname.':'.$udom);
}
}
- } elsif ($env{'form.remove_coowner'}) {
+ } elsif ($env{'form.remove_coowoner'}) {
foreach my $item (@currcoown) {
unless ($item eq $uname.':'.$udom) {
push(@newcoown,$item);
@@ -1189,8 +990,6 @@ sub process_changes {
if ($pendingcoowners ne '') {
@newpending = @pendingcoown;
}
- } else {
- @newcoown = @currcoown;
}
$newvalues{'pendingco-owners'} = join(',',sort(@newpending));
$newvalues{'co-owners'} = join(',',sort(@newcoown));
@@ -1260,7 +1059,8 @@ sub process_changes {
}
}
}
- } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied')) {
+ } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied') ||
+ ($entry eq 'pac.roles.denied')) {
my @denied = &Apache::loncommon::get_env_multiple('form.'.$entry);
@denied = sort(@denied);
my $deniedstr = '';
@@ -1268,7 +1068,8 @@ sub process_changes {
$deniedstr = join(',',@denied);
}
$newvalues{$entry} = $deniedstr;
- } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied')) {
+ } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied') ||
+ ($entry eq 'pac.users.denied')) {
my $total = $env{'form.'.$entry.'_total'};
my $userstr = '';
my @denied;
@@ -1320,14 +1121,14 @@ sub process_changes {
my ($classorder,$classtitles) = &discussion_vote_classes();
my $fontchange = 0;
foreach my $class (@{$classorder}) {
- my $ext_entry = $entry.'_'.$class;
+ my $ext_entry = $entry.'_'.$class;
my $size = $env{'form.'.$ext_entry.'_size'};
my $unit = $env{'form.'.$ext_entry.'_unit'};
my $weight = $env{'form.'.$ext_entry.'_weight'};
my $style = $env{'form.'.$ext_entry.'_style'};
my $other = $env{'form.'.$ext_entry.'_other'};
$size =~ s/,//g;
- $unit =~ s/,//g;
+ $unit =~ s/,//g;
$weight =~ s/,//g;
$style =~ s/,//g;
$other =~ s/[^\w;:\s\-\%.]//g;
@@ -1335,7 +1136,7 @@ sub process_changes {
$newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
my $current = $values->{$ext_entry};
if ($values->{$ext_entry} eq '') {
- $current = ',,,';
+ $current = ',,,';
}
if ($newvalues{$ext_entry} ne $current) {
$changes->{$ext_entry} = $newvalues{$ext_entry};
@@ -1344,7 +1145,7 @@ sub process_changes {
}
if ($fontchange) {
$changes->{$entry} = 1;
- }
+ }
} elsif ($entry eq 'nothideprivileged') {
my @curr_nothide;
my @new_nothide;
@@ -1419,7 +1220,7 @@ sub process_changes {
my $newtext = $maxnum-1;
$newhdr[$env{'form.printfmthdr_pos_'.$newtext}] = $env{'form.printfmthdr_text_'.$newtext};
$newvalues{$entry} = join('',@newhdr);
- } elsif (($entry eq 'languages') ||
+ } elsif (($entry eq 'languages') ||
($entry eq 'checkforpriv')) {
my $settings;
my $total = $env{'form.'.$entry.'_total'};
@@ -1435,7 +1236,7 @@ sub process_changes {
}
if ($env{'form.'.$entry.'_'.$total} ne '') {
my $new = $env{'form.'.$entry.'_'.$total};
- if ($entry eq 'languages') {
+ if ($entry eq 'languages') {
my %langchoices = &get_lang_choices();
if ($langchoices{$new}) {
$settings .= $new;
@@ -1456,81 +1257,10 @@ sub process_changes {
$settings =~ s/,$//;
}
$newvalues{$entry} = $settings;
- } elsif ($entry eq 'extresource') {
- if ($env{'form.'.$entry} =~ /^iframe|tab|window$/) {
- $newvalues{$entry} = $env{'form.'.$entry};
- if ($env{'form.'.$entry} ne 'iframe') {
- if ($env{'form.extwintabreuse'}) {
- $newvalues{$entry} .= ':1';
- } else {
- $newvalues{$entry} .= ':0';
- }
- if ($env{'form.'.$entry} eq 'window') {
- foreach my $dim ('width','height') {
- $env{'form.extreswin'.$dim} =~ s/^\s+|\s+$//g;
- if ($env{'form.extreswin'.$dim} =~ /^\d+$/) {
- $newvalues{$entry} .= ':'.$env{'form.extreswin'.$dim};
- } else {
- $newvalues{$entry} .= ':';
- }
- }
- }
- }
- }
- unless (($newvalues{$entry} eq 'iframe') && ($values->{$entry} eq '')) {
- if ($newvalues{$entry} ne $values->{$entry}) {
- $changes->{$entry} = $newvalues{$entry};
- }
- }
- } elsif ($entry eq 'timezone') {
- if ($env{'form.'.$entry}) {
- $newvalues{$entry} = $env{'form.'.$entry};
- if ($newvalues{$entry} ne $values->{$entry}) {
- $changes->{$entry} = $newvalues{$entry};
- }
- if ($env{'form.tzover'}) {
- $newvalues{'tzover'} = $env{'form.tzover'};
- if ($newvalues{'tzover'} ne $values->{'tzover'}) {
- $changes->{'tzover'} = $newvalues{'tzover'};
- }
- } elsif ($values->{'tzover'}) {
- $changes->{'tzover'} = '';
- }
- } elsif ($values->{$entry}) {
- $changes->{$entry} = '';
- }
- } elsif ($entry eq 'grading') {
- if ($env{'form.'.$entry} eq 'standard') {
- if ($env{'form.hidetotals'}) {
- my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
- if (keys(%sections)) {
- my @secs = &Apache::loncommon::get_env_multiple('form.hidetotals_sections');
- if (grep(/^all$/,@secs)) {
- $newvalues{'hidetotals'} = 'all';
- } elsif (@secs) {
- $newvalues{'hidetotals'} = '';
- foreach my $sec (sort {$a <=> $b} @secs) {
- if (exists($sections{$sec})) {
- $newvalues{'hidetotals'} .= $sec.','
- }
- }
- $newvalues{'hidetotals'} =~ s/,$//;
- }
- } else {
- $newvalues{'hidetotals'} = 'all';
- }
- }
- }
- if ($newvalues{'hidetotals'} ne $values->{'hidetotals'}) {
- $changes->{'hidetotals'} = $newvalues{'hidetotals'};
- $changes->{'grading'} = $env{'form.'.$entry};
- }
- $newvalues{$entry} = $env{'form.'.$entry};
} else {
$newvalues{$entry} = $env{'form.'.$entry};
}
- unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts') ||
- ($entry eq 'extresource') || ($entry eq 'timezone')) {
+ unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts')) {
if ($newvalues{$entry} ne $values->{$entry}) {
$changes->{$entry} = $newvalues{$entry};
}
@@ -1540,887 +1270,7 @@ sub process_changes {
}
}
}
- return $errors;
-}
-
-sub process_linkprot {
- my ($cdom,$cnum,$values,$changes,$context,$lastactref) = @_;
- my ($dest,$ltiauth,$privnum,$cipher,$errors,%linkprot);
- if (ref($values) eq 'HASH') {
- foreach my $id (keys(%{$values})) {
- if ($id =~ /^\d+$/) {
- unless (ref($values->{$id}) eq 'HASH') {
- $linkprot{$id} = '';
- }
- }
- }
- }
- ($cipher,$privnum) = &get_credentials($cdom,$cnum,'lti',$context);
- if ($context eq 'domain') {
- $dest = '/adm/domainprefs';
- $ltiauth = 1;
- } else {
- $dest = '/adm/courseprefs';
- 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,$context,$dest);
- my (@items,%deletions,%itemids,%haschanges);
- if ($env{'form.linkprot_add'}) {
- my $name = $env{'form.linkprot_name_add'};
- $name =~ s/(`)/'/g;
- my ($newid,$error) = &get_linkprot_id($cdom,$cnum,$name,$context);
- if ($newid) {
- $itemids{'add'} = $newid;
- push(@items,'add');
- $haschanges{$newid} = 1;
- } else {
- $errors .= ''.
- &mt('Failed to acquire unique ID for link protection').
- '';
- }
- }
- if (ref($values) eq 'HASH') {
- my @todelete = &Apache::loncommon::get_env_multiple('form.linkprot_del');
- my $maxnum = $env{'form.linkprot_maxnum'};
- for (my $i=0; $i<$maxnum; $i++) {
- my $itemid = $env{'form.linkprot_id_'.$i};
- $itemid =~ s/\D+//g;
- if ($itemid) {
- if (ref($values->{$itemid}) eq 'HASH') {
- push(@items,$i);
- $itemids{$i} = $itemid;
- if ((@todelete > 0) && (grep(/^$i$/,@todelete))) {
- $deletions{$itemid} = $values->{$itemid}->{'name'};
- }
- }
- }
- }
- }
- foreach my $idx (@items) {
- my $itemid = $itemids{$idx};
- next unless ($itemid);
- if (exists($deletions{$itemid})) {
- $linkprot{$itemid} = $deletions{$itemid};
- $haschanges{$itemid} = 1;
- next;
- }
- my %current;
- if (ref($values) eq 'HASH') {
- if (ref($values->{$itemid}) eq 'HASH') {
- foreach my $key (keys(%{$values->{$itemid}})) {
- $current{$key} = $values->{$itemid}->{$key};
- }
- }
- }
- foreach my $inner ('name','lifetime','version') {
- my $formitem = 'form.linkprot_'.$inner.'_'.$idx;
- $env{$formitem} =~ s/(`)/'/g;
- if ($inner eq 'lifetime') {
- $env{$formitem} =~ s/[^\d.]//g;
- }
- unless ($idx eq 'add') {
- if ($current{$inner} ne $env{$formitem}) {
- $haschanges{$itemid} = 1;
- }
- }
- if ($env{$formitem} ne '') {
- $linkprot{$itemid}{$inner} = $env{$formitem};
- }
- }
- my $urlitem = 'form.linkprot_returnurl_'.$idx;
- my $urlparamname = 'form.linkprot_urlparam_'.$idx;
- if ($env{$urlitem} == 1) {
- $env{$urlparamname} =~ s/(`)/'/g;
- } elsif (exists($env{$urlparamname})) {
- $env{$urlparamname} = '';
- }
- my $passback = 'form.linkprot_passback_'.$idx;
- my $passbackparamname = 'form.linkprot_passbackformat_'.$idx;
- if ($env{$passback} == 1) {
- unless ($env{$passbackparamname} =~ /^1\.(0|1)$/) {
- $env{$passbackparamname} = '';
- }
- } elsif (exists($env{$passbackparamname})) {
- $env{$passbackparamname} = '';
- }
- unless ($idx eq 'add') {
- if ((!$current{'returnurl'} && ($env{$urlparamname} ne '')) ||
- ($current{'returnurl'} && ($env{$urlparamname} eq ''))) {
- $haschanges{$itemid} = 1;
- }
- if ((!$current{'passback'} && ($env{$passbackparamname} ne '')) ||
- ($current{'passback'} && ($env{$passbackparamname} eq ''))) {
- $haschanges{$itemid} = 1;
- }
- }
- if ($env{$urlparamname} ne '') {
- $linkprot{$itemid}{'returnurl'} = $env{$urlparamname};
- }
- if ($env{$passbackparamname} ne '') {
- $linkprot{$itemid}{'passback'} = 1;
- $linkprot{$itemid}{'passbackformat'} = $env{$passbackparamname};
- }
- if ($ltiauth) {
- my $reqitem = 'form.linkprot_requser_'.$idx;
- $env{$reqitem} =~ s/(`)/'/g;
- unless ($idx eq 'add') {
- if ((!$current{'requser'} && $env{$reqitem}) ||
- ($current{'requser'} && !$env{$reqitem})) {
- $haschanges{$itemid} = 1;
- }
- }
- if ($env{$reqitem} == 1) {
- $linkprot{$itemid}{'requser'} = $env{$reqitem};
- foreach my $inner ('mapuser','notstudent') {
- my $formitem = 'form.linkprot_'.$inner.'_'.$idx;
- $env{$formitem} =~ s/(`)/'/g;
- if ($inner eq 'mapuser') {
- if ($env{$formitem} eq 'other') {
- my $mapuser = $env{'form.linkprot_customuser_'.$idx};
- $mapuser =~ s/(`)/'/g;
- $mapuser =~ s/^\s+|\s+$//g;
- if ($mapuser ne '') {
- $linkprot{$itemid}{$inner} = $mapuser;
- } else {
- delete($linkprot{$itemid}{'requser'});
- last;
- }
- } elsif ($env{$formitem} eq 'sourcedid') {
- $linkprot{$itemid}{$inner} = 'lis_person_sourcedid';
- } elsif ($env{$formitem} eq 'email') {
- $linkprot{$itemid}{$inner} = 'lis_person_contact_email_primary';
- }
- } else {
- $linkprot{$itemid}{$inner} = $env{$formitem};
- }
- unless ($idx eq 'add') {
- if ($current{$inner} ne $linkprot{$itemid}{$inner}) {
- $haschanges{$itemid} = 1;
- }
- }
- }
- }
- }
- unless ($switchserver) {
- my $keyitem = 'form.linkprot_key_'.$idx;
- $env{$keyitem} =~ s/(`)/'/g;
- unless ($idx eq 'add') {
- if ($current{'key'} ne $env{$keyitem}) {
- $haschanges{$itemid} = 1;
- }
- }
- if ($env{$keyitem} ne '') {
- $linkprot{$itemid}{'key'} = $env{$keyitem};
- }
- my $secretitem = 'form.linkprot_secret_'.$idx;
- $env{$secretitem} =~ s/(`)/'/g;
- if ($current{'usable'}) {
- if ($env{'form.linkprot_changesecret_'.$idx}) {
- if ($env{$secretitem} ne '') {
- if ($privnum && $cipher) {
- $linkprot{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
- $linkprot{$itemid}{'cipher'} = $privnum;
- } else {
- $linkprot{$itemid}{'secret'} = $env{$secretitem};
- }
- $haschanges{$itemid} = 1;
- }
- } else {
- $linkprot{$itemid}{'secret'} = $current{'secret'};
- $linkprot{$itemid}{'cipher'} = $current{'cipher'};
- }
- } elsif ($env{$secretitem} ne '') {
- if ($privnum && $cipher) {
- $linkprot{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
- $linkprot{$itemid}{'cipher'} = $privnum;
- } else {
- $linkprot{$itemid}{'secret'} = $env{$secretitem};
- }
- $haschanges{$itemid} = 1;
- }
- }
- }
- if (keys(%haschanges)) {
- foreach my $entry (keys(%haschanges)) {
- $changes->{$entry} = $linkprot{$entry};
- }
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'courselti'} = 1;
- }
- }
- return $errors;
-}
-
-sub get_linkprot_id {
- my ($cdom,$cnum,$name,$context) = @_;
- # get lock on lti db in course or linkprot db in domain
- my $lockhash = {
- lock => $env{'user.name'}.
- ':'.$env{'user.domain'},
- };
- my $tries = 0;
- my $gotlock;
- if ($context eq 'domain') {
- $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom);
- } else {
- $gotlock = &Apache::lonnet::newput('lti',$lockhash,$cdom,$cnum);
- }
- my ($id,$error);
- while (($gotlock ne 'ok') && ($tries<10)) {
- $tries ++;
- sleep (0.1);
- if ($context eq 'domain') {
- $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom);
- } else {
- $gotlock = &Apache::lonnet::newput('lti',$lockhash,$cdom,$cnum);
- }
- }
- if ($gotlock eq 'ok') {
- my %currids;
- if ($context eq 'domain') {
- %currids = &Apache::lonnet::dump_dom('linkprot',$cdom);
- } else {
- %currids = &Apache::lonnet::dump('lti',$cdom,$cnum,undef,undef,undef,1);
- }
- if ($currids{'lock'}) {
- delete($currids{'lock'});
- if (keys(%currids)) {
- my @curr = sort { $a <=> $b } keys(%currids);
- if ($curr[-1] =~ /^\d+$/) {
- $id = 1 + $curr[-1];
- } else {
- $id = 1;
- }
- } else {
- $id = 1;
- }
- if ($id) {
- if ($context eq 'domain') {
- unless (&Apache::lonnet::newput_dom('linkprot',{ $id => $name },$cdom) eq 'ok') {
- $error = 'nostore';
- }
- } else {
- unless (&Apache::lonnet::newput('lti',{ $id => $name },$cdom,$cnum) eq 'ok') {
- $error = 'nostore';
- }
- }
- } else {
- $error = 'nonumber';
- }
- }
- my $dellockoutcome;
- if ($context eq 'domain') {
- $dellockoutcome = &Apache::lonnet::del_dom('linkprot',['lock'],$cdom);
- } else {
- $dellockoutcome = &Apache::lonnet::del('lti',['lock'],$cdom,$cnum);
- }
- } else {
- $error = 'nolock';
- }
- return ($id,$error);
-}
-
-sub get_credentials {
- my ($cdom,$cnum,$type,$context) = @_;
- my ($cipher,$privnum,$home);
- my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
- my @ids=&Apache::lonnet::current_machine_ids();
- if ($context eq 'domain') {
- $home = &Apache::lonnet::domain($cdom,'primary');
- } else {
- $home = &Apache::lonnet::homeserver($cnum,$cdom);
- }
- my ($hostskey,$domkey,$crskey);
- if ($type eq 'ltitools') {
- $hostskey = 'toolprivhosts';
- $domkey = 'toolenc_dom';
- $crskey = 'toolenc_crs';
- } else {
- $hostskey = 'ltiprivhosts';
- $domkey = 'linkprotenc_dom';
- $crskey = 'linkprotenc_crs';
- }
- if ((($context eq 'domain') && ($domdefs{$domkey})) ||
- (($context eq 'course') && ($domdefs{$crskey}))) {
- unless (($home eq 'no_host') || ($home eq '')) {
- if (grep(/^\Q$home\E$/,@ids)) {
- if (ref($domdefs{$hostskey}) eq 'ARRAY') {
- if (grep(/^\Q$home\E$/,@{$domdefs{$hostskey}})) {
- my %privhash = &Apache::lonnet::restore_dom($type,'private',$cdom,$home,1);
- my $privkey = $privhash{'key'};
- $privnum = $privhash{'version'};
- if (($privnum) && ($privkey ne '')) {
- $cipher = Crypt::CBC->new({'key' => $privkey,
- 'cipher' => 'DES'});
- }
- }
- }
- }
- }
- }
- return ($cipher,$privnum);
-}
-
-sub process_ltitools {
- my ($r,$cdom,$cnum,$values,$changes,$context,$lastactref,$configuserok,$lonhost,
- $author_ok,$confname) = @_;
- my (%currconfig,$newid,@allpos,%changes,%ltitools,$errors);
-
- my (%posslti,%possfield);
- my @courseroles = ('cc','in','ta','ep','st');
- my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
- map { $posslti{$_} = 1; } @ltiroles;
- my @allfields = ('fullname','firstname','lastname','email','user','roles');
- map { $possfield{$_} = 1; } @allfields;
-
- my ($dest,$privnum,$cipher);
-
- ($cipher,$privnum) = &get_credentials($cdom,$cnum,'ltitools',$context);
- if ($context eq 'domain') {
- $dest = '/adm/domainprefs';
- } else {
- $dest = '/adm/courseprefs';
- }
- my $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
-
- my (@allpos,@items,%deletions,%itemids,%haschanges);
- if ($env{'form.ltitools_add'}) {
- my $title = $env{'form.ltitools_add_title'};
- $title =~ s/(`)/'/g;
- my ($newid,$error) = &Apache::lonnet::get_ltitools_id($context,$cdom,$cnum,$title);
- if ($newid) {
- my $position = $env{'form.ltitools_add_pos'};
- $position =~ s/\D+//g;
- if ($position ne '') {
- $allpos[$position] = $newid;
- }
- $haschanges{$newid} = 1;
- foreach my $item ('title','url','lifetime') {
- $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g;
- if ($item eq 'lifetime') {
- $env{'form.ltitools_add_'.$item} =~ s/[^\d.]//g;
- }
- if ($env{'form.ltitools_add_'.$item}) {
- $ltitools{$newid}{$item} = $env{'form.ltitools_add_'.$item};
- }
- }
- if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') {
- $ltitools{$newid}{'version'} = $env{'form.ltitools_add_version'};
- }
- if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') {
- $ltitools{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'};
- }
- if ($env{'form.ltitools_add_sigmethod'} eq 'HMAC-SHA256') {
- $ltitools{$newid}{'sigmethod'} = $env{'form.ltitools_add_sigmethod'};
- } else {
- $ltitools{$newid}{'sigmethod'} = 'HMAC-SHA1';
- }
- foreach my $item ('width','height','linktext','explanation') {
- $env{'form.ltitools_add_'.$item} =~ s/^\s+//;
- $env{'form.ltitools_add_'.$item} =~ s/\s+$//;
- if (($item eq 'width') || ($item eq 'height')) {
- if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) {
- $ltitools{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
- }
- } else {
- if ($env{'form.ltitools_add_'.$item} ne '') {
- $ltitools{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
- }
- }
- }
- if ($env{'form.ltitools_add_target'} eq 'window') {
- $ltitools{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
- } elsif ($env{'form.ltitools_add_target'} eq 'tab') {
- $ltitools{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
- } else {
- $ltitools{$newid}{'display'}{'target'} = 'iframe';
- }
- foreach my $item ('passback','roster') {
- if ($env{'form.ltitools_'.$item.'_add'}) {
- $ltitools{$newid}{$item} = 1;
- if ($env{'form.ltitools_'.$item.'valid_add'} ne '') {
- my $lifetime = $env{'form.ltitools_'.$item.'valid_add'};
- $lifetime =~ s/^\s+|\s+$//g;
- if ($lifetime =~ /^\d+\.?\d*$/) {
- $ltitools{$newid}{$item.'valid'} = $lifetime;
- }
- }
- }
- }
- if ($env{'form.ltitools_add_image.filename'} ne '') {
- my ($imageurl,$error) =
- &process_ltitools_image($r,$context,$cdom,$cnum,$confname,'ltitools_add_image',
- $newid,$configuserok,$lonhost,$author_ok);
- if ($imageurl) {
- $ltitools{$newid}{'image'} = $imageurl;
- }
- if ($error) {
- &Apache::lonnet::logthis($error);
- $errors .= ''.$error.'';
- }
- }
- my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields');
- foreach my $field (@fields) {
- if ($possfield{$field}) {
- if ($field eq 'roles') {
- foreach my $role (@courseroles) {
- my $choice = $env{'form.ltitools_add_roles_'.$role};
- if (($choice ne '') && ($posslti{$choice})) {
- $ltitools{$newid}{'roles'}{$role} = $choice;
- if ($role eq 'cc') {
- $ltitools{$newid}{'roles'}{'co'} = $choice;
- }
- }
- }
- } else {
- $ltitools{$newid}{'fields'}{$field} = 1;
- }
- }
- }
- if (ref($ltitools{$newid}{'fields'}) eq 'HASH') {
- if ($ltitools{$newid}{'fields'}{'user'}) {
- if ($env{'form.ltitools_add_userincdom'}) {
- $ltitools{$newid}{'incdom'} = 1;
- }
- }
- }
- my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_add_courseconfig');
- foreach my $item (@courseconfig) {
- $ltitools{$newid}{'crsconf'}{$item} = 1;
- }
- if ($env{'form.ltitools_add_custom'}) {
- my $name = $env{'form.ltitools_add_custom_name'};
- my $value = $env{'form.ltitools_add_custom_value'};
- $value =~ s/(`)/'/g;
- $name =~ s/(`)/'/g;
- $ltitools{$newid}{'custom'}{$name} = $value;
- }
- unless ($switchserver) {
- my $keyitem = 'form.ltitools_add_key';
- $env{$keyitem} =~ s/(`)/'/g;
- if ($env{$keyitem} ne '') {
- $ltitools{$newid}{'key'} = $env{$keyitem};
- }
- my $secretitem = 'form.ltitools_secret_add';
- $env{$secretitem} =~ s/(`)/'/g;
- if ($env{$secretitem} ne '') {
- if ($privnum && $cipher) {
- $ltitools{$newid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
- $ltitools{$newid}{'cipher'} = $privnum;
- } else {
- $ltitools{$newid}{'secret'} = $env{$secretitem};
- }
- }
- }
- } else {
- $errors .= ''.
- &mt('Failed to acquire unique ID for new external tool').
- '';
- }
- }
- if (ref($values) eq 'HASH') {
- my %deletions;
- my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del');
- if (@todelete) {
- map { $deletions{$_} = 1; } @todelete;
- }
- my %customadds;
- my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd');
- if (@newcustom) {
- map { $customadds{$_} = 1; } @newcustom;
- }
- my %imgdeletions;
- my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del');
- if (@todeleteimages) {
- map { $imgdeletions{$_} = 1; } @todeleteimages;
- }
- my $maxnum = $env{'form.ltitools_maxnum'};
- for (my $i=0; $i<=$maxnum; $i++) {
- my $itemid = $env{'form.ltitools_id_'.$i};
- $itemid =~ s/\D+//g;
- if (ref($values->{$itemid}) eq 'HASH') {
- if ($deletions{$itemid}) {
- if ($values->{$itemid}{'image'}) {
- #FIXME need to obsolete item in RES space
- }
- $haschanges{$itemid} = $values->{$itemid}{'title'};
- next;
- } else {
- my $newpos = $env{'form.ltitools_'.$itemid};
- $newpos =~ s/\D+//g;
- foreach my $item ('title','url','lifetime') {
- $ltitools{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
- if ($values->{$itemid}{$item} ne $ltitools{$itemid}{$item}) {
- $haschanges{$itemid} = 1;
- }
- }
- if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') {
- $ltitools{$itemid}{'version'} = $env{'form.ltitools_version_'.$i};
- }
- if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') {
- $ltitools{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i};
- }
- if ($env{'form.ltitools_sigmethod_'.$i} eq 'HMAC-SHA256') {
- $ltitools{$itemid}{'sigmethod'} = $env{'form.ltitools_sigmethod_'.$i};
- } else {
- $ltitools{$itemid}{'sigmethod'} = 'HMAC-SHA1';
- }
- if ($values->{$itemid}{'sigmethod'} eq '') {
- if ($ltitools{$itemid}{'sigmethod'} ne 'HMAC-SHA1') {
- $haschanges{$itemid} = 1;
- }
- } elsif ($values->{$itemid}{'sigmethod'} ne $ltitools{$itemid}{'sigmethod'}) {
- $haschanges{$itemid} = 1;
- }
- foreach my $size ('width','height') {
- $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//;
- $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//;
- if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) {
- $ltitools{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i};
- if (ref($values->{$itemid}{'display'}) eq 'HASH') {
- if ($values->{$itemid}{'display'}{$size} ne $ltitools{$itemid}{'display'}{$size}) {
- $haschanges{$itemid} = 1;
- }
- } else {
- $haschanges{$itemid} = 1;
- }
- } elsif (ref($values->{$itemid}{'display'}) eq 'HASH') {
- if ($values->{$itemid}{'display'}{$size} ne '') {
- $haschanges{$itemid} = 1;
- }
- }
- }
- foreach my $item ('linktext','explanation') {
- $env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//;
- $env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//;
- if ($env{'form.ltitools_'.$item.'_'.$i} ne '') {
- $ltitools{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
- if (ref($values->{$itemid}{'display'}) eq 'HASH') {
- if ($values->{$itemid}{'display'}{$item} ne $ltitools{$itemid}{'display'}{$item}) {
- $haschanges{$itemid} = 1;
- }
- } else {
- $haschanges{$itemid} = 1;
- }
- } elsif (ref($values->{$itemid}{'display'}) eq 'HASH') {
- if ($values->{$itemid}{'display'}{$item} ne '') {
- $haschanges{$itemid} = 1;
- }
- }
- }
- if ($env{'form.ltitools_target_'.$i} eq 'window') {
- $ltitools{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
- } elsif ($env{'form.ltitools_target_'.$i} eq 'tab') {
- $ltitools{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
- } else {
- $ltitools{$itemid}{'display'}{'target'} = 'iframe';
- }
- if (ref($values->{$itemid}{'display'}) eq 'HASH') {
- if ($values->{$itemid}{'display'}{'target'} ne $ltitools{$itemid}{'display'}{'target'}) {
- $haschanges{$itemid} = 1;
- }
- } else {
- $haschanges{$itemid} = 1;
- }
- foreach my $extra ('passback','roster') {
- if ($env{'form.ltitools_'.$extra.'_'.$i}) {
- $ltitools{$itemid}{$extra} = 1;
- if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
- my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i};
- $lifetime =~ s/^\s+|\s+$//g;
- if ($lifetime =~ /^\d+\.?\d*$/) {
- $ltitools{$itemid}{$extra.'valid'} = $lifetime;
- }
- }
- }
- if ($values->{$itemid}{$extra} ne $ltitools{$itemid}{$extra}) {
- $haschanges{$itemid} = 1;
- }
- if ($values->{$itemid}{$extra.'valid'} ne $ltitools{$itemid}{$extra.'valid'}) {
- $haschanges{$itemid} = 1;
- }
- }
- my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i);
- foreach my $item ('label','title','target','linktext','explanation','append') {
- if (grep(/^\Q$item\E$/,@courseconfig)) {
- $ltitools{$itemid}{'crsconf'}{$item} = 1;
- if (ref($values->{$itemid}{'crsconf'}) eq 'HASH') {
- if ($values->{$itemid}{'crsconf'}{$item} ne $ltitools{$itemid}{'crsconf'}{$item}) {
- $haschanges{$itemid} = 1;
- }
- } else {
- $haschanges{$itemid} = 1;
- }
- }
- }
- my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i);
- foreach my $field (@fields) {
- if ($possfield{$field}) {
- if ($field eq 'roles') {
- foreach my $role (@courseroles) {
- my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i};
- if (($choice ne '') && ($posslti{$choice})) {
- $ltitools{$itemid}{'roles'}{$role} = $choice;
- if ($role eq 'cc') {
- $ltitools{$itemid}{'roles'}{'co'} = $choice;
- }
- }
- if (ref($values->{$itemid}{'roles'}) eq 'HASH') {
- if ($values->{$itemid}{'roles'}{$role} ne $ltitools{$itemid}{'roles'}{$role}) {
- $haschanges{$itemid} = 1;
- }
- } elsif ($ltitools{$itemid}{'roles'}{$role}) {
- $haschanges{$itemid} = 1;
- }
- }
- } else {
- $ltitools{$itemid}{'fields'}{$field} = 1;
- if (ref($values->{$itemid}{'fields'}) eq 'HASH') {
- if ($values->{$itemid}{'fields'}{$field} ne $ltitools{$itemid}{'fields'}{$field}) {
- $haschanges{$itemid} = 1;
- }
- } else {
- $haschanges{$itemid} = 1;
- }
- }
- }
- }
- if (ref($ltitools{$itemid}{'fields'}) eq 'HASH') {
- if ($ltitools{$itemid}{'fields'}{'user'}) {
- if ($env{'form.ltitools_userincdom_'.$i}) {
- $ltitools{$itemid}{'incdom'} = 1;
- }
- if ($values->{$itemid}{'incdom'} ne $ltitools{$itemid}{'incdom'}) {
- $haschanges{$itemid} = 1;
- }
- }
- }
- $allpos[$newpos] = $itemid;
- }
- if ($imgdeletions{$itemid}) {
- $haschanges{$itemid} = 1;
- if ($context eq 'course') {
- my $currimgurl = $values->{$itemid}{'image'};
- if ($currimgurl =~ m{^(\Q/uploaded/$cdom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
- my ($path,$imagefile) = ($1,$2);
- if ($imagefile =~ /^tn\-(.+)$/) {
- my $origimg = $1;
- &Apache::lonnet::removeuploadedurl("$path/$origimg");
- }
- &Apache::lonnet::removeuploadedurl($currimgurl);
- }
- }
- #FIXME need to obsolete item in RES space
- } elsif ($env{'form.ltitools_image_'.$i.'.filename'}) {
- my $currimgurl = $values->{$itemid}{'image'};
- my ($imgurl,$error) = &process_ltitools_image($r,$context,$cdom,$cnum,$confname,'ltitools_image_'.$i,
- $itemid,$configuserok,$lonhost,$author_ok,$currimgurl);
- if ($imgurl) {
- $ltitools{$itemid}{'image'} = $imgurl;
- $haschanges{$itemid} = 1;
- }
- if ($error) {
- &Apache::lonnet::logthis($error);
- $errors .= ''.$error.'';
- }
- } elsif ($values->{$itemid}{'image'}) {
- $ltitools{$itemid}{'image'} = $values->{$itemid}{'image'};
- }
- if ($customadds{$i}) {
- my $name = $env{'form.ltitools_custom_name_'.$i};
- $name =~ s/(`)/'/g;
- $name =~ s/^\s+//;
- $name =~ s/\s+$//;
- my $value = $env{'form.ltitools_custom_value_'.$i};
- $value =~ s/(`)/'/g;
- $value =~ s/^\s+//;
- $value =~ s/\s+$//;
- if ($name ne '') {
- $ltitools{$itemid}{'custom'}{$name} = $value;
- $haschanges{$itemid} = 1;
- }
- }
- my %customdels;
- my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i);
- if (@customdeletions) {
- $haschanges{$itemid} = 1;
- }
- map { $customdels{$_} = 1; } @customdeletions;
- if (ref($values->{$itemid}{'custom'}) eq 'HASH') {
- foreach my $key (keys(%{$values->{$itemid}{'custom'}})) {
- unless ($customdels{$key}) {
- if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') {
- $ltitools{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i};
- }
- if ($values->{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) {
- $haschanges{$itemid} = 1;
- }
- }
- }
- }
- unless ($switchserver) {
- my $keyitem = 'form.ltitools_key_'.$i;
- $env{$keyitem} =~ s/(`)/'/g;
- if ($values->{$itemid}{'key'} ne $env{$keyitem}) {
- $haschanges{$itemid} = 1;
- }
- if ($env{$keyitem} ne '') {
- $ltitools{$itemid}{'key'} = $env{$keyitem};
- }
- my $secretitem = 'form.ltitools_secret_'.$i;
- $env{$secretitem} =~ s/(`)/'/g;
- if ($values->{$itemid}{'usable'}) {
- if ($env{'form.ltitools_changesecret_'.$i}) {
- if ($env{$secretitem} ne '') {
- if ($privnum && $cipher) {
- $ltitools{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
- $ltitools{$itemid}{'cipher'} = $privnum;
- } else {
- $ltitools{$itemid}{'secret'} = $env{$secretitem};
- }
- $haschanges{$itemid} = 1;
- }
- } else {
- $ltitools{$itemid}{'secret'} = $values->{$itemid}{'secret'};
- $ltitools{$itemid}{'cipher'} = $values->{$itemid}{'cipher'};
- }
- } elsif ($env{$secretitem} ne '') {
- if ($privnum && $cipher) {
- $ltitools{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
- $ltitools{$itemid}{'cipher'} = $privnum;
- } else {
- $ltitools{$itemid}{'secret'} = $env{$secretitem};
- }
- $haschanges{$itemid} = 1;
- }
- }
- unless ($haschanges{$itemid}) {
- foreach my $key (keys(%{$values->{$itemid}})) {
- if (ref($values->{$itemid}{$key}) eq 'HASH') {
- if (ref($ltitools{$itemid}{$key}) eq 'HASH') {
- foreach my $innerkey (keys(%{$values->{$itemid}{$key}})) {
- unless (exists($ltitools{$itemid}{$key}{$innerkey})) {
- $haschanges{$itemid} = 1;
- last;
- }
- }
- } elsif (keys(%{$values->{$itemid}{$key}}) > 0) {
- $haschanges{$itemid} = 1;
- }
- }
- last if ($haschanges{$itemid});
- }
- }
- }
- }
- }
- if (@allpos > 0) {
- my $idx = 0;
- foreach my $itemid (@allpos) {
- if ($itemid ne '') {
- $ltitools{$itemid}{'order'} = $idx;
- if (ref($values) eq 'HASH') {
- if (ref($values->{$itemid}) eq 'HASH') {
- if ($values->{$itemid}{'order'} ne $idx) {
- $haschanges{$itemid} = 1;
- }
- }
- }
- $idx ++;
- }
- }
- }
- if (keys(%haschanges)) {
- foreach my $entry (keys(%haschanges)) {
- $changes->{$entry} = $ltitools{$entry};
- }
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'courseltitools'} = 1;
- }
- }
- return $errors;
-}
-
-sub process_ltitools_image {
- my ($r,$context,$dom,$cnum,$confname,$caller,$itemid,$configuserok,$switch,$author_ok,$currimg) = @_;
- my $filename = $env{'form.'.$caller.'.filename'};
- my ($error,$url);
- my ($width,$height) = (21,21);
- if ($configuserok eq 'ok') {
- if ($switch) {
- $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]',
- $switch);
- } elsif ($author_ok eq 'ok') {
- my ($result,$imageurl,$madethumb);
- if ($context eq 'domain') {
- ($result,$imageurl,$madethumb) =
- &Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname,
- "ltitools/$itemid/icon",$width,$height);
- } else {
- ($result,$imageurl,$madethumb) = &processlogo($dom,$cnum,$caller,$currimg,$itemid,$width,$height);
- }
- if ($result eq 'ok') {
- if ($madethumb) {
- my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
- my $imagethumb = "$path/tn-".$imagefile;
- $url = $imagethumb;
- } else {
- $url = $imageurl;
- }
- } else {
- if ($context eq 'domain') {
- $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
- } else {
- $error = &mt("Upload of [_1] failed because an error occurred. Error was: [_2].",$filename,$result);
- }
- }
- } else {
- $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$author_ok);
- }
- } else {
- $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$configuserok);
- }
- return ($url,$error);
-}
-
-sub processlogo {
- my ($dom,$cnum,$caller,$currimg,$itemid,$width,$height) = @_;
- my ($result,$imageurl,$madethumb);
- if ($env{"form.$caller.filename"} ne '') {
- unless ($caller eq 'ltitools_add_image') {
- if ($currimg =~ m{^(\Q/uploaded/$dom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
- my ($path,$imagefile) = ($1,$2);
- if ($imagefile =~ /^tn\-(.+)$/) {
- my $origimg = $1;
- &Apache::lonnet::removeuploadedurl("$path/$origimg");
- }
- &Apache::lonnet::removeuploadedurl($currimg);
- }
- }
- $imageurl = &Apache::lonnet::userfileupload($caller,'toollogo',"toollogo/$itemid",
- '','','',$cnum,$dom,$width,$height);
- if ($imageurl =~ m{^(\Q/uploaded/$dom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
- my ($path,$imagefile) = ($1,$2);
- $result = 'ok';
- my $thumburl = "$path/tn-".$imagefile;
- my ($rtncode,$info);
- my $res = &Apache::lonnet::getuploaded('HEAD',$thumburl,$dom,$cnum,\$info,\$rtncode);
- if ($res eq 'ok') {
- $madethumb = 1;
- }
- } elsif ($imageurl eq '/adm/notfound.html') {
- undef($imageurl);
- $result = 'store failed';
- } elsif ($imageurl =~ /^error: (.+)$/) {
- $result = $1;
- }
- }
- return ($result,$imageurl,$madethumb);
+ return;
}
sub get_sec_str {
@@ -2465,15 +1315,8 @@ sub check_clone {
sub store_changes {
my ($cdom,$cnum,$prefs_order,$actions,$prefs,$values,$changes,$crstype) = @_;
my ($chome,$output);
- my (%storehash,@delkeys,@need_env_update,@oldcloner,%oldlinkprot,%oldltitools);
+ my (%storehash,@delkeys,@need_env_update,@oldcloner);
if ((ref($values) eq 'HASH') && (ref($changes) eq 'HASH')) {
- if (ref($values->{'linkprot'}) eq 'HASH') {
- %oldlinkprot = %{$values->{'linkprot'}};
- }
- delete($values->{'linkprot'});
- if (ref($values->{'ltitools'}) eq 'HASH') {
- %oldltitools = %{$values->{'ltitools'}};
- }
%storehash = %{$values};
} else {
if ($crstype eq 'Community') {
@@ -2483,22 +1326,6 @@ sub store_changes {
}
return $output;
}
- my ($numchanges,$skipstore);
- if (ref($changes) eq 'HASH') {
- $numchanges = scalar(keys(%{$changes}));
- if (($numchanges == 1) && (exists($changes->{'linkprot'}))) {
- $skipstore = 1;
- } elsif (($numchanges == 1) && (exists($changes->{'ltitools'}))) {
- $skipstore = 1;
- } elsif (!$numchanges) {
- if ($crstype eq 'Community') {
- $output = &mt('No changes made to community settings.');
- } else {
- $output = &mt('No changes made to course settings.');
- }
- return $output;
- }
- }
my %yesno = (
hidefromcat => '1',
problem_stream_switch => '1',
@@ -2524,10 +1351,6 @@ sub store_changes {
"'$storehash{$key}'")).'';
}
}
- } elsif ($item eq 'linkprot') {
- $output .= &store_linkprot($cdom,$cnum,'course',$changes->{$item},\%oldlinkprot);
- } elsif ($item eq 'ltitools') {
- $output .= &store_ltitools($cdom,$cnum,'course',$changes->{$item},\%oldltitools);
} else {
if (ref($prefs->{$item}->{'ordered'}) eq 'ARRAY') {
my @settings = @{$prefs->{$item}->{'ordered'}};
@@ -2559,88 +1382,14 @@ sub store_changes {
if ($msg ne '') {
$output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt($displayname)).'';
}
- } elsif ($key eq 'timezone') {
- next unless ((exists($changes->{$item}{$key})) || (exists($changes->{$item}{'tzover'})));
- my ($displayname,$text);
- $text = $prefs->{$item}->{'itemtext'}{$key};
- my $displayval;
- if (exists($changes->{$item}{$key})) {
- $displayname = &mt($text);
- $storehash{$key} = $changes->{$item}{$key};
- if ($changes->{$item}{$key} ne '') {
- $displayval = ''.$changes->{$item}{$key}.'';
- } else {
- push(@delkeys,$key);
- if (exists($values->{'tzover'})) {
- push(@delkeys,'tzover');
- }
- $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
- ''.$displayname.'')).'';
- }
- }
- unless (grep(/^\Q$key\E$/,@delkeys)) {
- if (exists($changes->{$item}{'tzover'})) {
- $storehash{'tzover'} = $changes->{$item}{'tzover'};
- my $tzovertext;
- if ($changes->{$item}{'tzover'} ne '') {
- $tzovertext = &mt('Course Time Zone overrides individual user preference');
- } else {
- push(@delkeys,'tzover');
- $tzovertext = &mt('Course Time Zone does not override individual user preference');
- }
- if ($displayval eq '') {
- $output .= ''.&Apache::lonhtmlcommon::confirm_success($tzovertext).'';
- } else {
- $displayval .= ' '.(' 'x5).$tzovertext;
- }
- }
- if ($displayval ne '') {
- $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
- ''.$displayname.'',$displayval)).'';
- }
- }
} else {
next if (!exists($changes->{$item}{$key}));
my ($displayname,$text);
$text = $prefs->{$item}->{'itemtext'}{$key};
my $displayval;
- unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts') || ($key eq 'extresource')) {
+ unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts')) {
$displayval = $changes->{$item}{$key};
}
- if (($item eq 'grading') && ($key eq 'grading')) {
- if ($displayval eq 'standard') {
- my $hidetotals;
- if (exists($changes->{$item}{'hidetotals'})) {
- if ($changes->{$item}{'hidetotals'} eq '') {
- if (exists($values->{'hidetotals'})) {
- push(@delkeys,'hidetotals');
- }
- } else {
- $hidetotals = $changes->{$item}{'hidetotals'};
- }
- } elsif (exists($values->{'hidetotals'})) {
- $hidetotals = $values->{'hidetotals'};
- }
- if ($hidetotals eq '') {
- $displayval = &mt('standard with "hide course totals" set to "No"');
- if (exists($values->{'hidetotals'})) {
- push(@delkeys,'hidetotals');
- }
- } elsif ($hidetotals =~ /^([\w,]+)$/) {
- my $secstr = $1;
- my @secs = split(/,/,$secstr);
- if (grep(/^all$/,@secs)) {
- $displayval = &mt('standard with "hide course totals" set to "Yes" for all users');
- $hidetotals = 'all';
- } else {
- $displayval = &mt('standard with "hide course totals" set to "Yes" for users in section(s): [_1]',join(', ',@secs));
- }
- $storehash{'hidetotals'} = $hidetotals;
- }
- } elsif (exists($values->{'hidetotals'})) {
- push(@delkeys,'hidetotals');
- }
- }
if ($item eq 'feedback') {
if ($key =~ /^(question|policy|comment)(\.email)\.text$/) {
$text = $prefs->{$item}->{'itemtext'}{$1.$2};
@@ -2718,16 +1467,6 @@ sub store_changes {
}
}
$displayname = &mt($text);
- } elsif ($item eq 'menuitems') {
- unless ($changes->{$item}{$key} eq '') {
- if ($key eq 'menudefault') {
- $displayname = &mt('Default collection of menu items');
- $displayval = &mt('Collection: [_1]',
- $changes->{$item}{$key});
- } elsif ($key eq 'menucollections') {
- $displayval = &menucollections_display($changes->{$item}{$key});
- }
- }
} else {
$displayname = &mt($text);
}
@@ -2740,44 +1479,12 @@ sub store_changes {
$displayval = &Apache::lonlocal::locallocaltime($displayval);
} elsif ($key eq 'categories') {
$displayval = $env{'form.categories_display'};
- } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') ||
- ($key eq 'uselcmath') || ($key eq 'inline_chem')) {
+ } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') || ($key eq 'uselcmath')) {
if ($changes->{$item}{$key} eq '1') {
$displayval = &mt('Yes');
} elsif ($changes->{$item}{$key} eq '0') {
$displayval = &mt('No');
}
- } elsif ($key eq 'extresource') {
- if ($changes->{$item}{$key} eq 'iframe') {
- $displayval = &mt('In iframe');
- } else {
- my ($selected,$reuse,$width,$height) = split(/:/,$changes->{$item}{$key});
- if ($selected eq 'tab') {
- if ($reuse) {
- $displayval = &mt('[_1]In tab[_2],[_3] and tab re-used for different external resources in course',
- "'","'",' ');
- } else {
- $displayval = &mt('[_1]In tab[_2],[_3] with new tab for each external resource in course',
- "'","'",' ');
- }
- } elsif ($selected eq 'window') {
- if ($reuse) {
- $displayval = &mt('[_1]In pop-up window[_2],[_3] and window re-used for different external resources in course',
- "'","'",' ');
- } else {
- $displayval = &mt('[_1]In pop-up window[_2],[_3] with new window for each external resource in course',
- "'","'",' ');
- }
- if (($width ne '') || ($height ne '')) {
- if ($width ne '') {
- $displayval .= ' '.&mt('Window width: [_1]px',$width);
- }
- if ($height ne '') {
- $displayval .= ' '.&mt('Window height: [_1]px',$height);
- }
- }
- }
- }
}
if ($key eq 'co-owners') {
if (ref($changes->{$item}{$key}) eq 'HASH') {
@@ -2804,12 +1511,12 @@ sub store_changes {
}
}
unless (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
- if ($env{'form.pending_coowner'} eq 'accept') {
+ if ($env{'form.pending_coowoner'} eq 'accept') {
$displayval = &mt('on');
- } elsif ($env{'form.pending_coowner'} eq 'decline') {
+ } elsif ($env{'form.pending_coowoner'} eq 'decline') {
$displayval = '';
$output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Invitation to be co-owner declined')).'';
- } elsif ($env{'form.remove_coowner'}) {
+ } elsif ($env{'form.remove_coowoner'}) {
$displayval = &mt('off');
}
if ($displayval) {
@@ -2822,25 +1529,12 @@ sub store_changes {
}
} elsif ($changes->{$item}{$key} eq '') {
push(@delkeys,$key);
- if ($item eq 'menuitems') {
- if ($key eq 'menudefault') {
- $output .= ''.&mt("Default collection of menu items set to: 'Standard' (all menus shown)").'';
- } elsif ($key eq 'menucollections') {
- $output .= ''.&mt('Specific collections of menus no longer available').'';
- }
- } else {
- $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
- ''.$displayname.'')).'';
- }
- } elsif ($key eq 'menucollections') {
- $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Numbered menu collections:')).' '.
- $displayval.'';
+ $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
+ ''.$displayname.'')).'';
} else {
- unless (($key eq 'extresource') && ($changes->{$item}{$key} ne 'iframe')) {
- $displayval = "'$displayval'";
- }
$output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
- ''.$displayname.'',$displayval));
+ ''.$displayname.'',
+ "'$displayval'"));
if ($key eq 'url') {
my $bkuptime=time;
$output .= (' 'x2).&mt('(Previous URL backed up)').': '.
@@ -2892,9 +1586,6 @@ sub store_changes {
}
}
}
- if ($skipstore) {
- return $output;
- }
if (&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum) eq 'ok') {
if (ref($changes) eq 'HASH') {
if (ref($changes->{'courseinfo'}) eq 'HASH') {
@@ -2937,378 +1628,6 @@ sub store_changes {
return $output;
}
-sub store_linkprot {
- my ($cdom,$cnum,$context,$changes,$oldlinkprot) = @_;
- my ($ltiauth,$home,$lti_save_error,$output,$error,%ltienc,@deletions);
- if ($context eq 'domain') {
- $ltiauth = 1;
- $home = &Apache::lonnet::domain($cdom,'primary');
- } else {
- $home = &Apache::lonnet::homeserver($cnum,$cdom);
- 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'};
- }
- }
- if (ref($changes) eq 'HASH') {
- foreach my $id (sort { $a <=> $b } keys(%{$changes})) {
- if (ref($changes->{$id}) eq 'HASH') {
- if (exists($changes->{$id}->{'key'})) {
- $ltienc{$id}{'key'} = $changes->{$id}->{'key'};
- delete($changes->{$id}->{'key'});
- }
- if (exists($changes->{$id}->{'secret'})) {
- $ltienc{$id}{'secret'} = $changes->{$id}->{'secret'};
- delete($changes->{$id}->{'secret'});
- } elsif (ref($oldlinkprot->{$id}) eq 'HASH') {
- if (exists($oldlinkprot->{$id}{'usable'})) {
- $changes->{$id}->{'usable'} = 1;
- }
- if (exists($oldlinkprot->{$id}{'cipher'})) {
- $changes->{$id}->{'cipher'} = $oldlinkprot->{$id}{'cipher'};
- }
- }
- }
- }
- }
- my @ids=&Apache::lonnet::current_machine_ids();
- if (keys(%ltienc) > 0) {
- if ($context eq 'domain') {
- foreach my $id (keys(%ltienc)) {
- if (exists($ltienc{$id}{'secret'})) {
- $changes->{$id}->{'usable'} = 1;
- }
- }
- } else {
- unless (($home eq 'no_host') || ($home eq '')) {
- my $allowed;
- foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
- if ($allowed) {
- if (&Apache::lonnet::put('nohist_ltienc',\%ltienc,$cdom,$cnum,1) eq 'ok') {
- foreach my $id (keys(%ltienc)) {
- if (exists($ltienc{$id}{'secret'})) {
- $changes->{$id}->{'usable'} = 1;
- }
- }
- } else {
- $lti_save_error = 1;
- }
- }
- }
- }
- }
- unless ($lti_save_error) {
- if ($context eq 'course') {
- if (&Apache::lonnet::put('lti',$changes,$cdom,$cnum,1) eq 'ok') {
- my $hashid=$cdom.'_'.$cnum;
- &Apache::lonnet::devalidate_cache_new('courselti',$hashid);
- unless (($home eq 'no_host') || ($home eq '')) {
- if (grep(/^\Q$home\E$/,@ids)) {
- &Apache::lonnet::devalidate_cache_new('courseltienc',$hashid);
- }
- }
- } else {
- $lti_save_error = 1;
- }
- }
- unless ($lti_save_error) {
- foreach my $id (sort { $a <=> $b } %{$changes}) {
- if (ref($changes->{$id}) eq 'HASH') {
- my %values = %{$changes->{$id}};
- my %desc = &linkprot_names();
- my $display;
- foreach my $title ('name','lifetime','version','key','secret','returnurl','passbackformat') {
- if (($title eq 'key') || ($title eq 'secret')) {
- if (ref($ltienc{$id}) eq 'HASH') {
- if (exists($ltienc{$id}{$title})) {
- if ($title eq 'secret') {
- my $length = length($ltienc{$id}{$title});
- $display .= $desc{$title}.': ['.&mt('not shown').'], ';
- } else {
- $display .= $desc{$title}.': '.$ltienc{$id}{$title}.', ';
- }
- }
- }
- } elsif ($title eq 'version') {
- if ($values{$title} eq 'LTI-1p0') {
- $display .= $desc{$title}.': 1.1, ';
- }
- } elsif ($title eq 'returnurl') {
- if ($values{$title}) {
- $display .= &mt('Return URL parameter').': '.$values{$title}.', ';
- }
- } elsif ($title eq 'passbackformat') {
- if ($values{$title} eq '1.0') {
- $display .= &mt('Can return grades to Launcher with Outcomes Service 1.0 format').', ';
- } elsif ($values{$title} eq '1.1') {
- $display .= &mt('Can return grades to Launcher with Outcomes Service 1.1 format').', ';
- }
- } else {
- $display .= $desc{$title}.': '.$values{$title}.', ';
- }
- }
- if ($ltiauth) {
- if (($values{'requser'}) && ($values{'mapuser'} ne '')) {
- if ($values{'mapuser'} eq 'lis_person_contact_email_primary') {
- $display .= &mt('Source of username: Email address [_1]',
- '(lis_person_contact_email_primary)').', ';
- } elsif ($values{'mapuser'} eq 'lis_person_sourcedid') {
- $display .= &mt('Source of username: User ID [_1]',
- '(lis_person_sourcedid)').', ';
- } else {
- $display .= &mt('Source of username: [_1]',$values{'mapuser'}).', ';
- }
- if ($values{'notstudent'} eq 'auth') {
- $display .= &mt('Display LON-CAPA login page if no match').', ';
- } elsif ($values{'notstudent'} eq 'reject') {
- $display .= &mt('Discontinue launch if no match').', ';
- }
- }
- }
- $display =~ s/, $//;
- $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',''.$id.'',
- "'$display'")).'';
- } elsif (ref($oldlinkprot->{$id}) eq 'HASH') {
- my $oldname = $oldlinkprot->{$id}{'name'};
- $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',''."$id ($oldname)".'')).'';
- }
- }
- } else {
- $lti_save_error = 1;
- }
- }
- unless ($lti_save_error) {
- foreach my $id (sort { $a <=> $b } keys(%{$changes})) {
- unless (ref($changes->{$id}) eq 'HASH') {
- push(@deletions,$id);
- }
- }
- if (@deletions) {
- if ($context eq 'course') {
- &Apache::lonnet::del('nohist_ltienc',\@deletions,$cdom,$cnum);
- }
- }
- }
- if ($lti_save_error) {
- $output .= ''.
- ''.
- &mt('An error occurred when saving changes to link protection settings, which remain unchanged.').
- ''.
- '';
- }
- return $output;
-}
-
-sub store_ltitools {
- my ($cdom,$cnum,$context,$changes,$oldltitools) = @_;
- my ($home,$ltitools_save_error,$output,$error,%toolsenc,@deletions);
- my %lt = <itools_names();
- my @courseroles = ('cc','in','ta','ep','st');
- my @allfields = ('fullname','firstname','lastname','email','user','roles');
- if ($context eq 'domain') {
- $home = &Apache::lonnet::domain($cdom,'primary');
- } else {
- $home = &Apache::lonnet::homeserver($cnum,$cdom);
- }
- if (ref($changes) eq 'HASH') {
- foreach my $id (sort { $a <=> $b } keys(%{$changes})) {
- if (ref($changes->{$id}) eq 'HASH') {
- if (exists($changes->{$id}->{'key'})) {
- $toolsenc{$id}{'key'} = $changes->{$id}->{'key'};
- delete($changes->{$id}->{'key'});
- }
- if (exists($changes->{$id}->{'secret'})) {
- $toolsenc{$id}{'secret'} = $changes->{$id}->{'secret'};
- delete($changes->{$id}->{'secret'});
- } elsif (ref($oldltitools->{$id}) eq 'HASH') {
- if (exists($oldltitools->{$id}{'usable'})) {
- $changes->{$id}->{'usable'} = 1;
- }
- if (exists($oldltitools->{$id}{'cipher'})) {
- $changes->{$id}->{'cipher'} = $oldltitools->{$id}{'cipher'};
- }
- }
- }
- }
- }
- my @ids=&Apache::lonnet::current_machine_ids();
- if (keys(%toolsenc) > 0) {
- unless (($home eq 'no_host') || ($home eq '')) {
- my $allowed;
- foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
- if ($allowed) {
- if (($context eq 'domain') ||
- (($context eq 'course') &&
- (&Apache::lonnet::put('nohist_toolsenc',\%toolsenc,$cdom,$cnum,1) eq 'ok'))) {
- foreach my $id (keys(%toolsenc)) {
- if (exists($toolsenc{$id}{'secret'})) {
- $changes->{$id}->{'usable'} = 1;
- }
- }
- } else {
- $ltitools_save_error = 1;
- }
- }
- }
- }
- unless ($ltitools_save_error) {
- if ($context eq 'course') {
- if (&Apache::lonnet::put('ltitools',$changes,$cdom,$cnum,1) eq 'ok') {
- my $hashid=$cdom.'_'.$cnum;
- &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid);
- unless (($home eq 'no_host') || ($home eq '')) {
- if (grep(/^\Q$home\E$/,@ids)) {
- &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid);
- }
- }
- } else {
- $ltitools_save_error = 1;
- }
- }
- unless ($ltitools_save_error) {
- my %bynum;
- foreach my $itemid (sort(keys(%{$changes}))) {
- my $position = $changes->{$itemid}{'order'};
- $bynum{$position} = $itemid;
- }
- foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
- my $itemid = $bynum{$pos};
- if (ref($changes->{$itemid}) ne 'HASH') {
- $output .= ''.&mt('Deleted: [_1]',$changes->{$itemid}).'';
- } else {
- $output .= ''.$changes->{$itemid}{'title'}.'';
- if ($changes->{$itemid}{'image'}) {
- $output .= ' '.
- ' ';
- }
- $output .= '';
- my $position = $pos + 1;
- $output .= '- '.&mt('Order: [_1]',$position).'
';
- foreach my $item ('version','msgtype','sigmethod','url','lifetime') {
- if ($changes->{$itemid}{$item} ne '') {
- $output .= '- '.$lt{$item}.': '.$changes->{$itemid}{$item}.'
';
- }
- }
- if (ref($toolsenc{$itemid}) eq 'HASH') {
- foreach my $item ('key','secret') {
- if (exists($toolsenc{$itemid}{$item})) {
- if ($item eq 'secret') {
- $output .= '- '.$lt{$item}.': ['.&mt('not shown').']
';
- } else {
- $output .= '- '.$lt{$item}.': '.$toolsenc{$itemid}{$item}.'
';
- }
- }
- }
- }
- $output .= '- '.&mt('Configurable in course:');
- my @possconfig = ('label','title','target','linktext','explanation','append');
- my $numconfig = 0;
- if (ref($changes->{$itemid}{'crsconf'}) eq 'HASH') {
- foreach my $item (@possconfig) {
- if ($changes->{$itemid}{'crsconf'}{$item}) {
- $numconfig ++;
- $output .= ' "'.$lt{'crs'.$item}.'"';
- }
- }
- }
- if (!$numconfig) {
- $output .= ' '.&mt('None');
- }
- $output .= '
';
- foreach my $item ('passback','roster') {
- $output .= '- '.$lt{$item}.' ';
- if ($changes->{$itemid}{$item}) {
- $output .= &mt('Yes');
- if ($changes->{$itemid}{$item.'valid'}) {
- if ($item eq 'passback') {
- $output .= ' '.&mt('valid for at least [quant,_1,day] after launch',
- $changes->{$itemid}{$item.'valid'});
- } else {
- $output .= ' '.&mt('valid for at least [quant,_1,second] after launch',
- $changes->{$itemid}{$item.'valid'});
- }
- }
- } else {
- $output .= &mt('No');
- }
- $output .= '
';
- }
- if (ref($changes->{$itemid}{'display'}) eq 'HASH') {
- my $displaylist;
- if ($changes->{$itemid}{'display'}{'target'}) {
- $displaylist = &mt('Display target').': '.
- $changes->{$itemid}{'display'}{'target'}.',';
- }
- foreach my $size ('width','height') {
- if ($changes->{$itemid}{'display'}{$size}) {
- $displaylist .= (' 'x2).$lt{$size}.': '.
- $changes->{$itemid}{'display'}{$size}.',';
- }
- }
- if ($displaylist) {
- $displaylist =~ s/,$//;
- $output .= '- '.$displaylist.'
';
- }
- foreach my $item ('linktext','explanation') {
- if ($changes->{$itemid}{'display'}{$item}) {
- $output .= '- '.$lt{$item}.': '.$changes->{$itemid}{'display'}{$item}.'
';
- }
- }
- }
- if (ref($changes->{$itemid}{'fields'}) eq 'HASH') {
- my $fieldlist;
- foreach my $field (@allfields) {
- if ($changes->{$itemid}{'fields'}{$field}) {
- $fieldlist .= (' 'x2).$lt{$field}.',';
- }
- }
- if ($fieldlist) {
- $fieldlist =~ s/,$//;
- if ($changes->{$itemid}{'fields'}{'user'}) {
- if ($changes->{$itemid}{'incdom'}) {
- $fieldlist .= ' ('.&mt('username:domain').')';
- } else {
- $fieldlist .= ' ('.&mt('username').')';
- }
- }
- $output .= '- '.&mt('Data sent').':'.$fieldlist.'
';
- }
- }
- if (ref($changes->{$itemid}{'roles'}) eq 'HASH') {
- my $rolemaps;
- foreach my $role (@courseroles) {
- if ($changes->{$itemid}{'roles'}{$role}) {
- $rolemaps .= (' 'x2).&Apache::lonnet::plaintext($role,'Course').'='.
- $changes->{$itemid}{'roles'}{$role}.',';
- }
- }
- if ($rolemaps) {
- $rolemaps =~ s/,$//;
- $output .= '- '.&mt('Role mapping:').$rolemaps.'
';
- }
- }
- if (ref($changes->{$itemid}{'custom'}) eq 'HASH') {
- my $customlist;
- if (keys(%{$changes->{$itemid}{'custom'}})) {
- foreach my $key (sort(keys(%{$changes->{$itemid}{'custom'}}))) {
- $customlist .= $key.':'.$changes->{$itemid}{'custom'}{$key}.(' 'x2);
- }
- }
- if ($customlist) {
- $output .= '- '.&mt('Custom items').': '.$customlist.'
';
- }
- }
- $output .= ' ';
- }
- }
- }
- }
- return $output;
-}
-
sub update_env {
my ($cnum,$cdom,$chome,$need_env_update,$storehash) = @_;
my $count = 0;
@@ -3437,17 +1756,12 @@ sub get_course {
}
sub get_jscript {
- my ($cid,$cdom,$phase,$crstype,$settings,$noedit) = @_;
+ my ($cid,$cdom,$phase,$crstype,$settings) = @_;
my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
- my ($jscript,$categorize_js,$loncaparev_js,$instcode_js,$extresource_js,$localization_js);
+ my ($jscript,$categorize_js,$loncaparev_js,$instcode_js);
my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
my $cloners_js = &cloners_javascript($phase);
- my $currltitools;
- if (ref($settings) eq 'HASH') {
- $currltitools = $settings->{'ltitools'};
- }
- my $ltitools_js = &Apache::lonconfigsettings::ltitools_javascript($currltitools);
my @code_order;
if ($crstype ne 'Community') {
if (ref($settings) eq 'HASH') {
@@ -3467,7 +1781,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);
@@ -3568,180 +1882,12 @@ function syllabusinfo() {
}
}
ENDSCRIPT
- my ($menuitems_js,$grading_js);
- unless ($noedit) {
- my $collections;
- my $next = 1;
- if (ref($settings) eq 'HASH') {
- if ($settings->{'menucollections'} ne '') {
- my @current;
- foreach my $item (split(/;/,$settings->{'menucollections'})) {
- my ($num) = split(/\%/,$item);
- if ($num =~ /^\d+$/) {
- push(@current,$num);
- }
- }
- $collections = join("','",sort { $a <=> $b } @current);
- if ($collections) {
- $collections = "'$collections'";
- }
- $next += $current[-1];
- }
- }
- my $deftext = &mt('Standard (all menus shown)');
- $menuitems_js = < 0) {
- var setvis;
- for (var i=0; i'."\n".
- '// '."\n".
- ''."\n".$stubrowse_js."\n".$ltitools_js."\n";
+ $cloners_js."\n".$instcode_js.
+ $syllabus_js."\n".'//]]>'."\n".
+ ''."\n".$stubrowse_js."\n";
return $jscript;
}
@@ -3826,36 +1972,6 @@ function getIndexByName(item) {
ENDSCRIPT
}
-sub linkprot_javascript {
- return <<"ENDSCRIPT";
-function toggleLinkProtExtra(form,item,extra,valon,styleon,num) {
- if (document.getElementById('linkprot_'+extra+'_'+num)) {
- var extraid = document.getElementById('linkprot_'+extra+'_'+num);
- var itemname = form.elements['linkprot_'+item+'_'+num];
- if (itemname) {
- if (itemname.length > 0) {
- var setvis;
- for (var i=0; i".
- &mt('Select Map').' '.
- &mt('Modification may make assessment data inaccessible!').
- '';
- $editsyllabus = &mt('[_1]Edit[_2]','',
- '');
- }
my %items = (
'url' => {
- text => ''.&mt($itemtext->{'url'}).''.$editmap,
+ text => ''.&mt($itemtext->{'url'}).''.(' 'x2).
+ '".
+ &mt('Select Map').' '.
+ &mt('Modification may make assessment data inaccessible!').
+ '',
input => 'textbox',
size => '55',
advanced => 1
@@ -3996,10 +2106,11 @@ sub print_courseinfo {
size => '20',
advanced => 1
},
- 'syllabus' => {
- text => ''.&mt($itemtext->{'syllabus'}).' '.
+ 'externalsyllabus' => {
+ text => ''.&mt($itemtext->{'externalsyllabus'}).' '.
&mt('(Syllabus type in use)').(' ' x2).
- $editsyllabus,
+ &mt('[_1]Edit[_2]','',
+ ''),
},
'hidefromcat' => {
text => ''.&mt($itemtext->{'hidefromcat'}).' '.
@@ -4031,7 +2142,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) {
@@ -4214,12 +2325,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;
}
@@ -4242,7 +2353,7 @@ sub print_courseinfo {
$datatable .= &manage_coownership($cnum,$cdom,\@currcoown,$noedit);
}
}
- } elsif ($item eq 'syllabus') {
+ } elsif ($item eq 'externalsyllabus') {
my $external = $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'};
my $uploaded = $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'};
my $minimal = $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'};
@@ -4266,12 +2377,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;
@@ -4296,7 +2407,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" ';
}
@@ -4447,7 +2558,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'};
@@ -4470,110 +2581,154 @@ sub display_loncaparev_constraints {
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);
}
}
}
@@ -4673,7 +2828,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}.' | ';
@@ -4691,9 +2846,9 @@ 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 $stdtype=&Apache::lonparmset::standard_parameter_types('type');
my $stdname=&Apache::lonparmset::standard_parameter_names('type');
my $valanon=&get_param_description($stdtype,'anonsurvey');
@@ -4753,7 +2908,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;
}
@@ -4966,7 +3121,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) {
@@ -5003,18 +3158,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;
@@ -5059,7 +3263,7 @@ sub coowner_invitations {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -5123,7 +3327,7 @@ sub manage_coownership {
@pendingcoown = split(',',$pendingcoowners);
}
if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
+ @currcoown == @{$currcoownref};
}
my $disabled;
if ($noedit) {
@@ -5158,10 +3362,10 @@ sub manage_coownership {
}
$output .= '';
if ($is_coowner) {
- $output .= &mt('You are currently a co-owner:').' ';
+ $output .= &mt('You are currently a co-owner:').' ';
} else {
- $output .= &mt('The course owner has invited you to become a co-owner:').' '.(' 'x2).
- '';
+ $output .= &mt('The course owner has invited you to become a co-owner:').' '.(' 'x2).
+ '';
}
$output .= '';
if (@currcoown) {
@@ -5209,23 +3413,9 @@ sub print_localization {
if ($item eq 'timezone') {
my $includeempty = 1;
my $timezone = &Apache::lonlocal::gettimezone();
- my $onchange;
- unless ($noedit) {
- $onchange = ' onchange="javascript:toggleTimeZone();"';
- }
- my $id = ' id="LC_set_timezone"';
$datatable .=
- &Apache::loncommon::select_timezone($item,$timezone,$onchange,
- $includeempty,$id,$disabled);
- my $tzsty = 'none';
- if ($timezone ne '') {
- $tzsty = 'block';
- }
- $datatable .= ' '.
- ''.
- &mt('Override individual user preference?').
- &yesno_radio('tzover',$settings,undef,1,'',$noedit).
- ' ';
+ &Apache::loncommon::select_timezone($item,$timezone,undef,
+ $includeempty,$disabled);
} elsif ($item eq 'datelocale') {
my $includeempty = 1;
my $locale_obj = &Apache::lonlocal::getdatelocale();
@@ -5238,7 +3428,7 @@ sub print_localization {
undef,$includeempty,$disabled);
} else {
if ($settings->{$item} eq '') {
- unless ($noedit) {
+ unless ($noedit) {
$datatable .= ' | '.
&Apache::loncommon::select_language('languages_0','',1);
}
@@ -5275,8 +3465,8 @@ sub print_localization {
&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();
@@ -5345,8 +3535,8 @@ sub print_feedback {
}
if ($position eq 'top') {
my $includeempty = 0;
- $datatable .= ' | '.
- &user_table($cdom,$item,\@sections,
+ $datatable .= ' | '.
+ &user_table($cdom,$item,\@sections,
$settings->{$item},\%lt,$noedit);
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
@@ -5433,7 +3623,7 @@ sub select_recipient {
my $domform = &Apache::loncommon::select_dom_form($cdom,$item.'_udom_'.$num,$includeempty);
my $selectlink =
&Apache::loncommon::selectstudent_link('display',$item.'_uname_'.$num,
- $item.'_udom_'.$num,'only');
+ $item.'_udom_'.$num,1);
my $output =
''.&mt('Username').' '.
' | '.
@@ -5450,7 +3640,7 @@ sub select_recipient {
}
sub select_sections {
- my ($item,$num,$sections,$selected,$noedit,$allval) = @_;
+ my ($item,$num,$sections,$selected,$noedit) = @_;
my ($output,@currsecs,$allsec,$disabled);
if (ref($selected) eq 'ARRAY') {
@currsecs = @{$selected};
@@ -5466,24 +3656,16 @@ sub select_sections {
my $mult;
if (@{$sections} > 1) {
$mult = ' multiple="multiple"';
- my $size;
if (@{$sections} > 3) {
- $size = 4;
- } else {
- $size = 1 + scalar(@{$sections});
+ $mult .= ' size="4"';
}
- $mult .= ' size="'.$size.'"';
}
- my $name = $item.'_sections';
- unless ($item eq 'hidetotals') {
- $name .= '_'.$num;
- }
- $output = '
|