version 1.295, 2017/03/20 03:19:43
|
version 1.302, 2017/07/18 16:03:08
|
Line 27
|
Line 27
|
# |
# |
# |
# |
############################################################### |
############################################################### |
############################################################## |
############################################################### |
|
|
=pod |
=pod |
|
|
Line 220 sub handler {
|
Line 220 sub handler {
|
'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
'ltitools','ssl','trust'],$dom); |
'ltitools','ssl','trust'],$dom); |
|
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
|
my %encconfig = |
|
&Apache::lonnet::get_dom('encconfig',['ltitools'],$dom); |
|
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
|
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
|
if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') { |
|
foreach my $item ('key','secret') { |
|
$domconfig{'ltitools'}{$id}{$item} = $encconfig{'ltitools'}{$id}{$item}; |
|
} |
|
} |
|
} |
|
} |
|
} |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'autoupdate','autocreate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
'usercreation','selfcreation','usermodification','scantron', |
'usercreation','selfcreation','usermodification','scantron', |
Line 488 sub handler {
|
Line 501 sub handler {
|
}, |
}, |
'ltitools' => |
'ltitools' => |
{text => 'External Tools (LTI)', |
{text => 'External Tools (LTI)', |
help => 'Domain_configuration_LTI_Tools', |
help => 'Domain_Configuration_LTI_Tools', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value',}], |
col2 => 'Value',}], |
print => \&print_ltitools, |
print => \&print_ltitools, |
Line 3248 sub print_helpsettings {
|
Line 3261 sub print_helpsettings {
|
my $css_class; |
my $css_class; |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my (%customroles,%ordered,%current); |
my (%customroles,%ordered,%current); |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%current = %{$settings->{'adhoc'}}; |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
|
%current = %{$settings->{'adhoc'}}; |
|
} |
} |
} |
my $count = 0; |
my $count = 0; |
foreach my $key (sort(keys(%existing))) { |
foreach my $key (sort(keys(%existing))) { |
Line 3745 sub print_ltitools {
|
Line 3760 sub print_ltitools {
|
if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
$currdisp{'window'} = ' checked="checked"'; |
$currdisp{'window'} = ' checked="checked"'; |
|
} elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') { |
|
$currdisp{'tab'} = ' checked="checked"'; |
} else { |
} else { |
$currdisp{'iframe'} = ' checked="checked"'; |
$currdisp{'iframe'} = ' checked="checked"'; |
} |
} |
Line 3754 sub print_ltitools {
|
Line 3771 sub print_ltitools {
|
if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
$currdisp{'height'} = $1; |
$currdisp{'height'} = $1; |
} |
} |
|
$currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'}; |
|
$currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'}; |
} else { |
} else { |
$currdisp{'iframe'} = ' checked="checked"'; |
$currdisp{'iframe'} = ' checked="checked"'; |
} |
} |
foreach my $disp ('iframe','window') { |
foreach my $disp ('iframe','tab','window') { |
$datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
$datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
$lt{$disp}.'</label>'.(' 'x2); |
$lt{$disp}.'</label>'.(' 'x2); |
} |
} |
Line 3767 sub print_ltitools {
|
Line 3786 sub print_ltitools {
|
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
|
$datatable .= '<br />'. |
|
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
'<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></label></div>'. |
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
|
'<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}. |
|
'</textarea></div><div style=""></div><br />'; |
$datatable .= '<br />'; |
$datatable .= '<br />'; |
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
my $checkedon = ''; |
my $checkedon = ''; |
Line 3848 sub print_ltitools {
|
Line 3873 sub print_ltitools {
|
} |
} |
} |
} |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target') { |
foreach my $item ('label','title','target','linktext','explanation') { |
my $checked; |
my $checked; |
if ($courseconfig{$item}) { |
if ($courseconfig{$item}) { |
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
Line 3916 sub print_ltitools {
|
Line 3941 sub print_ltitools {
|
'<span class="LC_nobreak">'.&mt('Display target:'); |
'<span class="LC_nobreak">'.&mt('Display target:'); |
my %defaultdisp; |
my %defaultdisp; |
$defaultdisp{'iframe'} = ' checked="checked"'; |
$defaultdisp{'iframe'} = ' checked="checked"'; |
foreach my $disp ('iframe','window') { |
foreach my $disp ('iframe','tab','window') { |
$datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
$datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
$lt{$disp}.'</label>'.(' 'x2); |
$lt{$disp}.'</label>'.(' 'x2); |
} |
} |
Line 3926 sub print_ltitools {
|
Line 3951 sub print_ltitools {
|
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$datatable .= '<br />'; |
$datatable .= '<br />'. |
|
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
'<input type="text" name="ltitools_add_linktext" size="5" /></label></div>'. |
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
|
'<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
|
'</div><div style=""></div><br />'; |
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
$datatable .= $lt{$extra}.' '. |
$datatable .= $lt{$extra}.' '. |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
Line 3964 sub print_ltitools {
|
Line 3994 sub print_ltitools {
|
} |
} |
$datatable .= '</tr></table></fieldset>'. |
$datatable .= '</tr></table></fieldset>'. |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target') { |
foreach my $item ('label','title','target','linktext','explanation') { |
$datatable .= '<label>'. |
$datatable .= '<label>'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
} |
} |
$datatable .= '</span></fieldset>'. |
$datatable .= '</span></fieldset>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
Line 3985 sub print_ltitools {
|
Line 4015 sub print_ltitools {
|
|
|
sub ltitools_names { |
sub ltitools_names { |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'title' => 'Title', |
'title' => 'Title', |
'version' => 'Version', |
'version' => 'Version', |
'msgtype' => 'Message Type', |
'msgtype' => 'Message Type', |
'url' => 'URL', |
'url' => 'URL', |
'key' => 'Key', |
'key' => 'Key', |
'secret' => 'Secret', |
'secret' => 'Secret', |
'icon' => 'Icon', |
'icon' => 'Icon', |
'user' => 'Username:domain', |
'user' => 'Username:domain', |
'fullname' => 'Full Name', |
'fullname' => 'Full Name', |
'firstname' => 'First Name', |
'firstname' => 'First Name', |
'lastname' => 'Last Name', |
'lastname' => 'Last Name', |
'email' => 'E-mail', |
'email' => 'E-mail', |
'roles' => 'Role', |
'roles' => 'Role', |
'window' => 'Window/Tab', |
'window' => 'Window', |
'iframe' => 'iFrame', |
'tab' => 'Tab', |
'height' => 'Height', |
'iframe' => 'iFrame', |
'width' => 'Width', |
'height' => 'Height', |
'passback' => 'Tool can return grades:', |
'width' => 'Width', |
'roster' => 'Tool can retrieve roster:', |
'linktext' => 'Default Link Text', |
'crstarget' => 'Display target', |
'explanation' => 'Default Explanation', |
'crslabel' => 'Course label', |
'passback' => 'Tool can return grades:', |
'crstitle' => 'Course title', |
'roster' => 'Tool can retrieve roster:', |
|
'crstarget' => 'Display target', |
|
'crslabel' => 'Course label', |
|
'crstitle' => 'Course title', |
|
'crslinktext' => 'Link Text', |
|
'crsexplanation' => 'Explanation', |
); |
); |
return %lt; |
return %lt; |
} |
} |
Line 5355 sub loadbalancing_titles {
|
Line 5390 sub loadbalancing_titles {
|
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'), |
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'), |
); |
); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange'); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange'); |
|
my @available; |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
unshift(@alltypes,@{$types},'default'); |
@available = @{$types}; |
|
} |
|
unless (grep(/^default$/,@available)) { |
|
push(@available,'default'); |
} |
} |
|
unshift(@alltypes,@available); |
my %titles; |
my %titles; |
foreach my $type (@alltypes) { |
foreach my $type (@alltypes) { |
if ($type =~ /^_LC_/) { |
if ($type =~ /^_LC_/) { |
Line 5735 sub print_selfcreation {
|
Line 5775 sub print_selfcreation {
|
my %radiohash; |
my %radiohash; |
my $numinrow = 4; |
my $numinrow = 4; |
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate; |
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate; |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
if ($position eq 'top') { |
if ($position eq 'top') { |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
cancreate_login => 'Institutional Login', |
cancreate_login => 'Institutional Login', |
Line 5750 sub print_selfcreation {
|
Line 5791 sub print_selfcreation {
|
\%choices,$itemcount,$onclick); |
\%choices,$itemcount,$onclick); |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
|
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
|
|
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
Line 5801 sub print_selfcreation {
|
Line 5840 sub print_selfcreation {
|
$$rowtotal ++; |
$$rowtotal ++; |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @posstypes; |
$usertypes->{'default'} = $othertitle; |
|
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
push(@{$types},'default'); |
@posstypes = @{$types}; |
$usertypes->{'default'} = $othertitle; |
} |
foreach my $status (@{$types}) { |
unless (grep(/^default$/,@posstypes)) { |
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
push(@posstypes,'default'); |
$numinrow,$$rowtotal,$usertypes); |
} |
$$rowtotal ++; |
my %usertypeshash; |
} |
if (ref($usertypes) eq 'HASH') { |
|
%usertypeshash = %{$usertypes}; |
|
} |
|
$usertypeshash{'default'} = $othertitle; |
|
foreach my $status (@posstypes) { |
|
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
|
$numinrow,$$rowtotal,\%usertypeshash); |
|
$$rowtotal ++; |
} |
} |
} else { |
} else { |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
Line 5828 sub print_selfcreation {
|
Line 5873 sub print_selfcreation {
|
my $onclick = "toggleDisplay(this.form,'emailoptions');"; |
my $onclick = "toggleDisplay(this.form,'emailoptions');"; |
my $additional = '<div id="emailoptions" style="display: '.$display.'">'; |
my $additional = '<div id="emailoptions" style="display: '.$display.'">'; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my $usertypes = {}; |
my $order; |
my $order = []; |
if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') { |
if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) { |
|
$usertypes = $domdefaults{'inststatustypes'}; |
|
$order = $domdefaults{'inststatusguest'}; |
$order = $domdefaults{'inststatusguest'}; |
} |
} |
|
my (@ordered,%usertypeshash); |
if (ref($order) eq 'ARRAY') { |
if (ref($order) eq 'ARRAY') { |
push(@{$order},'default'); |
@ordered = @{$order}; |
if (@{$order} > 1) { |
} |
$usertypes->{'default'} = &mt('Other users'); |
if (@ordered) { |
$additional .= '<table><tr>'; |
unless (grep(/^default$/,@ordered)) { |
foreach my $status (@{$order}) { |
push(@ordered,'default'); |
$additional .= '<th>'.$usertypes->{$status}.'</th>'; |
} |
} |
if (ref($usertypes) eq 'HASH') { |
$additional .= '</tr><tr>'; |
%usertypeshash = %{$usertypes}; |
foreach my $status (@{$order}) { |
} |
$additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; |
$usertypeshash{'default'} = $othertitle; |
} |
$additional .= '<table><tr>'; |
$additional .= '</tr></table>'; |
foreach my $status (@ordered) { |
} else { |
$additional .= '<th>'.$usertypeshash{$status}.'</th>'; |
$usertypes->{'default'} = &mt('All users'); |
|
$additional .= &email_as_username($rowtotal,$processing); |
|
} |
} |
|
$additional .= '</tr><tr>'; |
|
foreach my $status (@ordered) { |
|
$additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; |
|
} |
|
$additional .= '</tr></table>'; |
|
} else { |
|
$usertypeshash{'default'} = $othertitle; |
|
$additional .= &email_as_username($rowtotal,$processing); |
} |
} |
$additional .= '</div>'."\n"; |
$additional .= '</div>'."\n"; |
|
|
Line 5861 sub print_selfcreation {
|
Line 5911 sub print_selfcreation {
|
$$rowtotal ++; |
$$rowtotal ++; |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
$numinrow = 1; |
$numinrow = 1; |
if (ref($order) eq 'ARRAY') { |
foreach my $status (@ordered) { |
foreach my $status (@{$order}) { |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$numinrow,$$rowtotal,\%usertypeshash,$infofields,$infotitles); |
$numinrow,$$rowtotal,$usertypes,$infofields,$infotitles); |
$$rowtotal ++; |
$$rowtotal ++; |
|
} |
|
} |
} |
my ($emailrules,$emailruleorder) = |
my ($emailrules,$emailruleorder) = |
&Apache::lonnet::inst_userrules($dom,'email'); |
&Apache::lonnet::inst_userrules($dom,'email'); |
Line 9449 sub process_textbook_image {
|
Line 9497 sub process_textbook_image {
|
sub modify_ltitools { |
sub modify_ltitools { |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my ($newid,@allpos,%changes,%confhash,$errors,$resulttext); |
my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext); |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
Line 9474 sub modify_ltitools {
|
Line 9522 sub modify_ltitools {
|
foreach my $item ('title','url','key','secret') { |
foreach my $item ('title','url','key','secret') { |
$env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
$env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
if ($env{'form.ltitools_add_'.$item}) { |
if ($env{'form.ltitools_add_'.$item}) { |
$confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
if (($item eq 'key') || ($item eq 'secret')) { |
|
$encconfig{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} else { |
|
$confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
} |
} |
} |
} |
if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') { |
if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') { |
Line 9483 sub modify_ltitools {
|
Line 9535 sub modify_ltitools {
|
if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
$confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
$confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
} |
} |
foreach my $item ('width','height') { |
foreach my $item ('width','height','linktext','explanation') { |
$env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
$env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
$env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
$env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
if (($item eq 'width') || ($item eq 'height')) { |
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
|
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
|
} else { |
|
if ($env{'form.ltitools_add_'.$item} ne '') { |
|
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
} |
} |
} |
} |
if ($env{'form.ltitools_add_target'} eq 'window') { |
if ($env{'form.ltitools_add_target'} eq 'window') { |
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
|
} elsif ($env{'form.ltitools_add_target'} eq 'tab') { |
|
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
} else { |
} else { |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
} |
} |
Line 9575 sub modify_ltitools {
|
Line 9635 sub modify_ltitools {
|
} else { |
} else { |
my $newpos = $env{'form.ltitools_'.$itemid}; |
my $newpos = $env{'form.ltitools_'.$itemid}; |
$newpos =~ s/\D+//g; |
$newpos =~ s/\D+//g; |
foreach my $item ('title','url','key','secret') { |
foreach my $item ('title','url') { |
$confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
$confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
|
foreach my $item ('key','secret') { |
|
$encconfig{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
|
if ($domconfig{$action}{$itemid}{$item} ne $encconfig{$itemid}{$item}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') { |
if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') { |
$confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
$confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
} |
} |
Line 9599 sub modify_ltitools {
|
Line 9665 sub modify_ltitools {
|
} else { |
} else { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
|
} elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$size} ne '') { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
foreach my $item ('linktext','explanation') { |
|
$env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//; |
|
$env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//; |
|
if ($env{'form.ltitools_'.$item.'_'.$i} ne '') { |
|
$confhash{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
|
if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$item} ne $confhash{$itemid}{'display'}{$item}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} else { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$item} ne '') { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
} |
} |
if ($env{'form.ltitools_target_'.$i} eq 'window') { |
if ($env{'form.ltitools_target_'.$i} eq 'window') { |
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
|
} elsif ($env{'form.ltitools_target_'.$i} eq 'tab') { |
|
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
} else { |
} else { |
$confhash{$itemid}{'display'}{'target'} = 'iframe'; |
$confhash{$itemid}{'display'}{'target'} = 'iframe'; |
} |
} |
Line 9622 sub modify_ltitools {
|
Line 9712 sub modify_ltitools {
|
} |
} |
} |
} |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
foreach my $item ('label','title','target') { |
foreach my $item ('label','title','target','linktext','explanation') { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
Line 9761 sub modify_ltitools {
|
Line 9851 sub modify_ltitools {
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
|
my %ltienchash = ( |
|
$action => { %encconfig } |
|
); |
|
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
&Apache::lonnet::do_cache_new('ltitools',$dom,\%confhash,$cachetime); |
my %ltiall = %confhash; |
|
foreach my $id (keys(%ltiall)) { |
|
if (ref($encconfig{$id}) eq 'HASH') { |
|
foreach my $item ('key','secret') { |
|
$ltiall{$id}{$item} = $encconfig{$id}{$item}; |
|
} |
|
} |
|
} |
|
&Apache::lonnet::do_cache_new('ltitools',$dom,\%ltiall,$cachetime); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'ltitools'} = 1; |
$lastactref->{'ltitools'} = 1; |
} |
} |
Line 9787 sub modify_ltitools {
|
Line 9889 sub modify_ltitools {
|
$resulttext .= '</li><ul>'; |
$resulttext .= '</li><ul>'; |
my $position = $pos + 1; |
my $position = $pos + 1; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
foreach my $item ('version','msgtype','url','key') { |
foreach my $item ('version','msgtype','url') { |
if ($confhash{$itemid}{$item} ne '') { |
if ($confhash{$itemid}{$item} ne '') { |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
} |
} |
} |
} |
if ($confhash{$itemid}{'secret'} ne '') { |
if ($encconfig{$itemid}{'key'} ne '') { |
|
$resulttext .= '<li>'.$lt{'key'}.': '.$encconfig{$itemid}{'key'}.'</li>'; |
|
} |
|
if ($encconfig{$itemid}{'secret'} ne '') { |
$resulttext .= '<li>'.$lt{'secret'}.': '; |
$resulttext .= '<li>'.$lt{'secret'}.': '; |
my $num = length($confhash{$itemid}{'secret'}); |
my $num = length($encconfig{$itemid}{'secret'}); |
$resulttext .= ('*'x$num).'</li>'; |
$resulttext .= ('*'x$num).'</li>'; |
} |
} |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
my @possconfig = ('label','title','target'); |
my @possconfig = ('label','title','target','linktext','explanation'); |
my $numconfig = 0; |
my $numconfig = 0; |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
foreach my $item (@possconfig) { |
foreach my $item (@possconfig) { |
if ($confhash{$itemid}{'crsconf'}{$item}) { |
if ($confhash{$itemid}{'crsconf'}{$item}) { |
$numconfig ++; |
$numconfig ++; |
$resulttext .= ' '.$lt{'crs'.$item}; |
$resulttext .= ' "'.$lt{'crs'.$item}.'"'; |
} |
} |
} |
} |
} |
} |
Line 9837 sub modify_ltitools {
|
Line 9942 sub modify_ltitools {
|
$displaylist =~ s/,$//; |
$displaylist =~ s/,$//; |
$resulttext .= '<li>'.$displaylist.'</li>'; |
$resulttext .= '<li>'.$displaylist.'</li>'; |
} |
} |
} |
foreach my $item ('linktext','explanation') { |
|
if ($confhash{$itemid}{'display'}{$item}) { |
|
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{'display'}{$item}.'</li>'; |
|
} |
|
} |
|
} |
if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
my $fieldlist; |
my $fieldlist; |
foreach my $field (@allfields) { |
foreach my $field (@allfields) { |
Line 10052 sub modify_autoenroll {
|
Line 10162 sub modify_autoenroll {
|
} |
} |
if ($changes{'autofailsafe'}) { |
if ($changes{'autofailsafe'}) { |
if ($failsafe ne '') { |
if ($failsafe ne '') { |
$resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>'; |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt("$title{'failsafe'} deleted"); |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted'); |
} |
} |
&Apache::lonnet::get_domain_defaults($dom,1); |
&Apache::lonnet::get_domain_defaults($dom,1); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
Line 12883 sub modify_helpsettings {
|
Line 12993 sub modify_helpsettings {
|
order => 'Order', |
order => 'Order', |
desc => 'Role description', |
desc => 'Role description', |
access => 'Role usage', |
access => 'Role usage', |
status => 'Allowed instituional types', |
status => 'Allowed institutional types', |
exc => 'Allowed personnel', |
exc => 'Allowed personnel', |
inc => 'Disallowed personnel', |
inc => 'Disallowed personnel', |
); |
); |