--- loncom/interface/courseprefs.pm 2022/02/20 22:18:23 1.49.2.28.2.5
+++ loncom/interface/courseprefs.pm 2015/03/07 23:17:15 1.69
@@ -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.5 2022/02/20 22:18:23 raeburn Exp $
+# $Id: courseprefs.pm,v 1.69 2015/03/07 23:17:15 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()
@@ -141,7 +137,7 @@ whether Domain coordinators who are curr
advanced course user .db file for a course are to be hidden (e.g.,
in syllabus, or from course user lists).
-Inputs: $cdom,$item,$settings,$crstype,$noedit
+Inputs: $cdom,$item,$settings,$crstype
where $cdom is course domain, item is nothideprivileged, $settings is
HASH ref of the current values for nothideprivileged, $crstype is
course type (Course or Community).
@@ -221,10 +217,8 @@ use Apache::lonhtmlcommon();
use Apache::lonconfigsettings;
use Apache::lonrelrequtils;
use Apache::lonparmset;
-use Apache::courseclassifier;
use Apache::lonlocal;
use LONCAPA qw(:DEFAULT :match);
-use Crypt::CBC;
my $registered_cleanup;
my $modified_courses;
@@ -240,9 +234,9 @@ sub handler {
my $cid = $env{'request.course.id'};
my ($cnum,$cdom,$chome) = &get_course($cid);
my $crstype = &Apache::loncommon::course_type();
- my ($parm_permission,$allowed) = &get_permission($cid);
+ my $parm_permission = &Apache::lonnet::allowed('opa',$cid);
my $navmap = Apache::lonnavmaps::navmap->new();
- if ($allowed && $navmap) {
+ if ($parm_permission && $navmap) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
} else {
@@ -315,7 +309,7 @@ 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',
@@ -349,12 +343,12 @@ sub handler {
$phase = $env{'form.phase'};
}
- if (($phase eq 'categorizecourse') && ($parm_permission->{'categorizecourse'})) {
+ if ($phase eq 'categorizecourse') {
&assign_course_categories($r,$crstype);
return OK;
}
- if (($phase eq 'releaseinfo') && ($parm_permission->{'releaseinfo'})) {
+ if ($phase eq 'releaseinfo') {
my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
if ($loncaparev) {
if (&display_loncaparev_constraints($r,$navmap,$loncaparev,$crstype)) {
@@ -370,29 +364,9 @@ 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);
- 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'});
- }
my @prefs_order = ('courseinfo','localization','feedback','discussion',
'classlists','appearance','grading','printouts',
- 'menuitems','linkprot','spreadsheet','bridgetasks',
- 'other');
+ 'spreadsheet','bridgetasks','other');
my %prefs = (
'courseinfo' =>
@@ -400,18 +374,18 @@ sub handler {
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'},
'co-owners' => $lt{'cown'},
'description' => $lt{'desc'},
'courseid' => $lt{'idnu'},
- 'uniquecode' => $lt{'unco'},
+ 'uniquecode' => $lt{'unco'},
'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'},
@@ -489,7 +463,7 @@ sub handler {
help => 'Course_Prefs_Display',
ordered => ['default_xml_style','pageseparators',
'disable_receipt_display','texengine',
- 'tthoptions','uselcmath','usejsme','inline_chem'],
+ 'tthoptions','uselcmath','usejsme'],
itemtext => {
default_xml_style => 'Default XML style file',
pageseparators => 'Visibly Separate Items on Pages',
@@ -498,7 +472,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',
},
},
'grading' =>
@@ -519,7 +492,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',
@@ -553,29 +526,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',
- }],
- },
'other' =>
{ text => 'Other settings',
help => 'Course_Prefs_Other',
@@ -584,58 +534,23 @@ sub handler {
}],
},
);
- if (($phase eq 'process') && ($parm_permission->{'process'})) {
+ if ($phase eq 'process') {
my @allitems = &get_allitems(%prefs);
&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);
+ $cnum,undef,\@allitems,'coursepref');
+ } elsif ($phase eq 'display') {
+ my $jscript = &get_jscript($cid,$cdom,$phase,$crstype);
my @allitems = &get_allitems(%prefs);
&Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
- \@prefs_order,\%prefs,\%values,$cnum,$jscript,\@allitems,$crstype,
- 'coursepref',$parm_permission);
+ \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,'coursepref');
} else {
&Apache::lonconfigsettings::display_choices($r,$phase,$context,
- \@prefs_order,\%prefs,
- 'coursepref',$parm_permission);
+ \@prefs_order,\%prefs,'coursepref');
}
return OK;
}
-sub get_permission {
- my ($cid) = @_;
- my %permission;
- my $allowed = 0;
- return (\%permission,$allowed) unless ($cid);
- if (&Apache::lonnet::allowed('opa',$cid)) {
- %permission= (
- 'pickactions' => 1,
- 'categorizecourse' => 1,
- 'releaseinfo' => 1,
- 'process' => 1,
- 'display' => 1,
- );
- } elsif (&Apache::lonnet::allowed('vpa',$env{'request.course.id'})) {
- %permission = (
- 'pickactions' => 1,
- 'releaseinfo' => 1,
- 'display' => 1,
- );
- }
- foreach my $perm (values(%permission)) {
- if ($perm) { $allowed=1; last; }
- }
- return (\%permission,$allowed);
-}
-
sub get_allitems {
my (%prefs) = @_;
my @allitems;
@@ -653,15 +568,9 @@ 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) = @_;
my $ordered = $item->{'ordered'};
my $itemtext = $item->{'itemtext'};
- my $noedit;
- if (ref($parm_permission) eq 'HASH') {
- unless ($parm_permission->{'process'}) {
- $noedit = 1;
- }
- }
my $rowtotal = 0;
my $output =
'<table class="LC_nested_outer">
@@ -674,7 +583,7 @@ sub print_config_box {
}
$output .= '</span></th>'."\n".
'</tr>';
- if (($action eq 'feedback') || ($action eq 'classlists') || ($action eq 'menuitems')) {
+ if (($action eq 'feedback') || ($action eq 'classlists')) {
$output .= '
<tr>
<td>
@@ -696,11 +605,9 @@ sub print_config_box {
}
$rowtotal ++;
if ($action eq 'feedback') {
- $output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
+ $output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
} 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 .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
}
$output .= '
</table>
@@ -721,7 +628,7 @@ sub print_config_box {
$output .= &mt($item->{'header'}->[1]->{'col2'}).'</td>
</tr>';
if ($action eq 'classlists') {
- $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit).
+ $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
'
</table>
</td>
@@ -760,31 +667,27 @@ sub print_config_box {
}
$rowtotal ++;
if ($action eq 'courseinfo') {
- $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'localization') {
- $output .= &print_localization($cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
+ $output .= &print_localization($cdom,$settings,$ordered,$itemtext,\$rowtotal);
} elsif ($action eq 'feedback') {
- $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
+ $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
} elsif ($action eq 'discussion') {
- $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
+ $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal);
} elsif (($action eq 'classlists') || ($action eq 'viewableroster')) {
- $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'appearance') {
- $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'grading') {
- $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'printouts') {
- $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'spreadsheet') {
- $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'bridgetasks') {
- $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
- } 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');
+ $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
} elsif ($action eq 'other') {
- $output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype,$noedit);
+ $output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype);
}
$output .= '
</table>
@@ -795,8 +698,8 @@ sub print_config_box {
}
sub process_changes {
- my ($cdom,$cnum,$action,$values,$item,$changes,$allitems,$disallowed,$crstype) = @_;
- 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;
@@ -813,18 +716,6 @@ sub process_changes {
}
}
}
- } elsif ($action eq 'linkprot') {
- 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.linkprot_add'}) && ($env{'form.linkprot_maxnum'} =~ /^\d+$/)) {
- push(@ordered,$env{'form.linkprot_maxnum'});
- }
} elsif (ref($item->{'ordered'}) eq 'ARRAY') {
if ($action eq 'courseinfo') {
my ($can_toggle_cat,$can_categorize) =
@@ -836,8 +727,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') {
@@ -887,85 +777,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');
- }
} else {
foreach my $entry (@ordered) {
if ($entry eq 'cloners') {
@@ -975,7 +786,7 @@ sub process_changes {
my @clonedoms;
if (exists($env{'form.cloners_activate'})) {
my $actnum = $env{'form.cloners_activate'};
- if ($actnum ne '-1') {
+ if ($actnum ne '') {
if ($env{'form.cloners_dom_'.$actnum} ne '') {
my $clonedom = $env{'form.cloners_dom_'.$actnum};
if (&check_clone($clonedom,$disallowed) eq 'ok') {
@@ -993,7 +804,7 @@ sub process_changes {
my $clonedom = $env{'form.cloners_dom_'.$i};
if (&check_clone($clonedom,$disallowed) eq 'ok') {
if (!grep(/^\*:\Q$clonedom\E$/,@clonedoms)) {
- push(@clonedoms,'*:'.$clonedom);
+ push (@clonedoms,'*:'.$clonedom);
}
}
}
@@ -1006,7 +817,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;
}
@@ -1039,37 +850,6 @@ sub process_changes {
}
}
}
- if (ref($values) eq 'HASH') {
- my (@code_order,%codedefaults);
- &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
- \@code_order);
- my $clonebycode;
- if ($env{'form.cloners_instcode'}) {
- if (@code_order > 0) {
- my @standardnames = &Apache::loncommon::get_standard_codeitems();
- my %local_to_standard;
- for (my $i=0; $i<@code_order; $i++) {
- $local_to_standard{$code_order[$i]} = $standardnames[$i];
- }
- foreach my $item (@code_order) {
- my $key = $local_to_standard{$item};
- if ($key ne '') {
- if ($env{'form.'.$key}) {
- $clonebycode .= $key.'='.&escape($env{'form.'.$key}).'&';
- }
- }
- }
- $clonebycode =~ s/\&$//;
- }
- }
- if ($clonebycode) {
- if ($newvalues{$entry}) {
- $newvalues{$entry} .= ','.$clonebycode;
- } else {
- $newvalues{$entry} = $clonebycode;
- }
- }
- }
}
if (ref($disallowed) eq 'HASH') {
if (ref($disallowed->{'cloners'}) eq 'HASH') {
@@ -1095,9 +875,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');
@@ -1121,19 +899,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);
@@ -1142,8 +920,6 @@ sub process_changes {
if ($pendingcoowners ne '') {
@newpending = @pendingcoown;
}
- } else {
- @newcoown = @currcoown;
}
$newvalues{'pendingco-owners'} = join(',',sort(@newpending));
$newvalues{'co-owners'} = join(',',sort(@newcoown));
@@ -1273,14 +1049,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;
@@ -1288,7 +1064,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};
@@ -1297,7 +1073,7 @@ sub process_changes {
}
if ($fontchange) {
$changes->{$entry} = 1;
- }
+ }
} elsif ($entry eq 'nothideprivileged') {
my @curr_nothide;
my @new_nothide;
@@ -1372,7 +1148,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'};
@@ -1388,7 +1164,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;
@@ -1422,276 +1198,7 @@ sub process_changes {
}
}
}
- return $errors;
-}
-
-sub process_linkprot {
- my ($cdom,$cnum,$values,$changes,$context) = @_;
- my ($home,$dest,$ltiauth,$privkey,$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} = '';
- }
- }
- }
- }
- 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);
- }
- if ((($context eq 'domain') && ($domdefs{'linkprotenc_dom'})) ||
- (($context eq 'course') && ($domdefs{'linkprotenc_crs'}))) {
- unless (($home eq 'no_host') || ($home eq '')) {
- if (grep(/^\Q$home\E$/,@ids)) {
- if (ref($domdefs{'privhosts'}) eq 'ARRAY') {
- if (grep(/^\Q$home\E$/,@{$domdefs{'privhosts'}})) {
- my %privhash = &Apache::lonnet::restore_dom('lti','private',$cdom,$home,1);
- $privkey = $privhash{'key'};
- $privnum = $privhash{'version'};
- if (($privnum) && ($privkey ne '')) {
- $cipher = Crypt::CBC->new({'key' => $privkey,
- 'cipher' => 'DES'});
- }
- }
- }
- }
- }
- }
- 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 .= '<span class="LC_error">'.
- &mt('Failed to acquire unique ID for link protection').
- '</span>';
- }
- }
- 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};
- }
- }
- 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'};
- }
- } 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};
- }
- }
- 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);
+ return;
}
sub get_sec_str {
@@ -1736,12 +1243,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);
+ 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'});
%storehash = %{$values};
} else {
if ($crstype eq 'Community') {
@@ -1751,20 +1254,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) {
- 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',
@@ -1790,8 +1279,6 @@ sub store_changes {
"'$storehash{$key}'")).'</li>';
}
}
- } elsif ($item eq 'linkprot') {
- $output .= &store_linkprot($cdom,$cnum,'course',$changes->{$item},\%oldlinkprot);
} else {
if (ref($prefs->{$item}->{'ordered'}) eq 'ARRAY') {
my @settings = @{$prefs->{$item}->{'ordered'}};
@@ -1908,16 +1395,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);
}
@@ -1930,8 +1407,7 @@ 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') {
@@ -1963,12 +1439,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 .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Invitation to be co-owner declined')).'</li>';
- } elsif ($env{'form.remove_coowner'}) {
+ } elsif ($env{'form.remove_coowoner'}) {
$displayval = &mt('off');
}
if ($displayval) {
@@ -1981,19 +1457,8 @@ sub store_changes {
}
} elsif ($changes->{$item}{$key} eq '') {
push(@delkeys,$key);
- if ($item eq 'menuitems') {
- if ($key eq 'menudefault') {
- $output .= '<li>'.&mt("Default collection of menu items set to: 'Standard' (all menus shown)").'</li>';
- } elsif ($key eq 'menucollections') {
- $output .= '<li>'.&mt('Specific collections of menus no longer available').'</li>';
- }
- } else {
- $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
- '<i>'.$displayname.'</i>')).'</li>';
- }
- } elsif ($key eq 'menucollections') {
- $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Numbered menu collections:')).'<br />'.
- $displayval.'</li>';
+ $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
+ '<i>'.$displayname.'</i>')).'</li>';
} else {
$output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
'<i>'.$displayname.'</i>',
@@ -2049,9 +1514,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') {
@@ -2094,157 +1556,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;
- }
- }
- }
- }
- }
- 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') {
- 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, ';
- }
- } 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 .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]','<i>'.$id.'</i>',
- "'$display'")).'</li>';
- } elsif (ref($oldlinkprot->{$id}) eq 'HASH') {
- my $oldname = $oldlinkprot->{$id}{'name'};
- $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]','<i>'."$id ($oldname)".'</i>')).'</li>';
- }
- }
- } 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 .= '<li>'.
- '<span class="LC_error">'.
- &mt('An error occurred when saving changes to link protection settings, which remain unchanged.').
- '</span>'.
- '</li>';
- }
- return $output;
-}
-
sub update_env {
my ($cnum,$cdom,$chome,$need_env_update,$storehash) = @_;
my $count = 0;
@@ -2373,93 +1684,12 @@ sub get_course {
}
sub get_jscript {
- my ($cid,$cdom,$phase,$crstype,$settings,$noedit) = @_;
+ my ($cid,$cdom,$phase,$crstype) = @_;
my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
- my ($jscript,$categorize_js,$loncaparev_js,$instcode_js);
+ my ($jscript,$categorize_js,$loncaparev_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 @code_order;
- if ($crstype ne 'Community') {
- if (ref($settings) eq 'HASH') {
- my %codedefaults;
- &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
- \@code_order);
- if (@code_order > 0) {
- if ($phase eq 'display') {
- my @actions = &Apache::loncommon::get_env_multiple('form.actions');
- if (grep(/^courseinfo$/,@actions)) {
- if ($settings->{'cloners'} ne '') {
- unless ($settings->{'cloners'} eq '*') {
- my @cloners = split(/,/,$settings->{'cloners'});
- my @standardnames = &Apache::loncommon::get_standard_codeitems();
- my %local_to_standard;
- for (my $i=0; $i<@code_order; $i++) {
- $local_to_standard{$code_order[$i]} = $standardnames[$i];
- }
- foreach my $cloner (@cloners) {
- if (($cloner !~ /^\Q*:\E$match_domain$/) &&
- ($cloner !~ /^$match_username\:$match_domain$/)) {
- foreach my $item (split(/\&/,$cloner)) {
- my ($key,$val) = split(/\=/,$item);
- $val = &unescape($val);
- foreach my $code (@code_order) {
- if ($key eq $local_to_standard{$code}) {
- $env{'form.'.$key} = $val;
- }
- }
- }
- }
- }
- }
- }
- }
- }
- my @codetitles;
- (undef,$instcode_js) =
- &Apache::courseclassifier::instcode_selectors($cdom,'display',undef,
- \@codetitles);
- $instcode_js .= <<ENDSCRIPT;
-function toggleCloners(callerradio) {
- if (document.getElementById('LC_cloners_instcode')) {
- if (callerradio.value == 1) {
- document.getElementById('LC_cloners_instcode').style.display = "block";
- } else {
- uncheckOfficialLists();
- document.getElementById('LC_cloners_instcode').style.display = "none";
- }
- }
-}
-
-if (!document.getElementsByClassName) {
- function getElementsByClassName(node, classname) {
- var a = [];
- var re = new RegExp('(^| )'+classname+'( |$)');
- var els = node.getElementsByTagName("*");
- for(var i=0,j=els.length; i<j; i++)
- if(re.test(els[i].className))a.push(els[i]);
- return a;
- }
-}
-
-function uncheckOfficialLists() {
- var codepicks;
- if (document.getElementsByClassName) {
- codepicks = document.getElementsByClassName('LC_cloners_instcodes');
- } else {
- codepicks = getElementsByClassName(document.body,'LC_cloners_instcodes');
- }
- if (codepicks.length) {
- for (var i=0; i<codepicks.length; i++) {
- codepicks[i].selectedIndex = 0;
- }
- }
-}
-
-ENDSCRIPT
- }
- }
- }
if ($can_categorize) {
$categorize_js = <<ENDSCRIPT;
function catsbrowser() {
@@ -2499,95 +1729,11 @@ function syllabusinfo() {
}
}
ENDSCRIPT
- my $menuitems_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 = <<ENDSCRIPT;
-function toggleAddmenucoll() {
- if (document.getElementById('menucollections_add')) {
- var state = 'none';
- var add = document.getElementById('menucollections_add').checked;
- if (add) {
- state = 'inline-block';
- }
- var fieldsets = new Array('shown','text','links','list','inline');
- for (var i=0; i<fieldsets.length; i++) {
- if (document.getElementById('addmenucoll_'+fieldsets[i])) {
- document.getElementById('addmenucoll_'+fieldsets[i]).style.display = state;
- }
- }
- var box = document.getElementsByClassName('LC_menucoll_add');
- if (box.length) {
- for (var i=0; i<box.length; i++) {
- if (add) {
- box[i].checked = true;
- } else {
- box[i].checked = false;
- }
- }
- }
- if (document.getElementById('menudefault')) {
- var menudef = document.getElementById('menudefault');
- var currsel = menudef.selectedIndex;
- var colls = new Array($collections);
- menudef.options.length = 0;
- if (!add) {
- if (currsel == 1 + colls.length) {
- currsel = 0;
- }
- }
- if (currsel == 0) {
- menudef.options[0] = new Option('$deftext','',true,true);
- } else {
- menudef.options[0] = new Option('$deftext','',false,false);
- }
- if (colls.length) {
- for (var i=0; i<colls.length; i++) {
- var idx = i+1;
- if (currsel == colls[i]) {
- menudef.options[idx] = new Option(colls[i],colls[i],true,true);
- } else {
- menudef.options[idx] = new Option(colls[i],colls[i],false,false);
- }
- }
- }
- if (add) {
- var addidx = 1 + colls.length;
- if (currsel == addidx) {
- menudef.options[addidx] = new Option('$next','$next',true,true);
- } else {
- menudef.options[addidx] = new Option('$next','$next',false,false);
- }
- }
- }
- }
-}
-ENDSCRIPT
- }
$jscript = '<script type="text/javascript" language="Javascript">'."\n".
- '// <![CDATA['."\n".
+ '// <![CDATA['."\n".
$browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
- $cloners_js."\n".$instcode_js.
- $syllabus_js."\n".$menuitems_js."\n".
- &linkprot_javascript()."\n".'//]]>'."\n".
+ $cloners_js."\n".
+ $syllabus_js."\n".'//]]>'."\n".
'</script>'."\n".$stubrowse_js."\n";
return $jscript;
}
@@ -2622,7 +1768,7 @@ function update_cloners(caller,num) {
if (document.$formname.cloners_activate[i].value == '0') {
document.$formname.cloners_activate[i].checked = false;
}
- if (document.$formname.cloners_activate[i].value == '-1') {
+ if (document.$formname.cloners_activate[i].value == '') {
document.$formname.cloners_activate[i].checked = true;
}
}
@@ -2673,144 +1819,30 @@ function getIndexByName(item) {
ENDSCRIPT
}
-sub linkprot_javascript {
- return <<"ENDSCRIPT";
-function toggleLinkProt(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<radioname.length; i++) {
- if (radioname[i].checked == true) {
- if (radioname[i].value == 1) {
- newdivid.style.display = 'inline-block';
- currdivid.style.display = 'none';
- setvis = 1;
- }
- break;
- }
- }
- if (!setvis) {
- newdivid.style.display = 'none';
- currdivid.style.display = 'inline-block';
- }
- }
- }
- }
- return;
-}
-
-function toggleLinkProtReqUser(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<itemname.length; i++) {
- if (itemname[i].checked == true) {
- if (itemname[i].value == valon) {
- extraid.style.display = styleon;
- setvis = 1;
- }
- break;
- }
- }
- if (!setvis) {
- extraid.style.display = 'none';
- }
- }
- }
- }
- return;
-}
-ENDSCRIPT
-
-}
-
sub print_courseinfo {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
- my ($cathash,$categoriesform,$autocoowner,$clonedefaults,$disabled);
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
+ my ($cathash,$categoriesform,$autocoowner);
my %domconf =
- &Apache::lonnet::get_dom('configuration',
- ['coursecategories','autoenroll','coursedefaults'],$cdom);
+ &Apache::lonnet::get_dom('configuration',['coursecategories','autoenroll'],$cdom);
if (ref($domconf{'coursecategories'}) eq 'HASH') {
$cathash = $domconf{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
$categoriesform =
&Apache::loncommon::assign_categories_table($cathash,
- $settings->{'categories'},$crstype,$disabled)."\n";
+ $settings->{'categories'},$crstype)."\n";
}
}
if (ref($domconf{'autoenroll'}) eq 'HASH') {
$autocoowner = $domconf{'autoenroll'}{'co-owners'};
}
- my ($currcanclone,@code_order,$cloner_instcode);
- my %codedefaults;
- &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
- \@code_order);
- if ($settings->{'cloners'}) {
- unless ($settings->{'cloners'} eq '*') {
- my @currclone = split(/,/,$settings->{'cloners'});
- foreach my $item (@currclone) {
- unless ($item eq '*') {
- if (($item !~ /\:/) && ($item =~ /=/)) {
- $cloner_instcode = 1;
- }
- }
- }
- }
- }
- if (ref($domconf{'coursedefaults'}) eq 'HASH') {
- my $canclone = $domconf{'coursedefaults'}{'canclone'};
- if (ref($canclone) eq 'HASH') {
- if (ref($canclone->{'instcode'}) eq 'ARRAY') {
- if ($settings->{'internal.coursecode'}) {
- my @posscodes;
- if (@code_order > 0) {
- $currcanclone = 'instcode';
- foreach my $item (@{$canclone->{'instcode'}}) {
- if (grep(/^\Q$item\E$/,@code_order)) {
- push(@posscodes,$item);
- }
- }
- my $codestr = join(' + ',@posscodes);
- $clonedefaults = &mt('Default for official courses is to also allow cloning if [_1] match in cloner and cloned.',
- '"<span class="LC_nobreak" style="font-style:italic">'.$codestr.'</span>"').'<br />';
- }
- }
- }
- } elsif ($canclone eq 'domain') {
- $clonedefaults = &mt('Default is for any course requester in [_1] domain to be able to clone.',
- '<span class="LC_nobreak" style="font-style:italic">'.$cdom.'</span>').'<br />';
- $currcanclone = 'domain';
- }
- if ($clonedefaults) {
- if ($settings->{'cloners'} ne '') {
- $clonedefaults .= '<br />'.&mt('Default does [_1]not[_2] currently apply because values have been set in the course.','<b>','</b>');
- } else {
- $clonedefaults .= &mt('Default is disregarded if [_1]any[_2] values are set here in the course.','<i>','</i>');
- }
- $clonedefaults = '<br /><br />'.$clonedefaults;
- }
- }
if (!defined($categoriesform)) {
$categoriesform = &mt('No categories defined in this domain.');
}
+
my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -2820,20 +1852,14 @@ sub print_courseinfo {
} else {
$replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
}
- my ($editmap,$editsyllabus);
- unless ($noedit) {
- $editmap = (' 'x2).
- '<a href="javascript:openbrowser'.
- "('display','url','sequence')\">".
- &mt('Select Map').'</a><br /><span class="LC_warning"> '.
- &mt('Modification may make assessment data inaccessible!').
- '</span>';
- $editsyllabus = &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
- '</a>');
- }
my %items = (
'url' => {
- text => '<b>'.&mt($itemtext->{'url'}).'</b>'.$editmap,
+ text => '<b>'.&mt($itemtext->{'url'}).'</b>'.(' 'x2).
+ '<a href="javascript:openbrowser'.
+ "('display','url','sequence')\">".
+ &mt('Select Map').'</a><br /><span class="LC_warning"> '.
+ &mt('Modification may make assessment data inaccessible!').
+ '</span>',
input => 'textbox',
size => '55',
advanced => 1
@@ -2863,8 +1889,7 @@ sub print_courseinfo {
},
'cloners' => {
text => '<b>'.&mt($itemtext->{'cloners'}).'</b><br />'.
- &mt('Owner and Coordinators included automatically').
- $clonedefaults,
+ &mt('Owner and Coordinators included automatically'),
input => 'textbox',
size => '40'
},
@@ -2875,10 +1900,11 @@ sub print_courseinfo {
size => '20',
advanced => 1
},
- 'syllabus' => {
- text => '<b>'.&mt($itemtext->{'syllabus'}).'</b><br />'.
+ 'externalsyllabus' => {
+ text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />'.
&mt('(Syllabus type in use)').(' ' x2).
- $editsyllabus,
+ &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
+ '</a>'),
},
'hidefromcat' => {
text => '<b>'.&mt($itemtext->{'hidefromcat'}).'</b><br />'.
@@ -2910,7 +1936,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) {
@@ -2919,7 +1945,7 @@ sub print_courseinfo {
$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
}
if ($items{$item}{input} eq 'radio') {
- $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
+ $datatable .= &yesno_radio($item,$settings);
} elsif ($item eq 'cloners') {
my $includeempty = 1;
my $num = 0;
@@ -2933,14 +1959,13 @@ sub print_courseinfo {
$datatable .= ' checked="checked" ';
}
$datatable .= 'onchange="javascript:update_cloners('.
- "'cloners_all'".');"'.$disabled.' />'.&mt('Yes').'</label>'.
- (' 'x2).'<label>'.
- '<input type="radio" name="cloners_all" value="0" ';
+ "'cloners_all'".');" />'.&mt('Yes').'</label>'.
+ (' 'x2).'<input type="radio" name="cloners_all" value="0" ';
if ($settings->{$item} ne '*') {
$datatable .= ' checked="checked" ';
}
$datatable .= ' onchange="javascript:update_cloners('.
- "'cloners_all'".');"'.$disabled.' />'.&mt('No').'</label></td>'.
+ "'cloners_all'".');"/>'.&mt('No').'</label></td>'.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
'<table><tr><td align="left"><b>'.&mt('Or').
@@ -2948,13 +1973,7 @@ sub print_courseinfo {
&Apache::loncommon::start_data_table();
my @cloners;
if ($settings->{$item} eq '') {
- unless ($noedit) {
- my $default;
- if ($currcanclone eq 'domain') {
- $default = '0';
- }
- $datatable .= &new_cloners_dom_row($cdom,'0',$default);
- }
+ $datatable .= &new_cloners_dom_row($cdom,'0');
} elsif ($settings->{$item} ne '*') {
my @entries = split(/,/,$settings->{$item});
if (@entries > 0) {
@@ -2975,7 +1994,7 @@ sub print_courseinfo {
'</b><input type="hidden" name="cloners_dom_'.$num.
'" value="'.$udom.'" /></span><br />'.
'<span class="LC_nobreak"><label><input type="checkbox" '.
- 'name="cloners_delete" value="'.$num.'" onchange="javascript:update_cloners('."'cloners_delete','$num'".');"'.$disabled.' />'.
+ 'name="cloners_delete" value="'.$num.'" onchange="javascript:update_cloners('."'cloners_delete','$num'".');" />'.
&mt('Delete').'</label></span></td>'.
&Apache::loncommon::end_data_table_row();
$num ++;
@@ -2998,8 +2017,7 @@ sub print_courseinfo {
'<td align="left"><span class="LC_nobreak">'.
$add_domtitle.'</span><br />'.
&Apache::loncommon::select_dom_form('','cloners_newdom',
- $includeempty,undef,undef,
- undef,undef,$noedit).
+ $includeempty).
'<input type="hidden" name="cloners_total" value="'.$num.'" />'.
'</td>'.&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
@@ -3011,40 +2029,9 @@ sub print_courseinfo {
&mt('Specific users').' (<tt>'.
&mt('user:domain,user:domain').'</tt>)<br />'.
&Apache::lonhtmlcommon::textbox($item,$cloners_str,
- $items{$item}{'size'},$disabled).
+ $items{$item}{'size'}).
'</td>'.&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
- if (@code_order > 0) {
- my (%cat_items,@codetitles,%cat_titles,%cat_order);
- my ($jscript,$totcodes,$numtitles,$lasttitle) =
- &Apache::courseclassifier::instcode_selectors_data($cdom,'display',
- \%cat_items,\@codetitles,
- \%cat_titles,\%cat_order);
- my $showncodes = 'off';
- my $checkedoff = ' checked="checked"';
- my $checkedon = '';
- if ($cloner_instcode) {
- $checkedon = $checkedoff;
- $checkedoff = '';
- $showncodes = 'on';
- }
- $datatable .= '<table><tr><td align="left"><b>'.&mt('And').
- '</b></td></tr></table>'.
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_row().
- '<td align="left"><span class="LC_nobreak">'.
- &mt('Cloning by official course(s) based on course category').(' 'x2).
- '<label>'.
- '<input type="radio" name="cloners_instcode" value="1" onclick="toggleCloners(this);"'.$checkedon.$disabled.' />'.&mt('Yes').'</label>'.
- (' ').
- '<label>'.
- '<input type="radio" name="cloners_instcode" value="0" onclick="toggleCloners(this);"'.$checkedoff.$disabled.' />'.&mt('No').'</label>'.
- &Apache::courseclassifier::build_instcode_selectors($numtitles,
- $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order,
- $showncodes,'LC_cloners_instcodes','LC_cloners_instcode',$noedit).
- '</td>'.&Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table();
- }
} elsif ($item eq 'rolenames') {
$datatable .= '</td><td align="right">'.
&Apache::loncommon::start_data_table();
@@ -3062,17 +2049,12 @@ sub print_courseinfo {
'</span></td><td align="left">'.
&Apache::lonhtmlcommon::textbox('rolenames_'.$role,
$settings->{$role.'.plaintext'},
- $items{$item}{size},$disabled).'</td>'.
+ $items{$item}{size}).'</td>'.
&Apache::loncommon::end_data_table_row();
}
$datatable .= &Apache::loncommon::end_data_table().'</td>';
} elsif ($item eq 'categories') {
- my $launcher;
- if ($noedit) {
- $launcher = $disabled;
- } else {
- $launcher = 'onfocus="this.blur();javascript:catsbrowser();"';
- }
+ my $launcher = 'onfocus="this.blur();javascript:catsbrowser();"';
$datatable .= '<input type="hidden" name="categories" value="'.$settings->{$item}.'" />'.
&Apache::lonhtmlcommon::textbox($item.'_display',$settings->{$item},
$items{$item}{size},$launcher);
@@ -3093,12 +2075,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;
}
@@ -3112,16 +2094,16 @@ sub print_courseinfo {
if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
$datatable .= &show_autocoowners(@currcoown);
} else {
- $datatable .= &coowner_invitations($cnum,$cdom,\@currcoown,$noedit);
+ $datatable .= &coowner_invitations($cnum,$cdom,@currcoown);
}
} else {
if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
$datatable .= &show_autocoowners(@currcoown);
} else {
- $datatable .= &manage_coownership($cnum,$cdom,\@currcoown,$noedit);
+ $datatable .= &manage_coownership($cnum,$cdom,@currcoown);
}
}
- } 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'};
@@ -3145,12 +2127,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]',
'<a href="javascript:syllabusinfo();">',
- '</a>');
+ '</a>');
} elsif ($item eq 'loncaparev') {
my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
my $showreqd;
@@ -3162,7 +2144,7 @@ sub print_courseinfo {
}
$datatable .= $showreqd;
} else {
- $datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size},$disabled);
+ $datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size});
}
$datatable .= &item_table_row_end();
}
@@ -3171,24 +2153,19 @@ sub print_courseinfo {
}
sub new_cloners_dom_row {
- my ($newdom,$num,$default) = @_;
- my ($output,$checkedon,$checkedoff);
+ my ($newdom,$num) = @_;
+ my $output;
if ($newdom ne '') {
- if ($num eq $default) {
- $checkedon = 'checked="checked" ';
- } else {
- $checkedoff = 'checked="checked" ';
- }
$output .= &Apache::loncommon::start_data_table_row().
'<td valign="top"><span class="LC_nobreak">'.
&mt('Any user in domain:').' <b>'.$newdom.'</b>'.
(' 'x2).'<label><input type="radio" '.
- 'name="cloners_activate" value="'.$num.'" '.$checkedon.
+ 'name="cloners_activate" value="'.$num.'" '.
'onchange="javascript:update_cloners('.
"'cloners_activate','$num'".');" />'.
&mt('Yes').'</label>'.(' 'x2).
'<label><input type="radio" '.
- 'name="cloners_activate" value="-1" '.$checkedoff.
+ 'name="cloners_activate" value="" checked="checked" '.
'onchange="javascript:update_cloners('.
"'cloners_activate','$num'".');" />'.
&mt('No').'</label><input type="hidden" name="cloners_dom_'.
@@ -3249,7 +2226,6 @@ sub assign_course_categories {
} else {
$alert = &mt("Use 'Save' in the main window to save course categories");
}
- &js_escape(\$alert);
$catwin_js = <<ENDSCRIPT;
<script type="text/javascript">
@@ -3326,7 +2302,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'};
@@ -3359,8 +2335,8 @@ sub display_loncaparev_constraints {
} else {
$value = '';
}
- } elsif ($item eq 'printstartdate') {
- if ($value =~ /^\d+$/) {
+ } elsif ($item eq 'printstartdate') {
+ if ($value =~ /^\d+$/) {
if ($value > $now) {
$value = 'future';
}
@@ -3371,7 +2347,6 @@ sub display_loncaparev_constraints {
$value = 'past';
}
}
-
}
my ($middle,$scope,$which,$level,$map,$resource);
if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
@@ -3552,7 +2527,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().
'<td>'.$rev.'</td><td>'.$lt{$type}.'</td><td>';
@@ -3632,7 +2607,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;
}
@@ -3845,13 +2820,8 @@ 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;
if (ref($bymap->{$url}) eq 'HASH') {
foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
- if ($newrow) {
- $r->print(&Apache::loncommon::end_data_table_row().
- &Apache::loncommon::continue_data_table_row());
- }
$r->print('<td valign="middle">'.$rev.'</td><td>');
if (ref($bymap->{$url}{$rev}) eq 'HASH') {
$r->print('<table border="0">');
@@ -3873,7 +2843,6 @@ sub releases_by_map {
$r->print('</table>');
}
$r->print('</td>');
- $newrow = 1;
}
} else {
$r->print('<td colspan="2"> </td>');
@@ -3930,20 +2899,13 @@ sub show_autocoowners {
}
sub coowner_invitations {
- my ($cnum,$cdom,$currcoownref,$noedit) = @_;
- my ($output,@pendingcoown,@othercoords,@currcoown);
+ my ($cnum,$cdom,@currcoown) = @_;
+ my ($output,@pendingcoown,@othercoords);
my $pendingcoowners =
$env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
if ($pendingcoowners) {
@pendingcoown = split(',',$pendingcoowners);
}
- if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
- }
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
my $ccrole = 'cc';
my %ccroles = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,undef,[$ccrole]);
foreach my $key (sort(keys(%ccroles))) {
@@ -3961,7 +2923,7 @@ sub coowner_invitations {
'<td><i>'.&mt('Current co-owners').'</i></td><td>';
foreach my $person (@currcoown) {
my ($co_uname,$co_dom) = split(':',$person);
- $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="coowners" checked="checked" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="coowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
}
$output .= '</td>'.
&Apache::loncommon::end_data_table_row();
@@ -3971,7 +2933,7 @@ sub coowner_invitations {
'<td><i>'.&mt('Invited as co-owners [_1](agreement pending)','<br />').'</i></td><td>';
foreach my $person (@pendingcoown) {
my ($co_uname,$co_dom) = split(':',$person);
- $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="pendingcoowners" checked="checked" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="pendingcoowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
}
$output .= '</td>'.
&Apache::loncommon::end_data_table_row();
@@ -3981,7 +2943,7 @@ sub coowner_invitations {
'<td><i>'.&mt('Invite other Coordinators [_1]to become co-owners','<br />').'</i></td><td>';
foreach my $person (@othercoords) {
my ($co_uname,$co_dom) = split(':',$person);
- $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="invitecoowners" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="invitecoowners" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
}
$output .= '</td>'.
&Apache::loncommon::end_data_table_row();
@@ -3994,20 +2956,13 @@ sub coowner_invitations {
}
sub manage_coownership {
- my ($cnum,$cdom,$currcoownref,$noedit) = @_;
- my (@pendingcoown,@currcoown);
+ my ($cnum,$cdom,@currcoown) = @_;
+ my (@pendingcoown);
my $pendingcoowners =
$env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
if ($pendingcoowners) {
@pendingcoown = split(',',$pendingcoowners);
}
- if (ref($currcoownref) eq 'ARRAY') {
- @currcoown = @{$currcoownref};
- }
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
my ($is_coowner,$is_pending,$output);
my $uname = $env{'user.name'};
my $udom = $env{'user.domain'};
@@ -4037,10 +2992,10 @@ sub manage_coownership {
}
$output .= '<span class="LC_nobreak">';
if ($is_coowner) {
- $output .= &mt('You are currently a co-owner:').' <label><input type="checkbox" name="remove_coowner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
+ $output .= &mt('You are currently a co-owner:').' <label><input type="checkbox" name="remove_coowoner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
} else {
- $output .= &mt('The course owner has invited you to become a co-owner:').' <label><input type="radio" name="pending_coowner" value="accept"'.$disabled.' />'.&mt('Accept?').'</label>'.(' 'x2).
- '<label><input type="radio" name=pending_coowner" value="decline"'.$disabled.' />'.&mt('Decline?').'</label>';
+ $output .= &mt('The course owner has invited you to become a co-owner:').' <label><input type="radio" name="pending_coowoner" value="accept" />'.&mt('Accept?').'</label>'.(' 'x2).
+ '<label><input type="radio" name=pending_coowoner" value="decline" />'.&mt('Decline?').'</label>';
}
$output .= '</span>';
if (@currcoown) {
@@ -4054,7 +3009,7 @@ sub manage_coownership {
}
sub print_localization {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4073,16 +3028,13 @@ sub print_localization {
input => 'selectbox',
},
);
- my ($datatable,$disabled);
+ my $datatable;
my $count = 0;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
foreach my $item (@{$ordered}) {
$count ++;
my $colspan;
unless ($item eq 'languages') {
- $colspan = 2;
+ $colspan = 2;
}
$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
if ($item eq 'timezone') {
@@ -4090,7 +3042,7 @@ sub print_localization {
my $timezone = &Apache::lonlocal::gettimezone();
$datatable .=
&Apache::loncommon::select_timezone($item,$timezone,undef,
- $includeempty,$disabled);
+ $includeempty);
} elsif ($item eq 'datelocale') {
my $includeempty = 1;
my $locale_obj = &Apache::lonlocal::getdatelocale();
@@ -4100,13 +3052,11 @@ sub print_localization {
}
$datatable .=
&Apache::loncommon::select_datelocale($item,$currdatelocale,
- undef,$includeempty,$disabled);
+ undef,$includeempty);
} else {
if ($settings->{$item} eq '') {
- unless ($noedit) {
- $datatable .= '</td><td align="right">'.
- &Apache::loncommon::select_language('languages_0','',1);
- }
+ $datatable .= '</td><td align="right">'.
+ &Apache::loncommon::select_language('languages_0','',1);
} else {
my $num = 0;
my @languages = split(/\s*[,;:]\s*/,$settings->{$item});
@@ -4126,22 +3076,19 @@ sub print_localization {
'</b><input type="hidden" name="languages_'.$num.
'" value="'.$lang.'" /></span><br />'.
'<span class="LC_nobreak"><label><input type="checkbox" '.
- 'name="languages_delete" value="'.$num.'"'.$disabled.' />'.
+ 'name="languages_delete" value="'.$num.'" />'.
&mt('Delete').'</label></span></td>'.
&Apache::loncommon::end_data_table_row();
$num ++;
}
}
- unless ($noedit) {
- $datatable .=
- &Apache::loncommon::start_data_table_row().
+ $datatable .= &Apache::loncommon::start_data_table_row().
'<td align="left"><span class="LC_nobreak">'.
&mt('Additional language:'). '</span><br />'.
&Apache::loncommon::select_language('languages_'.$num,'',1).
'<input type="hidden" name="languages_total" value="'.$num.'" />'.
- '</td>'.&Apache::loncommon::end_data_table_row();
- }
- $datatable .= &Apache::loncommon::end_data_table().'<br />';
+ '</td>'.&Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table().'<br />';
}
}
$datatable .= &item_table_row_end();
@@ -4162,7 +3109,7 @@ sub get_lang_choices {
}
sub print_feedback {
- my ($position,$cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
+ my ($position,$cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4197,10 +3144,7 @@ sub print_feedback {
del => 'Delete?',
sec => 'Sections:',
);
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
+
foreach my $item (@{$ordered}) {
$count ++;
if ($position eq 'top') {
@@ -4210,12 +3154,12 @@ sub print_feedback {
}
if ($position eq 'top') {
my $includeempty = 0;
- $datatable .= '</td><td align="right">'.
- &user_table($cdom,$item,\@sections,
- $settings->{$item},\%lt,$noedit);
+ $datatable .= '</td><td align="right">'.
+ &user_table($cdom,$item,\@sections,
+ $settings->{$item},\%lt);
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
- $settings->{$item.'.text'},$items{$item}{size},$disabled);
+ $settings->{$item.'.text'},$items{$item}{size});
}
$datatable .= &item_table_row_end();
}
@@ -4224,21 +3168,15 @@ sub print_feedback {
}
sub user_table {
- my ($cdom,$item,$sections,$currvalue,$lt,$noedit) = @_;
+ my ($cdom,$item,$sections,$currvalue,$lt) = @_;
my $output;
if ($currvalue eq '') {
- unless ($noedit) {
- $output .= &select_recipient($item,'0',$cdom,$sections);
- }
+ $output .= &select_recipient($item,'0',$cdom,$sections);
} else {
my $num = 0;
my @curr = split(/,/,$currvalue);
$output .= '<table class="LC_data_table">';
my ($currusers);
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
foreach my $val (@curr) {
next if ($val eq '');
my ($uname,$udom,$seclist) = ($val =~ /^($match_username):($match_domain)(\(?[^\)]*\)?)$/);
@@ -4250,7 +3188,7 @@ sub user_table {
$currusers .= '<tr>'.
'<td valign="top"><span class="LC_nobreak">'.
'<label><input type="checkbox" '.
- 'name="'.$item.'_delete" value="'.$num.'"'.$disabled.' />'.
+ 'name="'.$item.'_delete" value="'.$num.'" />'.
$lt->{'del'}.'</label>'.
'<input type="hidden" name="'.$item.'_user_'.
$num.'" value="'.$uname.':'.$udom.'" />'.(' 'x2).
@@ -4261,7 +3199,7 @@ sub user_table {
if (@{$sections}) {
$currusers.= (' 'x3).$lt->{'sec'}.' '.
&select_sections($item,$num,$sections,
- \@selsec,$noedit);
+ \@selsec);
}
}
$currusers .= '</span></td></tr>';
@@ -4279,16 +3217,12 @@ sub user_table {
'<table>'.$currusers.'</table></td>'.
'</tr>';
}
- unless ($noedit) {
- $output .=
- '<tr>'.
+ $output .= '<tr>'.
'<td align="left"><span class="LC_nobreak"><i>'.
$lt->{'add'}.'</i></span><br />'.
&select_recipient($item,$num,$cdom,$sections).
'<input type="hidden" name="'.$item.'_total" value="'.$num.'" />'.
- '</td></tr>';
- }
- $output .= '</table>';
+ '</td></tr></table>';
}
return $output;
}
@@ -4298,7 +3232,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 =
'<table><tr><td align="center">'.&mt('Username').'<br />'.
'<input type="text" name="'.$item.'_uname_'.$num.'" value="" /></td>'.
@@ -4315,17 +3249,14 @@ sub select_recipient {
}
sub select_sections {
- my ($item,$num,$sections,$selected,$noedit) = @_;
- my ($output,@currsecs,$allsec,$disabled);
+ my ($item,$num,$sections,$selected) = @_;
+ my ($output,@currsecs,$allsec);
if (ref($selected) eq 'ARRAY') {
@currsecs = @{$selected};
}
if (!@currsecs) {
$allsec = ' selected="selected"';
}
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
if (ref($sections) eq 'ARRAY') {
if (@{$sections}) {
my $mult;
@@ -4335,7 +3266,7 @@ sub select_sections {
$mult .= ' size="4"';
}
}
- $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.$disabled.'>'.
+ $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.'>'.
' <option value=""'.$allsec.'>'.&mt('All').'</option>';
foreach my $sec (@{$sections}) {
my $is_sel;
@@ -4351,7 +3282,7 @@ sub select_sections {
}
sub print_discussion {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4413,26 +3344,26 @@ 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 .= '</td><td align="right">'.
- '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
+ '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
'</table>';
} elsif ($item eq 'plc.users.denied') {
- $datatable .= '</td><td align="right">'.
- &user_table($cdom,$item,undef,
- $settings->{$item},\%lt,$noedit);
+ $datatable .= '</td><td align="right">'.
+ &user_table($cdom,$item,undef,
+ $settings->{$item},\%lt);
} elsif ($item eq 'pch.roles.denied') {
$datatable .= '</td><td align="right">'.
- '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
+ '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
'</table>';
} elsif ($item eq 'pch.users.denied') {
$datatable .= '</td><td align="right">'.
&user_table($cdom,$item,undef,
- $settings->{$item},\%lt,$noedit);
+ $settings->{$item},\%lt);
} elsif ($item eq 'allow_limited_html_in_feedback') {
- $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
+ $datatable .= &yesno_radio($item,$settings);
} elsif ($item eq 'allow_discussion_post_editing') {
$datatable .= '</td><td align="right"><br />'.
&Apache::loncommon::start_data_table().
@@ -4440,7 +3371,7 @@ sub print_discussion {
'<th align="left">'.&mt('Role').'</th><th>'.
&mt('Sections').'</th>'.
&Apache::loncommon::end_data_table_row().
- &role_checkboxes($cdom,$cnum,$item,$settings,1,undef,$noedit).
+ &role_checkboxes($cdom,$cnum,$item,$settings,1).
&Apache::loncommon::end_data_table().'<br />';
} elsif ($item eq 'discussion_post_fonts') {
$datatable .= '</td><td align="right"><br />'.
@@ -4450,9 +3381,9 @@ sub print_discussion {
'<th align="center">'.&mt('font-size').'</th>'.
'<th align="center">'.&mt('font-weight').'</th>'.
'<th align="center">'.&mt('font-style').'</th>'.
- '<th align="center">'.&mt('Other css').'</th>'.
+ '<th align="center">'.&mt('Other css').'</th>'.
&Apache::loncommon::end_data_table_row().
- &set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
+ &set_discussion_fonts($cdom,$cnum,$item,$settings).
&Apache::loncommon::end_data_table().'<br />';
}
$datatable .= &item_table_row_end();
@@ -4462,7 +3393,7 @@ sub print_discussion {
}
sub role_checkboxes {
- my ($cdom,$cnum,$item,$settings,$showsections,$crstype,$noedit) = @_;
+ my ($cdom,$cnum,$item,$settings,$showsections,$crstype) = @_;
my @roles = ('st','ad','ta','ep','in');
if ($crstype eq 'Community') {
push(@roles,'co');
@@ -4500,10 +3431,6 @@ sub role_checkboxes {
}
my $numinrow = 3;
my $count = 0;
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
foreach my $role (@roles) {
my $checked = '';
if (grep(/^\Q$role\E$/,@current)) {
@@ -4522,11 +3449,11 @@ sub role_checkboxes {
}
}
$output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name="'.
- $item.'" value="'.$role.'"'.$checked.$disabled.'/> '.
+ $item.'" value="'.$role.'"'.$checked.'/> '.
$plrole.'</label></span></td>';
if ($showsections) {
$output .= '<td align="left">'.
- &select_sections($item,$role,\@sections,$currsec{$role},$noedit).
+ &select_sections($item,$role,\@sections,$currsec{$role}).
'</td></tr>';
}
$count ++;
@@ -4554,11 +3481,11 @@ sub role_checkboxes {
}
}
$output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
- $item.'" value="'.$value.'"'.$checked.$disabled.' /> '.$rolename.
+ $item.'" value="'.$value.'"'.$checked.' /> '.$rolename.
'</label></span></td>';
if ($showsections) {
$output .= '<td>'.
- &select_sections($item,$role,\@sections,$currsec{$role},$noedit).
+ &select_sections($item,$role,\@sections,$currsec{$role}).
'</td>'.&Apache::loncommon::end_data_table_row();
}
$total ++;
@@ -4580,15 +3507,11 @@ sub role_checkboxes {
}
sub set_discussion_fonts {
- my ($cdom,$cnum,$item,$settings,$noedit) = @_;
+ my ($cdom,$cnum,$item,$settings) = @_;
my ($classorder,$classtitles) = &discussion_vote_classes();
my ($styleorder,$styleitems) = &discussion_vote_styles();
my $output;
if (ref($classorder) eq 'ARRAY') {
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
foreach my $cat (@{$classorder}) {
my %curr = ();
($curr{'size'},$curr{'weight'},$curr{'style'},$curr{'other'}) =
@@ -4605,12 +3528,12 @@ sub set_discussion_fonts {
($currsize,$currunit) = ($1,$2);
$curr{'size'} = $currunit;
}
- $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5"'.$disabled.' />'.
+ $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5">'.
' ';
$selitem = 'unit';
}
if ((ref($styleitems) eq 'HASH') && (ref($styleitems->{$item}) eq 'ARRAY')) {
- $output .= '<select name="discussion_post_fonts_'.$cat.'_'.$selitem.'"'.$disabled.'>';
+ $output .= '<select name="discussion_post_fonts_'.$cat.'_'.$selitem.'">';
foreach my $val (@{$styleitems->{$item}}) {
my $sel;
if ($val eq $curr{$item}) {
@@ -4621,7 +3544,7 @@ sub set_discussion_fonts {
}
}
}
- $output .= '</span></td><td><input type="textbox" size="10" name="discussion_post_fonts_'.$cat.'_other" value="'.$curr{'other'}.'"'.$disabled.' /></td>';
+ $output .= '</span></td><td><input type="textbox" size="10" name="discussion_post_fonts_'.$cat.'_other" value="'.$curr{'other'}.'" /></td>';
}
$output .= &Apache::loncommon::end_data_table_row();
}
@@ -4630,7 +3553,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',
@@ -4653,7 +3576,7 @@ sub discussion_vote_styles {
}
sub print_classlists {
- my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
my @ordered;
if ($position eq 'top') {
@ordered = ('default_enrollment_start_date',
@@ -4696,7 +3619,7 @@ sub print_classlists {
'defaultcredits' => {
text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
},
-
+
'nothideprivileged' => {
text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
input => 'checkbox',
@@ -4727,11 +3650,11 @@ sub print_classlists {
($settings->{'student_classlist_view'} eq 'section')) {
$settings->{'student_classlist_view'} = 'disabled';
}
- return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists',$noedit);
+ return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists');
}
sub print_appearance {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4764,10 +3687,11 @@ sub print_appearance {
input => 'selectbox',
options => {
MathJax => 'MathJax',
+ jsMath => 'jsMath',
mimetex => &mt('Convert to Images'),
tth => &mt('TeX to HTML'),
},
- order => ['MathJax','mimetex','tth'],
+ order => ['MathJax','jsMath','mimetex','tth'],
nullval => $mathdef,
},
'tthoptions' => {
@@ -4783,16 +3707,12 @@ sub print_appearance {
text => '<b>'.&mt($itemtext->{'usejsme'}).'</b>',
input => 'radio',
},
- 'inline_chem' => {
- text => '<b>'.&mt($itemtext->{'inline_chem'}).'</b>',
- input => 'radio',
- },
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance',$noedit);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance');
}
sub print_grading {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4803,11 +3723,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 => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
@@ -4843,11 +3764,11 @@ sub print_grading {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading');
}
sub print_printouts {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4896,11 +3817,11 @@ sub print_printouts {
nullval => &mt('None specified - use domain default'),
}
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts',$noedit);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts');
}
sub print_spreadsheet {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4932,11 +3853,11 @@ sub print_spreadsheet {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet',$noedit);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet');
}
sub print_bridgetasks {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4974,580 +3895,11 @@ sub print_bridgetasks {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit);
-}
-
-sub ltimenu_titles {
- return &Apache::lonlocal::texthash(
- fullname => 'Full name',
- coursetitle => 'Course title',
- role => 'Role',
- logout => 'Logout',
- grades => 'Grades',
- );
-}
-
-sub print_menuitems {
- my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype,$noedit) = @_;
- unless ((ref($settings) eq 'HASH') && (ref($itemtext) eq 'HASH')) {
- return;
- }
- if ($position eq 'top') {
- my (%defaultmenu_options,@defaultmenu_order,$addcollection);
- if ($settings->{'menucollections'} ne '') {
- foreach my $item (split(/;/,$settings->{'menucollections'})) {
- my ($num,$value) = split(/\%/,$item);
- if ($num =~ /^\d+$/) {
- $defaultmenu_options{$num} = $num;
- }
- }
- @defaultmenu_order = sort { $a <=> $b } keys(%defaultmenu_options);
- $addcollection = $defaultmenu_order[-1] + 1;
- } else {
- $addcollection = 1;
- }
- $defaultmenu_options{$addcollection} = $addcollection;
- my %items = (
- 'menudefault' => {
- text => '<b>'.&mt($itemtext->{'menudefault'}).'</b><br />'.
- &mt("(can be overriden in deep-link context)"),
- input => 'selectbox',
- options => \%defaultmenu_options,
- order => \@defaultmenu_order,
- nullval => &mt('Standard (all menus shown)'),
- },
- );
- return &make_item_rows($cdom,\%items,['menudefault'],$settings,$rowtotal,$crstype,'menuitems',$noedit);
- } else {
- my %menu;
- my $count = 0;
- my $next = 1;
- my ($datatable,$disabled);
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
-
- my ($ordered,$cats) = &menuitems_categories();
- my @order = @{$ordered};
- my %categories = %{$cats};
- my %menutitles = &menuitems_titles();
- my %menufields = &menuitems_fields();
-
- if ($settings->{'menucollections'} ne '') {
- foreach my $item (split(/;/,$settings->{'menucollections'})) {
- my ($num,$value) = split(/\%/,$item);
- if ($num =~ /^\d+$/) {
- my @entries = split(/\&/,$value);
- foreach my $entry (@entries) {
- my ($name,$fields) = split(/=/,$entry);
- $menu{$num}{$name} = $fields;
- }
- }
- }
- if (keys(%menu)) {
- my @current = sort { $a <=> $b } keys(%menu);
- $next += $current[-1];
- foreach my $num (@current) {
- my %checked;
- my $on = ' checked="checked"';
- foreach my $key (keys(%{$menu{$num}})) {
- if (($key eq 'top') || ($key eq 'inline') || ($key eq 'foot') || ($key eq 'main')) {
- if ($menu{$num}{$key} eq 'y') {
- $checked{$key} = $on;
- }
- } else {
- foreach my $field (split(/,/,$menu{$num}{$key})) {
- if (exists($menufields{$field})) {
- $checked{$field} = $on;
- }
- }
- }
- }
- if (ref($menu{$num}) eq 'HASH') {
- $datatable .= &item_table_row_start('<em class="LC_nav_bar">'.$num.'</em>',$count,'','','','LC_left_item');
- foreach my $category (@order) {
- if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
- $datatable .= '<fieldset style="vertical-align:top; display:inline-block"><legend>'.$menutitles{$category}.'</legend>'."\n";
- if ($category eq 'text') {
- $datatable .= '<i>'.&mt('Header').'</i><br />';
- }
- foreach my $field (@{$categories{$category}}) {
- if ($field eq 'disc') {
- $datatable .= '<br /><i>'.&mt('Footer').'</i><br />';
- }
- $datatable .= '<label><input type="checkbox" name="menucollections_'.$num.'" value="'.$field.'"'.$checked{$field}.$disabled.' />'.
- $menufields{$field}.'</label><br />';
- }
- $datatable .= '</fieldset>';
- }
- }
- $datatable .= &item_table_row_end();
- $count ++;
- }
- }
- }
- } elsif ($noedit) {
- my $text = &mt('No menu collections defined for this course.');
- $datatable .= &item_table_row_start($text,$count);
- }
- unless ($noedit) {
- my $add = '<label><input type="checkbox" name="menucollections_add" id="menucollections_add" value="'.$next.'" '.
- 'onclick="javascript:toggleAddmenucoll();" />'.&mt('Add').'</label>';
- $datatable .= &item_table_row_start($add,$count,'','','','LC_left_item');
- foreach my $category (@order) {
- if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
- $datatable .= '<fieldset id="addmenucoll_'.$category.'" style="display:none; vertical-align:top;"><legend>'.$menutitles{$category}.'</legend>'."\n";
- foreach my $field (@{$categories{$category}}) {
- $datatable .= '<label><input type="checkbox" class="LC_menucoll_add" name="menucollections_'.$next.'" value="'.$field.'"'.$disabled.' />'.
- $menufields{$field}.'</label><br />';
- }
- $datatable .= '</fieldset>';
- }
- }
- $datatable .= &item_table_row_end();
- $count ++;
- }
- return $datatable;
- }
-}
-
-sub menuitems_abbreviations {
- my %briefcats = (
- text => 'pt',
- links => 'p',
- list => 'ps',
- inline => 's',
- );
- return %briefcats;
-}
-
-sub menuitems_categories {
- my @order = ('shown','text','links','list','inline');
- my %categories = (
- shown => ['top','inline','foot','main'],
- text => ['name','role','crs','disc','fdbk'],
- links => ['pers','logo','comm','roles','help','logout'],
- list => ['about','prefs','port','wish','anno','rss'],
- inline => ['cont','grades','chat','people','groups','resv','syll','feeds'],
- );
- return (\@order,\%categories);
-}
-
-sub menuitems_titles {
- return &Apache::lonlocal::texthash (
- shown => 'Hierarchy',
- text => 'Text',
- links => 'Header links',
- list => 'Drop-down list',
- inline => 'Inline links',
- );
-}
-
-sub menuitems_fields {
- return &Apache::lonlocal::texthash (
- top => 'Display header',
- inline => 'Display inline menu',
- foot => 'Display footer',
- main => 'Access to main menu',
- pers => 'Personal',
- logo => 'LON-CAPA',
- comm => 'Messages',
- roles => 'Roles/Courses',
- help => 'Help',
- logout => 'Logout',
- name => 'Fullname',
- crs => 'Course Title',
- role => 'Current Role',
- disc => 'Discussion',
- fdbk => 'Feedback',
- about => 'Information',
- prefs => 'Preferences',
- port => 'Portfolio',
- wish => 'Stored Links',
- anno => 'Calendar',
- rss => 'RSS Feeds',
- cont => 'Contents',
- grades => 'Grades',
- chat => 'Chat',
- people => 'People',
- groups => 'Groups',
- resv => 'Reservations',
- syll => 'Syllabus',
- feeds => 'Feeds',
- );
-}
-
-sub menucollections_display {
- my ($collections) = @_;
- my %menu;
- my ($ordered,$cats) = &menuitems_categories();
- my @order = @{$ordered};
- my %categories = %{$cats};
- my %menutitles = &menuitems_titles();
- my %menufields = &menuitems_fields();
- foreach my $item (split(/;/,$collections)) {
- my ($num,$value) = split(/\%/,$item);
- if ($num =~ /^\d+$/) {
- my @entries = split(/\&/,$value);
- foreach my $entry (@entries) {
- my ($name,$fields) = split(/=/,$entry);
- $menu{$num}{$name} = $fields;
- }
- }
- }
- my $output = '';
- if (keys(%menu)) {
- my @current = sort { $a <=> $b } keys(%menu);
- foreach my $num (@current) {
- my %checked;
- foreach my $key (keys(%{$menu{$num}})) {
- if (($key eq 'top') || ($key eq 'inline') || ($key eq 'foot') || ($key eq 'main')) {
- if ($menu{$num}{$key} eq 'y') {
- $checked{$key} = 1;
- }
- } else {
- foreach my $field (split(/,/,$menu{$num}{$key})) {
- if (exists($menufields{$field})) {
- $checked{$field} = 1;
- }
- }
- }
- }
- if (ref($menu{$num}) eq 'HASH') {
- $output .= '<fieldset><legend>'.&mt('Collection [_1]',$num).'</legend>';
- foreach my $category (@order) {
- if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
- $output .= '<fieldset style="vertical-align:top; display:inline-block">'.
- '<legend>'.$menutitles{$category}.'</legend>'."\n";
- if ($category eq 'text') {
- $output .= '<b>'.&mt('Header Text').'</b><br /><br />';
- }
- foreach my $field (@{$categories{$category}}) {
- if ($field eq 'disc') {
- $output .= '<br /><b>'.&mt('Footer Text').'</b><br /><br />';
- }
- if ($checked{$field}) {
- $output .= &Apache::lonhtmlcommon::confirm_success($menufields{$field});
- } else {
- $output .= &Apache::lonhtmlcommon::confirm_success($menufields{$field},1);
- }
- $output .= '<br />';
- }
- $output .= '</fieldset>';
- }
- }
- $output .= '</fieldset>';
- }
- }
- }
- return $output;
-}
-
-sub print_linkprotection {
- my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_;
- unless (ref($settings) eq 'HASH') {
- return;
- }
-
- my %linkprotection;
- my $count = 0;
- my $next = 1;
- my ($datatable,$disabled,$css_class,$dest);
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
- my %desc = &linkprot_names();
- my %lt = &Apache::lonlocal::texthash (
- 'requ' => 'Required settings',
- 'opti' => 'Optional settings',
- );
- my $itemcount = 0;
-
- my $ltiauth;
- if ($context eq 'domain') {
- $ltiauth = 1;
- } else {
- 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 ($context eq 'domain') {
- $dest = '/adm/domainprefs';
- } else {
- $dest = '/adm/courseprefs';
- }
-
- my ($switchserver,$switchmessage);
- $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
- if ($switchserver) {
- if ($context eq 'domain') {
- $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
- } elsif ($crstype eq 'Community') {
- $switchmessage = &mt("submit from community's home server: [_1].",$switchserver);
- } else {
- $switchmessage = &mt("submit from course's home server: [_1].",$switchserver);
- }
- }
-
- if (ref($settings->{'linkprot'}) eq 'HASH') {
- if (keys(%{$settings->{'linkprot'}})) {
- my @current = sort { $a <=> $b } keys(%{$settings->{'linkprot'}});
- $next += $current[-1];
- for (my $i=0; $i<@current; $i++) {
- my $num = $current[$i];
- my %values;
- if (ref($settings->{'linkprot'}->{$num}) eq 'HASH') {
- %values = %{$settings->{'linkprot'}->{$num}};
- } else {
- next;
- }
- my $selected;
- if (($values{'version'} eq 'LTI-1p0') || ($values{'version'} eq '')) {
- $selected = ' selected="selected"';
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .=
- '<tr '.$css_class.'><td><span class="LC_nobreak">'.
- '<label><input type="checkbox" name="linkprot_del" value="'.$i.'"'.$disabled.' />'.
- &mt('Delete?').'</label></span></td><td>';
- my ($usersty,$onclickrequser,%checkedrequser);
- if ($ltiauth) {
- $usersty = 'display:none';
- $onclickrequser = ' onclick="toggleLinkProtReqUser(this.form,'."'requser','optional','1','block','$i'".');"';
- %checkedrequser = (
- no => ' checked="checked"',
- yes => '',
- );
- if ($values{'requser'}) {
- $checkedrequser{'yes'} = $checkedrequser{'no'};
- $checkedrequser{'no'} = '';
- }
- $datatable .= '<fieldset><legend>'.$lt{'requ'}.'</legend>';
- if ($values{'requser'}) {
- $usersty = 'display:inline-block';
- }
- }
- $datatable .=
- '<span class="LC_nobreak">'.$desc{'name'}.
- ':<input type="text" size="15" name="linkprot_name_'.$i.'" value="'.$values{'name'}.'" autocomplete="off"'.$disabled.' /></span> '.
- (' 'x2).
- '<span class="LC_nobreak">'.$desc{'version'}.':<select name="linkprot_version_'.$i.'"'.$disabled.'>'.
- '<option value="LTI-1p0" '.$selected.'>1.1</option></select></span> '."\n".
- (' 'x2).
- '<span class="LC_nobreak">'.$desc{'lifetime'}.':<input type="text" name="linkprot_lifetime_'.$i.'"'.
- ' value="'.$values{'lifetime'}.'" size="3"'.$disabled.' /></span>';
- if ($ltiauth) {
- $datatable .= (' 'x2).'<span class="LC_nobreak">'.$desc{'requser'}.'?'.
- '<label><input type="radio" name="linkprot_requser_'.$i.'" value="0"'.
- $onclickrequser.$checkedrequser{'no'}.$disabled.' />'.&mt('No').'</label> '.
- '<label><input type="radio" name="linkprot_requser_'.$i.'" value="1"'.
- $onclickrequser.$checkedrequser{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>';
- }
- $datatable .= '<br /><br />';
- if ($values{'key'} ne '') {
- $datatable .= '<span class="LC_nobreak">'.$desc{'key'};
- if ($noedit) {
- $datatable .= ': ['.&mt('not shown').']';
- } elsif ($switchserver) {
- $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
- } else {
- $datatable .= ':<input type="text" size="25" name="linkprot_key_'.$i.'" value="'.$values{'key'}.'" autocomplete="off"'.$disabled.' />';
- }
- $datatable .= '</span> '.(' 'x2);
- } elsif (!$switchserver) {
- $datatable .= '<span class="LC_nobreak">'.$desc{'key'}.':'.
- '<input type="text" size="25" name="linkprot_key_'.$i.'" value="'.$values{'key'}.'" autocomplete="off"'.$disabled.' />'.
- '</span> '.(' 'x2);
- }
- if ($switchserver) {
- if ($values{'usable'} ne '') {
- $datatable .= '<div id="linkprot_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
- $desc{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'.
- '<span class="LC_nobreak">'.&mt('Change secret?').
- '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
- (' 'x2).
- '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');" '.$disabled.' />'.&mt('Yes').'</label>'.(' 'x2).
- '</span><div id="linkprot_divchgsecret_'.$i.'" style="display:none" />'.
- '<span class="LC_nobreak"> - '.$switchmessage.'</span>'.
- '</div>';
- } elsif ($values{'key'} eq '') {
- $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
- } else {
- $datatable .= '<span class="LC_nobreak">'.&mt('Secret required').' - '.$switchmessage.'</span>'."\n";
- }
- } else {
- if ($values{'usable'} ne '') {
- $datatable .= '<div id="linkprot_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
- $desc{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'.
- '<span class="LC_nobreak">'.&mt('Change?').
- '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
- (' 'x2).
- '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleLinkProt(this.form,'."'$i','secret'".');"'.$disabled.' />'.&mt('Yes').
- '</label> </span><div id="linkprot_divchgsecret_'.$i.'" style="display:none" />'.
- '<span class="LC_nobreak">'.&mt('New Secret').':'.
- '<input type="password" size="20" name="linkprot_secret_'.$i.'" value="" autocomplete="off"'.$disabled.' />'.
- '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
- '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" /></span></div>';
- } else {
- $datatable .=
- '<span class="LC_nobreak">'.$desc{'secret'}.':'.
- '<input type="password" size="20" name="linkprot_secret_'.$i.'" value="" autocomplete="off"'.$disabled.' />'.
- '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
- '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" /></span>';
- }
- }
- if ($ltiauth) {
- $datatable .=
- '</fieldset>'.
- '<fieldset id="linkprot_optional_'.$i.'" style="'.$usersty.'"><legend>'.$lt{'opti'}.'</legend>'.
- &linkprot_options($i,$itemcount,$disabled,\%values,\%desc).
- '</fieldset>';
- }
- $datatable .= '</td></tr>';
- $itemcount ++;
- }
- }
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
- '<input type="hidden" name="linkprot_maxnum" value="'.$next.'" />'."\n".
- '<input type="checkbox" name="linkprot_add" value="1"'.$disabled.' />'.&mt('Add').'</span></td>'."\n".
- '<td>';
- my ($usersty,$onclickrequser,%checkedrequser);
- if ($ltiauth) {
- $usersty = 'display:none';
- $onclickrequser = ' onclick="toggleLinkProtReqUser(this.form,'."'requser','optional','1','block','add'".');"';
- %checkedrequser = (
- no => ' checked="checked"',
- yes => '',
- );
- $datatable .= '<fieldset><legend>'.$lt{'requ'}.'</legend>';
- }
- $datatable .= '<span class="LC_nobreak">'.$desc{'name'}.
- ':<input type="text" size="15" name="linkprot_name_add" value="" autocomplete="off"'.$disabled.' /></span> '."\n".
- (' 'x2).
- '<span class="LC_nobreak">'.$desc{'version'}.':<select name="linkprot_version_add"'.$disabled.'>'.
- '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
- (' 'x2).
- '<span class="LC_nobreak">'.$desc{'lifetime'}.':<input type="text" size="3" name="linkprot_lifetime_add" value="300"'.$disabled.' /></span> '."\n";
- if ($ltiauth) {
- $datatable .= (' 'x2).'<span class="LC_nobreak">'.$desc{'requser'}.'?'.
- '<label><input type="radio" name="linkprot_requser_add" value="0"'.
- $onclickrequser.$checkedrequser{'no'}.$disabled.' />'.&mt('No').'</label> '.
- '<label><input type="radio" name="linkprot_requser_add" value="1"'.
- $onclickrequser.$checkedrequser{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>';
- }
- $datatable .= '<br /><br />';
- if ($switchserver) {
- $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
- } else {
- $datatable .= '<span class="LC_nobreak">'.$desc{'key'}.':<input type="text" size="25" name="linkprot_key_add" value="" autocomplete="off"'.$disabled.' /></span> '."\n".
- (' 'x2).
- '<span class="LC_nobreak">'.$desc{'secret'}.':<input type="password" size="20" name="linkprot_secret_add" value="" autocomplete="off"'.$disabled.' />'.
- '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.linkprot_secret_add.type='."'text'".' } else { this.form.linkprot_secret_add.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label></span> '."\n";
- }
- if ($ltiauth) {
- $datatable .= '</fieldset>'.
- '<fieldset id="linkprot_optional_add" style="'.$usersty.'"><legend>'.$lt{'opti'}.'</legend>'.
- &linkprot_options('add',$itemcount,$disabled,{},\%desc).
- '</fieldset>';
- }
- $datatable .= '</td></tr>';
- $$rowtotal ++;
- return $datatable;
-}
-
-sub linkprot_names {
- return &Apache::lonlocal::texthash(
- 'version' => 'LTI Version',
- 'key' => 'Key',
- 'lifetime' => 'Nonce lifetime (s)',
- 'name' => 'Launcher Application',
- '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,$context,$dest) = @_;
- my ($allowed,$switchserver,$home);
- if ($context eq 'domain') {
- $home = &Apache::lonnet::domain($cdom,'primary');
- } else {
- $home = &Apache::lonnet::homeserver($cnum,$cdom);
- }
- unless (($home eq 'no_host') || ($home eq '')) {
- my @ids=&Apache::lonnet::current_machine_ids();
- foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
- if (!$allowed) {
- $switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role='.
- &HTML::Entities::encode($env{'request.role'},'\'<>"&').
- '&destinationurl='.$dest.'">'.&mt('Switch Server').'</a>';
- }
- }
- 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="toggleLinkProtReqUser(this.form,'."'mapuser','userfield','other','inline-block','$num'".');"';
- my $output = '<div class="LC_floatleft"><span class="LC_nobreak">'.
- &mt('Source of LON-CAPA username in LTI request').': ';
- foreach my $option ('sourcedid','email','other') {
- $output .= '<label><input type="radio" name="linkprot_mapuser_'.$num.'" value="'.$option.'"'.
- $checked{$option}.$onclickuser.$disabled.' />'.$lt{$option}.'</label>'.
- ($option eq 'other' ? '' : (' 'x2) );
- }
- $output .= '</span></div>'.
- '<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="linkprot_userfield_'.$num.'">'.
- '<input type="text" name="linkprot_customuser_'.$num.'" '.
- 'value="'.$userfield.'"'.$disabled.' /></div>';
- $output .= '<br />'.
- '<div class="LC_floatleft"><span class="LC_nobreak">'.
- &mt('Action when username is not for an enrolled student').': ';
- foreach my $option ('reject','auth') {
- $output .= '<label><input type="radio" name="linkprot_notstudent_'.$num.'" value="'.$option.'"'.
- $checked{$option}.$disabled.' />'.$lt{$option}.'</label>'.
- ($option eq 'auth' ? '' : (' 'x2) );
- }
- $output .= '</span></div>';
- return $output;
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks');
}
sub print_other {
- my ($cdom,$settings,$allitems,$rowtotal,$crstype,$noedit) = @_;
+ my ($cdom,$settings,$allitems,$rowtotal,$crstype) = @_;
unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
return;
}
@@ -5568,7 +3920,7 @@ sub print_other {
input => 'textbox',
size => '30',
};
- return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
+ my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other');
}
sub get_other_items {
@@ -5597,23 +3949,17 @@ sub get_other_items {
}
sub item_table_row_start {
- my ($text,$count,$add_class,$colspan,$leftclass,$rightclass) = @_;
+ my ($text,$count,$add_class,$colspan) = @_;
my $output;
my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
- if ($leftclass eq '') {
- $leftclass = 'LC_left_item';
- }
- if ($rightclass eq '') {
- $rightclass = 'LC_right_item';
- }
$output .= '<tr class="'.$css_class.'">'."\n".
- '<td class="'.$leftclass.'">'.$text.
+ '<td class="LC_left_item">'.$text.
'</td>';
- if ($colspan > 1) {
- $output .= '<td class="'.$rightclass.'" colspan="'.$colspan.'">';
+ if ($colspan) {
+ $output .= '<td class="LC_right_item" colspan="'.$colspan.'">';
} else {
- $output .= '<td class="'.$rightclass.'">';
+ $output .= '<td class="LC_right_item">';
}
return $output;
}
@@ -5623,7 +3969,7 @@ sub item_table_row_end {
}
sub yesno_radio {
- my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit) = @_;
+ my ($item,$settings,$unsetdefault,$valueyes,$valueno) = @_;
my $itemon = ' ';
my $itemoff = ' checked="checked" ';
if (($valueyes eq '') && ($valueno eq '')) {
@@ -5642,24 +3988,16 @@ sub yesno_radio {
}
}
}
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
return '<span class="LC_nobreak"><label>'.
'<input type="radio" name="'.$item.'"'.
- $itemon.' value="'.$valueyes.'"'.$disabled.' />'.&mt('Yes').'</label> '.
+ $itemon.' value="'.$valueyes.'" />'.&mt('Yes').'</label> '.
'<label><input type="radio" name="'.$item.'"'.
- $itemoff.' value="'.$valueno.'"'.$disabled.' />'.&mt('No').'</label></span>';
+ $itemoff.' value="'.$valueno.'" />'.&mt('No').'</label></span>';
}
sub select_from_options {
- my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange,$noedit,$id) = @_;
+ my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange) = @_;
my $output;
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled=disabled"';
- }
if ((ref($order) eq 'ARRAY') && (ref($options) eq 'HASH')) {
$output='<select name="'.$item.'" '.$onchange;
if ($multiple) {
@@ -5670,10 +4008,7 @@ sub select_from_options {
$output .= ' size="'.$maxsize.'"';
}
}
- if ($id ne '') {
- $output .= ' id="'.$id.'"';
- }
- $output .= $disabled.'>'."\n";
+ $output .= '>'."\n";
if ($nullval ne '') {
$output .= '<option value=""';
if (ref($curr) eq 'ARRAY') {
@@ -5706,7 +4041,7 @@ sub select_from_options {
}
sub make_item_rows {
- my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit) = @_;
+ my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller) = @_;
my $datatable;
if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
my $count = 0;
@@ -5732,22 +4067,18 @@ sub make_item_rows {
}
$datatable .= $showcredits;
} elsif ($item eq 'nothideprivileged') {
- $datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype,$noedit);
+ $datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype);
} elsif ($item eq 'checkforpriv') {
- $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype,$noedit);
+ $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype);
} elsif ($item eq 'print_header_format') {
- $datatable .= &print_hdrfmt_row($item,$settings,$noedit);
+ $datatable .= &print_hdrfmt_row($item,$settings);
} elsif ($items->{$item}{input} eq 'dates') {
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
$datatable .=
&Apache::lonhtmlcommon::date_setter('display',$item,
- $settings->{$item},$disabled);
+ $settings->{$item});
} elsif ($items->{$item}{input} eq 'radio') {
my ($unsetdefault,$valueyes,$valueno);
- if (($item eq 'usejsme') || ($item eq 'uselcmath') || ($item eq 'inline_chem')) {
+ if (($item eq 'usejsme') || ($item eq 'uselcmath')) {
my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
unless ($domdefs{$item} eq '0') {
$unsetdefault = 1;
@@ -5755,27 +4086,17 @@ sub make_item_rows {
$valueyes = "1";
$valueno = "0";
}
- $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
+ $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno);
} elsif ($items->{$item}{input} eq 'selectbox') {
- my $id;
- if ($caller eq 'menuitems') {
- $id = $item;
- }
my $curr = $settings->{$item};
$datatable .=
&select_from_options($item,$items->{$item}{'order'},
$items->{$item}{'options'},$curr,
- $items->{$item}{'nullval'},
- undef,undef,undef,$noedit,$id);
+ $items->{$item}{'nullval'});
} elsif ($items->{$item}{input} eq 'textbox') {
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled=disabled"';
- }
$datatable .=
&Apache::lonhtmlcommon::textbox($item,$settings->{$item},
- $items->{$item}{size},
- $disabled);
+ $items->{$item}{size});
}
$datatable .= &item_table_row_end();
}
@@ -5787,7 +4108,7 @@ sub make_item_rows {
}
sub nothidepriv_row {
- my ($cdom,$item,$settings,$crstype,$noedit) = @_;
+ my ($cdom,$item,$settings,$crstype) = @_;
my ($cnum) = &get_course();
my ($datatable,%nothide,@checkdoms);
if (ref($settings) eq 'HASH') {
@@ -5801,7 +4122,7 @@ sub nothidepriv_row {
}
}
if ($settings->{'checkforpriv'}) {
- @checkdoms = split(/,/,$settings->{'checkforpriv'});
+ @checkdoms = split(/,/,$settings->{'checkforpriv'});
}
}
push(@checkdoms,$cdom);
@@ -5815,7 +4136,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);
@@ -5824,10 +4145,6 @@ sub nothidepriv_row {
}
}
if (@privusers > 0) {
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
$datatable .= '<table align="right">';
foreach my $user (sort(@privusers)) {
my $hideon = ' checked="checked" ';
@@ -5844,9 +4161,9 @@ sub nothidepriv_row {
'</td><td align="left">'.
'<span class="LC_nobreak"><label>'.
'<input type="radio" name="'.$item.'_'.$user.'"'.
- $hideon.' value=""'.$disabled.' />'.&mt('Hidden').'</label> '.
+ $hideon.' value="" />'.&mt('Hidden').'</label> '.
'<label><input type="radio" name="'.$item.'_'.$user.'"'.
- $hideoff.' value="yes"'.$disabled.' />'.&mt('Shown').'</label></span></td>'.
+ $hideoff.' value="yes" />'.&mt('Shown').'</label></span></td>'.
'</tr>';
}
$datatable .= '</table>';
@@ -5861,7 +4178,7 @@ sub nothidepriv_row {
}
sub checkforpriv_row {
- my ($cdom,$item,$settings,$crstype,$noedit) = @_;
+ my ($cdom,$item,$settings,$crstype) = @_;
my $datatable;
my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
if (keys(%domains) == 1) {
@@ -5874,24 +4191,19 @@ sub checkforpriv_row {
if ($settings->{$item} eq '') {
$datatable = '</td><td align="right">'.
&Apache::loncommon::select_dom_form('','checkforpriv_'.$num,
- 1,1,undef,undef,\@excdoms,
- $noedit);
+ 1,1,undef,undef,\@excdoms);
} else {
my @privdoms = split(/,/,$settings->{$item});
my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
$datatable = '</td><td align="right"><br />'.
&Apache::loncommon::start_data_table();
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
if (@privdoms > 0) {
foreach my $currdom (@privdoms) {
next unless ($domains{$currdom});
my $domdesc = &Apache::lonnet::domain($currdom,'description');
if ($domdesc eq '') {
$domdesc = $currdom;
- }
+ }
$datatable .=
&Apache::loncommon::start_data_table_row().
'<td align="left"><span class="LC_nobreak">'.
@@ -5899,22 +4211,22 @@ sub checkforpriv_row {
'</b><input type="hidden" name="checkforpriv_'.$num.
'" value="'.$currdom.'" /></span><br />'.
'<span class="LC_nobreak"><label><input type="checkbox" '.
- 'name="checkforpriv_delete" value="'.$num.'"'.$disabled.' />'.
+ 'name="checkforpriv_delete" value="'.$num.'" />'.
&mt('Delete').'</label></span></td>'.
&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().
'<td align="left"><span class="LC_nobreak">'.
&mt('Additional domain:'). '</span><br />'.
&Apache::loncommon::select_dom_form('','checkforpriv_'.$num,1,
- 1,undef,undef,\@excdoms,$noedit).
+ 1,undef,undef,\@excdoms).
'</td>'.&Apache::loncommon::end_data_table_row();
}
$datatable .= &Apache::loncommon::end_data_table().
@@ -5925,7 +4237,7 @@ sub checkforpriv_row {
}
sub print_hdrfmt_row {
- my ($item,$settings,$noedit) = @_;
+ my ($item,$settings) = @_;
my @curr;
my $currnum = 0;
my $maxnum = 2;
@@ -5998,43 +4310,36 @@ function getIndexByName(item) {
ENDJS
$output .= '</td><td align="right"><br />'.
$currstr.'<table class="LC_data_table">';
- my $disabled;
- if ($noedit) {
- $disabled = ' disabled="disabled"';
- }
if (@curr > 0) {
for (my $i=0; $i<@curr; $i++) {
my $pos = $i+1;
$output .= '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
- &position_selector($pos,$i,$maxnum,$disabled).&mt('Delete:').
+ &position_selector($pos,$i,$maxnum).&mt('Delete:').
'<input type="checkbox" name="printfmthdr_del_'.$i.
- '"'.$disabled.' /></span></td>';
+ '" /></span></td>';
if ($curr[$i] =~ /^%\d*[nca]$/) {
my ($limit,$subst) = ($curr[$i] =~ /^%(\d*)([nca])$/);
$output .= '<td align="left">'.
- &substitution_selector($i,$subst,$limit,$disabled).'</td>';
+ &substitution_selector($i,$subst,$limit).'</td>';
} else {
$output .= '<td colspan="2" align="left">'.&mt('Text').'<br />'.
'<input type="textbox" name="printfmthdr_text_'.$i.'"'.
- ' value="'.$curr[$i].'" size="25"'.$disabled.' /></td>';
+ ' value="'.$curr[$i].'" size="25" /></td>';
}
$output .= '</tr>';
}
}
my $pos = $currnum+1;
- unless ($noedit) {
- $output .=
- '<tr>'.
+ $output .= '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
&position_selector($pos,$currnum,$maxnum).
'<b>'.&mt('New').'</b></span></td><td align="left">'.
&substitution_selector($currnum).'</td>'.
'</tr>';
- $pos ++;
- $currnum ++;
- $output .=
- '<tr>'.
+ $pos ++;
+ $currnum ++;
+ $output .= '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
&position_selector($pos,$currnum,$maxnum).
'<b>'.&mt('New').'</b></span></td>'.
@@ -6043,15 +4348,14 @@ ENDJS
'" value="" size ="25" />'.
'<input type="hidden" name="printfmthdr_maxnum" value="'.
$maxnum.'" /></td>'.
- '</tr>';
- }
- $output .= '</table><br />';
+ '</tr>'.
+ '</table><br />';
return $output;
}
sub position_selector {
- my ($pos,$num,$maxnum,$disabled) = @_;
- my $output = '<select name="printfmthdr_pos_'.$num.'" onchange="reOrder('."'$num'".');"'.$disabled.'>';
+ my ($pos,$num,$maxnum) = @_;
+ my $output = '<select name="printfmthdr_pos_'.$num.'" onchange="reOrder('."'$num'".');">';
for (my $j=1; $j<=$maxnum; $j++) {
my $sel = '';
if ($pos == $j) {
@@ -6065,7 +4369,7 @@ sub position_selector {
}
sub substitution_selector {
- my ($num,$subst,$limit,$crstype,$disabled) = @_;
+ my ($num,$subst,$limit,$crstype) = @_;
my ($stunametxt,$crsidtxt);
if ($crstype eq 'Community') {
$stunametxt = 'member name';
@@ -6080,7 +4384,7 @@ sub substitution_selector {
a => 'assignment note',
);
my $output .= &mt('Substitution').'<br />'.
- '<select name="printfmthdr_sub_'.$num.'"'.$disabled.'>';
+ '<select name="printfmthdr_sub_'.$num.'">';
if ($subst eq '') {
$output .= '<option value="" selected="selected"> </option>';
}
@@ -6094,7 +4398,7 @@ sub substitution_selector {
}
$output .= '</select></td><td align="left">'.&mt('Size limit').'<br />'.
'<input type="textbox" name="printfmthdr_limit_'.$num.
- '" value="'.$limit.'" size="5"'.$disabled.' /></span>';
+ '" value="'.$limit.'" size="5" /></span>';
return $output;
}
@@ -6112,19 +4416,17 @@ sub change_clone {
foreach my $currclone (@allowclone) {
if (!grep(/^$currclone$/,@$oldcloner)) {
if ($currclone ne '*') {
- if ($currclone =~ /:/) {
- my ($uname,$udom) = split(/:/,$currclone);
- if ($uname && $udom && $uname ne '*') {
- if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
- my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
- if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
- if ($currclonecrs{'cloneable'} eq '') {
- $currclonecrs{'cloneable'} = $clone_crs;
- } else {
- $currclonecrs{'cloneable'} .= ','.$clone_crs;
- }
- &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
+ my ($uname,$udom) = split(/:/,$currclone);
+ if ($uname && $udom && $uname ne '*') {
+ if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+ my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+ if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+ if ($currclonecrs{'cloneable'} eq '') {
+ $currclonecrs{'cloneable'} = $clone_crs;
+ } else {
+ $currclonecrs{'cloneable'} .= ','.$clone_crs;
}
+ &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
}
}
}
@@ -6134,26 +4436,24 @@ sub change_clone {
foreach my $oldclone (@$oldcloner) {
if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
if ($oldclone ne '*') {
- if ($oldclone =~ /:/) {
- my ($uname,$udom) = split(/:/,$oldclone);
- if ($uname && $udom && $uname ne '*' ) {
- if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
- my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
- my %newclonecrs = ();
- if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
- if ($currclonecrs{'cloneable'} =~ /,/) {
- my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
- foreach my $crs (@currclonecrs) {
- if ($crs ne $clone_crs) {
- $newclonecrs{'cloneable'} .= $crs.',';
- }
+ my ($uname,$udom) = split(/:/,$oldclone);
+ if ($uname && $udom && $uname ne '*' ) {
+ if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+ my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+ my %newclonecrs = ();
+ if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+ if ($currclonecrs{'cloneable'} =~ /,/) {
+ my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+ foreach my $crs (@currclonecrs) {
+ if ($crs ne $clone_crs) {
+ $newclonecrs{'cloneable'} .= $crs.',';
}
- $newclonecrs{'cloneable'} =~ s/,$//;
- } else {
- $newclonecrs{'cloneable'} = '';
}
- &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
+ $newclonecrs{'cloneable'} =~ s/,$//;
+ } else {
+ $newclonecrs{'cloneable'} = '';
}
+ &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
}
}
}