|
version 1.420, 2023/03/08 15:06:45
|
version 1.421, 2023/03/19 16:05:48
|
|
Line 221 sub handler {
|
Line 221 sub handler {
|
| 'serverstatuses','requestcourses','helpsettings', |
'serverstatuses','requestcourses','helpsettings', |
| 'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
| 'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
| 'ltitools','ssl','trust','lti','ltisec','privacy','passwords', |
'ltitools','toolsec','ssl','trust','lti','ltisec', |
| 'proctoring','wafproxy','ipaccess'],$dom); |
'privacy','passwords','proctoring','wafproxy','ipaccess'],$dom); |
| my %encconfig = |
my %encconfig = |
| &Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring','linkprot'],$dom,undef,1); |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring','linkprot'],$dom,undef,1); |
| if (ref($domconfig{'ltitools'}) eq 'HASH') { |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
|
Line 230 sub handler {
|
Line 230 sub handler {
|
| foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
| if ((ref($domconfig{'ltitools'}{$id}) eq 'HASH') && |
if ((ref($domconfig{'ltitools'}{$id}) eq 'HASH') && |
| (ref($encconfig{'ltitools'}{$id}) eq 'HASH')) { |
(ref($encconfig{'ltitools'}{$id}) eq 'HASH')) { |
| foreach my $item ('key','secret') { |
$domconfig{'ltitools'}{$id}{'key'} = $encconfig{'ltitools'}{$id}{'key'}; |
| $domconfig{'ltitools'}{$id}{$item} = $encconfig{'ltitools'}{$id}{$item}; |
|
| } |
|
| } |
} |
| } |
} |
| } |
} |
|
Line 585 sub handler {
|
Line 583 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 => 'Encryption of shared secrets', |
| col2 => 'Value',}], |
col2 => 'Settings'}, |
| |
{col1 => 'Rules for shared secrets', |
| |
col2 => 'Settings'}, |
| |
{col1 => 'Providers', |
| |
col2 => 'Settings',}], |
| print => \&print_ltitools, |
print => \&print_ltitools, |
| modify => \&modify_ltitools, |
modify => \&modify_ltitools, |
| }, |
}, |
|
Line 894 sub print_config_box {
|
Line 896 sub print_config_box {
|
| &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
| \@templateroles); |
\@templateroles); |
| } elsif ($action eq 'ltitools') { |
} elsif ($action eq 'ltitools') { |
| $output .= <itools_javascript($settings); |
$output .= &Apache::lonconfigsettings::ltitools_javascript($settings); |
| } elsif ($action eq 'lti') { |
} elsif ($action eq 'lti') { |
| $output .= &passwords_javascript('secrets')."\n". |
$output .= &passwords_javascript('ltisecrets')."\n". |
| <i_javascript($dom,$settings); |
<i_javascript($dom,$settings); |
| } elsif ($action eq 'proctoring') { |
} elsif ($action eq 'proctoring') { |
| $output .= &proctoring_javascript($settings); |
$output .= &proctoring_javascript($settings); |
|
Line 951 sub print_config_box {
|
Line 953 sub print_config_box {
|
| ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
| ($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
| ($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') || |
($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') || |
| ($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'wafproxy') || ($action eq 'lti')) { |
($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'wafproxy') || |
| |
($action eq 'lti') || ($action eq 'ltitools')) { |
| $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
| } elsif ($action eq 'passwords') { |
} elsif ($action eq 'passwords') { |
| $output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
|
Line 987 sub print_config_box {
|
Line 990 sub print_config_box {
|
| ($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
| ($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
| ($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') || |
($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') || |
| ($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti')) { |
($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti') || |
| |
($action eq 'ltitools')) { |
| if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
| $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
| $colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
|
Line 1278 sub print_config_box {
|
Line 1282 sub print_config_box {
|
| $output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
| } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
| ($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
| ($action eq 'ltitools') || ($action eq 'proctoring') || |
($action eq 'proctoring') || ($action eq 'ipaccess')) { |
| ($action eq 'ipaccess')) { |
|
| $output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
| } |
} |
| } |
} |
|
Line 3730 function toggleLTI(form,setting,item) {
|
Line 3733 function toggleLTI(form,setting,item) {
|
| return; |
return; |
| } |
} |
| |
|
| function toggleLTIEncKey(form) { |
|
| var shownhosts = new Array(); |
|
| var hiddenhosts = new Array(); |
|
| var forcourse = new Array($course_servers); |
|
| var fromdomain = '$primary'; |
|
| var crsradio = form.elements['ltisec_crslinkprot']; |
|
| if (crsradio.length) { |
|
| for (var i=0; i<crsradio.length; i++) { |
|
| if (crsradio[i].checked) { |
|
| if (crsradio[i].value == 1) { |
|
| if (forcourse.length > 0) { |
|
| for (var j=0; j<forcourse.length; j++) { |
|
| if (!shownhosts.includes(forcourse[j])) { |
|
| shownhosts.push(forcourse[j]); |
|
| } |
|
| } |
|
| } |
|
| } else { |
|
| if (forcourse.length > 0) { |
|
| for (var j=0; j<forcourse.length; j++) { |
|
| if (!hiddenhosts.includes(forcourse[j])) { |
|
| hiddenhosts.push(forcourse[j]); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| var domradio = form.elements['ltisec_domlinkprot']; |
|
| if (domradio.length) { |
|
| for (var i=0; i<domradio.length; i++) { |
|
| if (domradio[i].checked) { |
|
| if (domradio[i].value == 1) { |
|
| if (!shownhosts.includes(fromdomain)) { |
|
| shownhosts.push(fromdomain); |
|
| } |
|
| } else { |
|
| if (!hiddenhosts.includes(fromdomain)) { |
|
| hiddenhosts.push(fromdomain); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| var consumersradio = form.elements['ltisec_consumers']; |
|
| if (consumersradio.length) { |
|
| for (var i=0; i<consumersradio.length; i++) { |
|
| if (consumersradio[i].checked) { |
|
| if (consumersradio[i].value == 1) { |
|
| if (!shownhosts.includes(fromdomain)) { |
|
| shownhosts.push(fromdomain); |
|
| } |
|
| } else { |
|
| if (!hiddenhosts.includes(fromdomain)) { |
|
| hiddenhosts.push(fromdomain); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| if (shownhosts.length > 0) { |
|
| for (var i=0; i<shownhosts.length; i++) { |
|
| if (document.getElementById('ltisec_info_'+shownhosts[i])) { |
|
| document.getElementById('ltisec_info_'+shownhosts[i]).style.display = 'block'; |
|
| } |
|
| } |
|
| if (document.getElementById('ltisec_noprivkey')) { |
|
| document.getElementById('ltisec_noprivkey').style.display = 'none'; |
|
| } |
|
| } else { |
|
| if (document.getElementById('ltisec_noprivkey')) { |
|
| document.getElementById('ltisec_noprivkey').style.display = 'inline-block'; |
|
| } |
|
| } |
|
| if (hiddenhosts.length > 0) { |
|
| for (var i=0; i<hiddenhosts.length; i++) { |
|
| if (!shownhosts.includes(hiddenhosts[i])) { |
|
| if (document.getElementById('ltisec_info_'+hiddenhosts[i])) { |
|
| document.getElementById('ltisec_info_'+hiddenhosts[i]).style.display = 'none'; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return; |
|
| } |
|
| |
|
| function togglePrivKey(form,hostid) { |
|
| var radioname = ''; |
|
| var currdivid = ''; |
|
| var newdivid = ''; |
|
| if ((document.getElementById('ltisec_divcurrprivkey_'+hostid)) && |
|
| (document.getElementById('ltisec_divchgprivkey_'+hostid))) { |
|
| currdivid = document.getElementById('ltisec_divcurrprivkey_'+hostid); |
|
| newdivid = document.getElementById('ltisec_divchgprivkey_'+hostid); |
|
| radioname = form.elements['ltisec_changeprivkey_'+hostid]; |
|
| 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'; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| |
|
| // ]]> |
// ]]> |
| </script> |
</script> |
| |
|
|
Line 5399 sub radiobutton_prefs {
|
Line 5284 sub radiobutton_prefs {
|
| } |
} |
| |
|
| sub print_ltitools { |
sub print_ltitools { |
| my ($dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
| my $rownum = 0; |
my (%rules,%encrypt,%privkeys,%linkprot); |
| my $css_class; |
|
| my $itemcount = 1; |
|
| my $maxnum = 0; |
|
| my %ordered; |
|
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| foreach my $item (keys(%{$settings})) { |
if ($position eq 'top') { |
| if (ref($settings->{$item}) eq 'HASH') { |
if (exists($settings->{'encrypt'})) { |
| my $num = $settings->{$item}{'order'}; |
if (ref($settings->{'encrypt'}) eq 'HASH') { |
| $ordered{$num} = $item; |
foreach my $key (keys(%{$settings->{'encrypt'}})) { |
| } |
$encrypt{'toolsec_'.$key} = $settings->{'encrypt'}{$key}; |
| } |
|
| } |
|
| my $confname = $dom.'-domainconfig'; |
|
| my $switchserver = &check_switchserver($dom,$confname); |
|
| my $maxnum = scalar(keys(%ordered)); |
|
| my $datatable; |
|
| my %lt = <itools_names(); |
|
| my @courseroles = ('cc','in','ta','ep','st'); |
|
| my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner); |
|
| my @fields = ('fullname','firstname','lastname','email','roles','user'); |
|
| if (keys(%ordered)) { |
|
| my @items = sort { $a <=> $b } keys(%ordered); |
|
| for (my $i=0; $i<@items; $i++) { |
|
| $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
| my $item = $ordered{$items[$i]}; |
|
| my ($title,$key,$secret,$url,$lifetime,$imgsrc,%sigsel); |
|
| if (ref($settings->{$item}) eq 'HASH') { |
|
| $title = $settings->{$item}->{'title'}; |
|
| $url = $settings->{$item}->{'url'}; |
|
| $key = $settings->{$item}->{'key'}; |
|
| $secret = $settings->{$item}->{'secret'}; |
|
| $lifetime = $settings->{$item}->{'lifetime'}; |
|
| my $image = $settings->{$item}->{'image'}; |
|
| if ($image ne '') { |
|
| $imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />'; |
|
| } |
|
| if ($settings->{$item}->{'sigmethod'} eq 'HMAC-256') { |
|
| $sigsel{'HMAC-256'} = ' selected="selected"'; |
|
| } else { |
|
| $sigsel{'HMAC-SHA1'} = ' selected="selected"'; |
|
| } |
|
| } |
|
| my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_".$item."'".');"'; |
|
| $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
|
| .'<select name="ltitools_'.$item.'"'.$chgstr.'>'; |
|
| for (my $k=0; $k<=$maxnum; $k++) { |
|
| my $vpos = $k+1; |
|
| my $selstr; |
|
| if ($k == $i) { |
|
| $selstr = ' selected="selected" '; |
|
| } |
|
| $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
| } |
|
| $datatable .= '</select>'.(' 'x2). |
|
| '<label><input type="checkbox" name="ltitools_del" value="'.$item.'" />'. |
|
| &mt('Delete?').'</label></span></td>'. |
|
| '<td colspan="2">'. |
|
| '<fieldset><legend>'.&mt('Required settings').'</legend>'. |
|
| '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '. |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'. |
|
| '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '. |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'. |
|
| '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '. |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_sigmethod_'.$i.'">'. |
|
| '<option value="HMAC-SHA1"'.$sigsel{'HMAC-SHA1'}.'>HMAC-SHA1</option>'. |
|
| '<option value="HMAC-SHA256"'.$sigsel{'HMAC-SHA256'}.'>HMAC-SHA256</option></select></span>'. |
|
| '<br /><br />'. |
|
| '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="ltitools_url_'.$i.'"'. |
|
| ' value="'.$url.'" /></span>'. |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'key'}.':'. |
|
| '<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '. |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'lifetime'}.':'. |
|
| '<input type="text" size="5" name="ltitools_lifetime_'.$i.'" value="'.$lifetime.'" /></span> '. |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'secret'}.':'. |
|
| '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="'.$secret.'" />'. |
|
| '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'. |
|
| '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span>'. |
|
| '</fieldset>'. |
|
| '<fieldset><legend>'.&mt('Optional settings').'</legend>'. |
|
| '<span class="LC_nobreak">'.&mt('Display target:'); |
|
| my %currdisp; |
|
| if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
|
| if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
|
| $currdisp{'window'} = ' checked="checked"'; |
|
| } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') { |
|
| $currdisp{'tab'} = ' checked="checked"'; |
|
| } else { |
|
| $currdisp{'iframe'} = ' checked="checked"'; |
|
| } |
|
| if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) { |
|
| $currdisp{'width'} = $1; |
|
| } |
|
| if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
|
| $currdisp{'height'} = $1; |
|
| } |
|
| $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'}; |
|
| $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'}; |
|
| } else { |
|
| $currdisp{'iframe'} = ' checked="checked"'; |
|
| } |
|
| foreach my $disp ('iframe','tab','window') { |
|
| $datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
|
| $lt{$disp}.'</label>'.(' 'x2); |
|
| } |
|
| $datatable .= (' 'x4); |
|
| foreach my $dimen ('width','height') { |
|
| $datatable .= '<label>'.$lt{$dimen}.' '. |
|
| '<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
|
| (' 'x2); |
|
| } |
|
| $datatable .= '</span><br />'. |
|
| '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
| '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></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 />'; |
|
| my %units = ( |
|
| 'passback' => 'days', |
|
| 'roster' => 'seconds', |
|
| ); |
|
| foreach my $extra ('passback','roster') { |
|
| my $validsty = 'none'; |
|
| my $currvalid; |
|
| my $checkedon = ''; |
|
| my $checkedoff = ' checked="checked"'; |
|
| if ($settings->{$item}->{$extra}) { |
|
| $checkedon = $checkedoff; |
|
| $checkedoff = ''; |
|
| $validsty = 'inline-block'; |
|
| if ($settings->{$item}->{$extra.'valid'} =~ /^\d+\.?\d*$/) { |
|
| $currvalid = $settings->{$item}->{$extra.'valid'}; |
|
| } |
|
| } |
|
| my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','$i'".');"'; |
|
| $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.' '. |
|
| '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.$onclick.' />'. |
|
| &mt('No').'</label>'.(' 'x2). |
|
| '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.$onclick.' />'. |
|
| &mt('Yes').'</label></span></div>'. |
|
| '<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_'.$extra.'time_'.$i.'">'. |
|
| '<span class="LC_nobreak">'. |
|
| &mt("at least [_1] $units{$extra} after launch", |
|
| '<input type="text" name="ltitools_'.$extra.'valid_'.$i.'" value="'.$currvalid.'" />'). |
|
| '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>'; |
|
| } |
|
| $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.': '; |
|
| if ($imgsrc) { |
|
| $datatable .= $imgsrc. |
|
| '<label><input type="checkbox" name="ltitools_image_del"'. |
|
| ' value="'.$item.'" />'.&mt('Delete?').'</label></span> '. |
|
| '<span class="LC_nobreak"> '.&mt('Replace:').' '; |
|
| } else { |
|
| $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').') '; |
|
| } |
|
| if ($switchserver) { |
|
| $datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
| } else { |
|
| $datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />'; |
|
| } |
|
| $datatable .= '</span></fieldset>'; |
|
| my (%checkedfields,%rolemaps,$userincdom); |
|
| if (ref($settings->{$item}) eq 'HASH') { |
|
| if (ref($settings->{$item}->{'fields'}) eq 'HASH') { |
|
| %checkedfields = %{$settings->{$item}->{'fields'}}; |
|
| } |
|
| $userincdom = $settings->{$item}->{'incdom'}; |
|
| if (ref($settings->{$item}->{'roles'}) eq 'HASH') { |
|
| %rolemaps = %{$settings->{$item}->{'roles'}}; |
|
| $checkedfields{'roles'} = 1; |
|
| } |
|
| } |
|
| $datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'. |
|
| '<span class="LC_nobreak">'; |
|
| my $userfieldstyle = 'display:none;'; |
|
| my $seluserdom = ''; |
|
| my $unseluserdom = ' selected="selected"'; |
|
| foreach my $field (@fields) { |
|
| my ($checked,$onclick,$id,$spacer); |
|
| if ($checkedfields{$field}) { |
|
| $checked = ' checked="checked"'; |
|
| } |
|
| if ($field eq 'user') { |
|
| $id = ' id="ltitools_user_field_'.$i.'"'; |
|
| $onclick = ' onclick="toggleLTITools(this.form,'."'$field','$i'".')"'; |
|
| if ($checked) { |
|
| $userfieldstyle = 'display:inline-block'; |
|
| if ($userincdom) { |
|
| $seluserdom = $unseluserdom; |
|
| $unseluserdom = ''; |
|
| } |
|
| } |
} |
| } else { |
|
| $spacer = (' ' x2); |
|
| } |
} |
| $datatable .= '<label>'. |
|
| '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$id.$checked.$onclick.' />'. |
|
| $lt{$field}.'</label>'.$spacer; |
|
| } |
} |
| $datatable .= '</span>'; |
if (exists($settings->{'private'})) { |
| $datatable .= '<div style="'.$userfieldstyle.'" id="ltitools_user_div_'.$i.'">'. |
if (ref($settings->{'private'}) eq 'HASH') { |
| '<span class="LC_nobreak"> : '. |
if (ref($settings->{'private'}) eq 'HASH') { |
| '<select name="ltitools_userincdom_'.$i.'">'. |
if (ref($settings->{'private'}{'keys'}) eq 'ARRAY') { |
| '<option value="">'.&mt('Select').'</option>'. |
map { $privkeys{$_} = 1; } (@{$settings->{'private'}{'keys'}}); |
| '<option value="0"'.$unseluserdom.'>'.&mt('username').'</option>'. |
|
| '<option value="1"'.$seluserdom.'>'.&mt('username:domain').'</option>'. |
|
| '</select></span></div>'; |
|
| $datatable .= '</fieldset>'. |
|
| '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>'; |
|
| foreach my $role (@courseroles) { |
|
| my ($selected,$selectnone); |
|
| if (!$rolemaps{$role}) { |
|
| $selectnone = ' selected="selected"'; |
|
| } |
|
| $datatable .= '<td style="text-align: center">'. |
|
| &Apache::lonnet::plaintext($role,'Course').'<br />'. |
|
| '<select name="ltitools_roles_'.$role.'_'.$i.'">'. |
|
| '<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
|
| foreach my $ltirole (@ltiroles) { |
|
| unless ($selectnone) { |
|
| if ($rolemaps{$role} eq $ltirole) { |
|
| $selected = ' selected="selected"'; |
|
| } else { |
|
| $selected = ''; |
|
| } |
} |
| } |
} |
| $datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>'; |
|
| } |
} |
| $datatable .= '</select></td>'; |
|
| } |
} |
| $datatable .= '</tr></table></fieldset>'; |
} elsif ($position eq 'middle') { |
| my %courseconfig; |
if (exists($settings->{'rules'})) { |
| if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{'rules'}) eq 'HASH') { |
| if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') { |
%rules = %{$settings->{'rules'}}; |
| %courseconfig = %{$settings->{$item}->{'crsconf'}}; |
|
| } |
|
| } |
|
| $datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
|
| foreach my $item ('label','title','target','linktext','explanation','append') { |
|
| my $checked; |
|
| if ($courseconfig{$item}) { |
|
| $checked = ' checked="checked"'; |
|
| } |
} |
| $datatable .= '<label>'. |
|
| '<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'. |
|
| $lt{'crs'.$item}.'</label> '."\n"; |
|
| } |
} |
| $datatable .= '</span></fieldset>'. |
} else { |
| '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
foreach my $key ('encrypt','private','rules') { |
| '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'; |
if (exists($settings->{$key})) { |
| if (ref($settings->{$item}->{'custom'}) eq 'HASH') { |
delete($settings->{$key}); |
| my %custom = %{$settings->{$item}->{'custom'}}; |
|
| if (keys(%custom) > 0) { |
|
| foreach my $key (sort(keys(%custom))) { |
|
| $datatable .= '<tr><td><span class="LC_nobreak">'. |
|
| '<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'. |
|
| $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'. |
|
| '<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'. |
|
| ' value="'.$custom{$key}.'" /></td></tr>'; |
|
| } |
|
| } |
} |
| } |
} |
| $datatable .= '<tr><td><span class="LC_nobreak">'. |
|
| '<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'. |
|
| &mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'. |
|
| '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>'; |
|
| $datatable .= '</table></fieldset></td></tr>'."\n"; |
|
| $itemcount ++; |
|
| } |
} |
| } |
} |
| $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $datatable; |
| my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_add_pos'".');"'; |
my $itemcount = 1; |
| $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
if ($position eq 'top') { |
| '<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n". |
$datatable = &secrets_form($dom,'toolsec',\%encrypt,\%privkeys,$rowtotal); |
| '<select name="ltitools_add_pos"'.$chgstr.'>'; |
} elsif ($position eq 'middle') { |
| for (my $k=0; $k<$maxnum+1; $k++) { |
$datatable = &password_rules('toolsecrets',\$itemcount,\%rules); |
| my $vpos = $k+1; |
$$rowtotal += $itemcount; |
| my $selstr; |
} else { |
| if ($k == $maxnum) { |
$datatable = &Apache::courseprefs::print_ltitools($dom,'',$settings,\$rowtotal,'','','domain'); |
| $selstr = ' selected="selected" '; |
|
| } |
|
| $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
| } |
} |
| $datatable .= '</select> '."\n". |
|
| '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</span></td>'."\n". |
|
| '<td colspan="2">'. |
|
| '<fieldset><legend>'.&mt('Required settings').'</legend>'. |
|
| '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_add_title" value="" /></span> '."\n". |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'. |
|
| '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n". |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'. |
|
| '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '. |
|
| '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_add_sigmethod">'. |
|
| '<option value="HMAC-SHA1" selected="selected">HMAC-SHA1</option>'. |
|
| '<option value="HMAC-SHA256">HMAC-SHA256</option></select></span>'. |
|
| '<br />'. |
|
| '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="ltitools_add_url" value="" /></span> '."\n". |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" /></span> '."\n". |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="ltitools_add_lifetime" value="300" /></span> '."\n". |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_add_secret" value="" />'. |
|
| '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_add_secret.type='."'text'".' } else { this.form.ltitools_add_secret.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n". |
|
| '</fieldset>'. |
|
| '<fieldset><legend>'.&mt('Optional settings').'</legend>'. |
|
| '<span class="LC_nobreak">'.&mt('Display target:'); |
|
| my %defaultdisp; |
|
| $defaultdisp{'iframe'} = ' checked="checked"'; |
|
| foreach my $disp ('iframe','tab','window') { |
|
| $datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
|
| $lt{$disp}.'</label>'.(' 'x2); |
|
| } |
|
| $datatable .= (' 'x4); |
|
| foreach my $dimen ('width','height') { |
|
| $datatable .= '<label>'.$lt{$dimen}.' '. |
|
| '<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
|
| (' 'x2); |
|
| } |
|
| $datatable .= '</span><br />'. |
|
| '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
| '<input type="text" name="ltitools_add_linktext" size="5" /></div>'. |
|
| '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
|
| '<textarea name="ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
|
| '</div><div style=""></div><br />'; |
|
| my %units = ( |
|
| 'passback' => 'days', |
|
| 'roster' => 'seconds', |
|
| ); |
|
| my %defaulttimes = ( |
|
| 'passback' => '7', |
|
| 'roster' => '300', |
|
| ); |
|
| foreach my $extra ('passback','roster') { |
|
| my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','add'".');"'; |
|
| $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.' '. |
|
| '<label><input type="radio" name="ltitools_'.$extra.'_add" value="0" checked="checked"'.$onclick.' />'. |
|
| &mt('No').'</label></span>'.(' 'x2).'<span class="LC_nobreak">'. |
|
| '<label><input type="radio" name="ltitools_'.$extra.'_add" value="1"'.$onclick.' />'. |
|
| &mt('Yes').'</label></span></div>'. |
|
| '<div class="LC_floatleft" style="display:none;" id="ltitools_'.$extra.'time_add">'. |
|
| '<span class="LC_nobreak">'. |
|
| &mt("at least [_1] $units{$extra} after launch", |
|
| '<input type="text" name="ltitools_'.$extra.'valid_add" value="'.$defaulttimes{$extra}.'" />'). |
|
| '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>'; |
|
| } |
|
| $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.': '. |
|
| '('.&mt('if larger than 21x21 pixels, image will be scaled').') '; |
|
| if ($switchserver) { |
|
| $datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
| } else { |
|
| $datatable .= '<input type="file" name="ltitools_add_image" value="" />'; |
|
| } |
|
| $datatable .= '</span></fieldset>'. |
|
| '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'. |
|
| '<span class="LC_nobreak">'; |
|
| foreach my $field (@fields) { |
|
| my ($id,$onclick,$spacer); |
|
| if ($field eq 'user') { |
|
| $id = ' id="ltitools_user_field_add"'; |
|
| $onclick = ' onclick="toggleLTITools(this.form,'."'$field','add'".')"'; |
|
| } else { |
|
| $spacer = (' ' x2); |
|
| } |
|
| $datatable .= '<label>'. |
|
| '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'"'.$id.$onclick.' />'. |
|
| $lt{$field}.'</label>'.$spacer; |
|
| } |
|
| $datatable .= '</span>'. |
|
| '<div style="display:none;" id="ltitools_user_div_add">'. |
|
| '<span class="LC_nobreak"> : '. |
|
| '<select name="ltitools_userincdom_add">'. |
|
| '<option value="" selected="selected">'.&mt('Select').'</option>'. |
|
| '<option value="0">'.&mt('username').'</option>'. |
|
| '<option value="1">'.&mt('username:domain').'</option>'. |
|
| '</select></span></div></fieldset>'; |
|
| $datatable .= '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>'; |
|
| foreach my $role (@courseroles) { |
|
| my ($checked,$checkednone); |
|
| $datatable .= '<td style="text-align: center">'. |
|
| &Apache::lonnet::plaintext($role,'Course').'<br />'. |
|
| '<select name="ltitools_add_roles_'.$role.'">'. |
|
| '<option value="" selected="selected">'.&mt('Select').'</option>'; |
|
| foreach my $ltirole (@ltiroles) { |
|
| $datatable .= '<option value="'.$ltirole.'">'.$ltirole.'</option>'; |
|
| } |
|
| $datatable .= '</select></td>'; |
|
| } |
|
| $datatable .= '</tr></table></fieldset>'. |
|
| '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
|
| foreach my $item ('label','title','target','linktext','explanation','append') { |
|
| $datatable .= '<label>'. |
|
| '<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
|
| $lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
|
| } |
|
| $datatable .= '</span></fieldset>'. |
|
| '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
|
| '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'. |
|
| '<tr><td><span class="LC_nobreak">'. |
|
| '<label><input type="checkbox" name="ltitools_add_custom" value="1" />'. |
|
| &mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'. |
|
| '</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'. |
|
| '</table></fieldset>'."\n". |
|
| '</td>'."\n". |
|
| '</tr>'."\n"; |
|
| $itemcount ++; |
|
| return $datatable; |
return $datatable; |
| } |
} |
| |
|
|
Line 5853 sub ltitools_names {
|
Line 5367 sub ltitools_names {
|
| return %lt; |
return %lt; |
| } |
} |
| |
|
| |
sub secrets_form { |
| |
my ($dom,$context,$encrypt,$privkeys,$rowtotal) = @_; |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| |
my %servers = &Apache::lonnet::get_servers($dom,'library'); |
| |
my $primary = &Apache::lonnet::domain($dom,'primary'); |
| |
my ($css_class,$extra,$numshown,$itemcount,$output); |
| |
$itemcount = 0; |
| |
foreach my $hostid (sort(keys(%servers))) { |
| |
my ($showextra,$divsty,$switch); |
| |
if ($hostid eq $primary) { |
| |
if ($context eq 'ltisec') { |
| |
if (($encrypt->{'ltisec_consumers'}) || ($encrypt->{'ltisec_domlinkprot'})) { |
| |
$showextra = 1; |
| |
} |
| |
if ($encrypt->{'ltisec_crslinkprot'}) { |
| |
$showextra = 1; |
| |
} |
| |
} else { |
| |
if (($encrypt->{'toolsec_crs'}) || ($encrypt->{'toolsec_dom'})) { |
| |
$showextra = 1; |
| |
} |
| |
} |
| |
unless (grep(/^\Q$hostid\E$/,@ids)) { |
| |
$switch = 1; |
| |
} |
| |
if ($showextra) { |
| |
$numshown ++; |
| |
$divsty = 'display:inline-block'; |
| |
} else { |
| |
$divsty = 'display:none'; |
| |
} |
| |
$extra .= '<fieldset id="'.$context.'_info_'.$hostid.'" style="'.$divsty.'">'. |
| |
'<legend>'.$hostid.'</legend>'; |
| |
if ($switch) { |
| |
my $switchserver = '<a href="/adm/switchserver?otherserver='.$hostid.'&role='. |
| |
&HTML::Entities::encode($env{'request.role'},'\'<>"&'). |
| |
'&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
| |
if (exists($privkeys->{$hostid})) { |
| |
$extra .= '<div id="'.$context.'_divcurrprivkey_'.$hostid.'" style="display:inline-block" />'. |
| |
'<span class="LC_nobreak">'. |
| |
&mt('Encryption Key').': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'. |
| |
'<span class="LC_nobreak">'.&mt('Change?'). |
| |
'<label><input type="radio" value="0" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" checked="checked" />'.&mt('No').'</label>'. |
| |
(' 'x2). |
| |
'<label><input type="radio" value="1" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" />'.&mt('Yes'). |
| |
'</label> </span><div id="'.$context.'_divchgprivkey_'.$hostid.'" style="display:none" />'. |
| |
'<span class="LC_nobreak"> - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver). |
| |
'</span></div>'; |
| |
} else { |
| |
$extra .= '<span class="LC_nobreak">'. |
| |
&mt('Key required').' - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver). |
| |
'</span>'."\n"; |
| |
} |
| |
} elsif (exists($privkeys->{$hostid})) { |
| |
$extra .= '<div id="'.$context.'_divcurrprivkey_'.$hostid.'" style="display:inline-block" /><span class="LC_nobreak">'. |
| |
&mt('Encryption Key').': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'. |
| |
'<span class="LC_nobreak">'.&mt('Change?'). |
| |
'<label><input type="radio" value="0" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" checked="checked" />'.&mt('No').'</label>'. |
| |
(' 'x2). |
| |
'<label><input type="radio" value="1" name="'.$context.'_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$context','$hostid'".');" />'.&mt('Yes'). |
| |
'</label> </span><div id="'.$context.'_divchgprivkey_'.$hostid.'" style="display:none" />'. |
| |
'<span class="LC_nobreak">'.&mt('New Key').':'. |
| |
'<input type="password" size="20" name="'.$context.'_privkey_'.$hostid.'" value="" autocomplete="new-password" />'. |
| |
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.'.$context.'_privkey_'.$hostid.'.type='."'text'".' } else { this.form.'.$context.'_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'. |
| |
'</span></div>'; |
| |
} else { |
| |
$extra .= '<span class="LC_nobreak">'.&mt('Encryption Key').':'. |
| |
'<input type="password" size="20" name="'.$context.'_privkey_'.$hostid.'" value="" autocomplete="new-password" />'. |
| |
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.'.$context.'_privkey_'.$hostid.'.type='."'text'".' } else { this.form.'.$context.'_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'; |
| |
} |
| |
$extra .= '</fieldset>'; |
| |
} |
| |
} |
| |
my (%choices,@toggles,%defaultchecked); |
| |
if ($context eq 'ltisec') { |
| |
%choices = &Apache::lonlocal::texthash ( |
| |
ltisec_crslinkprot => 'Encrypt stored link protection secrets defined in courses', |
| |
ltisec_domlinkprot => 'Encrypt stored link protection secrets defined in domain', |
| |
ltisec_consumers => 'Encrypt stored consumer secrets defined in domain', |
| |
); |
| |
@toggles = qw(ltisec_crslinkprot ltisec_domlinkprot ltisec_consumers); |
| |
%defaultchecked = ( |
| |
'ltisec_crslinkprot' => 'off', |
| |
'ltisec_domlinkprot' => 'off', |
| |
'ltisec_consumers' => 'off', |
| |
); |
| |
} else { |
| |
%choices = &Apache::lonlocal::texthash ( |
| |
toolsec_crs => 'Encrypt stored external tool secrets defined in courses', |
| |
toolsec_dom => 'Encrypt stored external tool secrets defined in domain', |
| |
); |
| |
@toggles = qw(toolsec_crs toolsec_dom); |
| |
%defaultchecked = ( |
| |
'toolsec_crs' => 'off', |
| |
'toolsec_dom' => 'off', |
| |
); |
| |
} |
| |
my ($onclick,$itemcount); |
| |
$onclick = 'javascript:toggleLTIEncKey(this.form,'."'$context'".');'; |
| |
($output,$itemcount) = &radiobutton_prefs($encrypt,\@toggles,\%defaultchecked, |
| |
\%choices,$itemcount,$onclick,'','left','no'); |
| |
|
| |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
| |
my $noprivkeysty = 'display:inline-block'; |
| |
if ($numshown) { |
| |
$noprivkeysty = 'display:none'; |
| |
} |
| |
$output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.&mt('Encryption Key(s)').'</td>'. |
| |
'<td><div id="'.$context.'_noprivkey" style="'.$noprivkeysty.'" >'. |
| |
'<span class="LC_nobreak">'.&mt('Not in use').'</span></div>'. |
| |
$extra. |
| |
'</td></tr>'; |
| |
$itemcount ++; |
| |
$$rowtotal += $itemcount; |
| |
return $output; |
| |
} |
| |
|
| sub print_proctoring { |
sub print_proctoring { |
| my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
| my $itemcount = 1; |
my $itemcount = 1; |
|
Line 6538 sub print_lti {
|
Line 6169 sub print_lti {
|
| } |
} |
| } |
} |
| if ($position eq 'top') { |
if ($position eq 'top') { |
| my @ids=&Apache::lonnet::current_machine_ids(); |
$datatable = &secrets_form($dom,'ltisec',\%encrypt,\%privkeys,$rowtotal); |
| my %servers = &Apache::lonnet::get_servers($dom,'library'); |
|
| my $primary = &Apache::lonnet::domain($dom,'primary'); |
|
| my ($extra,$numshown); |
|
| foreach my $hostid (sort(keys(%servers))) { |
|
| my ($showextra,$divsty,$switch); |
|
| if ($hostid eq $primary) { |
|
| if (($encrypt{'ltisec_consumers'}) || ($encrypt{'ltisec_domlinkprot'})) { |
|
| $showextra = 1; |
|
| } |
|
| } |
|
| if ($encrypt{'ltisec_crslinkprot'}) { |
|
| $showextra = 1; |
|
| } |
|
| unless (grep(/^\Q$hostid\E$/,@ids)) { |
|
| $switch = 1; |
|
| } |
|
| if ($showextra) { |
|
| $numshown ++; |
|
| $divsty = 'display:inline-block'; |
|
| } else { |
|
| $divsty = 'display:none'; |
|
| } |
|
| $extra .= '<fieldset id="ltisec_info_'.$hostid.'" style="'.$divsty.'">'. |
|
| '<legend>'.$hostid.'</legend>'; |
|
| if ($switch) { |
|
| my $switchserver = '<a href="/adm/switchserver?otherserver='.$hostid.'&role='. |
|
| &HTML::Entities::encode($env{'request.role'},'\'<>"&'). |
|
| '&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
|
| if (exists($privkeys{$hostid})) { |
|
| $extra .= '<div id="ltisec_divcurrprivkey_'.$hostid.'" style="display:inline-block" />'. |
|
| '<span class="LC_nobreak">'. |
|
| &mt('Encryption Key').': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'. |
|
| '<span class="LC_nobreak">'.&mt('Change?'). |
|
| '<label><input type="radio" value="0" name="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" checked="checked" />'.&mt('No').'</label>'. |
|
| (' 'x2). |
|
| '<label><input type="radio" value="1" name="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" />'.&mt('Yes'). |
|
| '</label> </span><div id="ltisec_divchgprivkey_'.$hostid.'" style="display:none" />'. |
|
| '<span class="LC_nobreak"> - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver). |
|
| '</span></div>'; |
|
| } else { |
|
| $extra .= '<span class="LC_nobreak">'. |
|
| &mt('Key required').' - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver). |
|
| '</span>'."\n"; |
|
| } |
|
| } elsif (exists($privkeys{$hostid})) { |
|
| $extra .= '<div id="ltisec_divcurrprivkey_'.$hostid.'" style="display:inline-block" /><span class="LC_nobreak">'. |
|
| &mt('Encryption Key').': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'. |
|
| '<span class="LC_nobreak">'.&mt('Change?'). |
|
| '<label><input type="radio" value="0" name="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" checked="checked" />'.&mt('No').'</label>'. |
|
| (' 'x2). |
|
| '<label><input type="radio" value="1" name="ltisec_changeprivkey_'.$hostid.'" onclick="javascript:togglePrivKey(this.form,'."'$hostid'".');" />'.&mt('Yes'). |
|
| '</label> </span><div id="ltisec_divchgprivkey_'.$hostid.'" style="display:none" />'. |
|
| '<span class="LC_nobreak">'.&mt('New Key').':'. |
|
| '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="new-password" />'. |
|
| '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltisec_privkey_'.$hostid.'.type='."'text'".' } else { this.form.ltisec_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'. |
|
| '</span></div>'; |
|
| } else { |
|
| $extra .= '<span class="LC_nobreak">'.&mt('Encryption Key').':'. |
|
| '<input type="password" size="20" name="ltisec_privkey_'.$hostid.'" value="" autocomplete="new-password" />'. |
|
| '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltisec_privkey_'.$hostid.'.type='."'text'".' } else { this.form.ltisec_privkey_'.$hostid.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'; |
|
| } |
|
| $extra .= '</fieldset>'; |
|
| } |
|
| my %choices = &Apache::lonlocal::texthash ( |
|
| ltisec_crslinkprot => 'Encrypt stored link protection secrets defined in courses', |
|
| ltisec_domlinkprot => 'Encrypt stored link protection secrets defined in domain', |
|
| ltisec_consumers => 'Encrypt stored consumer secrets defined in domain', |
|
| ); |
|
| my @toggles = qw(ltisec_crslinkprot ltisec_domlinkprot ltisec_consumers); |
|
| my %defaultchecked = ( |
|
| 'ltisec_crslinkprot' => 'off', |
|
| 'ltisec_domlinkprot' => 'off', |
|
| 'ltisec_consumers' => 'off', |
|
| ); |
|
| my ($onclick,$itemcount); |
|
| $onclick = 'javascript:toggleLTIEncKey(this.form);'; |
|
| ($datatable,$itemcount) = &radiobutton_prefs(\%encrypt,\@toggles,\%defaultchecked, |
|
| \%choices,$itemcount,$onclick,'','left','no'); |
|
| |
|
| $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
| my $noprivkeysty = 'display:inline-block'; |
|
| if ($numshown) { |
|
| $noprivkeysty = 'display:none'; |
|
| } |
|
| $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.&mt('Encryption Key(s)').'</td>'. |
|
| '<td><div id="ltisec_noprivkey" style="'.$noprivkeysty.'" >'. |
|
| '<span class="LC_nobreak">'.&mt('Not in use').'</span></div>'. |
|
| $extra. |
|
| '</td></tr>'; |
|
| $itemcount ++; |
|
| $$rowtotal += $itemcount; |
|
| } elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
| $datatable = &password_rules('secrets',\$itemcount,\%rules); |
$datatable = &password_rules('ltisecrets',\$itemcount,\%rules); |
| $$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
| } elsif ($position eq 'lower') { |
} elsif ($position eq 'lower') { |
| $datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain'); |
$datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain'); |
|
Line 8237 sub password_rules {
|
Line 7777 sub password_rules {
|
| max => 'Maximum password length', |
max => 'Maximum password length', |
| chars => 'Required characters', |
chars => 'Required characters', |
| ); |
); |
| } elsif ($prefix eq 'secrets') { |
} elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) { |
| %titles = &Apache::lonlocal::texthash ( |
%titles = &Apache::lonlocal::texthash ( |
| min => 'Minimum secret length', |
min => 'Minimum secret length', |
| max => 'Maximum secret length', |
max => 'Maximum secret length', |
|
Line 11061 sub legacy_scantronformat {
|
Line 10601 sub legacy_scantronformat {
|
| my ($url,$error); |
my ($url,$error); |
| my @statinfo = &Apache::lonnet::stat_file($newurl); |
my @statinfo = &Apache::lonnet::stat_file($newurl); |
| if ((!@statinfo) || ($statinfo[0] eq 'no_such_dir')) { |
if ((!@statinfo) || ($statinfo[0] eq 'no_such_dir')) { |
| |
my $modified = []; |
| (my $result,$url) = |
(my $result,$url) = |
| &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron', |
&Apache::lonconfigsettings::publishlogo($r,'copy',$legacyfile,$dom,$confname, |
| '','',$newfile); |
'scantron','','',$newfile,$modified); |
| if ($result ne 'ok') { |
if ($result eq 'ok') { |
| |
&update_modify_urls($r,$modified); |
| |
} else { |
| $error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result); |
$error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result); |
| } |
} |
| } |
} |
|
Line 11644 sub passwords_javascript {
|
Line 11187 sub passwords_javascript {
|
| passexp => 'Warning: days before password expiration must be a positive integer (or blank).', |
passexp => 'Warning: days before password expiration must be a positive integer (or blank).', |
| passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).', |
passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).', |
| ); |
); |
| } elsif ($prefix eq 'secrets') { |
} elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) { |
| %intalert = &Apache::lonlocal::texthash ( |
%intalert = &Apache::lonlocal::texthash ( |
| passmin => 'Warning: minimum secret length must be a positive integer greater than 6.', |
passmin => 'Warning: minimum secret length must be a positive integer greater than 6.', |
| passmax => 'Warning: maximum secret length must be a positive integer (or blank).', |
passmax => 'Warning: maximum secret length must be a positive integer (or blank).', |
|
Line 12518 sub modify_login {
|
Line 12061 sub modify_login {
|
| if ($addedfile ne '') { |
if ($addedfile ne '') { |
| push(@allnew,$addedfile); |
push(@allnew,$addedfile); |
| } |
} |
| |
my $modified = []; |
| foreach my $lang (@allnew) { |
foreach my $lang (@allnew) { |
| my $formelem = 'loginhelpurl_'.$lang; |
my $formelem = 'loginhelpurl_'.$lang; |
| if ($lang eq $env{'form.loginhelpurl_add_lang'}) { |
if ($lang eq $env{'form.loginhelpurl_add_lang'}) { |
| $formelem = 'loginhelpurl_add_file'; |
$formelem = 'loginhelpurl_add_file'; |
| } |
} |
| (my $result,$newurl{$lang}) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
(my $result,$newurl{$lang}) = |
| "help/$lang",'','',$newfile{$lang}); |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
| |
"help/$lang",'','',$newfile{$lang}, |
| |
$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $loginhash{'login'}{'helpurl'}{$lang} = $newurl{$lang}; |
$loginhash{'login'}{'helpurl'}{$lang} = $newurl{$lang}; |
| $changes{'helpurl'}{$lang} = 1; |
$changes{'helpurl'}{$lang} = 1; |
|
Line 12537 sub modify_login {
|
Line 12083 sub modify_login {
|
| } |
} |
| } |
} |
| } |
} |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of custom log-in help file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
$error = &mt("Upload of custom log-in help file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
| } |
} |
|
Line 12594 sub modify_login {
|
Line 12141 sub modify_login {
|
| if ($switchserver) { |
if ($switchserver) { |
| $error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver); |
$error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver); |
| } elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
| |
my $modified = []; |
| foreach my $lonhost (@newhosts) { |
foreach my $lonhost (@newhosts) { |
| my $formelem = 'loginheadtag_'.$lonhost; |
my $formelem = 'loginheadtag_'.$lonhost; |
| (my $result,$newheadtagurls{$lonhost}) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
(my $result,$newheadtagurls{$lonhost}) = |
| "login/headtag/$lonhost",'','', |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
| $env{'form.loginheadtag_'.$lonhost.'.filename'}); |
"login/headtag/$lonhost",'','', |
| |
$env{'form.loginheadtag_'.$lonhost.'.filename'}, |
| |
$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost}; |
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost}; |
| $changes{'headtag'}{$lonhost} = 1; |
$changes{'headtag'}{$lonhost} = 1; |
|
Line 12615 sub modify_login {
|
Line 12165 sub modify_login {
|
| } |
} |
| } |
} |
| } |
} |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of custom markup file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
$error = &mt("Upload of custom markup file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
| } |
} |
|
Line 12689 sub modify_login {
|
Line 12240 sub modify_login {
|
| if ($switchserver) { |
if ($switchserver) { |
| $error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver); |
$error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver); |
| } elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
| |
my $modified = []; |
| foreach my $lonhost (@newsamlimgs) { |
foreach my $lonhost (@newsamlimgs) { |
| my $formelem = 'saml_img_'.$lonhost; |
my $formelem = 'saml_img_'.$lonhost; |
| my ($result,$imgurl) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
my ($result,$imgurl) = |
| "login/saml/$lonhost",'','', |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
| $env{'form.saml_img_'.$lonhost.'.filename'}); |
"login/saml/$lonhost",'','', |
| |
$env{'form.saml_img_'.$lonhost.'.filename'}, |
| |
$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $currsaml{$lonhost}{'img'} = $imgurl; |
$currsaml{$lonhost}{'img'} = $imgurl; |
| $loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl; |
$loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl; |
|
Line 12704 sub modify_login {
|
Line 12258 sub modify_login {
|
| $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
| } |
} |
| } |
} |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of SSO button image file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
$error = &mt("Upload of SSO button image file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
| } |
} |
|
Line 13408 sub modify_colors {
|
Line 12963 sub modify_colors {
|
| $error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver); |
$error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver); |
| } else { |
} else { |
| if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
| |
my $modified = []; |
| my ($result,$logourl) = |
my ($result,$logourl) = |
| &publishlogo($r,'upload',$role.'_'.$img, |
&Apache::lonconfigsettings::publishlogo($r,'upload',$role.'_'.$img, |
| $dom,$confname,$img,$width,$height); |
$dom,$confname,$img,$width,$height, |
| |
'',$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $confhash->{$role}{$img} = $logourl; |
$confhash->{$role}{$img} = $logourl; |
| $changes{$role}{'images'}{$img} = 1; |
$changes{$role}{'images'}{$img} = 1; |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result); |
$error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result); |
| } |
} |
|
Line 13435 sub modify_colors {
|
Line 12993 sub modify_colors {
|
| # is confname an author? |
# is confname an author? |
| if ($switchserver eq '') { |
if ($switchserver eq '') { |
| if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
| |
my $modified = []; |
| my ($result,$logourl) = |
my ($result,$logourl) = |
| &publishlogo($r,'copy',$domconfig->{$role}{$img}, |
&Apache::lonconfigsettings::publishlogo($r,'copy',$domconfig->{$role}{$img}, |
| $dom,$confname,$img,$width,$height); |
$dom,$confname,$img,$width,$height, |
| |
'',$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $confhash->{$role}{$img} = $logourl; |
$confhash->{$role}{$img} = $logourl; |
| $changes{$role}{'images'}{$img} = 1; |
$changes{$role}{'images'}{$img} = 1; |
| |
&update_modify_urls($r,$modified); |
| } |
} |
| } |
} |
| } |
} |
|
Line 13734 sub check_authorstatus {
|
Line 13295 sub check_authorstatus {
|
| return $author_ok; |
return $author_ok; |
| } |
} |
| |
|
| sub publishlogo { |
sub update_modify_urls { |
| my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_; |
my ($r,$modified) = @_; |
| my ($output,$fname,$logourl,$madethumb); |
if ((ref($modified) eq 'ARRAY') && (@{$modified})) { |
| if ($action eq 'upload') { |
push(@{$modified_urls},$modified); |
| $fname=$env{'form.'.$formname.'.filename'}; |
unless ($registered_cleanup) { |
| chop($env{'form.'.$formname}); |
my $handlers = $r->get_handlers('PerlCleanupHandler'); |
| } else { |
$r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
| ($fname) = ($formname =~ /([^\/]+)$/); |
$registered_cleanup=1; |
| } |
|
| if ($savefileas ne '') { |
|
| $fname = $savefileas; |
|
| } |
|
| $fname=&Apache::lonnet::clean_filename($fname); |
|
| # See if there is anything left |
|
| unless ($fname) { return ('error: no uploaded file'); } |
|
| $fname="$subdir/$fname"; |
|
| my $docroot=$r->dir_config('lonDocRoot'); |
|
| my $filepath="$docroot/priv"; |
|
| my $relpath = "$dom/$confname"; |
|
| my ($fnamepath,$file,$fetchthumb); |
|
| $file=$fname; |
|
| if ($fname=~m|/|) { |
|
| ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|); |
|
| } |
|
| my @parts=split(/\//,"$filepath/$relpath/$fnamepath"); |
|
| my $count; |
|
| for ($count=5;$count<=$#parts;$count++) { |
|
| $filepath.="/$parts[$count]"; |
|
| if ((-e $filepath)!=1) { |
|
| mkdir($filepath,02770); |
|
| } |
|
| } |
|
| # Check for bad extension and disallow upload |
|
| if ($file=~/\.(\w+)$/ && |
|
| (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { |
|
| $output = |
|
| &mt('Invalid file extension ([_1]) - reserved for internal use.',$1); |
|
| } elsif ($file=~/\.(\w+)$/ && |
|
| !defined(&Apache::loncommon::fileembstyle($1))) { |
|
| $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1); |
|
| } elsif ($file=~/\.(\d+)\.(\w+)$/) { |
|
| $output = &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2); |
|
| } elsif (-d "$filepath/$file") { |
|
| $output = &mt('Filename is a directory name - rename the file and re-upload'); |
|
| } else { |
|
| my $source = $filepath.'/'.$file; |
|
| my $logfile; |
|
| if (!open($logfile,">>",$source.'.log')) { |
|
| return (&mt('No write permission to Authoring Space')); |
|
| } |
|
| print $logfile |
|
| "\n================= Publish ".localtime()." ================\n". |
|
| $env{'user.name'}.':'.$env{'user.domain'}."\n"; |
|
| # Save the file |
|
| if (!open(FH,">",$source)) { |
|
| &Apache::lonnet::logthis('Failed to create '.$source); |
|
| return (&mt('Failed to create file')); |
|
| } |
|
| if ($action eq 'upload') { |
|
| if (!print FH ($env{'form.'.$formname})) { |
|
| &Apache::lonnet::logthis('Failed to write to '.$source); |
|
| return (&mt('Failed to write file')); |
|
| } |
|
| } else { |
|
| my $original = &Apache::lonnet::filelocation('',$formname); |
|
| if(!copy($original,$source)) { |
|
| &Apache::lonnet::logthis('Failed to copy '.$original.' to '.$source); |
|
| return (&mt('Failed to write file')); |
|
| } |
|
| } |
|
| close(FH); |
|
| chmod(0660, $source); # Permissions to rw-rw---. |
|
| |
|
| my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath; |
|
| my $copyfile=$targetdir.'/'.$file; |
|
| |
|
| my @parts=split(/\//,$targetdir); |
|
| my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]"; |
|
| for (my $count=5;$count<=$#parts;$count++) { |
|
| $path.="/$parts[$count]"; |
|
| if (!-e $path) { |
|
| print $logfile "\nCreating directory ".$path; |
|
| mkdir($path,02770); |
|
| } |
|
| } |
|
| my $versionresult; |
|
| if (-e $copyfile) { |
|
| $versionresult = &logo_versioning($targetdir,$file,$logfile); |
|
| } else { |
|
| $versionresult = 'ok'; |
|
| } |
|
| if ($versionresult eq 'ok') { |
|
| if (copy($source,$copyfile)) { |
|
| print $logfile "\nCopied original source to ".$copyfile."\n"; |
|
| $output = 'ok'; |
|
| $logourl = '/res/'.$dom.'/'.$confname.'/'.$fname; |
|
| push(@{$modified_urls},[$copyfile,$source]); |
|
| my $metaoutput = |
|
| &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile); |
|
| unless ($registered_cleanup) { |
|
| my $handlers = $r->get_handlers('PerlCleanupHandler'); |
|
| $r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
|
| $registered_cleanup=1; |
|
| } |
|
| } else { |
|
| print $logfile "\nUnable to write ".$copyfile.':'.$!."\n"; |
|
| $output = &mt('Failed to copy file to RES space').", $!"; |
|
| } |
|
| if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) { |
|
| my $inputfile = $filepath.'/'.$file; |
|
| my $outfile = $filepath.'/'.'tn-'.$file; |
|
| my ($fullwidth,$fullheight) = &check_dimensions($inputfile); |
|
| if ($fullwidth ne '' && $fullheight ne '') { |
|
| if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
|
| my $thumbsize = $thumbwidth.'x'.$thumbheight; |
|
| my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile); |
|
| system({$args[0]} @args); |
|
| chmod(0660, $filepath.'/tn-'.$file); |
|
| if (-e $outfile) { |
|
| my $copyfile=$targetdir.'/tn-'.$file; |
|
| if (copy($outfile,$copyfile)) { |
|
| print $logfile "\nCopied source to ".$copyfile."\n"; |
|
| my $thumb_metaoutput = |
|
| &write_metadata($dom,$confname,$formname, |
|
| $targetdir,'tn-'.$file,$logfile); |
|
| push(@{$modified_urls},[$copyfile,$outfile]); |
|
| unless ($registered_cleanup) { |
|
| my $handlers = $r->get_handlers('PerlCleanupHandler'); |
|
| $r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
|
| $registered_cleanup=1; |
|
| } |
|
| $madethumb = 1; |
|
| } else { |
|
| print $logfile "\nUnable to write ".$copyfile. |
|
| ':'.$!."\n"; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } else { |
|
| $output = $versionresult; |
|
| } |
} |
| } |
} |
| return ($output,$logourl,$madethumb); |
|
| } |
|
| |
|
| sub logo_versioning { |
|
| my ($targetdir,$file,$logfile) = @_; |
|
| my $target = $targetdir.'/'.$file; |
|
| my ($maxversion,$fn,$extn,$output); |
|
| $maxversion = 0; |
|
| if ($file =~ /^(.+)\.(\w+)$/) { |
|
| $fn=$1; |
|
| $extn=$2; |
|
| } |
|
| opendir(DIR,$targetdir); |
|
| while (my $filename=readdir(DIR)) { |
|
| if ($filename=~/\Q$fn\E\.(\d+)\.\Q$extn\E$/) { |
|
| $maxversion=($1>$maxversion)?$1:$maxversion; |
|
| } |
|
| } |
|
| $maxversion++; |
|
| print $logfile "\nCreating old version ".$maxversion."\n"; |
|
| my $copyfile=$targetdir.'/'.$fn.'.'.$maxversion.'.'.$extn; |
|
| if (copy($target,$copyfile)) { |
|
| print $logfile "Copied old target to ".$copyfile."\n"; |
|
| $copyfile=$copyfile.'.meta'; |
|
| if (copy($target.'.meta',$copyfile)) { |
|
| print $logfile "Copied old target metadata to ".$copyfile."\n"; |
|
| $output = 'ok'; |
|
| } else { |
|
| print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n"; |
|
| $output = &mt('Failed to copy old meta').", $!, "; |
|
| } |
|
| } else { |
|
| print $logfile "Unable to write ".$copyfile.':'.$!."\n"; |
|
| $output = &mt('Failed to copy old target').", $!, "; |
|
| } |
|
| return $output; |
|
| } |
|
| |
|
| sub write_metadata { |
|
| my ($dom,$confname,$formname,$targetdir,$file,$logfile) = @_; |
|
| my (%metadatafields,%metadatakeys,$output); |
|
| $metadatafields{'title'}=$formname; |
|
| $metadatafields{'creationdate'}=time; |
|
| $metadatafields{'lastrevisiondate'}=time; |
|
| $metadatafields{'copyright'}='public'; |
|
| $metadatafields{'modifyinguser'}=$env{'user.name'}.':'. |
|
| $env{'user.domain'}; |
|
| $metadatafields{'authorspace'}=$confname.':'.$dom; |
|
| $metadatafields{'domain'}=$dom; |
|
| { |
|
| print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
|
| my $mfh; |
|
| if (open($mfh,">",$targetdir.'/'.$file.'.meta')) { |
|
| foreach (sort(keys(%metadatafields))) { |
|
| unless ($_=~/\./) { |
|
| my $unikey=$_; |
|
| $unikey=~/^([A-Za-z]+)/; |
|
| my $tag=$1; |
|
| $tag=~tr/A-Z/a-z/; |
|
| print $mfh "\n\<$tag"; |
|
| foreach (split(/\,/,$metadatakeys{$unikey})) { |
|
| my $value=$metadatafields{$unikey.'.'.$_}; |
|
| $value=~s/\"/\'\'/g; |
|
| print $mfh ' '.$_.'="'.$value.'"'; |
|
| } |
|
| print $mfh '>'. |
|
| &HTML::Entities::encode($metadatafields{$unikey},'<>&"') |
|
| .'</'.$tag.'>'; |
|
| } |
|
| } |
|
| $output = 'ok'; |
|
| print $logfile "\nWrote metadata"; |
|
| close($mfh); |
|
| } else { |
|
| print $logfile "\nFailed to open metadata file"; |
|
| $output = &mt('Could not write metadata'); |
|
| } |
|
| } |
|
| return $output; |
|
| } |
} |
| |
|
| sub notifysubscribed { |
sub notifysubscribed { |
|
Line 14738 sub process_textbook_image {
|
Line 14086 sub process_textbook_image {
|
| $error = &mt('Upload of textbook image is not permitted to this server: [_1]', |
$error = &mt('Upload of textbook image is not permitted to this server: [_1]', |
| $switchserver); |
$switchserver); |
| } elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
| |
my $modified = []; |
| my ($result,$imageurl) = |
my ($result,$imageurl) = |
| &publishlogo($r,'upload',$caller,$dom,$confname, |
&Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname, |
| "$type/$cdom/$cnum/cover",$width,$height); |
"$type/$cdom/$cnum/cover",$width,$height, |
| |
'',$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $url = $imageurl; |
$url = $imageurl; |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result); |
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result); |
| } |
} |
|
Line 14757 sub process_textbook_image {
|
Line 14108 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 (%currtoolsec,%secchanges,%newtoolsec,%newkeyset); |
| my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext); |
&fetch_secrets($dom,'toolsec',\%domconfig,\%currtoolsec,\%secchanges,\%newtoolsec,\%newkeyset); |
| |
|
| 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); |
| my (%posslti,%possfield); |
|
| my @courseroles = ('cc','in','ta','ep','st'); |
my ($resulttext,$ltitoolsoutput,$is_home,$errors,%ltitoolschg,%newtoolsenc,%newltitools); |
| my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner); |
my $toolserror = |
| map { $posslti{$_} = 1; } @ltiroles; |
&Apache::courseprefs::process_ltitools($r,$dom,$confname,$domconfig{'ltitools'},\%ltitoolschg,'domain', |
| my @allfields = ('fullname','firstname','lastname','email','user','roles'); |
$lastactref,$configuserok,$switchserver,$author_ok); |
| map { $possfield{$_} = 1; } @allfields; |
|
| my %lt = <itools_names(); |
my $home = &Apache::lonnet::domain($dom,'primary'); |
| if ($env{'form.ltitools_add'}) { |
unless (($home eq 'no_host') || ($home eq '')) { |
| my $title = $env{'form.ltitools_add_title'}; |
my @ids=&Apache::lonnet::current_machine_ids(); |
| $title =~ s/(`)/'/g; |
foreach my $id (@ids) { if ($id eq $home) { $is_home=1; last; } } |
| ($newid,my $error) = &get_ltitools_id($dom,$title); |
} |
| if ($newid) { |
|
| my $position = $env{'form.ltitools_add_pos'}; |
if (keys(%ltitoolschg)) { |
| $position =~ s/\D+//g; |
foreach my $id (keys(%ltitoolschg)) { |
| if ($position ne '') { |
if (ref($ltitoolschg{$id}) eq 'HASH') { |
| $allpos[$position] = $newid; |
foreach my $inner (keys(%{$ltitoolschg{$id}})) { |
| } |
if (($inner eq 'secret') || ($inner eq 'key')) { |
| $changes{$newid} = 1; |
if ($is_home) { |
| foreach my $item ('title','url','key','secret','lifetime') { |
$newtoolsenc{$id}{$inner} = $ltitoolschg{$id}{$inner}; |
| $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
|
| if ($item eq 'lifetime') { |
|
| $env{'form.ltitools_add_'.$item} =~ s/[^\d.]//g; |
|
| } |
|
| if ($env{'form.ltitools_add_'.$item}) { |
|
| 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') { |
|
| $confhash{$newid}{'version'} = $env{'form.ltitools_add_version'}; |
|
| } |
|
| if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
|
| $confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
|
| } |
|
| if ($env{'form.ltitools_add_sigmethod'} eq 'HMAC-SHA256') { |
|
| $confhash{$newid}{'sigmethod'} = $env{'form.ltitools_add_sigmethod'}; |
|
| } else { |
|
| $confhash{$newid}{'sigmethod'} = 'HMAC-SHA1'; |
|
| } |
|
| foreach my $item ('width','height','linktext','explanation') { |
|
| $env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
|
| $env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
|
| if (($item eq 'width') || ($item eq 'height')) { |
|
| if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
|
| $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') { |
|
| $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 { |
|
| $confhash{$newid}{'display'}{'target'} = 'iframe'; |
|
| } |
|
| foreach my $item ('passback','roster') { |
|
| if ($env{'form.ltitools_'.$item.'_add'}) { |
|
| $confhash{$newid}{$item} = 1; |
|
| if ($env{'form.ltitools_'.$item.'valid_add'} ne '') { |
|
| my $lifetime = $env{'form.ltitools_'.$item.'valid_add'}; |
|
| $lifetime =~ s/^\s+|\s+$//g; |
|
| if ($lifetime =~ /^\d+\.?\d*$/) { |
|
| $confhash{$newid}{$item.'valid'} = $lifetime; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| if ($env{'form.ltitools_add_image.filename'} ne '') { |
|
| my ($imageurl,$error) = |
|
| &process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$newid, |
|
| $configuserok,$switchserver,$author_ok); |
|
| if ($imageurl) { |
|
| $confhash{$newid}{'image'} = $imageurl; |
|
| } |
|
| if ($error) { |
|
| &Apache::lonnet::logthis($error); |
|
| $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
| } |
|
| } |
|
| my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields'); |
|
| foreach my $field (@fields) { |
|
| if ($possfield{$field}) { |
|
| if ($field eq 'roles') { |
|
| foreach my $role (@courseroles) { |
|
| my $choice = $env{'form.ltitools_add_roles_'.$role}; |
|
| if (($choice ne '') && ($posslti{$choice})) { |
|
| $confhash{$newid}{'roles'}{$role} = $choice; |
|
| if ($role eq 'cc') { |
|
| $confhash{$newid}{'roles'}{'co'} = $choice; |
|
| } |
|
| } |
|
| } |
} |
| } else { |
|
| $confhash{$newid}{'fields'}{$field} = 1; |
|
| } |
} |
| } |
} |
| } |
} |
| if (ref($confhash{$newid}{'fields'}) eq 'HASH') { |
|
| if ($confhash{$newid}{'fields'}{'user'}) { |
|
| if ($env{'form.ltitools_userincdom_add'}) { |
|
| $confhash{$newid}{'incdom'} = 1; |
|
| } |
|
| } |
|
| } |
|
| my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig'); |
|
| foreach my $item (@courseconfig) { |
|
| $confhash{$newid}{'crsconf'}{$item} = 1; |
|
| } |
|
| if ($env{'form.ltitools_add_custom'}) { |
|
| my $name = $env{'form.ltitools_add_custom_name'}; |
|
| my $value = $env{'form.ltitools_add_custom_value'}; |
|
| $value =~ s/(`)/'/g; |
|
| $name =~ s/(`)/'/g; |
|
| $confhash{$newid}{'custom'}{$name} = $value; |
|
| } |
|
| } else { |
|
| my $error = &mt('Failed to acquire unique ID for new external tool'); |
|
| $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
| } |
|
| } |
|
| if (ref($domconfig{$action}) eq 'HASH') { |
|
| my %deletions; |
|
| my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del'); |
|
| if (@todelete) { |
|
| map { $deletions{$_} = 1; } @todelete; |
|
| } |
} |
| my %customadds; |
$ltitoolsoutput = &Apache::courseprefs::store_ltitools($dom,'','domain',\%ltitoolschg,$domconfig{'ltitools'}); |
| my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd'); |
if (keys(%ltitoolschg)) { |
| if (@newcustom) { |
%newltitools = %ltitoolschg; |
| map { $customadds{$_} = 1; } @newcustom; |
|
| } |
|
| my %imgdeletions; |
|
| my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del'); |
|
| if (@todeleteimages) { |
|
| map { $imgdeletions{$_} = 1; } @todeleteimages; |
|
| } |
} |
| my $maxnum = $env{'form.ltitools_maxnum'}; |
} |
| for (my $i=0; $i<=$maxnum; $i++) { |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
| my $itemid = $env{'form.ltitools_id_'.$i}; |
foreach my $id (%{$domconfig{'ltitools'}}) { |
| $itemid =~ s/\D+//g; |
next if ($id !~ /^\d+$/); |
| if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
unless (exists($ltitoolschg{$id})) { |
| if ($deletions{$itemid}) { |
if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') { |
| if ($domconfig{$action}{$itemid}{'image'}) { |
foreach my $inner (keys(%{$domconfig{'ltitools'}{$id}})) { |
| #FIXME need to obsolete item in RES space |
if (($inner eq 'secret') || ($inner eq 'key')) { |
| } |
if ($is_home) { |
| $changes{$itemid} = $domconfig{$action}{$itemid}{'title'}; |
$newtoolsenc{$id}{$inner} = $domconfig{'ltitools'}{$id}{$inner}; |
| next; |
|
| } else { |
|
| my $newpos = $env{'form.ltitools_'.$itemid}; |
|
| $newpos =~ s/\D+//g; |
|
| foreach my $item ('title','url','lifetime') { |
|
| $confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
|
| if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
|
| $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') { |
|
| $confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
|
| } |
|
| if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') { |
|
| $confhash{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i}; |
|
| } |
|
| if ($env{'form.ltitools_sigmethod_'.$i} eq 'HMAC-SHA256') { |
|
| $confhash{$itemid}{'sigmethod'} = $env{'form.ltitools_sigmethod_'.$i}; |
|
| } else { |
|
| $confhash{$itemid}{'sigmethod'} = 'HMAC-SHA1'; |
|
| } |
|
| if ($domconfig{$action}{$itemid}{'sigmethod'} eq '') { |
|
| if ($confhash{$itemid}{'sigmethod'} ne 'HMAC-SHA1') { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } elsif ($domconfig{$action}{$itemid}{'sigmethod'} ne $confhash{$itemid}{'sigmethod'}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| foreach my $size ('width','height') { |
|
| $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//; |
|
| $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//; |
|
| if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) { |
|
| $confhash{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i}; |
|
| if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
| if ($domconfig{$action}{$itemid}{'display'}{$size} ne $confhash{$itemid}{'display'}{$size}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } else { |
|
| $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') { |
|
| $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 { |
|
| $confhash{$itemid}{'display'}{'target'} = 'iframe'; |
|
| } |
|
| if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
| if ($domconfig{$action}{$itemid}{'display'}{'target'} ne $confhash{$itemid}{'display'}{'target'}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } else { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| foreach my $extra ('passback','roster') { |
|
| if ($env{'form.ltitools_'.$extra.'_'.$i}) { |
|
| $confhash{$itemid}{$extra} = 1; |
|
| if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') { |
|
| my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i}; |
|
| $lifetime =~ s/^\s+|\s+$//g; |
|
| if ($lifetime =~ /^\d+\.?\d*$/) { |
|
| $confhash{$itemid}{$extra.'valid'} = $lifetime; |
|
| } |
|
| } |
|
| } |
|
| if ($domconfig{$action}{$itemid}{$extra} ne $confhash{$itemid}{$extra}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| if ($domconfig{$action}{$itemid}{$extra.'valid'} ne $confhash{$itemid}{$extra.'valid'}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
|
| foreach my $item ('label','title','target','linktext','explanation','append') { |
|
| if (grep(/^\Q$item\E$/,@courseconfig)) { |
|
| $confhash{$itemid}{'crsconf'}{$item} = 1; |
|
| if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
|
| if ($domconfig{$action}{$itemid}{'crsconf'}{$item} ne $confhash{$itemid}{'crsconf'}{$item}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } else { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| } |
|
| my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i); |
|
| foreach my $field (@fields) { |
|
| if ($possfield{$field}) { |
|
| if ($field eq 'roles') { |
|
| foreach my $role (@courseroles) { |
|
| my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i}; |
|
| if (($choice ne '') && ($posslti{$choice})) { |
|
| $confhash{$itemid}{'roles'}{$role} = $choice; |
|
| if ($role eq 'cc') { |
|
| $confhash{$itemid}{'roles'}{'co'} = $choice; |
|
| } |
|
| } |
|
| if (ref($domconfig{$action}{$itemid}{'roles'}) eq 'HASH') { |
|
| if ($domconfig{$action}{$itemid}{'roles'}{$role} ne $confhash{$itemid}{'roles'}{$role}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } elsif ($confhash{$itemid}{'roles'}{$role}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| } else { |
|
| $confhash{$itemid}{'fields'}{$field} = 1; |
|
| if (ref($domconfig{$action}{$itemid}{'fields'}) eq 'HASH') { |
|
| if ($domconfig{$action}{$itemid}{'fields'}{$field} ne $confhash{$itemid}{'fields'}{$field}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } else { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
|
| if ($confhash{$itemid}{'fields'}{'user'}) { |
|
| if ($env{'form.ltitools_userincdom_'.$i}) { |
|
| $confhash{$itemid}{'incdom'} = 1; |
|
| } |
|
| if ($domconfig{$action}{$itemid}{'incdom'} ne $confhash{$itemid}{'incdom'}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| } |
|
| $allpos[$newpos] = $itemid; |
|
| } |
|
| if ($imgdeletions{$itemid}) { |
|
| $changes{$itemid} = 1; |
|
| #FIXME need to obsolete item in RES space |
|
| } elsif ($env{'form.ltitools_image_'.$i.'.filename'}) { |
|
| my ($imgurl,$error) = &process_ltitools_image($r,$dom,$confname,'ltitools_image_'.$i, |
|
| $itemid,$configuserok,$switchserver, |
|
| $author_ok); |
|
| if ($imgurl) { |
|
| $confhash{$itemid}{'image'} = $imgurl; |
|
| $changes{$itemid} = 1; |
|
| } |
|
| if ($error) { |
|
| &Apache::lonnet::logthis($error); |
|
| $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
| } |
|
| } elsif ($domconfig{$action}{$itemid}{'image'}) { |
|
| $confhash{$itemid}{'image'} = |
|
| $domconfig{$action}{$itemid}{'image'}; |
|
| } |
|
| if ($customadds{$i}) { |
|
| my $name = $env{'form.ltitools_custom_name_'.$i}; |
|
| $name =~ s/(`)/'/g; |
|
| $name =~ s/^\s+//; |
|
| $name =~ s/\s+$//; |
|
| my $value = $env{'form.ltitools_custom_value_'.$i}; |
|
| $value =~ s/(`)/'/g; |
|
| $value =~ s/^\s+//; |
|
| $value =~ s/\s+$//; |
|
| if ($name ne '') { |
|
| $confhash{$itemid}{'custom'}{$name} = $value; |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| my %customdels; |
|
| my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i); |
|
| if (@customdeletions) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| map { $customdels{$_} = 1; } @customdeletions; |
|
| if (ref($domconfig{$action}{$itemid}{'custom'}) eq 'HASH') { |
|
| foreach my $key (keys(%{$domconfig{$action}{$itemid}{'custom'}})) { |
|
| unless ($customdels{$key}) { |
|
| if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') { |
|
| $confhash{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i}; |
|
| } |
|
| if ($domconfig{$action}{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) { |
|
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| unless ($changes{$itemid}) { |
|
| foreach my $key (keys(%{$domconfig{$action}{$itemid}})) { |
|
| if (ref($domconfig{$action}{$itemid}{$key}) eq 'HASH') { |
|
| if (ref($confhash{$itemid}{$key}) eq 'HASH') { |
|
| foreach my $innerkey (keys(%{$domconfig{$action}{$itemid}{$key}})) { |
|
| unless (exists($confhash{$itemid}{$key}{$innerkey})) { |
|
| $changes{$itemid} = 1; |
|
| last; |
|
| } |
|
| } |
|
| } elsif (keys(%{$domconfig{$action}{$itemid}{$key}}) > 0) { |
|
| $changes{$itemid} = 1; |
|
| } |
} |
| |
} else { |
| |
$newltitools{$id}{$inner} = $domconfig{'ltitools'}{$id}{$inner}; |
| } |
} |
| last if ($changes{$itemid}); |
|
| } |
} |
| |
} else { |
| |
$newltitools{$id} = $domconfig{'ltitools'}{$id}; |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| if (@allpos > 0) { |
if ($toolserror) { |
| my $idx = 0; |
$errors = '<li>'.$toolserror.'</li>'; |
| foreach my $itemid (@allpos) { |
} |
| if ($itemid ne '') { |
if ((keys(%ltitoolschg) == 0) && (keys(%secchanges) == 0)) { |
| $confhash{$itemid}{'order'} = $idx; |
$resulttext = &mt('No changes made.'); |
| if (ref($domconfig{$action}) eq 'HASH') { |
if ($errors) { |
| if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
$resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'. |
| if ($domconfig{$action}{$itemid}{'order'} ne $idx) { |
$errors.'</ul>'; |
| $changes{$itemid} = 1; |
|
| } |
|
| } |
|
| } |
|
| $idx ++; |
|
| } |
|
| } |
} |
| |
return $resulttext; |
| } |
} |
| my %ltitoolshash = ( |
my %ltitoolshash = ( |
| $action => { %confhash } |
$action => { %newltitools } |
| ); |
); |
| my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
if (keys(%secchanges)) { |
| $dom); |
$ltitoolshash{'toolsec'} = \%newtoolsec; |
| |
} |
| |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash,$dom); |
| if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
| my %ltienchash = ( |
my %keystore; |
| $action => { %encconfig } |
if ($is_home) { |
| ); |
my %toolsenchash = ( |
| &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
$action => { %newtoolsenc } |
| if (keys(%changes) > 0) { |
); |
| my $cachetime = 24*60*60; |
&Apache::lonnet::put_dom('encconfig',\%toolsenchash,$dom,undef,1); |
| my %ltiall = %confhash; |
&store_security($dom,'ltitools',\%secchanges,\%newkeyset,\%keystore,$lastactref); |
| foreach my $id (keys(%ltiall)) { |
} |
| if (ref($encconfig{$id}) eq 'HASH') { |
$resulttext = &mt('Changes made:').'<ul>'; |
| foreach my $item ('key','secret') { |
if (keys(%secchanges) > 0) { |
| $ltiall{$id}{$item} = $encconfig{$id}{$item}; |
$resulttext .= <i_security_results('ltitools',\%secchanges,\%newtoolsec,\%newkeyset,\%keystore); |
| |
} |
| |
if (keys(%ltitoolschg) > 0) { |
| |
$resulttext .= $ltitoolsoutput; |
| |
} |
| |
} else { |
| |
$errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
| |
} |
| |
if ($errors) { |
| |
$resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'. |
| |
$errors.'</ul></p>'; |
| |
} |
| |
return $resulttext; |
| |
} |
| |
|
| |
sub fetch_secrets { |
| |
my ($dom,$context,$domconfig,$currsec,$secchanges,$newsec,$newkeyset) = @_; |
| |
my %keyset; |
| |
%{$currsec} = (); |
| |
$newsec->{'private'}{'keys'} = []; |
| |
$newsec->{'encrypt'} = {}; |
| |
$newsec->{'rules'} = {}; |
| |
if ($context eq 'ltisec') { |
| |
$newsec->{'linkprot'} = {}; |
| |
} |
| |
if (ref($domconfig->{$context}) eq 'HASH') { |
| |
%{$currsec} = %{$domconfig->{$context}}; |
| |
if ($context eq 'ltisec') { |
| |
if (ref($currsec->{'linkprot'}) eq 'HASH') { |
| |
foreach my $id (keys(%{$currsec->{'linkprot'}})) { |
| |
unless ($id =~ /^\d+$/) { |
| |
delete($currsec->{'linkprot'}{$id}); |
| } |
} |
| } |
} |
| } |
} |
| &Apache::lonnet::do_cache_new('ltitools',$dom,\%ltiall,$cachetime); |
} |
| if (ref($lastactref) eq 'HASH') { |
if (ref($currsec->{'private'}) eq 'HASH') { |
| $lastactref->{'ltitools'} = 1; |
if (ref($currsec->{'private'}{'keys'}) eq 'ARRAY') { |
| |
$newsec->{'private'}{'keys'} = $currsec->{'private'}{'keys'}; |
| |
map { $keyset{$_} = 1; } @{$currsec->{'private'}{'keys'}}; |
| } |
} |
| $resulttext = &mt('Changes made:').'<ul>'; |
} |
| my %bynum; |
} |
| foreach my $itemid (sort(keys(%changes))) { |
my @items= ('crs','dom'); |
| my $position = $confhash{$itemid}{'order'}; |
if ($context eq 'ltisec') { |
| $bynum{$position} = $itemid; |
push(@items,'consumers'); |
| |
} |
| |
foreach my $item (@items) { |
| |
my $formelement; |
| |
if (($context eq 'toolsec') || ($item eq 'consumers')) { |
| |
$formelement = 'form.'.$context.'_'.$item; |
| |
} else { |
| |
$formelement = 'form.'.$context.'_'.$item.'linkprot'; |
| |
} |
| |
if ($env{$formelement}) { |
| |
$newsec->{'encrypt'}{$item} = 1; |
| |
if (ref($currsec->{'encrypt'}) eq 'HASH') { |
| |
unless ($currsec->{'encrypt'}{$item}) { |
| |
$secchanges->{'encrypt'} = 1; |
| |
} |
| |
} else { |
| |
$secchanges->{'encrypt'} = 1; |
| } |
} |
| foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
} elsif (ref($currsec->{'encrypt'}) eq 'HASH') { |
| my $itemid = $bynum{$pos}; |
if ($currsec->{'encrypt'}{$item}) { |
| if (ref($confhash{$itemid}) ne 'HASH') { |
$secchanges->{'encrypt'} = 1; |
| $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
} |
| } else { |
} |
| $resulttext .= '<li><b>'.$confhash{$itemid}{'title'}.'</b>'; |
} |
| if ($confhash{$itemid}{'image'}) { |
my $secrets; |
| $resulttext .= ' '. |
if ($context eq 'ltisec') { |
| '<img src="'.$confhash{$itemid}{'image'}.'"'. |
$secrets = 'ltisecrets'; |
| ' alt="'.&mt('Tool Provider icon').'" />'; |
} else { |
| } |
$secrets = 'toolsecrets'; |
| $resulttext .= '</li><ul>'; |
} |
| my $position = $pos + 1; |
unless (exists($currsec->{'rules'})) { |
| $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
$currsec->{'rules'} = {}; |
| foreach my $item ('version','msgtype','sigmethod','url','lifetime') { |
} |
| if ($confhash{$itemid}{$item} ne '') { |
&password_rule_changes($secrets,$newsec->{'rules'},$currsec->{'rules'},$secchanges); |
| $resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
|
| } |
my @ids=&Apache::lonnet::current_machine_ids(); |
| } |
my %servers = &Apache::lonnet::get_servers($dom,'library'); |
| if ($encconfig{$itemid}{'key'} ne '') { |
|
| $resulttext .= '<li>'.$lt{'key'}.': '.$encconfig{$itemid}{'key'}.'</li>'; |
foreach my $hostid (keys(%servers)) { |
| } |
if (($hostid ne '') && (grep(/^\Q$hostid\E$/,@ids))) { |
| if ($encconfig{$itemid}{'secret'} ne '') { |
my $newkey; |
| $resulttext .= '<li>'.$lt{'secret'}.': '; |
my $keyitem = 'form.'.$context.'_privkey_'.$hostid; |
| my $num = length($encconfig{$itemid}{'secret'}); |
if (exists($env{$keyitem})) { |
| $resulttext .= ('*'x$num).'</li>'; |
$env{$keyitem} =~ s/(`)/'/g; |
| } |
if ($keyset{$hostid}) { |
| $resulttext .= '<li>'.&mt('Configurable in course:'); |
if ($env{'form.'.$context.'_changeprivkey_'.$hostid}) { |
| my @possconfig = ('label','title','target','linktext','explanation','append'); |
if ($env{$keyitem} ne '') { |
| my $numconfig = 0; |
$secchanges->{'private'} = 1; |
| if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
$newkeyset->{$hostid} = $env{$keyitem}; |
| foreach my $item (@possconfig) { |
|
| if ($confhash{$itemid}{'crsconf'}{$item}) { |
|
| $numconfig ++; |
|
| $resulttext .= ' "'.$lt{'crs'.$item}.'"'; |
|
| } |
|
| } |
|
| } |
|
| if (!$numconfig) { |
|
| $resulttext .= ' '.&mt('None'); |
|
| } |
|
| $resulttext .= '</li>'; |
|
| foreach my $item ('passback','roster') { |
|
| $resulttext .= '<li>'.$lt{$item}.' '; |
|
| if ($confhash{$itemid}{$item}) { |
|
| $resulttext .= &mt('Yes'); |
|
| if ($confhash{$itemid}{$item.'valid'}) { |
|
| if ($item eq 'passback') { |
|
| $resulttext .= ' '.&mt('valid for at least [quant,_1,day] after launch', |
|
| $confhash{$itemid}{$item.'valid'}); |
|
| } else { |
|
| $resulttext .= ' '.&mt('valid for at least [quant,_1,second] after launch', |
|
| $confhash{$itemid}{$item.'valid'}); |
|
| } |
|
| } |
|
| } else { |
|
| $resulttext .= &mt('No'); |
|
| } |
|
| $resulttext .= '</li>'; |
|
| } |
|
| if (ref($confhash{$itemid}{'display'}) eq 'HASH') { |
|
| my $displaylist; |
|
| if ($confhash{$itemid}{'display'}{'target'}) { |
|
| $displaylist = &mt('Display target').': '. |
|
| $confhash{$itemid}{'display'}{'target'}.','; |
|
| } |
|
| foreach my $size ('width','height') { |
|
| if ($confhash{$itemid}{'display'}{$size}) { |
|
| $displaylist .= (' 'x2).$lt{$size}.': '. |
|
| $confhash{$itemid}{'display'}{$size}.','; |
|
| } |
|
| } |
|
| if ($displaylist) { |
|
| $displaylist =~ s/,$//; |
|
| $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') { |
|
| my $fieldlist; |
|
| foreach my $field (@allfields) { |
|
| if ($confhash{$itemid}{'fields'}{$field}) { |
|
| $fieldlist .= (' 'x2).$lt{$field}.','; |
|
| } |
|
| } |
|
| if ($fieldlist) { |
|
| $fieldlist =~ s/,$//; |
|
| if ($confhash{$itemid}{'fields'}{'user'}) { |
|
| if ($confhash{$itemid}{'incdom'}) { |
|
| $fieldlist .= ' ('.&mt('username:domain').')'; |
|
| } else { |
|
| $fieldlist .= ' ('.&mt('username').')'; |
|
| } |
|
| } |
|
| $resulttext .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>'; |
|
| } |
} |
| } |
} |
| if (ref($confhash{$itemid}{'roles'}) eq 'HASH') { |
} elsif ($env{$keyitem} ne '') { |
| my $rolemaps; |
unless (grep(/^\Q$hostid\E$/,@{$newsec->{'private'}{'keys'}})) { |
| foreach my $role (@courseroles) { |
push(@{$newsec->{'private'}{'keys'}},$hostid); |
| if ($confhash{$itemid}{'roles'}{$role}) { |
|
| $rolemaps .= (' 'x2).&Apache::lonnet::plaintext($role,'Course').'='. |
|
| $confhash{$itemid}{'roles'}{$role}.','; |
|
| } |
|
| } |
|
| if ($rolemaps) { |
|
| $rolemaps =~ s/,$//; |
|
| $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
|
| } |
|
| } |
} |
| if (ref($confhash{$itemid}{'custom'}) eq 'HASH') { |
$secchanges->{'private'} = 1; |
| my $customlist; |
$newkeyset->{$hostid} = $env{$keyitem}; |
| if (keys(%{$confhash{$itemid}{'custom'}})) { |
|
| foreach my $key (sort(keys(%{$confhash{$itemid}{'custom'}}))) { |
|
| $customlist .= $key.':'.$confhash{$itemid}{'custom'}{$key}.(' 'x2); |
|
| } |
|
| } |
|
| if ($customlist) { |
|
| $resulttext .= '<li>'.&mt('Custom items').': '.$customlist.'</li>'; |
|
| } |
|
| } |
|
| $resulttext .= '</ul></li>'; |
|
| } |
} |
| } |
} |
| $resulttext .= '</ul>'; |
|
| } else { |
|
| $resulttext = &mt('No changes made.'); |
|
| } |
} |
| } else { |
|
| $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
|
| } |
|
| if ($errors) { |
|
| $resulttext .= &mt('The following errors occurred: ').'<ul>'. |
|
| $errors.'</ul>'; |
|
| } |
} |
| return $resulttext; |
|
| } |
} |
| |
|
| sub process_ltitools_image { |
sub store_security { |
| my ($r,$dom,$confname,$caller,$itemid,$configuserok,$switchserver,$author_ok) = @_; |
my ($dom,$context,$secchanges,$newkeyset,$keystore,$lastactref) = @_; |
| my $filename = $env{'form.'.$caller.'.filename'}; |
return unless ((ref($secchanges) eq 'HASH') && (ref($newkeyset) eq 'HASH') && |
| my ($error,$url); |
(ref($keystore) eq 'HASH')); |
| my ($width,$height) = (21,21); |
if (keys(%{$secchanges})) { |
| if ($configuserok eq 'ok') { |
if ($secchanges->{'private'}) { |
| if ($switchserver) { |
my $who = &escape($env{'user.name'}.':'.$env{'user.domain'}); |
| $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]', |
foreach my $hostid (keys(%{$newkeyset})) { |
| $switchserver); |
my $storehash = { |
| } elsif ($author_ok eq 'ok') { |
key => $newkeyset->{$hostid}, |
| my ($result,$imageurl,$madethumb) = |
who => $env{'user.name'}.':'.$env{'user.domain'}, |
| &publishlogo($r,'upload',$caller,$dom,$confname, |
}; |
| "ltitools/$itemid/icon",$width,$height); |
$keystore->{$hostid} = &Apache::lonnet::store_dom($storehash,$context,'private', |
| if ($result eq 'ok') { |
$dom,$hostid); |
| if ($madethumb) { |
} |
| my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$}); |
} |
| my $imagethumb = "$path/tn-".$imagefile; |
if (ref($lastactref) eq 'HASH') { |
| $url = $imagethumb; |
if (($secchanges->{'encrypt'}) || ($secchanges->{'private'})) { |
| } else { |
$lastactref->{'domdefaults'} = 1; |
| $url = $imageurl; |
|
| } |
|
| } else { |
|
| $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result); |
|
| } |
} |
| } else { |
|
| $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$author_ok); |
|
| } |
} |
| } else { |
|
| $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$configuserok); |
|
| } |
} |
| return ($url,$error); |
|
| } |
} |
| |
|
| sub get_ltitools_id { |
sub lti_security_results { |
| my ($cdom,$title) = @_; |
my ($context,$secchanges,$newsec,$newkeyset,$keystore) = @_; |
| # get lock on ltitools db |
my $output; |
| my $lockhash = { |
foreach my $item (keys(%{$secchanges})) { |
| lock => $env{'user.name'}. |
if ($item eq 'encrypt') { |
| ':'.$env{'user.domain'}, |
my %encrypted; |
| }; |
if ($context eq 'lti') { |
| my $tries = 0; |
%encrypted = ( |
| my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom); |
crs => { |
| my ($id,$error); |
on => &mt('Encryption of stored link protection secrets defined in courses enabled'), |
| |
off => &mt('Encryption of stored link protection secrets defined in courses disabled'), |
| while (($gotlock ne 'ok') && ($tries<10)) { |
}, |
| $tries ++; |
dom => { |
| sleep (0.1); |
on => &mt('Encryption of stored link protection secrets defined in domain enabled'), |
| $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom); |
off => &mt('Encryption of stored link protection secrets defined in domain disabled'), |
| } |
}, |
| if ($gotlock eq 'ok') { |
consumers => { |
| my %currids = &Apache::lonnet::dump_dom('ltitools',$cdom); |
on => &mt('Encryption of stored consumer secrets defined in domain enabled'), |
| if ($currids{'lock'}) { |
off => &mt('Encryption of stored consumer secrets defined in domain disabled'), |
| delete($currids{'lock'}); |
}, |
| if (keys(%currids)) { |
); |
| my @curr = sort { $a <=> $b } keys(%currids); |
|
| if ($curr[-1] =~ /^\d+$/) { |
|
| $id = 1 + $curr[-1]; |
|
| } |
|
| } else { |
} else { |
| $id = 1; |
%encrypted = ( |
| |
crs => { |
| |
on => &mt('Encryption of stored external tool secrets defined in courses enabled'), |
| |
off => &mt('Encryption of stored external tool secrets defined in courses disabled'), |
| |
}, |
| |
dom => { |
| |
on => &mt('Encryption of stored external tool secrets defined in domain enabled'), |
| |
off => &mt('Encryption of stored external tool secrets defined in domain disabled'), |
| |
}, |
| |
); |
| |
|
| } |
} |
| if ($id) { |
my @types= ('crs','dom'); |
| unless (&Apache::lonnet::newput_dom('ltitools',{ $id => $title },$cdom) eq 'ok') { |
if ($context eq 'lti') { |
| $error = 'nostore'; |
push(@types,'consumers'); |
| |
} |
| |
foreach my $type (@types) { |
| |
my $shown = $encrypted{$type}{'off'}; |
| |
if (ref($newsec->{$item}) eq 'HASH') { |
| |
if ($newsec->{$item}{$type}) { |
| |
$shown = $encrypted{$type}{'on'}; |
| |
} |
| |
} |
| |
$output .= '<li>'.$shown.'</li>'; |
| |
} |
| |
} elsif ($item eq 'rules') { |
| |
my %titles = &Apache::lonlocal::texthash( |
| |
min => 'Minimum password length', |
| |
max => 'Maximum password length', |
| |
chars => 'Required characters', |
| |
); |
| |
foreach my $rule ('min','max') { |
| |
if ($newsec->{rules}{$rule} eq '') { |
| |
if ($rule eq 'min') { |
| |
$output .= '<li>'.&mt('[_1] not set.',$titles{$rule}); |
| |
' '.&mt('Default of [_1] will be used', |
| |
$Apache::lonnet::passwdmin).'</li>'; |
| |
} else { |
| |
$output .= '<li>'.&mt('[_1] set to none',$titles{$rule}).'</li>'; |
| |
} |
| |
} else { |
| |
$output .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$newsec->{rules}{$rule}).'</li>'; |
| |
} |
| |
} |
| |
if (ref($newsec->{'rules'}{'chars'}) eq 'ARRAY') { |
| |
if (@{$newsec->{'rules'}{'chars'}} > 0) { |
| |
my %rulenames = &Apache::lonlocal::texthash( |
| |
uc => 'At least one upper case letter', |
| |
lc => 'At least one lower case letter', |
| |
num => 'At least one number', |
| |
spec => 'At least one non-alphanumeric', |
| |
); |
| |
my $needed = '<ul><li>'. |
| |
join('</li><li>',map {$rulenames{$_} } @{$newsec->{'rules'}{'chars'}}). |
| |
'</li></ul>'; |
| |
$output .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>'; |
| |
} else { |
| |
$output .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
| } |
} |
| } else { |
} else { |
| $error = 'nonumber'; |
$output .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
| } |
} |
| |
} elsif ($item eq 'private') { |
| |
if (keys(%{$newkeyset})) { |
| |
foreach my $hostid (sort(keys(%{$newkeyset}))) { |
| |
if ($keystore->{$hostid} eq 'ok') { |
| |
$output .= '<li>'.&mt('Encryption key for storage of shared secrets saved for [_1]',$hostid).'</li>'; |
| |
} |
| |
} |
| |
} |
| |
} elsif ($item eq 'linkprot') { |
| |
next; |
| } |
} |
| my $dellockoutcome = &Apache::lonnet::del_dom('ltitools',['lock'],$cdom); |
|
| } else { |
|
| $error = 'nolock'; |
|
| } |
} |
| return ($id,$error); |
return $output; |
| } |
} |
| |
|
| sub modify_proctoring { |
sub modify_proctoring { |
|
Line 15916 sub process_proctoring_image {
|
Line 14930 sub process_proctoring_image {
|
| $error = &mt('Upload of Remote Proctoring Provider icon is not permitted to this server: [_1]', |
$error = &mt('Upload of Remote Proctoring Provider icon is not permitted to this server: [_1]', |
| $switchserver); |
$switchserver); |
| } elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
| |
my $modified = []; |
| my ($result,$imageurl,$madethumb) = |
my ($result,$imageurl,$madethumb) = |
| &publishlogo($r,'upload',$caller,$dom,$confname, |
&Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname, |
| "proctoring/$provider/icon",$width,$height); |
"proctoring/$provider/icon",$width,$height, |
| |
'',$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| if ($madethumb) { |
if ($madethumb) { |
| my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$}); |
my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$}); |
|
Line 15927 sub process_proctoring_image {
|
Line 14943 sub process_proctoring_image {
|
| } else { |
} else { |
| $url = $imageurl; |
$url = $imageurl; |
| } |
} |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result); |
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result); |
| } |
} |
|
Line 15963 sub modify_lti {
|
Line 14980 sub modify_lti {
|
| map { $posscrstype{$_} = 1; } @coursetypes; |
map { $posscrstype{$_} = 1; } @coursetypes; |
| |
|
| my %menutitles = <imenu_titles(); |
my %menutitles = <imenu_titles(); |
| |
my (%currltisec,%secchanges,%newltisec,%newltienc,%newkeyset); |
| |
|
| my (%currltisec,%secchanges,%newltisec,%newltienc,%keyset,%newkeyset); |
&fetch_secrets($dom,'ltisec',\%domconfig,\%currltisec,\%secchanges,\%newltisec,\%newkeyset); |
| $newltisec{'private'}{'keys'} = []; |
|
| $newltisec{'encrypt'} = {}; |
|
| $newltisec{'rules'} = {}; |
|
| $newltisec{'linkprot'} = {}; |
|
| if (ref($domconfig{'ltisec'}) eq 'HASH') { |
|
| %currltisec = %{$domconfig{'ltisec'}}; |
|
| if (ref($currltisec{'linkprot'}) eq 'HASH') { |
|
| foreach my $id (keys(%{$currltisec{'linkprot'}})) { |
|
| unless ($id =~ /^\d+$/) { |
|
| delete($currltisec{'linkprot'}{$id}); |
|
| } |
|
| } |
|
| } |
|
| if (ref($currltisec{'private'}) eq 'HASH') { |
|
| if (ref($currltisec{'private'}{'keys'}) eq 'ARRAY') { |
|
| $newltisec{'private'}{'keys'} = $currltisec{'private'}{'keys'}; |
|
| map { $keyset{$_} = 1; } @{$currltisec{'private'}{'keys'}}; |
|
| } |
|
| } |
|
| } |
|
| foreach my $item ('crs','dom','consumers') { |
|
| my $formelement; |
|
| if ($item eq 'consumers') { |
|
| $formelement = 'form.ltisec_'.$item; |
|
| } else { |
|
| $formelement = 'form.ltisec_'.$item.'linkprot'; |
|
| } |
|
| if ($env{$formelement}) { |
|
| $newltisec{'encrypt'}{$item} = 1; |
|
| if (ref($currltisec{'encrypt'}) eq 'HASH') { |
|
| unless ($currltisec{'encrypt'}{$item}) { |
|
| $secchanges{'encrypt'} = 1; |
|
| } |
|
| } else { |
|
| $secchanges{'encrypt'} = 1; |
|
| } |
|
| } elsif (ref($currltisec{'encrypt'}) eq 'HASH') { |
|
| if ($currltisec{'encrypt'}{$item}) { |
|
| $secchanges{'encrypt'} = 1; |
|
| } |
|
| } |
|
| } |
|
| unless (exists($currltisec{'rules'})) { |
|
| $currltisec{'rules'} = {}; |
|
| } |
|
| &password_rule_changes('secrets',$newltisec{'rules'},$currltisec{'rules'},\%secchanges); |
|
| |
|
| my @ids=&Apache::lonnet::current_machine_ids(); |
|
| my %servers = &Apache::lonnet::get_servers($dom,'library'); |
|
| |
|
| foreach my $hostid (keys(%servers)) { |
|
| if (($hostid ne '') && (grep(/^\Q$hostid\E$/,@ids))) { |
|
| my $newkey; |
|
| my $keyitem = 'form.ltisec_privkey_'.$hostid; |
|
| if (exists($env{$keyitem})) { |
|
| $env{$keyitem} =~ s/(`)/'/g; |
|
| if ($keyset{$hostid}) { |
|
| if ($env{'form.ltisec_changeprivkey_'.$hostid}) { |
|
| if ($env{$keyitem} ne '') { |
|
| $secchanges{'private'} = 1; |
|
| $newkeyset{$hostid} = $env{$keyitem}; |
|
| } |
|
| } |
|
| } elsif ($env{$keyitem} ne '') { |
|
| unless (grep(/^\Q$hostid\E$/,@{$newltisec{'private'}{'keys'}})) { |
|
| push(@{$newltisec{'private'}{'keys'}},$hostid); |
|
| } |
|
| $secchanges{'private'} = 1; |
|
| $newkeyset{$hostid} = $env{$keyitem}; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| |
|
| my (%linkprotchg,$linkprotoutput,$is_home); |
my (%linkprotchg,$linkprotoutput,$is_home); |
| my $proterror = &Apache::courseprefs::process_linkprot($dom,'',$currltisec{'linkprot'}, |
my $proterror = &Apache::courseprefs::process_linkprot($dom,'',$currltisec{'linkprot'}, |
|
Line 16414 sub modify_lti {
|
Line 15359 sub modify_lti {
|
| my $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,$dom); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,$dom); |
| if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
| my %keystore; |
my %keystore; |
| if (keys(%secchanges)) { |
&store_security($dom,'lti',\%secchanges,\%newkeyset,\%keystore,$lastactref); |
| if ($secchanges{'private'}) { |
|
| my $who = &escape($env{'user.name'}.':'.$env{'user.domain'}); |
|
| foreach my $hostid (keys(%newkeyset)) { |
|
| my $storehash = { |
|
| key => $newkeyset{$hostid}, |
|
| who => $env{'user.name'}.':'.$env{'user.domain'}, |
|
| }; |
|
| $keystore{$hostid} = &Apache::lonnet::store_dom($storehash,'lti','private', |
|
| $dom,$hostid); |
|
| } |
|
| } |
|
| if (ref($lastactref) eq 'HASH') { |
|
| if (($secchanges{'encrypt'}) || ($secchanges{'private'})) { |
|
| $lastactref->{'domdefaults'} = 1; |
|
| } |
|
| } |
|
| } |
|
| &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
| if ((keys(%changes) == 0) && (keys(%secchanges) == 0)) { |
if ((keys(%changes) == 0) && (keys(%secchanges) == 0)) { |
| return &mt('No changes made.'); |
return &mt('No changes made.'); |
| } |
} |
| $resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
| if (keys(%secchanges) > 0) { |
if (keys(%secchanges) > 0) { |
| foreach my $item (keys(%secchanges)) { |
$resulttext .= <i_security_results('lti',\%secchanges,\%newltisec,\%newkeyset,\%keystore); |
| if ($item eq 'encrypt') { |
if (exists($secchanges{'linkprot'})) { |
| my %encrypted = ( |
$resulttext .= $linkprotoutput; |
| crs => { |
|
| on => &mt('Encryption of stored link protection secrets defined in courses enabled'), |
|
| off => &mt('Encryption of stored link protection secrets defined in courses disabled'), |
|
| }, |
|
| dom => { |
|
| on => &mt('Encryption of stored link protection secrets defined in domain enabled'), |
|
| off => &mt('Encryption of stored link protection secrets defined in domain disabled'), |
|
| }, |
|
| consumers => { |
|
| on => &mt('Encryption of stored consumer secrets defined in domain enabled'), |
|
| off => &mt('Encryption of stored consumer secrets defined in domain disabled'), |
|
| }, |
|
| ); |
|
| foreach my $type ('crs','dom','consumers') { |
|
| my $shown = $encrypted{$type}{'off'}; |
|
| if (ref($newltisec{$item}) eq 'HASH') { |
|
| if ($newltisec{$item}{$type}) { |
|
| $shown = $encrypted{$type}{'on'}; |
|
| } |
|
| } |
|
| $resulttext .= '<li>'.$shown.'</li>'; |
|
| } |
|
| } elsif ($item eq 'rules') { |
|
| my %titles = &Apache::lonlocal::texthash( |
|
| min => 'Minimum password length', |
|
| max => 'Maximum password length', |
|
| chars => 'Required characters', |
|
| ); |
|
| foreach my $rule ('min','max') { |
|
| if ($newltisec{rules}{$rule} eq '') { |
|
| if ($rule eq 'min') { |
|
| $resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule}); |
|
| ' '.&mt('Default of [_1] will be used', |
|
| $Apache::lonnet::passwdmin).'</li>'; |
|
| } else { |
|
| $resulttext .= '<li>'.&mt('[_1] set to none',$titles{$rule}).'</li>'; |
|
| } |
|
| } else { |
|
| $resulttext .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$newltisec{rules}{$rule}).'</li>'; |
|
| } |
|
| } |
|
| if (ref($newltisec{'rules'}{'chars'}) eq 'ARRAY') { |
|
| if (@{$newltisec{'rules'}{'chars'}} > 0) { |
|
| my %rulenames = &Apache::lonlocal::texthash( |
|
| uc => 'At least one upper case letter', |
|
| lc => 'At least one lower case letter', |
|
| num => 'At least one number', |
|
| spec => 'At least one non-alphanumeric', |
|
| ); |
|
| my $needed = '<ul><li>'. |
|
| join('</li><li>',map {$rulenames{$_} } @{$newltisec{'rules'}{'chars'}}). |
|
| '</li></ul>'; |
|
| $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>'; |
|
| } else { |
|
| $resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
|
| } |
|
| } else { |
|
| $resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
|
| } |
|
| } elsif ($item eq 'private') { |
|
| if (keys(%newkeyset)) { |
|
| foreach my $hostid (sort(keys(%newkeyset))) { |
|
| if ($keystore{$hostid} eq 'ok') { |
|
| $resulttext .= '<li>'.&mt('Encryption key for storage of shared secrets saved for [_1]',$hostid).'</li>'; |
|
| } |
|
| } |
|
| } |
|
| } elsif ($item eq 'linkprot') { |
|
| $resulttext .= $linkprotoutput; |
|
| } |
|
| } |
} |
| } |
} |
| if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
|
Line 18208 sub modify_privacy {
|
Line 17066 sub modify_privacy {
|
| $resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
| } |
} |
| } |
} |
| $resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
| } else { |
} else { |
| $resulttext = &mt('No changes made to user information settings'); |
$resulttext = &mt('No changes made to user information settings'); |
| } |
} |
|
Line 18395 sub modify_passwords {
|
Line 17253 sub modify_passwords {
|
| $error = &mt("Upload of file containing domain-specific text is not permitted to this server: [_1]",$switchserver); |
$error = &mt("Upload of file containing domain-specific text is not permitted to this server: [_1]",$switchserver); |
| } else { |
} else { |
| if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
| |
my $modified = []; |
| my ($result,$customurl) = |
my ($result,$customurl) = |
| &publishlogo($r,'upload','passwords_customfile',$dom, |
&Apache::lonconfigsettings::publishlogo($r,'upload','passwords_customfile',$dom, |
| $confname,'customtext/resetpw','','',$customfn); |
$confname,'customtext/resetpw','','',$customfn, |
| |
$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $newvalues{'resetcustom'} = $customurl; |
$newvalues{'resetcustom'} = $customurl; |
| $changes{'reset'} = 1; |
$changes{'reset'} = 1; |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customfn,$result); |
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customfn,$result); |
| } |
} |
|
Line 18721 sub password_rule_changes {
|
Line 17582 sub password_rule_changes {
|
| my (@rules,%staticdefaults); |
my (@rules,%staticdefaults); |
| if ($prefix eq 'passwords') { |
if ($prefix eq 'passwords') { |
| @rules = ('min','max','expire','numsaved'); |
@rules = ('min','max','expire','numsaved'); |
| } elsif ($prefix eq 'secrets') { |
} elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) { |
| @rules = ('min','max'); |
@rules = ('min','max'); |
| } |
} |
| $staticdefaults{'min'} = $Apache::lonnet::passwdmin; |
$staticdefaults{'min'} = $Apache::lonnet::passwdmin; |
|
Line 19656 sub modify_selfcreation {
|
Line 18517 sub modify_selfcreation {
|
| $output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
$output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
| } else { |
} else { |
| $output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address needs to end: [_1]", |
$output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address needs to end: [_1]", |
| $cancreate{'emaildomain'}{$type}{'inst'}).'</li>'; |
$cancreate{'emaildomain'}{$type}{'inst'}).'</li>'; |
| } |
} |
| } |
} |
| } elsif ($cancreate{'emailoptions'}{$type} eq 'noninst') { |
} elsif ($cancreate{'emailoptions'}{$type} eq 'noninst') { |
|
Line 19674 sub modify_selfcreation {
|
Line 18535 sub modify_selfcreation {
|
| $output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
$output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
| } else { |
} else { |
| $output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address must not end: [_1]", |
$output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address must not end: [_1]", |
| $cancreate{'emaildomain'}{$type}{'noninst'}).'</li>'; |
$cancreate{'emaildomain'}{$type}{'noninst'}).'</li>'; |
| } |
} |
| } |
} |
| } |
} |
|
Line 20415 sub modify_scantron {
|
Line 19276 sub modify_scantron {
|
| $error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver); |
$error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver); |
| } else { |
} else { |
| if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
| |
my $modified = []; |
| my ($result,$scantronurl) = |
my ($result,$scantronurl) = |
| &publishlogo($r,'upload','scantronformat',$dom, |
&Apache::lonconfigsettings::publishlogo($r,'upload','scantronformat',$dom, |
| $confname,'scantron','','',$custom); |
$confname,'scantron','','',$custom, |
| |
$modified); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $confhash{'scantron'}{'scantronformat'} = $scantronurl; |
$confhash{'scantron'}{'scantronformat'} = $scantronurl; |
| $changes{'scantronformat'} = 1; |
$changes{'scantronformat'} = 1; |
| |
&update_modify_urls($r,$modified); |
| } else { |
} else { |
| $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$custom,$result); |
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$custom,$result); |
| } |
} |
![[BACK]](/icons/back.gif){kind=icon}
Return to domainprefs.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface