version 1.382, 2021/04/29 17:45:22
|
version 1.395, 2021/11/30 14:12:02
|
Line 221 sub handler {
|
Line 221 sub handler {
|
'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
'ltitools','ssl','trust','lti','privacy','passwords', |
'ltitools','ssl','trust','lti','privacy','passwords', |
'proctoring','wafproxy'],$dom); |
'proctoring','wafproxy','ipaccess'],$dom); |
my %encconfig = |
my %encconfig = |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring'],$dom); |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring'],$dom,undef,1); |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
Line 260 sub handler {
|
Line 260 sub handler {
|
} |
} |
} |
} |
} |
} |
my @prefs_order = ('rolecolors','login','defaults','wafproxy','passwords','quotas', |
my @prefs_order = ('rolecolors','login','ipaccess','defaults','wafproxy','passwords', |
'autoenroll','autoupdate','autocreate','directorysrch', |
'quotas','autoenroll','autoupdate','autocreate','directorysrch', |
'contacts','privacy','usercreation','selfcreation', |
'contacts','privacy','usercreation','selfcreation', |
'usermodification','scantron','requestcourses','requestauthor', |
'usermodification','scantron','requestcourses','requestauthor', |
'coursecategories','serverstatuses','helpsettings','coursedefaults', |
'coursecategories','serverstatuses','helpsettings','coursedefaults', |
Line 297 sub handler {
|
Line 297 sub handler {
|
{col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Custom HTML in document head', |
{col1 => 'Custom HTML in document head', |
col2 => 'Value'}], |
col2 => 'Value'}, |
|
{col1 => 'SSO', |
|
col2 => 'Dual login: SSO and non-SSO options'}, |
|
], |
print => \&print_login, |
print => \&print_login, |
modify => \&modify_login, |
modify => \&modify_login, |
}, |
}, |
Line 621 sub handler {
|
Line 624 sub handler {
|
print => \&print_lti, |
print => \&print_lti, |
modify => \&modify_lti, |
modify => \&modify_lti, |
}, |
}, |
|
'ipaccess' => |
|
{text => 'IP-based access control', |
|
help => 'Domain_Configuration_IP_Access', |
|
header => [{col1 => 'Setting', |
|
col2 => 'Value'},], |
|
print => \&print_ipaccess, |
|
modify => \&modify_ipaccess, |
|
}, |
); |
); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
$prefs{'login'} = { text => 'Log-in page options', |
$prefs{'login'} = { text => 'Log-in page options', |
Line 632 sub handler {
|
Line 643 sub handler {
|
{col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Custom HTML in document head', |
{col1 => 'Custom HTML in document head', |
col2 => 'Value'}], |
col2 => 'Value'}, |
|
{col1 => 'SSO', |
|
col2 => 'Dual login: SSO and non-SSO options'}, |
|
], |
print => \&print_login, |
print => \&print_login, |
modify => \&modify_login, |
modify => \&modify_login, |
}; |
}; |
Line 673 $javascript_validations
|
Line 687 $javascript_validations
|
</script> |
</script> |
$coursebrowserjs |
$coursebrowserjs |
END |
END |
|
} elsif (grep(/^ipaccess$/,@actions)) { |
|
$js .= &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); |
} |
} |
if (grep(/^selfcreation$/,@actions)) { |
if (grep(/^selfcreation$/,@actions)) { |
$js .= &selfcreate_javascript(); |
$js .= &selfcreate_javascript(); |
Line 819 sub process_changes {
|
Line 835 sub process_changes {
|
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
} elsif ($action eq 'wafproxy') { |
} elsif ($action eq 'wafproxy') { |
$output = &modify_wafproxy($dom,$action,$lastactref,%domconfig); |
$output = &modify_wafproxy($dom,$action,$lastactref,%domconfig); |
|
} elsif ($action eq 'ipaccess') { |
|
$output = &modify_ipaccess($dom,$lastactref,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 857 sub print_config_box {
|
Line 875 sub print_config_box {
|
$output .= &proctoring_javascript($settings); |
$output .= &proctoring_javascript($settings); |
} elsif ($action eq 'wafproxy') { |
} elsif ($action eq 'wafproxy') { |
$output .= &wafproxy_javascript($dom); |
$output .= &wafproxy_javascript($dom); |
|
} elsif ($action eq 'autoupdate') { |
|
$output .= &autoupdate_javascript(); |
|
} elsif ($action eq 'login') { |
|
$output .= &saml_javascript(); |
|
} elsif ($action eq 'ipaccess') { |
|
$output .= &ipaccess_javascript($settings); |
} |
} |
$output .= |
$output .= |
'<table class="LC_nested_outer"> |
'<table class="LC_nested_outer"> |
Line 876 sub print_config_box {
|
Line 900 sub print_config_box {
|
my $leftnobr = ''; |
my $leftnobr = ''; |
if (($action eq 'rolecolors') || ($action eq 'defaults') || |
if (($action eq 'rolecolors') || ($action eq 'defaults') || |
($action eq 'directorysrch') || |
($action eq 'directorysrch') || |
(($action eq 'login') && ($numheaders < 4))) { |
(($action eq 'login') && ($numheaders < 5))) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} |
} |
if ($action eq 'usersessions') { |
if ($action eq 'usersessions') { |
Line 907 sub print_config_box {
|
Line 931 sub print_config_box {
|
} elsif ($action eq 'scantron') { |
} elsif ($action eq 'scantron') { |
$output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 5) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
} else { |
} else { |
Line 1048 sub print_config_box {
|
Line 1072 sub print_config_box {
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'. |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'. |
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 5) { |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
</table> |
</table> |
</td> |
</td> |
Line 1072 sub print_config_box {
|
Line 1096 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row">'; |
<tr class="LC_info_row">'; |
if ($numheaders == 4) { |
if ($numheaders == 5) { |
$output .= ' |
$output .= ' |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
Line 1084 sub print_config_box {
|
Line 1108 sub print_config_box {
|
</tr>'; |
</tr>'; |
} |
} |
$rowtotal ++; |
$rowtotal ++; |
$output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row">'; |
|
if ($numheaders == 5) { |
|
$output .= ' |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col2'}).'</td> |
|
</tr>'; |
|
} else { |
|
$output .= ' |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
|
</tr>'; |
|
} |
|
$rowtotal ++; |
|
$output .= &print_login('saml',$dom,$confname,$phase,$settings,\$rowtotal); |
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$rowtotal ++; |
$rowtotal ++; |
Line 1205 sub print_config_box {
|
Line 1249 sub print_config_box {
|
} 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 'lti') || |
($action eq 'ltitools') || ($action eq 'lti') || |
($action eq 'proctoring')) { |
($action eq 'proctoring') || ($action eq 'ipaccess')) { |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
} |
} |
} |
} |
Line 1219 sub print_config_box {
|
Line 1263 sub print_config_box {
|
|
|
sub print_login { |
sub print_login { |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable,$switchserver,%lt); |
my %choices = &login_choices(); |
my %choices = &login_choices(); |
|
if (($caller eq 'help') || ($caller eq 'headtag') || ($caller eq 'saml')) { |
|
%lt = &login_file_options(); |
|
$switchserver = &check_switchserver($dom,$confname); |
|
} |
if ($caller eq 'service') { |
if ($caller eq 'service') { |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my $choice = $choices{'disallowlogin'}; |
my $choice = $choices{'disallowlogin'}; |
Line 1415 sub print_login {
|
Line 1462 sub print_login {
|
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
} elsif ($caller eq 'help') { |
} elsif ($caller eq 'help') { |
my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices); |
my ($defaulturl,$defaulttype,%url,%type,%langchoices); |
my $switchserver = &check_switchserver($dom,$confname); |
|
my $itemcount = 1; |
my $itemcount = 1; |
$defaulturl = '/adm/loginproblems.html'; |
$defaulturl = '/adm/loginproblems.html'; |
$defaulttype = 'default'; |
$defaulttype = 'default'; |
%lt = &Apache::lonlocal::texthash ( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
default => 'Default', |
|
custom => 'Custom', |
|
); |
|
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
my @currlangs; |
my @currlangs; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
Line 1523 sub print_login {
|
Line 1562 sub print_login {
|
} |
} |
} |
} |
} |
} |
my %lt = &Apache::lonlocal::texthash( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
curr => 'View contents', |
|
none => 'None', |
|
); |
|
my $switchserver = &check_switchserver($dom,$confname); |
|
foreach my $lonhost (sort(keys(%domservers))) { |
foreach my $lonhost (sort(keys(%domservers))) { |
my $exempt = &check_exempt_addresses($currexempt{$lonhost}); |
my $exempt = &check_exempt_addresses($currexempt{$lonhost}); |
$datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>'; |
$datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>'; |
Line 1554 sub print_login {
|
Line 1585 sub print_login {
|
$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
} |
} |
$datatable .= '</table></td></tr>'; |
$datatable .= '</table></td></tr>'; |
|
} elsif ($caller eq 'saml') { |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
|
$datatable .= '<tr><td colspan="3" style="text-align: left">'. |
|
'<table><tr><th>'.$choices{'hostid'}.'</th>'. |
|
'<th>'.$choices{'samllanding'}.'</th>'. |
|
'<th>'.$choices{'samloptions'}.'</th></tr>'."\n"; |
|
my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso,%styleon,%styleoff); |
|
foreach my $lonhost (keys(%domservers)) { |
|
$samlurl{$lonhost} = '/adm/sso'; |
|
$styleon{$lonhost} = 'display:none'; |
|
$styleoff{$lonhost} = ''; |
|
} |
|
if (ref($settings->{'saml'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$settings->{'saml'}})) { |
|
if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') { |
|
$saml{$lonhost} = 1; |
|
$samltext{$lonhost} = $settings->{'saml'}{$lonhost}{'text'}; |
|
$samlimg{$lonhost} = $settings->{'saml'}{$lonhost}{'img'}; |
|
$samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'}; |
|
$samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'}; |
|
$samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'}; |
|
$samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'}; |
|
$styleon{$lonhost} = ''; |
|
$styleoff{$lonhost} = 'display:none'; |
|
} else { |
|
$styleon{$lonhost} = 'display:none'; |
|
$styleoff{$lonhost} = ''; |
|
} |
|
} |
|
} |
|
my $itemcount = 1; |
|
foreach my $lonhost (sort(keys(%domservers))) { |
|
my $samlon = ' '; |
|
my $samloff = ' checked="checked" '; |
|
if ($saml{$lonhost}) { |
|
$samlon = $samloff; |
|
$samloff = ' '; |
|
} |
|
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.$domservers{$lonhost}.'</span></td>'. |
|
'<td><span class="LC_nobreak"><label><input type="radio" name="saml_'.$lonhost.'"'.$samloff. |
|
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="0" />'. |
|
&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="saml_'.$lonhost.'"'.$samlon. |
|
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="1" />'. |
|
&mt('Yes').'</label></span></td>'. |
|
'<td id="samloptionson_'.$lonhost.'" style="'.$styleon{$lonhost}.'" width="100%">'. |
|
'<table><tr><th colspan="5" align="center">'.&mt('SSO').'</th><th align="center">'. |
|
'<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'. |
|
'<tr><th>'.&mt('Text').'</th><th>'.&mt('Image').'</th>'. |
|
'<th>'.&mt('Alt Text').'</th><th>'.&mt('URL').'</th>'. |
|
'<th>'.&mt('Tool Tip').'</th><th>'.&mt('Text').'</th></tr>'. |
|
'<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="8" value="'. |
|
$samltext{$lonhost}.'" /></td><td>'; |
|
if ($samlimg{$lonhost}) { |
|
$datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="saml_img_del" value="'.$lonhost.'" />'. |
|
$lt{'del'}.'</label> '.$lt{'rep'}.'</span>'; |
|
} else { |
|
$datatable .= $lt{'upl'}; |
|
} |
|
$datatable .='<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="saml_img_'.$lonhost.'" />'; |
|
} |
|
$datatable .= '</td>'. |
|
'<td><input type="text" name="saml_alt_'.$lonhost.'" size="20" '. |
|
'value="'.$samlalt{$lonhost}.'" /></td>'. |
|
'<td><input type="text" name="saml_url_'.$lonhost.'" size="8" '. |
|
'value="'.$samlurl{$lonhost}.'" /></td>'. |
|
'<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="15">'. |
|
$samltitle{$lonhost}.'</textarea></td>'. |
|
'<td><input type="text" name="saml_notsso_'.$lonhost.'" size="8" '. |
|
'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'. |
|
'</table></td>'. |
|
'<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%"> </td></tr>'; |
|
$itemcount ++; |
|
} |
|
$datatable .= '</table></td></tr>'; |
} |
} |
return $datatable; |
return $datatable; |
} |
} |
Line 1590 sub login_choices {
|
Line 1703 sub login_choices {
|
headtag => "Custom markup", |
headtag => "Custom markup", |
action => "Action", |
action => "Action", |
current => "Current", |
current => "Current", |
|
samllanding => "Dual login?", |
|
samloptions => "Options", |
); |
); |
return %choices; |
return %choices; |
} |
} |
|
|
|
sub login_file_options { |
|
return &Apache::lonlocal::texthash( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
curr => 'View contents', |
|
default => 'Default', |
|
custom => 'Custom', |
|
none => 'None', |
|
); |
|
} |
|
|
|
sub print_ipaccess { |
|
my ($dom,$settings,$rowtotal) = @_; |
|
my $css_class; |
|
my $itemcount = 0; |
|
my $datatable; |
|
my %ordered; |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (keys(%{$settings})) { |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
my $num = $settings->{$item}{'order'}; |
|
if ($num eq '') { |
|
$num = scalar(keys(%{$settings})); |
|
} |
|
$ordered{$num} = $item; |
|
} |
|
} |
|
} |
|
my $maxnum = scalar(keys(%ordered)); |
|
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 ($name,$ipranges,%commblocks,%courses); |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
$name = $settings->{$item}->{'name'}; |
|
$ipranges = $settings->{$item}->{'ip'}; |
|
if (ref($settings->{$item}->{'commblocks'}) eq 'HASH') { |
|
%commblocks = %{$settings->{$item}->{'commblocks'}}; |
|
} |
|
if (ref($settings->{$item}->{'courses'}) eq 'HASH') { |
|
%courses = %{$settings->{$item}->{'courses'}}; |
|
} |
|
} |
|
my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_".$item."'".');"'; |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
|
.'<select name="ipaccess_pos_'.$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="ipaccess_del" value="'.$item.'" />'. |
|
&mt('Delete?').'</label></span></td>'. |
|
'<td colspan="2"><input type="hidden" name="ipaccess_id_'.$i.'" value="'.$item.'" />'. |
|
&ipaccess_options($i,$itemcount,$dom,$name,$ipranges,\%commblocks,\%courses). |
|
'</td></tr>'; |
|
$itemcount ++; |
|
} |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_add'".');"'; |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
|
'<input type="hidden" name="ipaccess_maxnum" value="'.$maxnum.'" />'."\n". |
|
'<select name="ipaccess_pos_add"'.$chgstr.'>'; |
|
for (my $k=0; $k<$maxnum+1; $k++) { |
|
my $vpos = $k+1; |
|
my $selstr; |
|
if ($k == $maxnum) { |
|
$selstr = ' selected="selected" '; |
|
} |
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
} |
|
$datatable .= '</select> '."\n". |
|
'<input type="checkbox" name="ipaccess_add" value="1" />'.&mt('Add').'</span></td>'."\n". |
|
'<td colspan="2">'. |
|
&ipaccess_options('add',$itemcount,$dom). |
|
'</td>'."\n". |
|
'</tr>'."\n"; |
|
$$rowtotal ++; |
|
return $datatable; |
|
} |
|
|
|
sub ipaccess_options { |
|
my ($num,$itemcount,$dom,$name,$ipranges,$blocksref,$coursesref) = @_; |
|
my (%currblocks,%currcourses,$output); |
|
if (ref($blocksref) eq 'HASH') { |
|
%currblocks = %{$blocksref}; |
|
} |
|
if (ref($coursesref) eq 'HASH') { |
|
%currcourses = %{$coursesref}; |
|
} |
|
$output = '<fieldset><legend>'.&mt('Location(s)').'</legend>'. |
|
'<span class="LC_nobreak">'.&mt('Name').': '. |
|
'<input type="text" name="ipaccess_name_'.$num.'" value="'.$name.'" />'. |
|
'</span></fieldset>'. |
|
'<fieldset><legend>'.&mt('IP Range(s)').'</legend>'. |
|
&mt('Format for each IP range').': '.&mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'<br />'. |
|
&mt('Range(s) will be stored as IP netblock(s) in CIDR notation (comma separated)').'<br />'. |
|
'<textarea name="ipaccess_range_'.$num.'" rows="3" cols="80">'. |
|
$ipranges.'</textarea></fieldset>'. |
|
'<fieldset><legend>'.&mt('Functionality Blocked?').'</legend>'. |
|
&blocker_checkboxes($num,$blocksref).'</fieldset>'. |
|
'<fieldset><legend>'.&mt('Courses/Communities allowed').'</legend>'. |
|
'<table>'; |
|
foreach my $cid (sort(keys(%currcourses))) { |
|
my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1}); |
|
$output .= '<tr><td><span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="ipaccess_course_delete_'.$num.'" value="'.$cid.'" />'. |
|
&mt('Delete?').' <span class="LC_cusr_emph">'.$courseinfo{'description'}.'</span></label></span>'. |
|
' <span class="LC_fontsize_medium">('.$cid.')</span></td></tr>'; |
|
} |
|
$output .= '<tr><td><span class="LC_nobreak">'.&mt('Add').': '. |
|
'<input type="text" name="ipaccess_cdesc_'.$num.'" value="" onfocus="this.blur();opencrsbrowser('."'display','ipaccess_cnum_$num','ipaccess_cdom_$num','ipaccess_cdesc_$num'".');" />'. |
|
&Apache::loncommon::selectcourse_link('display','ipaccess_cnum_'.$num,'ipaccess_cdom_'.$num,'ipaccess_cdesc_'.$num,$dom,undef,'Course/Community'). |
|
'<input type="hidden" name="ipaccess_cnum_'.$num.'" value="" />'. |
|
'<input type="hidden" name="ipaccess_cdom_'.$num.'" value="" />'. |
|
'</span></td></tr></table>'."\n". |
|
'</fieldset>'; |
|
return $output; |
|
} |
|
|
|
sub blocker_checkboxes { |
|
my ($num,$blocks) = @_; |
|
my ($typeorder,$types) = &commblocktype_text(); |
|
my $numinrow = 6; |
|
my $output = '<table>'; |
|
for (my $i=0; $i<@{$typeorder}; $i++) { |
|
my $block = $typeorder->[$i]; |
|
my $blockstatus; |
|
if (ref($blocks) eq 'HASH') { |
|
if ($blocks->{$block} eq 'on') { |
|
$blockstatus = 'checked="checked"'; |
|
} |
|
} |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$output .= '</tr>'; |
|
} |
|
$output .= '<tr>'; |
|
} |
|
if ($i == scalar(@{$typeorder})-1) { |
|
my $colsleft = $numinrow-$rem; |
|
if ($colsleft > 1) { |
|
$output .= '<td colspan="'.$colsleft.'">'; |
|
} else { |
|
$output .= '<td>'; |
|
} |
|
} else { |
|
$output .= '<td>'; |
|
} |
|
my $item = 'ipaccess_block_'.$num; |
|
if ($blockstatus) { |
|
$blockstatus = ' '.$blockstatus; |
|
} |
|
$output .= '<span class="LC_nobreak"><label>'."\n". |
|
'<input type="checkbox" name="'.$item.'"'. |
|
$blockstatus.' value="'.$block.'"'.' />'. |
|
$types->{$block}.'</label></span>'."\n". |
|
'<br /></td>'; |
|
} |
|
$output .= '</tr></table>'; |
|
return $output; |
|
} |
|
|
|
sub commblocktype_text { |
|
my %types = &Apache::lonlocal::texthash( |
|
'com' => 'Messaging', |
|
'chat' => 'Chat Room', |
|
'boards' => 'Discussion', |
|
'port' => 'Portfolio', |
|
'groups' => 'Groups', |
|
'blogs' => 'Blogs', |
|
'about' => 'User Information', |
|
'printout' => 'Printouts', |
|
'passwd' => 'Change Password', |
|
'grades' => 'Gradebook', |
|
); |
|
my $typeorder = ['com','chat','boards','port','groups','blogs','about','printout','grades','passwd']; |
|
return ($typeorder,\%types); |
|
} |
|
|
sub print_rolecolors { |
sub print_rolecolors { |
my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_; |
my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_; |
my %choices = &color_font_choices(); |
my %choices = &color_font_choices(); |
Line 3064 sub lti_javascript {
|
Line 3368 sub lti_javascript {
|
return $togglejs; |
return $togglejs; |
} |
} |
my (%ordered,$total,%jstext); |
my (%ordered,$total,%jstext); |
$total = 0; |
$total = scalar(keys(%{$settings})); |
foreach my $item (keys(%{$settings})) { |
foreach my $item (keys(%{$settings})) { |
if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{$item}) eq 'HASH') { |
my $num = $settings->{$item}{'order'}; |
my $num = $settings->{$item}{'order'}; |
|
if ($num eq '') { |
|
$num = $total - 1; |
|
} |
$ordered{$num} = $item; |
$ordered{$num} = $item; |
} |
} |
} |
} |
$total = scalar(keys(%{$settings})); |
|
my @jsarray = (); |
my @jsarray = (); |
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
push(@jsarray,$ordered{$item}); |
push(@jsarray,$ordered{$item}); |
Line 3134 sub lti_toggle_js {
|
Line 3440 sub lti_toggle_js {
|
localauth => 'Local auth argument', |
localauth => 'Local auth argument', |
krb => 'Kerberos domain', |
krb => 'Kerberos domain', |
); |
); |
|
my $crsincalert = &mt('"User\'s identity sent" needs to be set to "Yes" first,[_1] before setting "Course\'s identity sent" to "Yes"',"\n"); |
|
&js_escape(\$crsincalert); |
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
|
|
function toggleLTI(form,setting,item) { |
function toggleLTI(form,setting,item) { |
if (setting == 'requser') { |
if ((setting == 'requser') || (setting == 'crsinc')) { |
var fieldsets = document.getElementsByClassName('ltioption_'+item); |
var usrfieldsets = document.getElementsByClassName('ltioption_usr_'+item); |
if (fieldsets.length) { |
var setvis = ''; |
var radioname = 'lti_'+setting+'_'+item; |
var radioname = 'lti_requser_'+item; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
setvis = 1; |
|
break; |
|
} |
|
} |
|
} |
|
} |
|
if (usrfieldsets.length) { |
|
for (var j=0; j<usrfieldsets.length; j++) { |
|
if (setvis) { |
|
usrfieldsets[j].style.display = 'block'; |
|
} else { |
|
usrfieldsets[j].style.display = 'none'; |
|
} |
|
} |
|
} |
|
var crsfieldsets = document.getElementsByClassName('ltioption_crs_'+item); |
|
if (crsfieldsets.length) { |
|
radioname = 'lti_crsinc_'+item; |
var num = form.elements[radioname].length; |
var num = form.elements[radioname].length; |
if (num) { |
if (num) { |
var setvis = ''; |
var crsvis = ''; |
for (var i=0; i<num; i++) { |
for (var i=0; i<num; i++) { |
if (form.elements[radioname][i].checked) { |
if (form.elements[radioname][i].checked) { |
if (form.elements[radioname][i].value == '1') { |
if (form.elements[radioname][i].value == '1') { |
setvis = 1; |
if (setvis == '') { |
break; |
if (setting == 'crsinc'){ |
|
alert("$crsincalert"); |
|
form.elements[radioname][0].checked = true; |
|
} |
|
} else { |
|
crsvis = 1; |
|
} |
|
break; |
} |
} |
} |
} |
} |
} |
for (var j=0; j<fieldsets.length; j++) { |
setvis = crsvis; |
if (setvis) { |
} |
fieldsets[j].style.display = 'block'; |
for (var j=0; j<crsfieldsets.length; j++) { |
} else { |
if (setvis) { |
fieldsets[j].style.display = 'none'; |
crsfieldsets[j].style.display = 'block'; |
} |
} else { |
|
crsfieldsets[j].style.display = 'none'; |
} |
} |
} |
} |
} |
} |
Line 3311 function toggleLTI(form,setting,item) {
|
Line 3650 function toggleLTI(form,setting,item) {
|
ENDSCRIPT |
ENDSCRIPT |
} |
} |
|
|
|
sub autoupdate_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function toggleLastActiveDays(form) { |
|
var radioname = 'lastactive'; |
|
var divid = 'lastactive_div'; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub saml_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function toggleSamlOptions(form,hostid) { |
|
var radioname = 'saml_'+hostid; |
|
var tablecellon = 'samloptionson_'+hostid; |
|
var tablecelloff = 'samloptionsoff_'+hostid; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (document.getElementById(tablecellon)) { |
|
document.getElementById(tablecellon).style.display=''; |
|
} |
|
if (document.getElementById(tablecelloff)) { |
|
document.getElementById(tablecelloff).style.display='none'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(tablecellon)) { |
|
document.getElementById(tablecellon).style.display='none'; |
|
} |
|
if (document.getElementById(tablecelloff)) { |
|
document.getElementById(tablecelloff).style.display=''; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub ipaccess_javascript { |
|
my ($settings) = @_; |
|
my (%ordered,$total,%jstext); |
|
$total = 0; |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (keys(%{$settings})) { |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
my $num = $settings->{$item}{'order'}; |
|
$ordered{$num} = $item; |
|
} |
|
} |
|
$total = scalar(keys(%{$settings})); |
|
} |
|
my @jsarray = (); |
|
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
|
push(@jsarray,$ordered{$item}); |
|
} |
|
my $jstext = ' var ipaccess = Array('."'".join("','",@jsarray)."'".');'."\n"; |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function reorderIPaccess(form,item) { |
|
var changedVal; |
|
$jstext |
|
var newpos = 'ipaccess_pos_add'; |
|
var maxh = 1 + $total; |
|
var current = new Array; |
|
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
|
if (item == newpos) { |
|
changedVal = newitemVal; |
|
} else { |
|
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
|
current[newitemVal] = newpos; |
|
} |
|
for (var i=0; i<ipaccess.length; i++) { |
|
var elementName = 'ipaccess_pos_'+ipaccess[i]; |
|
if (elementName != item) { |
|
if (form.elements[elementName]) { |
|
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
|
current[currVal] = elementName; |
|
} |
|
} |
|
} |
|
var oldVal; |
|
for (var j=0; j<maxh; j++) { |
|
if (current[j] == undefined) { |
|
oldVal = j; |
|
} |
|
} |
|
if (oldVal < changedVal) { |
|
for (var k=oldVal+1; k<=changedVal ; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1; |
|
} |
|
} else { |
|
for (var k=changedVal; k<oldVal; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1; |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
Line 3397 sub print_autoenroll {
|
Line 3881 sub print_autoenroll {
|
|
|
sub print_autoupdate { |
sub print_autoupdate { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $datatable; |
my ($enable,$datatable); |
if ($position eq 'top') { |
if ($position eq 'top') { |
|
my %choices = &Apache::lonlocal::texthash ( |
|
run => 'Auto-update active?', |
|
classlists => 'Update information in classlists?', |
|
unexpired => 'Skip updates for users without active or future roles?', |
|
lastactive => 'Skip updates for inactive users?', |
|
); |
|
my $itemcount = 0; |
my $updateon = ' '; |
my $updateon = ' '; |
my $updateoff = ' checked="checked" '; |
my $updateoff = ' checked="checked" '; |
my $classlistson = ' '; |
|
my $classlistsoff = ' checked="checked" '; |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'run'} eq '1') { |
if ($settings->{'run'} eq '1') { |
$updateon = $updateoff; |
$updateon = $updateoff; |
$updateoff = ' '; |
$updateoff = ' '; |
} |
} |
if ($settings->{'classlists'} eq '1') { |
|
$classlistson = $classlistsoff; |
|
$classlistsoff = ' '; |
|
} |
|
} |
} |
my %title = ( |
$enable = '<tr class="LC_odd_row">'. |
run => 'Auto-update active?', |
'<td>'.$choices{'run'}.'</td>'. |
classlists => 'Update information in classlists?', |
'<td class="LC_left_item"><span class="LC_nobreak"><label>'. |
); |
|
$datatable = '<tr class="LC_odd_row">'. |
|
'<td>'.&mt($title{'run'}).'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autoupdate_run"'. |
'<input type="radio" name="autoupdate_run"'. |
$updateon.' value="1" />'.&mt('Yes').'</label> '. |
$updateoff.' value="0" />'.&mt('No').'</label> '. |
'<label><input type="radio" name="autoupdate_run"'. |
'<label><input type="radio" name="autoupdate_run"'. |
$updateoff.'value="0" />'.&mt('No').'</label></span></td>'. |
$updateon.'value="1" />'.&mt('Yes').'</label></span></td>'. |
'</tr><tr>'. |
|
'<td>'.&mt($title{'classlists'}).'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="classlists"'. |
|
$classlistson.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="classlists"'. |
|
$classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
'</tr>'; |
$$rowtotal += 2; |
my @toggles = ('classlists','unexpired'); |
|
my %defaultchecked = ('classlists' => 'off', |
|
'unexpired' => 'off' |
|
); |
|
$$rowtotal ++; |
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
|
\%choices,$itemcount,'','','left','no'); |
|
$datatable = $enable.$datatable; |
|
$$rowtotal += $itemcount; |
|
my $lastactiveon = ' '; |
|
my $lastactiveoff = ' checked="checked" '; |
|
my $lastactivestyle = 'none'; |
|
my $lastactivedays; |
|
my $onclick = ' onclick="javascript:toggleLastActiveDays(this.form);"'; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'lastactive'} =~ /^\d+$/) { |
|
$lastactiveon = $lastactiveoff; |
|
$lastactiveoff = ' '; |
|
$lastactivestyle = 'inline-block'; |
|
$lastactivedays = $settings->{'lastactive'}; |
|
} |
|
} |
|
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td>'.$choices{'lastactive'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="lastactive"'. |
|
$lastactiveoff.'value="0"'.$onclick.' />'.&mt('No').'</label>'. |
|
' <label>'. |
|
'<input type="radio" name="lastactive"'. |
|
$lastactiveon.' value="1"'.$onclick.' />'.&mt('Yes').'</label>'. |
|
'<div id="lastactive_div" style="display:'.$lastactivestyle.';">'. |
|
': '.&mt('inactive = no activity in last [_1] days', |
|
'<input type="text" size="5" name="lastactivedays" value="'. |
|
$lastactivedays.'" />'). |
|
'</span></td>'. |
|
'</tr>'; |
|
$$rowtotal ++; |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my $numinrow = 3; |
my $numinrow = 3; |
Line 4561 sub helpdeskroles_access {
|
Line 5072 sub helpdeskroles_access {
|
|
|
sub radiobutton_prefs { |
sub radiobutton_prefs { |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
$additional,$align) = @_; |
$additional,$align,$firstval) = @_; |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
(ref($choices) eq 'HASH')); |
(ref($choices) eq 'HASH')); |
|
|
Line 4601 sub radiobutton_prefs {
|
Line 5112 sub radiobutton_prefs {
|
} else { |
} else { |
$datatable .= '<td class="LC_right_item">'; |
$datatable .= '<td class="LC_right_item">'; |
} |
} |
$datatable .= |
$datatable .= '<span class="LC_nobreak">'; |
'<span class="LC_nobreak">'. |
if ($firstval eq 'no') { |
'<label><input type="radio" name="'. |
$datatable .= |
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
'<label><input type="radio" name="'. |
'</label> <label><input type="radio" name="'.$item.'" '. |
$item.'" '.$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No'). |
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'. |
'</label> <label><input type="radio" name="'.$item.'" '. |
'</span>'.$additional. |
$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').'</label>'; |
'</td>'. |
} else { |
'</tr>'; |
$datatable .= |
|
'<label><input type="radio" name="'. |
|
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
|
'</label> <label><input type="radio" name="'.$item.'" '. |
|
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'; |
|
} |
|
$datatable .= '</span>'.$additional.'</td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
return ($datatable,$itemcount); |
return ($datatable,$itemcount); |
Line 5714 sub print_lti {
|
Line 6231 sub print_lti {
|
foreach my $item (keys(%{$settings})) { |
foreach my $item (keys(%{$settings})) { |
if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{$item}) eq 'HASH') { |
my $num = $settings->{$item}{'order'}; |
my $num = $settings->{$item}{'order'}; |
|
if ($num eq '') { |
|
$num = scalar(keys(%{$settings})); |
|
} |
$ordered{$num} = $item; |
$ordered{$num} = $item; |
} |
} |
} |
} |
Line 5726 sub print_lti {
|
Line 6246 sub print_lti {
|
for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $item = $ordered{$items[$i]}; |
my $item = $ordered{$items[$i]}; |
my ($key,$secret,$lifetime,$consumer,$requser,$current); |
my ($key,$secret,$lifetime,$consumer,$requser,$crsinc,$current); |
if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{$item}) eq 'HASH') { |
$key = $settings->{$item}->{'key'}; |
$key = $settings->{$item}->{'key'}; |
$secret = $settings->{$item}->{'secret'}; |
$secret = $settings->{$item}->{'secret'}; |
$lifetime = $settings->{$item}->{'lifetime'}; |
$lifetime = $settings->{$item}->{'lifetime'}; |
$consumer = $settings->{$item}->{'consumer'}; |
$consumer = $settings->{$item}->{'consumer'}; |
$requser = $settings->{$item}->{'requser'}; |
$requser = $settings->{$item}->{'requser'}; |
|
$crsinc = $settings->{$item}->{'crsinc'}; |
$current = $settings->{$item}; |
$current = $settings->{$item}; |
} |
} |
my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"'; |
my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"'; |
Line 5744 sub print_lti {
|
Line 6265 sub print_lti {
|
$checkedrequser{'no'} = $checkedrequser{'yes'}; |
$checkedrequser{'no'} = $checkedrequser{'yes'}; |
$checkedrequser{'yes'} = ''; |
$checkedrequser{'yes'} = ''; |
} |
} |
|
my $onclickcrsinc = ' onclick="toggleLTI(this.form,'."'crsinc','$i'".');"'; |
|
my %checkedcrsinc = ( |
|
yes => ' checked="checked"', |
|
no => '', |
|
); |
|
if (!$crsinc) { |
|
$checkedcrsinc{'no'} = $checkedcrsinc{'yes'}; |
|
$checkedcrsinc{'yes'} = ''; |
|
} |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"'; |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
.'<select name="lti_pos_'.$item.'"'.$chgstr.'>'; |
.'<select name="lti_pos_'.$item.'"'.$chgstr.'>'; |
Line 5773 sub print_lti {
|
Line 6303 sub print_lti {
|
'<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n". |
'<br /><br />'. |
'<br /><br />'. |
|
'<span class="LC_nobreak">'.$lt{'crsinc'}.':'. |
|
'<label><input type="radio" name="lti_crsinc_'.$i.'" value="1"'.$onclickcrsinc.$checkedcrsinc{yes}.' />'.&mt('Yes').'</label> '."\n". |
|
'<label><input type="radio" name="lti_crsinc_'.$i.'" value="0"'.$onclickcrsinc.$checkedcrsinc{no}.' />'.&mt('No').'</label></span>'."\n". |
|
(' 'x4). |
'<span class="LC_nobreak">'.$lt{'key'}. |
'<span class="LC_nobreak">'.$lt{'key'}. |
':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '. |
':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '. |
(' 'x2). |
(' 'x2). |
Line 5813 sub print_lti {
|
Line 6347 sub print_lti {
|
'<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n". |
'<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n". |
'<br /><br />'. |
'<br /><br />'. |
|
'<span class="LC_nobreak">'.$lt{'crsinc'}.':'. |
|
'<label><input type="radio" name="lti_crsinc_add" value="1" onclick="toggleLTI(this.form,'."'crsinc','add'".');" checked="checked" />'.&mt('Yes').'</label> '."\n". |
|
'<label><input type="radio" name="lti_crsinc_add" value="0" onclick="toggleLTI(this.form,'."'crsinc','add'".');" />'.&mt('No').'</label></span>'."\n". |
|
(' 'x4). |
'<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" />'. |
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" />'. |
Line 5833 sub lti_names {
|
Line 6371 sub lti_names {
|
'consumer' => 'Consumer', |
'consumer' => 'Consumer', |
'secret' => 'Secret', |
'secret' => 'Secret', |
'requser' => "User's identity sent", |
'requser' => "User's identity sent", |
|
'crsinc' => "Course's identity sent", |
'email' => 'Email address', |
'email' => 'Email address', |
'sourcedid' => 'User ID', |
'sourcedid' => 'User ID', |
'other' => 'Other', |
'other' => 'Other', |
Line 5849 sub lti_options {
|
Line 6388 sub lti_options {
|
my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield,$callback); |
my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield,$callback); |
$checked{'mapuser'}{'sourcedid'} = ' checked="checked"'; |
$checked{'mapuser'}{'sourcedid'} = ' checked="checked"'; |
$checked{'mapcrs'}{'course_offering_sourcedid'} = ' checked="checked"'; |
$checked{'mapcrs'}{'course_offering_sourcedid'} = ' checked="checked"'; |
$checked{'makecrs'}{'N'} = ' checked="checked"'; |
$checked{'storecrs'}{'Y'} = ' checked="checked"'; |
|
$checked{'makecrs'}{'N'} = ' checked="checked"'; |
$checked{'mapcrstype'} = {}; |
$checked{'mapcrstype'} = {}; |
$checked{'makeuser'} = {}; |
$checked{'makeuser'} = {}; |
$checked{'selfenroll'} = {}; |
$checked{'selfenroll'} = {}; |
Line 5867 sub lti_options {
|
Line 6407 sub lti_options {
|
my $callbacksty = 'none'; |
my $callbacksty = 'none'; |
my $passbacksty = 'none'; |
my $passbacksty = 'none'; |
my $optionsty = 'block'; |
my $optionsty = 'block'; |
|
my $crssty = 'block'; |
my $lcauthparm; |
my $lcauthparm; |
my $lcauthparmstyle = 'display:none'; |
my $lcauthparmstyle = 'display:none'; |
my $lcauthparmtext; |
my $lcauthparmtext; |
Line 5877 sub lti_options {
|
Line 6418 sub lti_options {
|
if (ref($current) eq 'HASH') { |
if (ref($current) eq 'HASH') { |
if (!$current->{'requser'}) { |
if (!$current->{'requser'}) { |
$optionsty = 'none'; |
$optionsty = 'none'; |
|
$crssty = 'none'; |
|
} elsif (!$current->{'crsinc'}) { |
|
$crssty = 'none'; |
} |
} |
if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) { |
if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) { |
$checked{'mapuser'}{'sourcedid'} = ''; |
$checked{'mapuser'}{'sourcedid'} = ''; |
Line 5903 sub lti_options {
|
Line 6447 sub lti_options {
|
$checked{'mapcrstype'}{$type} = ' checked="checked"'; |
$checked{'mapcrstype'}{$type} = ' checked="checked"'; |
} |
} |
} |
} |
|
if (!$current->{'storecrs'}) { |
|
$checked{'storecrs'}{'N'} = $checked{'storecrs'}{'Y'}; |
|
$checked{'storecrs'}{'Y'} = ''; |
|
} |
if ($current->{'makecrs'}) { |
if ($current->{'makecrs'}) { |
$checked{'makecrs'}{'Y'} = ' checked="checked"'; |
$checked{'makecrs'}{'Y'} = ' checked="checked"'; |
} |
} |
Line 6009 sub lti_options {
|
Line 6557 sub lti_options {
|
my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"'; |
my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"'; |
my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"'; |
my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"'; |
my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"'; |
my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"'; |
my $output = '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'. |
my $output = '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Logout options').'</legend>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback to logout LON-CAPA on log out from Consumer').': '. |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="0"'. |
|
$checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="1"'. |
|
$checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Parameter').': '. |
|
'<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'. |
|
'</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'. |
|
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').': '; |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').': '; |
foreach my $option ('sourcedid','email','other') { |
foreach my $option ('sourcedid','email','other') { |
$output .= '<label><input type="radio" name="lti_mapuser_'.$num.'" value="'.$option.'"'. |
$output .= '<label><input type="radio" name="lti_mapuser_'.$num.'" value="'.$option.'"'. |
Line 6020 sub lti_options {
|
Line 6578 sub lti_options {
|
'<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="lti_userfield_'.$num.'">'. |
'<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="lti_userfield_'.$num.'">'. |
'<input type="text" name="lti_customuser_'.$num.'" '. |
'<input type="text" name="lti_customuser_'.$num.'" '. |
'value="'.$userfield.'" /></div></fieldset>'. |
'value="'.$userfield.'" /></div></fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>'; |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>'; |
foreach my $ltirole (@lticourseroles) { |
|
my ($selected,$selectnone); |
|
if ($rolemaps{$ltirole} eq '') { |
|
$selectnone = ' selected="selected"'; |
|
} |
|
$output .= '<td style="text-align: center">'.$ltirole.'<br />'. |
|
'<select name="lti_maprole_'.$ltirole.'_'.$num.'">'. |
|
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
|
foreach my $role (@courseroles) { |
|
unless ($selectnone) { |
|
if ($rolemaps{$ltirole} eq $role) { |
|
$selected = ' selected="selected"'; |
|
} else { |
|
$selected = ''; |
|
} |
|
} |
|
$output .= '<option value="'.$role.'"'.$selected.'>'. |
|
&Apache::lonnet::plaintext($role,'Course'). |
|
'</option>'; |
|
} |
|
$output .= '</select></td>'; |
|
} |
|
$output .= '</tr></table></fieldset>'. |
|
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>'; |
|
foreach my $ltirole (@ltiroles) { |
foreach my $ltirole (@ltiroles) { |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'. |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'. |
$checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label> </span> '; |
$checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label> </span> '; |
} |
} |
$output .= '</fieldset>'. |
$output .= '</fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'. |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'. |
'<table>'. |
'<table>'. |
&modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount). |
&modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount). |
'</table>'. |
'</table>'. |
Line 6073 sub lti_options {
|
Line 6607 sub lti_options {
|
'<span id="lti_lcauth_parmtext_'.$num.'">'.$lcauthparmtext.'</span>'. |
'<span id="lti_lcauth_parmtext_'.$num.'">'.$lcauthparmtext.'</span>'. |
'<input type="text" name="lti_lcauthparm_'.$num.'" value="" /></span></td></tr>'. |
'<input type="text" name="lti_lcauthparm_'.$num.'" value="" /></span></td></tr>'. |
'</table></fieldset>'. |
'</table></fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping courses').'</legend>'. |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'. |
|
&mt('LON-CAPA menu items (Course Coordinator can override)').'</legend>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.': '. |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'. |
|
$checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'. |
|
$checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.': '. |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'. |
|
$checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'. |
|
$checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'; |
|
$output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Menu items').': '; |
|
foreach my $type ('fullname','coursetitle','role','logout','grades') { |
|
$output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'. |
|
$checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'. |
|
(' 'x2); |
|
} |
|
$output .= '</span></div></fieldset>'. |
|
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping courses').'</legend>'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'. |
&mt('Unique course identifier').': '; |
&mt('Unique course identifier').': '; |
foreach my $option ('course_offering_sourcedid','context_id','other') { |
foreach my $option ('course_offering_sourcedid','context_id','other') { |
Line 6090 sub lti_options {
|
Line 6646 sub lti_options {
|
$checked{'mapcrstype'}{$type}.' />'.$coursetypetitles{$type}.'</label>'. |
$checked{'mapcrstype'}{$type}.' />'.$coursetypetitles{$type}.'</label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$output .= '</span></fieldset>'. |
$output .= '</span><br /><br />'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Creating courses').'</legend>'. |
'<span class="LC_nobreak">'.&mt('Store mapping of course identifier to LON-CAPA CourseID').': '. |
|
'<label><input type="radio" name="lti_storecrs_'.$num.'" value="0"'. |
|
$checked{'storecrs'}{'N'}.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_storecrs_'.$num.'" value="1"'. |
|
$checked{'storecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'. |
|
'</fieldset>'. |
|
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>'; |
|
foreach my $ltirole (@lticourseroles) { |
|
my ($selected,$selectnone); |
|
if ($rolemaps{$ltirole} eq '') { |
|
$selectnone = ' selected="selected"'; |
|
} |
|
$output .= '<td style="text-align: center">'.$ltirole.'<br />'. |
|
'<select name="lti_maprole_'.$ltirole.'_'.$num.'">'. |
|
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
|
foreach my $role (@courseroles) { |
|
unless ($selectnone) { |
|
if ($rolemaps{$ltirole} eq $role) { |
|
$selected = ' selected="selected"'; |
|
} else { |
|
$selected = ''; |
|
} |
|
} |
|
$output .= '<option value="'.$role.'"'.$selected.'>'. |
|
&Apache::lonnet::plaintext($role,'Course'). |
|
'</option>'; |
|
} |
|
$output .= '</select></td>'; |
|
} |
|
$output .= '</tr></table></fieldset>'. |
|
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Creating courses').'</legend>'. |
'<span class="LC_nobreak">'.&mt('Course created (if absent) on Instructor access').': '. |
'<span class="LC_nobreak">'.&mt('Course created (if absent) on Instructor access').': '. |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="0"'. |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="0"'. |
$checked{'makecrs'}{'N'}.' />'.&mt('No').'</label>'.(' 'x2). |
$checked{'makecrs'}{'N'}.' />'.&mt('No').'</label>'.(' 'x2). |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="1"'. |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="1"'. |
$checked{'makecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'. |
$checked{'makecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'. |
'</fieldset>'. |
'</fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>'; |
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>'; |
foreach my $lticrsrole (@lticourseroles) { |
foreach my $lticrsrole (@lticourseroles) { |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_selfenroll_'.$num.'" value="'.$lticrsrole.'"'. |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_selfenroll_'.$num.'" value="'.$lticrsrole.'"'. |
$checked{'selfenroll'}{$lticrsrole}.' />'.$lticrsrole.'</label> </span> '; |
$checked{'selfenroll'}{$lticrsrole}.' />'.$lticrsrole.'</label> </span> '; |
} |
} |
$output .= '</fieldset>'. |
$output .= '</fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course options').'</legend>'. |
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Course options').'</legend>'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Assign users to sections').': '. |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Assign users to sections').': '. |
'<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'. |
'<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'. |
$checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.(' 'x2). |
$checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.(' 'x2). |
Line 6156 sub lti_options {
|
Line 6742 sub lti_options {
|
&mt('Outcomes Service (1.1)').'</label>'.(' 'x2). |
&mt('Outcomes Service (1.1)').'</label>'.(' 'x2). |
'<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'. |
'<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'. |
&mt('Outcomes Extension (1.0)').'</label></span></div>'. |
&mt('Outcomes Extension (1.0)').'</label></span></div>'. |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
'<div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'; |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback on logout').': '. |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="0"'. |
|
$checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="1"'. |
|
$checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Parameter').': '. |
|
'<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'. |
|
'</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'. |
|
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course defaults (Course Coordinator can override)').'</legend>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.': '. |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'. |
|
$checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'. |
|
$checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.': '. |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'. |
|
$checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'. |
|
$checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'; |
|
$output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Menu items').': '; |
|
foreach my $type ('fullname','coursetitle','role','logout','grades') { |
|
$output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'. |
|
$checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'. |
|
(' 'x2); |
|
} |
|
$output .= '</span></div></fieldset>'; |
$output .= '</span></div></fieldset>'; |
# '<fieldset><legend>'.&mt('Assigning author roles').'</legend>'; |
# '<fieldset><legend>'.&mt('Assigning author roles').'</legend>'; |
# |
# |
Line 7295 sub print_wafproxy {
|
Line 7852 sub print_wafproxy {
|
my $itemcount = 0; |
my $itemcount = 0; |
my $datatable; |
my $datatable; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%othercontrol,%otherdoms,%aliases,%values,$setdom,$showdom); |
my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom); |
my %lt = &wafproxy_titles(); |
my %lt = &wafproxy_titles(); |
foreach my $server (sort(keys(%servers))) { |
foreach my $server (sort(keys(%servers))) { |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
Line 7320 sub print_wafproxy {
|
Line 7877 sub print_wafproxy {
|
$showdom = 1; |
$showdom = 1; |
} |
} |
} |
} |
|
if (ref($settings->{'saml'}) eq 'HASH') { |
|
$saml{$dom} = $settings->{'saml'}; |
|
} |
} |
} |
} |
} |
} |
} |
Line 7337 sub print_wafproxy {
|
Line 7897 sub print_wafproxy {
|
foreach my $domain (keys(%otherdoms)) { |
foreach my $domain (keys(%otherdoms)) { |
%{$values{$domain}} = (); |
%{$values{$domain}} = (); |
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
if (ref($config{$domain}) eq 'HASH') { |
if (ref($config{'wafproxy'}) eq 'HASH') { |
if (ref($config{$domain}{'wafproxy'}) eq 'HASH') { |
$aliases{$domain} = $config{'wafproxy'}{'alias'}; |
$aliases{$domain} = $config{$domain}{'wafproxy'}{'alias'}; |
if (exists($config{'wafproxy'}{'saml'})) { |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
$saml{$domain} = $config{'wafproxy'}{'saml'}; |
$values{$domain}{$item} = $config{$domain}{'wafproxy'}{$item}; |
} |
} |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
|
$values{$domain}{$item} = $config{'wafproxy'}{$item}; |
} |
} |
} |
} |
} |
} |
Line 7354 sub print_wafproxy {
|
Line 7915 sub print_wafproxy {
|
$itemcount ++; |
$itemcount ++; |
my $dom_in_effect; |
my $dom_in_effect; |
my $aliasrows = '<tr>'. |
my $aliasrows = '<tr>'. |
'<td class="LC_left_item">'.&mt('Hostname').': '. |
'<td class="LC_left_item" style="vertical-align: baseline;">'. |
&Apache::lonnet::hostname($server).'</td>'; |
&mt('Hostname').': '. |
|
'<i>'.&Apache::lonnet::hostname($server).'</i></td><td> </td>'; |
if ($othercontrol{$server}) { |
if ($othercontrol{$server}) { |
$dom_in_effect = $othercontrol{$server}; |
$dom_in_effect = $othercontrol{$server}; |
my $current; |
my ($current,$forsaml); |
if (ref($aliases{$othercontrol{$server}}) eq 'HASH') { |
if (ref($aliases{$dom_in_effect}) eq 'HASH') { |
$current = $aliases{$othercontrol{$server}{$server}}; |
$current = $aliases{$dom_in_effect}{$server}; |
|
} |
|
if (ref($saml{$dom_in_effect}) eq 'HASH') { |
|
if ($saml{$dom_in_effect}{$server}) { |
|
$forsaml = 1; |
|
} |
} |
} |
|
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
|
&mt('Alias').': '; |
if ($current) { |
if ($current) { |
$aliasrows .= $current; |
$aliasrows .= $current; |
|
if ($forsaml) { |
|
$aliasrows .= ' ('.&mt('also for Shibboleth').')'; |
|
} |
} else { |
} else { |
$aliasrows .= &mt('None in effect'); |
$aliasrows .= &mt('None'); |
} |
} |
$aliasrows .= '<td class="LC_left_item"><span class="LC_small">('. |
$aliasrows .= ' <span class="LC_small">('. |
&mt('WAF/Reverse Proxy controlled by domain: [_1]', |
&mt('controlled by domain: [_1]', |
'<b>'.$othercontrol{$server}.'</b>').'</span></td>'; |
'<b>'.$dom_in_effect.'</b>').')</span></td>'; |
} else { |
} else { |
$dom_in_effect = $dom; |
$dom_in_effect = $dom; |
my $current; |
my ($current,$samlon,$samloff); |
|
$samloff = ' checked="checked"'; |
if (ref($aliases{$dom}) eq 'HASH') { |
if (ref($aliases{$dom}) eq 'HASH') { |
if ($aliases{$dom}{$server}) { |
if ($aliases{$dom}{$server}) { |
$current = $aliases{$dom}{$server}; |
$current = $aliases{$dom}{$server}; |
} |
} |
} |
} |
$aliasrows .= '<td class="LC_left_item">'.&mt('WAF/Reverse Proxy Alias').': '. |
if (ref($saml{$dom}) eq 'HASH') { |
|
if ($saml{$dom}{$server}) { |
|
$samlon = $samloff; |
|
undef($samloff); |
|
} |
|
} |
|
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
|
&mt('Alias').': '. |
'<input type="text" name="wafproxy_alias_'.$server.'" '. |
'<input type="text" name="wafproxy_alias_'.$server.'" '. |
'value="'.$current.'" size="30" /></td>'; |
'value="'.$current.'" size="30" />'. |
|
(' 'x2).'<span class="LC_nobreak">'. |
|
&mt('Alias used for Shibboleth').': <label>'. |
|
'<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'. |
|
&mt('No').'</label> <label>'. |
|
'<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'. |
|
&mt('Yes').'</label></span>'. |
|
'</td>'; |
} |
} |
$aliasrows .= '</tr>'; |
$aliasrows .= '</tr>'; |
$aliasinfo{$dom_in_effect} .= $aliasrows; |
$aliasinfo{$dom_in_effect} .= $aliasrows; |
Line 7408 sub print_wafproxy {
|
Line 7995 sub print_wafproxy {
|
'</table></td></tr>'; |
'</table></td></tr>'; |
$itemcount++; |
$itemcount++; |
} |
} |
if (keys(%othercontrol)) { |
if (keys(%otherdoms)) { |
foreach my $key (sort(keys(%othercontrol))) { |
foreach my $key (sort(keys(%otherdoms))) { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$datatable = '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$key.'</b>').'</td>'. |
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$key.'</b>').'</td>'. |
'<td class="LC_left_item"><table>'.$aliasinfo{$key}. |
'<td class="LC_left_item"><table>'.$aliasinfo{$key}. |
'</table></td></tr>'; |
'</table></td></tr>'; |
$itemcount++; |
$itemcount++; |
} |
} |
} |
} |
} else { |
} else { |
|
my %ip_methods = &remoteip_methods(); |
if ($setdom) { |
if ($setdom) { |
$itemcount ++; |
$itemcount ++; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
Line 7462 sub print_wafproxy {
|
Line 8050 sub print_wafproxy {
|
'<tr'.$css_class.' id="wafproxyrow_'.$dom.'"'.$wafstyle.'>'. |
'<tr'.$css_class.' id="wafproxyrow_'.$dom.'"'.$wafstyle.'>'. |
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br /><br />'. |
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br /><br />'. |
'<div id="wafproxyranges_'.$dom.'">'.&mt('Format for comma separated IP ranges').':<br />'. |
'<div id="wafproxyranges_'.$dom.'">'.&mt('Format for comma separated IP ranges').':<br />'. |
&mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'</div></td>'. |
&mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'<br />'. |
|
&mt('Range(s) stored in CIDR notation').'</div></td>'. |
'<td class="LC_left_item"><table>'. |
'<td class="LC_left_item"><table>'. |
'<tr>'. |
'<tr>'. |
'<td valign="top">'.$lt{'remoteip'}.': '. |
'<td valign="top">'.$lt{'remoteip'}.': '. |
'<select name="wafproxy_remoteip" id="wafproxy_remoteip" onchange="javascript:updateWAF();">'; |
'<select name="wafproxy_remoteip" id="wafproxy_remoteip" onchange="javascript:updateWAF();">'; |
my %ip_methods = &remoteip_methods(); |
|
foreach my $option ('m','h','n') { |
foreach my $option ('m','h','n') { |
my $sel; |
my $sel; |
if ($option eq $curr_remotip) { |
if ($option eq $curr_remotip) { |
Line 7515 sub print_wafproxy {
|
Line 8103 sub print_wafproxy {
|
$itemcount ++; |
$itemcount ++; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'.&mt('Domain: [_1]',$domain).'</td>'. |
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$domain.'</b>').'</td>'. |
'<td class="LC_left_item"><table>'; |
'<td class="LC_left_item"><table>'; |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
my $showval = &mt('None'); |
my $showval = &mt('None'); |
Line 7526 sub print_wafproxy {
|
Line 8114 sub print_wafproxy {
|
$showval = $values{$domain}{$item}; |
$showval = $values{$domain}{$item}; |
if ($item eq 'ssl') { |
if ($item eq 'ssl') { |
$showval = $lt{'alltossl'}; |
$showval = $lt{'alltossl'}; |
|
} elsif ($item eq 'remoteip') { |
|
$showval = $ip_methods{$values{$domain}{$item}}; |
} |
} |
} |
} |
$datatable .= '<tr>'. |
$datatable .= '<tr>'. |
Line 11177 sub usertype_update_row {
|
Line 11767 sub usertype_update_row {
|
sub modify_login { |
sub modify_login { |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon); |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon, |
|
%currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso); |
%title = ( coursecatalog => 'Display course catalog', |
%title = ( coursecatalog => 'Display course catalog', |
adminmail => 'Display administrator E-mail address', |
adminmail => 'Display administrator E-mail address', |
helpdesk => 'Display "Contact Helpdesk" link', |
helpdesk => 'Display "Contact Helpdesk" link', |
newuser => 'Link for visitors to create a user account', |
newuser => 'Link for visitors to create a user account', |
loginheader => 'Log-in box header'); |
loginheader => 'Log-in box header', |
|
saml => 'Dual SSO and non-SSO login'); |
@offon = ('off','on'); |
@offon = ('off','on'); |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
Line 11190 sub modify_login {
|
Line 11782 sub modify_login {
|
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost}; |
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost}; |
} |
} |
} |
} |
|
if (ref($domconfig{login}{'saml'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$domconfig{login}{'saml'}})) { |
|
if (ref($domconfig{login}{'saml'}{$lonhost}) eq 'HASH') { |
|
$currsaml{$lonhost} = $domconfig{login}{'saml'}{$lonhost}; |
|
$saml{$lonhost} = 1; |
|
$samltext{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'text'}; |
|
$samlurl{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'url'}; |
|
$samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'}; |
|
$samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'}; |
|
$samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'}; |
|
$samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'}; |
|
} |
|
} |
|
} |
} |
} |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
\%domconfig,\%loginhash); |
\%domconfig,\%loginhash); |
Line 11436 sub modify_login {
|
Line 12042 sub modify_login {
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
} |
} |
} |
|
my @delsamlimg = &Apache::loncommon::get_env_multiple('form.saml_img_del'); |
|
my @newsamlimgs; |
|
foreach my $lonhost (keys(%domservers)) { |
|
if ($env{'form.saml_'.$lonhost}) { |
|
if ($env{'form.saml_img_'.$lonhost.'.filename'}) { |
|
push(@newsamlimgs,$lonhost); |
|
} |
|
foreach my $item ('text','alt','url','title','notsso') { |
|
$env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g; |
|
} |
|
if ($saml{$lonhost}) { |
|
if (grep(/^\Q$lonhost\E$/,@delsamlimg)) { |
|
#FIXME Need to obsolete published image |
|
delete($currsaml{$lonhost}{'img'}); |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_alt_'.$lonhost} ne $samlalt{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_text_'.$lonhost} ne $samltext{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_url_'.$lonhost} ne $samlurl{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
} else { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
foreach my $item ('text','alt','url','title','notsso') { |
|
$currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost}; |
|
} |
|
} else { |
|
if ($saml{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
delete($currsaml{$lonhost}); |
|
} |
|
} |
|
} |
|
foreach my $posshost (keys(%currsaml)) { |
|
unless (exists($domservers{$posshost})) { |
|
delete($currsaml{$posshost}); |
|
} |
|
} |
|
%{$loginhash{'login'}{'saml'}} = %currsaml; |
|
if (@newsamlimgs) { |
|
my $error; |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver); |
|
} elsif ($author_ok eq 'ok') { |
|
foreach my $lonhost (@newsamlimgs) { |
|
my $formelem = 'saml_img_'.$lonhost; |
|
my ($result,$imgurl) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
|
"login/saml/$lonhost",'','', |
|
$env{'form.saml_img_'.$lonhost.'.filename'}); |
|
if ($result eq 'ok') { |
|
$currsaml{$lonhost}{'img'} = $imgurl; |
|
$loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl; |
|
$changes{'saml'}{$lonhost} = 1; |
|
} else { |
|
my $puberror = &mt("Upload of SSO button image failed for [_1] because an error occurred publishing the file in RES space. Error was: [_2].", |
|
$lonhost,$result); |
|
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
|
} |
|
} |
|
} 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); |
|
} |
|
} else { |
|
$error = &mt("Upload of SSO button image file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2]. Error was: [_3].",$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
|
|
my $defaulthelpfile = '/adm/loginproblems.html'; |
my $defaulthelpfile = '/adm/loginproblems.html'; |
Line 11476 sub modify_login {
|
Line 12165 sub modify_login {
|
} |
} |
if (keys(%changes) > 0 || $colchgtext) { |
if (keys(%changes) > 0 || $colchgtext) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
if (exists($changes{'saml'})) { |
|
my $hostid_in_use; |
|
my @hosts = &Apache::lonnet::current_machine_ids(); |
|
if (@hosts > 1) { |
|
foreach my $hostid (@hosts) { |
|
if (&Apache::lonnet::host_domain($hostid) eq $dom) { |
|
$hostid_in_use = $hostid; |
|
last; |
|
} |
|
} |
|
} else { |
|
$hostid_in_use = $r->dir_config('lonHostID'); |
|
} |
|
if (($hostid_in_use) && |
|
(&Apache::lonnet::host_domain($hostid_in_use) eq $dom)) { |
|
&Apache::lonnet::devalidate_cache_new('samllanding',$hostid_in_use); |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
if (ref($changes{'saml'}) eq 'HASH') { |
|
my %updates; |
|
map { $updates{$_} = 1; } keys(%{$changes{'saml'}}); |
|
$lastactref->{'samllanding'} = \%updates; |
|
} |
|
} |
|
} |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domainconfig'} = 1; |
} |
} |
Line 11555 sub modify_login {
|
Line 12269 sub modify_login {
|
} |
} |
} |
} |
} |
} |
|
} elsif ($item eq 'saml') { |
|
if (ref($changes{$item}) eq 'HASH') { |
|
my %notlt = ( |
|
text => 'Text for log-in by SSO', |
|
img => 'SSO button image', |
|
alt => 'Alt text for button image', |
|
url => 'SSO URL', |
|
title => 'Tooltip for SSO link', |
|
notsso => 'Text for non-SSO log-in', |
|
); |
|
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
|
if (ref($currsaml{$lonhost}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt("$title{$item} in use for [_1]","<b>$lonhost</b>"). |
|
'<ul>'; |
|
foreach my $key ('text','img','alt','url','title','notsso') { |
|
if ($currsaml{$lonhost}{$key} eq '') { |
|
$resulttext .= '<li>'.&mt("$notlt{$key} not in use").'</li>'; |
|
} else { |
|
my $value = "'$currsaml{$lonhost}{$key}'"; |
|
if ($key eq 'img') { |
|
$value = '<img src="'.$currsaml{$lonhost}{$key}.'" />'; |
|
} |
|
$resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]", |
|
$value).'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt("$title{$item} not in use for [_1]",$lonhost).'</li>'; |
|
} |
|
} |
|
} |
} elsif ($item eq 'captcha') { |
} elsif ($item eq 'captcha') { |
if (ref($loginhash{'login'}) eq 'HASH') { |
if (ref($loginhash{'login'}) eq 'HASH') { |
my $chgtxt; |
my $chgtxt; |
Line 11657 sub color_font_choices {
|
Line 12403 sub color_font_choices {
|
return %choices; |
return %choices; |
} |
} |
|
|
|
sub modify_ipaccess { |
|
my ($dom,$lastactref,%domconfig) = @_; |
|
my (@allpos,%changes,%confhash,$errors,$resulttext); |
|
my (@items,%deletions,%itemids,@warnings); |
|
my ($typeorder,$types) = &commblocktype_text(); |
|
if ($env{'form.ipaccess_add'}) { |
|
my $name = $env{'form.ipaccess_name_add'}; |
|
my ($newid,$error) = &get_ipaccess_id($dom,$name); |
|
if ($newid) { |
|
$itemids{'add'} = $newid; |
|
push(@items,'add'); |
|
$changes{$newid} = 1; |
|
} else { |
|
$error = &mt('Failed to acquire unique ID for new IP access control item'); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
if (ref($domconfig{'ipaccess'}) eq 'HASH') { |
|
my @todelete = &Apache::loncommon::get_env_multiple('form.ipaccess_del'); |
|
if (@todelete) { |
|
map { $deletions{$_} = 1; } @todelete; |
|
} |
|
my $maxnum = $env{'form.ipaccess_maxnum'}; |
|
for (my $i=0; $i<$maxnum; $i++) { |
|
my $itemid = $env{'form.ipaccess_id_'.$i}; |
|
$itemid =~ s/\D+//g; |
|
if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') { |
|
if ($deletions{$itemid}) { |
|
$changes{$itemid} = $domconfig{'ipaccess'}{$itemid}{'name'}; |
|
} else { |
|
push(@items,$i); |
|
$itemids{$i} = $itemid; |
|
} |
|
} |
|
} |
|
} |
|
foreach my $idx (@items) { |
|
my $itemid = $itemids{$idx}; |
|
next unless ($itemid); |
|
my %current; |
|
unless ($idx eq 'add') { |
|
if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') { |
|
%current = %{$domconfig{'ipaccess'}{$itemid}}; |
|
} |
|
} |
|
my $position = $env{'form.ipaccess_pos_'.$itemid}; |
|
$position =~ s/\D+//g; |
|
if ($position ne '') { |
|
$allpos[$position] = $itemid; |
|
} |
|
my $name = $env{'form.ipaccess_name_'.$idx}; |
|
$name =~ s/^\s+|\s+$//g; |
|
$confhash{$itemid}{'name'} = $name; |
|
my $possrange = $env{'form.ipaccess_range_'.$idx}; |
|
$possrange =~ s/^\s+|\s+$//g; |
|
unless ($possrange eq '') { |
|
$possrange =~ s/[\r\n]+/\s/g; |
|
$possrange =~ s/\s*-\s*/-/g; |
|
$possrange =~ s/\s+/,/g; |
|
$possrange =~ s/,+/,/g; |
|
if ($possrange ne '') { |
|
my (@ok,$count); |
|
$count = 0; |
|
foreach my $poss (split(/\,/,$possrange)) { |
|
$count ++; |
|
$poss = &validate_ip_pattern($poss); |
|
if ($poss ne '') { |
|
push(@ok,$poss); |
|
} |
|
} |
|
my $diff = $count - scalar(@ok); |
|
if ($diff) { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('[quant,_1,IP] invalid and excluded from saved value for IP range(s) for [_2]', |
|
$diff,$name). |
|
'</span></li>'; |
|
} |
|
if (@ok) { |
|
my @cidr_list; |
|
foreach my $item (@ok) { |
|
@cidr_list = &Net::CIDR::cidradd($item,@cidr_list); |
|
} |
|
$confhash{$itemid}{'ip'} = join(',',@cidr_list); |
|
} |
|
} |
|
} |
|
foreach my $field ('name','ip') { |
|
unless (($idx eq 'add') || ($changes{$itemid})) { |
|
if ($current{$field} ne $confhash{$itemid}{$field}) { |
|
$changes{$itemid} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
$confhash{$itemid}{'commblocks'} = {}; |
|
|
|
my %commblocks; |
|
map { $commblocks{$_} = 1; } &Apache::loncommon::get_env_multiple('form.ipaccess_block_'.$idx); |
|
foreach my $type (@{$typeorder}) { |
|
if ($commblocks{$type}) { |
|
$confhash{$itemid}{'commblocks'}{$type} = 'on'; |
|
} |
|
unless (($idx eq 'add') || ($changes{$itemid})) { |
|
if (ref($current{'commblocks'}) eq 'HASH') { |
|
if ($confhash{$itemid}{'commblocks'}{$type} ne $current{'commblocks'}{$type}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif ($confhash{$itemid}{'commblocks'}{$type}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
$confhash{$itemid}{'courses'} = {}; |
|
my %crsdeletions; |
|
my @delcrs = &Apache::loncommon::get_env_multiple('form.ipaccess_course_delete_'.$idx); |
|
if (@delcrs) { |
|
map { $crsdeletions{$_} = 1; } @delcrs; |
|
} |
|
if (ref($current{'courses'}) eq 'HASH') { |
|
foreach my $cid (sort(keys(%{$current{'courses'}}))) { |
|
if ($crsdeletions{$cid}) { |
|
$changes{$itemid} = 1; |
|
} else { |
|
$confhash{$itemid}{'courses'}{$cid} = 1; |
|
} |
|
} |
|
} |
|
$env{'form.ipaccess_cnum_'.$idx} =~ s/^\s+|\s+$//g; |
|
$env{'form.ipaccess_cdom_'.$idx} =~ s/^\s+|\s+$//g; |
|
if (($env{'form.ipaccess_cnum_'.$idx} =~ /^$match_courseid$/) && |
|
($env{'form.ipaccess_cdom_'.$idx} =~ /^$match_domain$/)) { |
|
if (&Apache::lonnet::homeserver($env{'form.ipaccess_cnum_'.$idx}, |
|
$env{'form.ipaccess_cdom_'.$idx}) eq 'no_host') { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('Invalid courseID [_1] omitted from list of allowed courses', |
|
$env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}). |
|
'</span></li>'; |
|
} else { |
|
$confhash{$itemid}{'courses'}{$env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}} = 1; |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
if (@allpos > 0) { |
|
my $idx = 0; |
|
foreach my $itemid (@allpos) { |
|
if ($itemid ne '') { |
|
$confhash{$itemid}{'order'} = $idx; |
|
unless ($changes{$itemid}) { |
|
if (ref($domconfig{'ipaccess'}) eq 'HASH') { |
|
if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') { |
|
if ($domconfig{'ipaccess'}{$itemid}{'order'} ne $idx) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
} |
|
$idx ++; |
|
} |
|
} |
|
} |
|
if (keys(%changes)) { |
|
my %defaultshash = ( |
|
ipaccess => \%confhash, |
|
); |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
my $cachetime = 1800; |
|
&Apache::lonnet::do_cache_new('ipaccess',$dom,\%confhash,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'ipaccess'} = 1; |
|
} |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
my %bynum; |
|
foreach my $itemid (sort(keys(%changes))) { |
|
if (ref($confhash{$itemid}) eq 'HASH') { |
|
my $position = $confhash{$itemid}{'order'}; |
|
if ($position =~ /^\d+$/) { |
|
$bynum{$position} = $itemid; |
|
} |
|
} |
|
} |
|
if (keys(%deletions)) { |
|
foreach my $itemid (sort { $a <=> $b } keys(%deletions)) { |
|
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
|
} |
|
} |
|
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
|
my $itemid = $bynum{$pos}; |
|
if (ref($confhash{$itemid}) eq 'HASH') { |
|
$resulttext .= '<li><b>'.$confhash{$itemid}{'name'}.'</b><ul>'; |
|
my $position = $pos + 1; |
|
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
|
if ($confhash{$itemid}{'ip'} eq '') { |
|
$resulttext .= '<li>'.&mt('No IP Range(s) set').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('IP Range(s): [_1]',$confhash{$itemid}{'ip'}).'</li>'; |
|
} |
|
if (keys(%{$confhash{$itemid}{'commblocks'}})) { |
|
$resulttext .= '<li>'.&mt('Functionality Blocked: [_1]', |
|
join(', ', map { $types->{$_}; } sort(keys(%{$confhash{$itemid}{'commblocks'}})))). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No functionality blocked').'</li>'; |
|
} |
|
if (keys(%{$confhash{$itemid}{'courses'}})) { |
|
my @courses; |
|
foreach my $cid (sort(keys(%{$confhash{$itemid}{'courses'}}))) { |
|
my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1}); |
|
push(@courses,$courseinfo{'description'}.' ('.$cid.')'); |
|
} |
|
$resulttext .= '<li>'.&mt('Courses/Communities allowed').':<ul><li>'. |
|
join('</li><li>',@courses).'</li></ul>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No courses allowed').'</li>'; |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
|
} |
|
} else { |
|
$resulttext = &mt('No changes made'); |
|
} |
|
if ($errors) { |
|
$resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'. |
|
$errors.'</ul></p>'; |
|
} |
|
return $resulttext; |
|
} |
|
|
|
sub get_ipaccess_id { |
|
my ($domain,$location) = @_; |
|
# get lock on ipaccess db |
|
my $lockhash = { |
|
lock => $env{'user.name'}. |
|
':'.$env{'user.domain'}, |
|
}; |
|
my $tries = 0; |
|
my $gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain); |
|
my ($id,$error); |
|
|
|
while (($gotlock ne 'ok') && ($tries<10)) { |
|
$tries ++; |
|
sleep (0.1); |
|
$gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain); |
|
} |
|
if ($gotlock eq 'ok') { |
|
my %currids = &Apache::lonnet::dump_dom('ipaccess',$domain); |
|
if ($currids{'lock'}) { |
|
delete($currids{'lock'}); |
|
if (keys(%currids)) { |
|
my @curr = sort { $a <=> $b } keys(%currids); |
|
if ($curr[-1] =~ /^\d+$/) { |
|
$id = 1 + $curr[-1]; |
|
} |
|
} else { |
|
$id = 1; |
|
} |
|
if ($id) { |
|
unless (&Apache::lonnet::newput_dom('ipaccess',{ $id => $location },$domain) eq 'ok') { |
|
$error = 'nostore'; |
|
} |
|
} else { |
|
$error = 'nonumber'; |
|
} |
|
} |
|
my $dellockoutcome = &Apache::lonnet::del_dom('ipaccess',['lock'],$domain); |
|
} else { |
|
$error = 'nolock'; |
|
} |
|
return ($id,$error); |
|
} |
|
|
sub modify_rolecolors { |
sub modify_rolecolors { |
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_; |
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_; |
my ($resulttext,%rolehash); |
my ($resulttext,%rolehash); |
Line 13523 sub modify_ltitools {
|
Line 14546 sub modify_ltitools {
|
my %ltienchash = ( |
my %ltienchash = ( |
$action => { %encconfig } |
$action => { %encconfig } |
); |
); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %ltiall = %confhash; |
my %ltiall = %confhash; |
Line 14097 sub modify_proctoring {
|
Line 15120 sub modify_proctoring {
|
my %proc_enchash = ( |
my %proc_enchash = ( |
$action => { %encconfhash } |
$action => { %encconfhash } |
); |
); |
&Apache::lonnet::put_dom('encconfig',\%proc_enchash,$dom); |
&Apache::lonnet::put_dom('encconfig',\%proc_enchash,$dom,undef,1); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %procall = %confhash; |
my %procall = %confhash; |
Line 14300 sub modify_lti {
|
Line 15323 sub modify_lti {
|
my @courseroles = ('cc','in','ta','ep','st'); |
my @courseroles = ('cc','in','ta','ep','st'); |
my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator); |
my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator); |
my @lticourseroles = qw(Instructor TeachingAssistant Mentor Learner); |
my @lticourseroles = qw(Instructor TeachingAssistant Mentor Learner); |
my @coursetypes = ('official','unofficial','community','textbook','placement'); |
my @coursetypes = ('official','unofficial','community','textbook','placement','lti'); |
my %coursetypetitles = &Apache::lonlocal::texthash ( |
my %coursetypetitles = &Apache::lonlocal::texthash ( |
official => 'Official', |
official => 'Official', |
unofficial => 'Unofficial', |
unofficial => 'Unofficial', |
community => 'Community', |
community => 'Community', |
textbook => 'Textbook', |
textbook => 'Textbook', |
placement => 'Placement Test', |
placement => 'Placement Test', |
|
lti => 'LTI Provider', |
); |
); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %lt = <i_names(); |
my %lt = <i_names(); |
Line 14336 sub modify_lti {
|
Line 15360 sub modify_lti {
|
map { $deletions{$_} = 1; } @todelete; |
map { $deletions{$_} = 1; } @todelete; |
} |
} |
my $maxnum = $env{'form.lti_maxnum'}; |
my $maxnum = $env{'form.lti_maxnum'}; |
for (my $i=0; $i<=$maxnum; $i++) { |
for (my $i=0; $i<$maxnum; $i++) { |
my $itemid = $env{'form.lti_id_'.$i}; |
my $itemid = $env{'form.lti_id_'.$i}; |
$itemid =~ s/\D+//g; |
$itemid =~ s/\D+//g; |
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
if ($deletions{$itemid}) { |
if ($deletions{$itemid}) { |
$changes{$itemid} = $domconfig{$action}{$itemid}{'consumer'}; |
$changes{$itemid} = $domconfig{$action}{$itemid}{'consumer'}; |
} else { |
} else { |
push(@items,$i); |
push(@items,$i); |
$itemids{$i} = $itemid; |
$itemids{$i} = $itemid; |
} |
} |
} |
} |
} |
} |
Line 14352 sub modify_lti {
|
Line 15376 sub modify_lti {
|
foreach my $idx (@items) { |
foreach my $idx (@items) { |
my $itemid = $itemids{$idx}; |
my $itemid = $itemids{$idx}; |
next unless ($itemid); |
next unless ($itemid); |
my $position = $env{'form.lti_pos_'.$idx}; |
my $position = $env{'form.lti_pos_'.$itemid}; |
$position =~ s/\D+//g; |
$position =~ s/\D+//g; |
if ($position ne '') { |
if ($position ne '') { |
$allpos[$position] = $itemid; |
$allpos[$position] = $itemid; |
} |
} |
foreach my $item ('consumer','key','secret','lifetime','requser') { |
foreach my $item ('consumer','key','secret','lifetime','requser','crsinc') { |
my $formitem = 'form.lti_'.$item.'_'.$idx; |
my $formitem = 'form.lti_'.$item.'_'.$idx; |
$env{$formitem} =~ s/(`)/'/g; |
$env{$formitem} =~ s/(`)/'/g; |
if ($item eq 'lifetime') { |
if ($item eq 'lifetime') { |
Line 14390 sub modify_lti {
|
Line 15414 sub modify_lti {
|
$mapuser =~ s/^\s+|\s+$//g; |
$mapuser =~ s/^\s+|\s+$//g; |
$confhash{$itemid}{'mapuser'} = $mapuser; |
$confhash{$itemid}{'mapuser'} = $mapuser; |
} |
} |
foreach my $ltirole (@lticourseroles) { |
|
my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx}; |
|
if (grep(/^\Q$possrole\E$/,@courseroles)) { |
|
$confhash{$itemid}{'maproles'}{$ltirole} = $possrole; |
|
} |
|
} |
|
my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx); |
my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx); |
my @makeuser; |
my @makeuser; |
foreach my $ltirole (sort(@possmakeuser)) { |
foreach my $ltirole (sort(@possmakeuser)) { |
Line 14428 sub modify_lti {
|
Line 15446 sub modify_lti {
|
} |
} |
} |
} |
} |
} |
if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') || |
|
($env{'form.lti_mapcrs_'.$idx} eq 'context_id')) { |
|
$confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx}; |
|
} elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') { |
|
my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; |
|
$mapcrs =~ s/(`)/'/g; |
|
$mapcrs =~ s/^\s+|\s+$//g; |
|
$confhash{$itemid}{'mapcrs'} = $mapcrs; |
|
} |
|
my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx); |
|
my @crstypes; |
|
foreach my $type (sort(@posstypes)) { |
|
if ($posscrstype{$type}) { |
|
push(@crstypes,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'mapcrstype'} = \@crstypes; |
|
if ($env{'form.lti_makecrs_'.$idx}) { |
|
$confhash{$itemid}{'makecrs'} = 1; |
|
} |
|
my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx); |
|
my @selfenroll; |
|
foreach my $type (sort(@possenroll)) { |
|
if ($posslticrs{$type}) { |
|
push(@selfenroll,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'selfenroll'} = \@selfenroll; |
|
if ($env{'form.lti_crssec_'.$idx}) { |
|
if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') { |
|
$confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx}; |
|
} elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') { |
|
my $section = $env{'form.lti_customsection_'.$idx}; |
|
$section =~ s/(`)/'/g; |
|
$section =~ s/^\s+|\s+$//g; |
|
if ($section ne '') { |
|
$confhash{$itemid}{'section'} = $section; |
|
} |
|
} |
|
} |
|
if ($env{'form.lti_callback_'.$idx}) { |
if ($env{'form.lti_callback_'.$idx}) { |
if ($env{'form.lti_callbackparam_'.$idx}) { |
if ($env{'form.lti_callbackparam_'.$idx}) { |
my $callback = $env{'form.lti_callbackparam_'.$idx}; |
my $callback = $env{'form.lti_callbackparam_'.$idx}; |
Line 14475 sub modify_lti {
|
Line 15453 sub modify_lti {
|
$confhash{$itemid}{'callback'} = $callback; |
$confhash{$itemid}{'callback'} = $callback; |
} |
} |
} |
} |
foreach my $field ('passback','roster','topmenu','inlinemenu') { |
foreach my $field ('topmenu','inlinemenu') { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
$confhash{$itemid}{$field} = 1; |
$confhash{$itemid}{$field} = 1; |
} |
} |
} |
} |
if ($env{'form.lti_passback_'.$idx}) { |
|
if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') { |
|
$confhash{$itemid}{'passbackformat'} = '1.0'; |
|
} else { |
|
$confhash{$itemid}{'passbackformat'} = '1.1'; |
|
} |
|
} |
|
if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) { |
if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) { |
$confhash{$itemid}{lcmenu} = []; |
$confhash{$itemid}{lcmenu} = []; |
my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx); |
my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx); |
Line 14499 sub modify_lti {
|
Line 15470 sub modify_lti {
|
} |
} |
} |
} |
} |
} |
unless (($idx eq 'add') || ($changes{$itemid})) { |
if ($confhash{$itemid}{'crsinc'}) { |
foreach my $field ('mapuser','mapcrs','makecrs','section','passback','roster','lcauth','lcauthparm','topmenu','inlinemenu','callback') { |
if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') || |
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
($env{'form.lti_mapcrs_'.$idx} eq 'context_id')) { |
$changes{$itemid} = 1; |
$confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx}; |
|
} elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') { |
|
my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; |
|
$mapcrs =~ s/(`)/'/g; |
|
$mapcrs =~ s/^\s+|\s+$//g; |
|
$confhash{$itemid}{'mapcrs'} = $mapcrs; |
|
} |
|
my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx); |
|
my @crstypes; |
|
foreach my $type (sort(@posstypes)) { |
|
if ($posscrstype{$type}) { |
|
push(@crstypes,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'mapcrstype'} = \@crstypes; |
|
if ($env{'form.lti_storecrs_'.$idx}) { |
|
$confhash{$itemid}{'storecrs'} = 1; |
|
} |
|
if ($env{'form.lti_makecrs_'.$idx}) { |
|
$confhash{$itemid}{'makecrs'} = 1; |
|
} |
|
foreach my $ltirole (@lticourseroles) { |
|
my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx}; |
|
if (grep(/^\Q$possrole\E$/,@courseroles)) { |
|
$confhash{$itemid}{'maproles'}{$ltirole} = $possrole; |
|
} |
|
} |
|
my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx); |
|
my @selfenroll; |
|
foreach my $type (sort(@possenroll)) { |
|
if ($posslticrs{$type}) { |
|
push(@selfenroll,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'selfenroll'} = \@selfenroll; |
|
if ($env{'form.lti_crssec_'.$idx}) { |
|
if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') { |
|
$confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx}; |
|
} elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') { |
|
my $section = $env{'form.lti_customsection_'.$idx}; |
|
$section =~ s/(`)/'/g; |
|
$section =~ s/^\s+|\s+$//g; |
|
if ($section ne '') { |
|
$confhash{$itemid}{'section'} = $section; |
|
} |
} |
} |
} |
} |
unless ($changes{$itemid}) { |
foreach my $field ('passback','roster') { |
if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) { |
$confhash{$itemid}{$field} = 1; |
|
} |
|
} |
|
if ($env{'form.lti_passback_'.$idx}) { |
|
if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') { |
|
$confhash{$itemid}{'passbackformat'} = '1.0'; |
|
} else { |
|
$confhash{$itemid}{'passbackformat'} = '1.1'; |
|
} |
|
} |
|
} |
|
unless (($idx eq 'add') || ($changes{$itemid})) { |
|
if ($confhash{$itemid}{'crsinc'}) { |
|
foreach my $field ('mapcrs','storecrs','makecrs','section','passback','roster') { |
|
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
} |
|
foreach my $field ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') { |
|
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) { |
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
|
$confhash{$itemid}{$field}); |
|
if (@diffs) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
} |
} |
} |
foreach my $field ('mapcrstype','selfenroll') { |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) { |
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne |
$confhash{$itemid}{$field}); |
$confhash{$itemid}{'maproles'}{$ltirole}) { |
if (@diffs) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{$field}} > 0) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
last; |
|
} |
} |
} |
} |
unless ($changes{$itemid}) { |
} |
foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) { |
} |
if ($confhash{$itemid}{'maproles'}{$ltirole} ne |
unless ($changes{$itemid}) { |
$domconfig{$action}{$itemid}{'maproles'}{$ltirole}) { |
if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') { |
|
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) { |
|
if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne |
|
$confhash{$itemid}{'maproles'}{$ltirole}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
last; |
last; |
} |
} |
} |
} |
|
unless ($changes{$itemid}) { |
|
foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) { |
|
if ($confhash{$itemid}{'maproles'}{$ltirole} ne |
|
$domconfig{$action}{$itemid}{'maproles'}{$ltirole}) { |
|
$changes{$itemid} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
unless ($changes{$itemid}) { |
|
if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
} elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) { |
} |
|
} |
|
} |
|
unless ($changes{$itemid}) { |
|
foreach my $field ('mapuser','lcauth','lcauthparm','topmenu','inlinemenu','callback') { |
|
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
} |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) { |
foreach my $field ('makeuser','lcmenu') { |
$changes{$itemid} = 1; |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
|
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
|
$confhash{$itemid}{$field}); |
|
if (@diffs) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
} |
} |
} |
} |
Line 14589 sub modify_lti {
|
Line 15651 sub modify_lti {
|
my %ltienchash = ( |
my %ltienchash = ( |
$action => { %encconfig } |
$action => { %encconfig } |
); |
); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %ltiall = %confhash; |
my %ltiall = %confhash; |
Line 14615 sub modify_lti {
|
Line 15677 sub modify_lti {
|
if (ref($confhash{$itemid}) ne 'HASH') { |
if (ref($confhash{$itemid}) ne 'HASH') { |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
} else { |
} else { |
$resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b></li><ul>'; |
$resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b><ul>'; |
my $position = $pos + 1; |
my $position = $pos + 1; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
foreach my $item ('version','lifetime') { |
foreach my $item ('version','lifetime') { |
Line 14632 sub modify_lti {
|
Line 15694 sub modify_lti {
|
$resulttext .= ('*'x$num).'</li>'; |
$resulttext .= ('*'x$num).'</li>'; |
} |
} |
if ($confhash{$itemid}{'requser'}) { |
if ($confhash{$itemid}{'requser'}) { |
|
if ($confhash{$itemid}{'callback'}) { |
|
$resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Callback to logout LON-CAPA on log out from Consumer').'</li>'; |
|
} |
if ($confhash{$itemid}{'mapuser'}) { |
if ($confhash{$itemid}{'mapuser'}) { |
my $shownmapuser; |
my $shownmapuser; |
if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') { |
if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') { |
Line 14643 sub modify_lti {
|
Line 15710 sub modify_lti {
|
} |
} |
$resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>'; |
$resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>'; |
} |
} |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
my $rolemaps; |
|
foreach my $role (@ltiroles) { |
|
if ($confhash{$itemid}{'maproles'}{$role}) { |
|
$rolemaps .= (' 'x2).$role.'='. |
|
&Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role}, |
|
'Course').','; |
|
} |
|
} |
|
if ($rolemaps) { |
|
$rolemaps =~ s/,$//; |
|
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
|
} |
|
} |
|
if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') { |
if (@{$confhash{$itemid}{'makeuser'}} > 0) { |
if (@{$confhash{$itemid}{'makeuser'}} > 0) { |
$resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]', |
$resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]', |
Line 14689 sub modify_lti {
|
Line 15742 sub modify_lti {
|
$resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>'; |
$resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>'; |
} |
} |
} |
} |
if ($confhash{$itemid}{'mapcrs'}) { |
foreach my $item ('topmenu','inlinemenu') { |
$resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'mapcrstype'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]', |
|
join(', ',map { $coursetypetitles{$_}; } @coursetypes)). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'makecrs'}) { |
|
$resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'selfenroll'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]', |
|
join(', ',@{$confhash{$itemid}{'selfenroll'}})). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'section'}) { |
|
if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') { |
|
$resulttext .= '<li>'.&mt('User section from standard field:'). |
|
' (course_section_sourcedid)'.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('User section from:').' '. |
|
$confhash{$itemid}{'section'}.'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No section assignment').'</li>'; |
|
} |
|
if ($confhash{$itemid}{'callback'}) { |
|
$resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No callback to logout LON-CAPA session when user logs out of Comsumer'); |
|
} |
|
foreach my $item ('passback','roster','topmenu','inlinemenu') { |
|
$resulttext .= '<li>'.$lt{$item}.': '; |
$resulttext .= '<li>'.$lt{$item}.': '; |
if ($confhash{$itemid}{$item}) { |
if ($confhash{$itemid}{$item}) { |
$resulttext .= &mt('Yes'); |
$resulttext .= &mt('Yes'); |
if ($item eq 'passback') { |
|
if ($confhash{$itemid}{'passbackformat'} eq '1.0') { |
|
$resulttext .= ' ('.&mt('Outcomes Extension (1.0)').')'; |
|
} elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') { |
|
$resulttext .= ' ('.&mt('Outcomes Service (1.1)').')'; |
|
} |
|
} |
|
} else { |
} else { |
$resulttext .= &mt('No'); |
$resulttext .= &mt('No'); |
} |
} |
Line 14750 sub modify_lti {
|
Line 15754 sub modify_lti {
|
if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') { |
if (@{$confhash{$itemid}{'lcmenu'}} > 0) { |
if (@{$confhash{$itemid}{'lcmenu'}} > 0) { |
$resulttext .= '<li>'.&mt('Menu items:').' '. |
$resulttext .= '<li>'.&mt('Menu items:').' '. |
join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; |
join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; |
$resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'crsinc'}) { |
|
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
my $rolemaps; |
|
foreach my $role (@ltiroles) { |
|
if ($confhash{$itemid}{'maproles'}{$role}) { |
|
$rolemaps .= (' 'x2).$role.'='. |
|
&Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role}, |
|
'Course').','; |
|
} |
|
} |
|
if ($rolemaps) { |
|
$rolemaps =~ s/,$//; |
|
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'mapcrs'}) { |
|
$resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'mapcrstype'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]', |
|
join(', ',map { $coursetypetitles{$_}; } @coursetypes)). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'storecrs'}) { |
|
$resulttext .= '<li>'.&mt('Store mapping of course identifier to LON-CAPA CourseID').': '.$confhash{$itemid}{'storecrs'}.'</li>'; |
|
} |
|
if ($confhash{$itemid}{'makecrs'}) { |
|
$resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'selfenroll'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]', |
|
join(', ',@{$confhash{$itemid}{'selfenroll'}})). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'section'}) { |
|
if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') { |
|
$resulttext .= '<li>'.&mt('User section from standard field:'). |
|
' (course_section_sourcedid)'.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('User section from:').' '. |
|
$confhash{$itemid}{'section'}.'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No section assignment').'</li>'; |
|
} |
|
foreach my $item ('passback','roster','topmenu','inlinemenu') { |
|
$resulttext .= '<li>'.$lt{$item}.': '; |
|
if ($confhash{$itemid}{$item}) { |
|
$resulttext .= &mt('Yes'); |
|
if ($item eq 'passback') { |
|
if ($confhash{$itemid}{'passbackformat'} eq '1.0') { |
|
$resulttext .= ' ('.&mt('Outcomes Extension (1.0)').')'; |
|
} elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') { |
|
$resulttext .= ' ('.&mt('Outcomes Service (1.1)').')'; |
|
} |
|
} |
|
} else { |
|
$resulttext .= &mt('No'); |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'lcmenu'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Menu items:').' '. |
|
join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 14931 sub modify_autoupdate {
|
Line 16015 sub modify_autoupdate {
|
} |
} |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my %title = &Apache::lonlocal::texthash ( |
my %title = &Apache::lonlocal::texthash ( |
run => 'Auto-update:', |
run => 'Auto-update:', |
classlists => 'Updates to user information in classlists?' |
classlists => 'Updates to user information in classlists?', |
|
unexpired => 'Skip updates for users without active or future roles?', |
|
lastactive => 'Skip updates for inactive users?', |
); |
); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my %fieldtitles = &Apache::lonlocal::texthash ( |
my %fieldtitles = &Apache::lonlocal::texthash ( |
Line 14976 sub modify_autoupdate {
|
Line 16062 sub modify_autoupdate {
|
my %updatehash = ( |
my %updatehash = ( |
autoupdate => { run => $env{'form.autoupdate_run'}, |
autoupdate => { run => $env{'form.autoupdate_run'}, |
classlists => $env{'form.classlists'}, |
classlists => $env{'form.classlists'}, |
|
unexpired => $env{'form.unexpired'}, |
fields => {%fields}, |
fields => {%fields}, |
lockablenames => \@lockablenames, |
lockablenames => \@lockablenames, |
} |
} |
); |
); |
|
my $lastactivedays; |
|
if ($env{'form.lastactive'}) { |
|
$lastactivedays = $env{'form.lastactivedays'}; |
|
$lastactivedays =~ s/^\s+|\s+$//g; |
|
unless ($lastactivedays =~ /^\d+$/) { |
|
undef($lastactivedays); |
|
$env{'form.lastactive'} = 0; |
|
} |
|
} |
|
$updatehash{'autoupdate'}{'lastactive'} = $lastactivedays; |
foreach my $key (keys(%currautoupdate)) { |
foreach my $key (keys(%currautoupdate)) { |
if (($key eq 'run') || ($key eq 'classlists')) { |
if (($key eq 'run') || ($key eq 'classlists') || ($key eq 'unexpired') || ($key eq 'lastactive')) { |
if (exists($updatehash{autoupdate}{$key})) { |
if (exists($updatehash{autoupdate}{$key})) { |
if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) { |
if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) { |
$changes{$key} = 1; |
$changes{$key} = 1; |
Line 15027 sub modify_autoupdate {
|
Line 16124 sub modify_autoupdate {
|
$changes{'lockablenames'} = 1; |
$changes{'lockablenames'} = 1; |
} |
} |
} |
} |
|
unless (grep(/^unexpired$/,keys(%currautoupdate))) { |
|
if ($updatehash{'autoupdate'}{'unexpired'}) { |
|
$changes{'unexpired'} = 1; |
|
} |
|
} |
|
unless (grep(/^lastactive$/,keys(%currautoupdate))) { |
|
if ($updatehash{'autoupdate'}{'lastactive'} ne '') { |
|
$changes{'lastactive'} = 1; |
|
} |
|
} |
foreach my $item (@{$types},'default') { |
foreach my $item (@{$types},'default') { |
if (defined($fields{$item})) { |
if (defined($fields{$item})) { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
Line 15089 sub modify_autoupdate {
|
Line 16196 sub modify_autoupdate {
|
my $newvalue; |
my $newvalue; |
if ($key eq 'run') { |
if ($key eq 'run') { |
$newvalue = $offon[$env{'form.autoupdate_run'}]; |
$newvalue = $offon[$env{'form.autoupdate_run'}]; |
|
} elsif ($key eq 'lastactive') { |
|
$newvalue = $offon[$env{'form.lastactive'}]; |
|
unless ($lastactivedays eq '') { |
|
$newvalue .= '; '.&mt('inactive = no activity in last [quant,_1,day]',$lastactivedays); |
|
} |
} else { |
} else { |
$newvalue = $offon[$env{'form.'.$key}]; |
$newvalue = $offon[$env{'form.'.$key}]; |
} |
} |
Line 19828 sub modify_selfenrollment {
|
Line 20940 sub modify_selfenrollment {
|
sub modify_wafproxy { |
sub modify_wafproxy { |
my ($dom,$action,$lastactref,%domconfig) = @_; |
my ($dom,$action,$lastactref,%domconfig) = @_; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%othercontrol,%canset,%values,%curralias,%currvalue,@warnings,%wafproxy, |
my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings, |
%changes,%expirecache); |
%wafproxy,%changes,%expirecache,%expiresaml); |
foreach my $server (sort(keys(%servers))) { |
foreach my $server (sort(keys(%servers))) { |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
if ($serverhome eq $server) { |
if ($serverhome eq $server) { |
Line 19844 sub modify_wafproxy {
|
Line 20956 sub modify_wafproxy {
|
if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') { |
if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') { |
%curralias = %{$domconfig{'wafproxy'}{'alias'}}; |
%curralias = %{$domconfig{'wafproxy'}{'alias'}}; |
} |
} |
|
if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') { |
|
%currsaml = %{$domconfig{'wafproxy'}{'saml'}}; |
|
} |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
$currvalue{$item} = $domconfig{'wafproxy'}{$item}; |
$currvalue{$item} = $domconfig{'wafproxy'}{$item}; |
} |
} |
Line 19851 sub modify_wafproxy {
|
Line 20966 sub modify_wafproxy {
|
my $output; |
my $output; |
if (keys(%canset)) { |
if (keys(%canset)) { |
%{$wafproxy{'alias'}} = (); |
%{$wafproxy{'alias'}} = (); |
|
%{$wafproxy{'saml'}} = (); |
foreach my $key (sort(keys(%canset))) { |
foreach my $key (sort(keys(%canset))) { |
if ($env{'form.wafproxy_'.$dom}) { |
if ($env{'form.wafproxy_'.$dom}) { |
$wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key}; |
$wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key}; |
Line 19858 sub modify_wafproxy {
|
Line 20974 sub modify_wafproxy {
|
if ($wafproxy{'alias'}{$key} ne $curralias{$key}) { |
if ($wafproxy{'alias'}{$key} ne $curralias{$key}) { |
$changes{'alias'} = 1; |
$changes{'alias'} = 1; |
} |
} |
|
if ($env{'form.wafproxy_alias_saml_'.$key}) { |
|
$wafproxy{'saml'}{$key} = 1; |
|
} |
|
if ($wafproxy{'saml'}{$key} ne $currsaml{$key}) { |
|
$changes{'saml'} = 1; |
|
} |
} else { |
} else { |
$wafproxy{'alias'}{$key} = ''; |
$wafproxy{'alias'}{$key} = ''; |
|
$wafproxy{'saml'}{$key} = ''; |
if ($curralias{$key}) { |
if ($curralias{$key}) { |
$changes{'alias'} = 1; |
$changes{'alias'} = 1; |
} |
} |
|
if ($currsaml{$key}) { |
|
$changes{'saml'} = 1; |
|
} |
} |
} |
if ($wafproxy{'alias'}{$key} eq '') { |
if ($wafproxy{'alias'}{$key} eq '') { |
if ($curralias{$key}) { |
if ($curralias{$key}) { |
Line 19870 sub modify_wafproxy {
|
Line 20996 sub modify_wafproxy {
|
} |
} |
delete($wafproxy{'alias'}{$key}); |
delete($wafproxy{'alias'}{$key}); |
} |
} |
|
if ($wafproxy{'saml'}{$key} eq '') { |
|
if ($currsaml{$key}) { |
|
$expiresaml{$key} = 1; |
|
} |
|
delete($wafproxy{'saml'}{$key}); |
|
} |
} |
} |
unless (keys(%{$wafproxy{'alias'}})) { |
unless (keys(%{$wafproxy{'alias'}})) { |
delete($wafproxy{'alias'}); |
delete($wafproxy{'alias'}); |
} |
} |
# Localization for values in %warn occus in &mt() calls separately. |
unless (keys(%{$wafproxy{'saml'}})) { |
|
delete($wafproxy{'saml'}); |
|
} |
|
# Localization for values in %warn occurs in &mt() calls separately. |
my %warn = ( |
my %warn = ( |
trusted => 'trusted IP range(s)', |
trusted => 'trusted IP range(s)', |
vpnint => 'internal IP range(s) for VPN sessions(s)', |
vpnint => 'internal IP range(s) for VPN sessions(s)', |
Line 19911 sub modify_wafproxy {
|
Line 21046 sub modify_wafproxy {
|
$possible =~ s/[\r\n]+/\s/g; |
$possible =~ s/[\r\n]+/\s/g; |
$possible =~ s/\s*-\s*/-/g; |
$possible =~ s/\s*-\s*/-/g; |
$possible =~ s/\s+/,/g; |
$possible =~ s/\s+/,/g; |
|
$possible =~ s/,+/,/g; |
} |
} |
$count = 0; |
$count = 0; |
if ($possible ne '') { |
if ($possible ne '') { |
foreach my $poss (split(/\,/,$possible)) { |
foreach my $poss (split(/\,/,$possible)) { |
$count ++; |
$count ++; |
if (&validate_ip_pattern($poss)) { |
$poss = &validate_ip_pattern($poss); |
|
if ($poss ne '') { |
push(@ok,$poss); |
push(@ok,$poss); |
} |
} |
} |
} |
if (@ok) { |
|
$wafproxy{$item} = join(',',@ok); |
|
} |
|
my $diff = $count - scalar(@ok); |
my $diff = $count - scalar(@ok); |
if ($diff) { |
if ($diff) { |
push(@warnings,'<li>'. |
push(@warnings,'<li>'. |
Line 19930 sub modify_wafproxy {
|
Line 21064 sub modify_wafproxy {
|
$diff,$warn{$item}). |
$diff,$warn{$item}). |
'</li>'); |
'</li>'); |
} |
} |
|
if (@ok) { |
|
my @cidr_list; |
|
foreach my $item (@ok) { |
|
@cidr_list = &Net::CIDR::cidradd($item,@cidr_list); |
|
} |
|
$wafproxy{$item} = join(',',@cidr_list); |
|
} |
} |
} |
} |
} |
if ($wafproxy{$item} ne $currvalue{$item}) { |
if ($wafproxy{$item} ne $currvalue{$item}) { |
Line 19942 sub modify_wafproxy {
|
Line 21083 sub modify_wafproxy {
|
} else { |
} else { |
if (keys(%curralias)) { |
if (keys(%curralias)) { |
$changes{'alias'} = 1; |
$changes{'alias'} = 1; |
|
} |
|
if (keys(%currsaml)) { |
|
$changes{'saml'} = 1; |
} |
} |
if (keys(%currvalue)) { |
if (keys(%currvalue)) { |
foreach my $key (keys(%currvalue)) { |
foreach my $key (keys(%currvalue)) { |
Line 19994 sub modify_wafproxy {
|
Line 21138 sub modify_wafproxy {
|
$lastactref->{'proxyalias'} = \%updates; |
$lastactref->{'proxyalias'} = \%updates; |
} |
} |
} |
} |
|
if ((exists($wafproxy{'saml'})) || (keys(%expiresaml))) { |
|
my %samlupdates = %expiresaml; |
|
foreach my $key (keys(%expiresaml)) { |
|
&Apache::lonnet::devalidate_cache_new('proxysaml',$key); |
|
} |
|
if (ref($wafproxy{'saml'}) eq 'HASH') { |
|
my $cachetime = 24*60*60; |
|
foreach my $key (keys(%{$wafproxy{'saml'}})) { |
|
$samlupdates{$key} = 1; |
|
&Apache::lonnet::do_cache_new('proxysaml',$key,$wafproxy{'saml'}{$key}, |
|
$cachetime); |
|
} |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'proxysaml'} = \%samlupdates; |
|
} |
|
} |
$output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>'; |
$output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>'; |
foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
if ($changes{$item}) { |
if ($changes{$item}) { |
Line 20017 sub modify_wafproxy {
|
Line 21178 sub modify_wafproxy {
|
unless ($numaliased) { |
unless ($numaliased) { |
$output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>'; |
$output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>'; |
} |
} |
|
} elsif ($item eq 'saml') { |
|
my $shown; |
|
if (ref($wafproxy{'saml'}) eq 'HASH') { |
|
if (keys(%{$wafproxy{'saml'}})) { |
|
$shown = join(', ',sort(keys(%{$wafproxy{'saml'}}))); |
|
} |
|
} |
|
if ($shown) { |
|
$output .= '<li>'.&mt('Alias used by Shibboleth for: [_1]', |
|
$shown).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('No alias used for Shibboleth').'</li>'; |
|
} |
} else { |
} else { |
if ($item eq 'remoteip') { |
if ($item eq 'remoteip') { |
my %ip_methods = &remoteip_methods(); |
my %ip_methods = &remoteip_methods(); |
Line 20088 sub validate_ip_pattern {
|
Line 21262 sub validate_ip_pattern {
|
if ($pattern =~ /^([^-]+)\-([^-]+)$/) { |
if ($pattern =~ /^([^-]+)\-([^-]+)$/) { |
my ($start,$end) = ($1,$2); |
my ($start,$end) = ($1,$2); |
if ((&Net::CIDR::cidrvalidate($start)) && (&Net::CIDR::cidrvalidate($end))) { |
if ((&Net::CIDR::cidrvalidate($start)) && (&Net::CIDR::cidrvalidate($end))) { |
return 1; |
if (($start !~ m{/}) && ($end !~ m{/})) { |
|
return $start.'-'.$end; |
|
} |
|
} |
|
} elsif ($pattern ne '') { |
|
$pattern = &Net::CIDR::cidrvalidate($pattern); |
|
if ($pattern ne '') { |
|
return $pattern; |
} |
} |
} elsif (&Net::CIDR::cidrvalidate($pattern)) { |
|
return 1; |
|
} |
} |
return |
return; |
} |
} |
|
|
sub modify_usersessions { |
sub modify_usersessions { |
Line 21029 sub modify_loadbalancing {
|
Line 22208 sub modify_loadbalancing {
|
} |
} |
} |
} |
if ($changes{'curr'}{$balancer}{'cookie'}) { |
if ($changes{'curr'}{$balancer}{'cookie'}) { |
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled', |
if ($currcookies{$balancer}) { |
$balancer).'</li>'; |
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use disabled', |
|
$balancer).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled', |
|
$balancer).'</li>'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 21810 sub devalidate_remote_domconfs {
|
Line 22994 sub devalidate_remote_domconfs {
|
my %thismachine; |
my %thismachine; |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions', |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions', |
'directorysrch','passwdconf','cats','proxyalias'); |
'directorysrch','passwdconf','cats','proxyalias','proxysaml', |
|
'ipaccess'); |
|
my %cache_by_lonhost; |
|
if (exists($cachekeys->{'samllanding'})) { |
|
if (ref($cachekeys->{'samllanding'}) eq 'HASH') { |
|
my %landing = %{$cachekeys->{'samllanding'}}; |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
|
if (keys(%domservers)) { |
|
foreach my $server (keys(%domservers)) { |
|
my @cached; |
|
next if ($thismachine{$server}); |
|
if ($landing{$server}) { |
|
push(@cached,&escape('samllanding').':'.&escape($server)); |
|
} |
|
if (@cached) { |
|
$cache_by_lonhost{$server} = \@cached; |
|
} |
|
} |
|
} |
|
} |
|
} |
if (keys(%servers)) { |
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |
my @cached; |
my @cached; |
foreach my $name (@posscached) { |
foreach my $name (@posscached) { |
if ($cachekeys->{$name}) { |
if ($cachekeys->{$name}) { |
if ($name eq 'proxyalias') { |
if (($name eq 'proxyalias') || ($name eq 'proxysaml')) { |
if (ref($cachekeys->{$name}) eq 'HASH') { |
if (ref($cachekeys->{$name}) eq 'HASH') { |
foreach my $key (keys(%{$cachekeys->{$name}})) { |
foreach my $key (keys(%{$cachekeys->{$name}})) { |
push(@cached,&escape($name).':'.&escape($key)); |
push(@cached,&escape($name).':'.&escape($key)); |
} |
} |
Line 21828 sub devalidate_remote_domconfs {
|
Line 23032 sub devalidate_remote_domconfs {
|
} |
} |
} |
} |
} |
} |
|
if ((exists($cache_by_lonhost{$server})) && |
|
(ref($cache_by_lonhost{$server}) eq 'ARRAY')) { |
|
push(@cached,@{$cache_by_lonhost{$server}}); |
|
} |
if (@cached) { |
if (@cached) { |
&Apache::lonnet::remote_devalidate_cache($server,\@cached); |
&Apache::lonnet::remote_devalidate_cache($server,\@cached); |
} |
} |