version 1.286, 2017/01/18 21:24:39
|
version 1.305, 2017/08/03 16:22:08
|
Line 27
|
Line 27
|
# |
# |
# |
# |
############################################################### |
############################################################### |
############################################################## |
############################################################### |
|
|
=pod |
=pod |
|
|
Line 220 sub handler {
|
Line 220 sub handler {
|
'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
'ltitools','ssl','trust'],$dom); |
'ltitools','ssl','trust'],$dom); |
|
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
|
my %encconfig = |
|
&Apache::lonnet::get_dom('encconfig',['ltitools'],$dom); |
|
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
|
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
|
if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') { |
|
foreach my $item ('key','secret') { |
|
$domconfig{'ltitools'}{$id}{$item} = $encconfig{'ltitools'}{$id}{$item}; |
|
} |
|
} |
|
} |
|
} |
|
} |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'autoupdate','autocreate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
'usercreation','selfcreation','usermodification','scantron', |
'usercreation','selfcreation','usermodification','scantron', |
Line 265 sub handler {
|
Line 278 sub handler {
|
help => 'Domain_Configuration_LangTZAuth', |
help => 'Domain_Configuration_LangTZAuth', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value'}, |
col2 => 'Value'}, |
|
{col1 => 'Internal Authentication', |
|
col2 => 'Value'}, |
{col1 => 'Institutional user types', |
{col1 => 'Institutional user types', |
col2 => 'Assignable to e-mail usernames'}], |
col2 => 'Name displayed'}], |
print => \&print_defaults, |
print => \&print_defaults, |
modify => \&modify_defaults, |
modify => \&modify_defaults, |
}, |
}, |
Line 348 sub handler {
|
Line 363 sub handler {
|
col2 => 'Enabled?'}, |
col2 => 'Enabled?'}, |
{col1 => 'Institutional user type (login/SSO self-creation)', |
{col1 => 'Institutional user type (login/SSO self-creation)', |
col2 => 'Information user can enter'}, |
col2 => 'Information user can enter'}, |
{col1 => 'Self-creation with e-mail as username', |
{col1 => 'Self-creation with e-mail verification', |
col2 => 'Settings'}], |
col2 => 'Settings'}], |
print => \&print_selfcreation, |
print => \&print_selfcreation, |
modify => \&modify_selfcreation, |
modify => \&modify_selfcreation, |
Line 486 sub handler {
|
Line 501 sub handler {
|
}, |
}, |
'ltitools' => |
'ltitools' => |
{text => 'External Tools (LTI)', |
{text => 'External Tools (LTI)', |
help => 'Domain_configuration_LTI_Tools', |
help => 'Domain_Configuration_LTI_Tools', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value',}], |
col2 => 'Value',}], |
print => \&print_ltitools, |
print => \&print_ltitools, |
Line 499 sub handler {
|
Line 514 sub handler {
|
col2 => 'Certificate Status'}, |
col2 => 'Certificate Status'}, |
{col1 => 'Connections to other servers', |
{col1 => 'Connections to other servers', |
col2 => 'Rules'}, |
col2 => 'Rules'}, |
|
{col1 => 'Connections from other servers', |
|
col2 => 'Rules'}, |
{col1 => "Replicating domain's published content", |
{col1 => "Replicating domain's published content", |
col2 => 'Rules'}], |
col2 => 'Rules'}], |
print => \&print_ssl, |
print => \&print_ssl, |
Line 581 $javascript_validations
|
Line 598 $javascript_validations
|
$coursebrowserjs |
$coursebrowserjs |
END |
END |
} |
} |
|
if (grep(/^selfcreation$/,@actions)) { |
|
$js .= &selfcreate_javascript(); |
|
} |
if (grep(/^contacts$/,@actions)) { |
if (grep(/^contacts$/,@actions)) { |
$js .= &contacts_javascript(); |
$js .= &contacts_javascript(); |
} |
} |
Line 673 sub process_changes {
|
Line 693 sub process_changes {
|
} elsif ($action eq 'autocreate') { |
} elsif ($action eq 'autocreate') { |
$output = &modify_autocreate($dom,%domconfig); |
$output = &modify_autocreate($dom,%domconfig); |
} elsif ($action eq 'directorysrch') { |
} elsif ($action eq 'directorysrch') { |
$output = &modify_directorysrch($dom,%domconfig); |
$output = &modify_directorysrch($dom,$lastactref,%domconfig); |
} elsif ($action eq 'usercreation') { |
} elsif ($action eq 'usercreation') { |
$output = &modify_usercreation($dom,%domconfig); |
$output = &modify_usercreation($dom,%domconfig); |
} elsif ($action eq 'selfcreation') { |
} elsif ($action eq 'selfcreation') { |
$output = &modify_selfcreation($dom,%domconfig); |
$output = &modify_selfcreation($dom,$lastactref,%domconfig); |
} elsif ($action eq 'usermodification') { |
} elsif ($action eq 'usermodification') { |
$output = &modify_usermodification($dom,%domconfig); |
$output = &modify_usermodification($dom,%domconfig); |
} elsif ($action eq 'contacts') { |
} elsif ($action eq 'contacts') { |
Line 806 sub print_config_box {
|
Line 826 sub print_config_box {
|
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'ssl') || ($action eq 'trust') || ($action eq 'contacts')) { |
($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults')) { |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
Line 866 sub print_config_box {
|
Line 886 sub print_config_box {
|
($action eq 'defaults') || ($action eq 'directorysrch') || |
($action eq 'defaults') || ($action eq 'directorysrch') || |
($action eq 'helpsettings')) { |
($action eq 'helpsettings')) { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} elsif ($action eq 'ssl') { |
|
$output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->('connfrom',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<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>'. |
|
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 4) { |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
Line 2240 sub print_quotas {
|
Line 2282 sub print_quotas {
|
} |
} |
|
|
sub print_requestmail { |
sub print_requestmail { |
my ($dom,$action,$settings,$rowtotal) = @_; |
my ($dom,$action,$settings,$rowtotal,$customcss,$rowstyle) = @_; |
my ($now,$datatable,%currapp); |
my ($now,$datatable,%currapp); |
$now = time; |
$now = time; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
Line 2252 sub print_requestmail {
|
Line 2294 sub print_requestmail {
|
} |
} |
my $numinrow = 2; |
my $numinrow = 2; |
my $css_class; |
my $css_class; |
$css_class = ($$rowtotal%2? ' class="LC_odd_row"':''); |
if ($$rowtotal%2) { |
|
$css_class = 'LC_odd_row'; |
|
} |
|
if ($customcss) { |
|
$css_class .= " $customcss"; |
|
} |
|
$css_class =~ s/^\s+//; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowstyle) { |
|
$css_class .= ' style="'.$rowstyle.'"'; |
|
} |
my $text; |
my $text; |
if ($action eq 'requestcourses') { |
if ($action eq 'requestcourses') { |
$text = &mt('Receive notification of course requests requiring approval'); |
$text = &mt('Receive notification of course requests requiring approval'); |
Line 2725 sub print_autoupdate {
|
Line 2779 sub print_autoupdate {
|
my $locknamesettings; |
my $locknamesettings; |
$datatable .= &insttypes_row($settings,$types,$usertypes, |
$datatable .= &insttypes_row($settings,$types,$usertypes, |
$dom,$numinrow,$othertitle, |
$dom,$numinrow,$othertitle, |
'lockablenames'); |
'lockablenames',$rowtotal); |
$$rowtotal ++; |
$$rowtotal ++; |
} else { |
} else { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
Line 2868 sub print_directorysrch {
|
Line 2922 sub print_directorysrch {
|
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$numinrow,$othertitle,'cansearch'); |
$numinrow,$othertitle,'cansearch', |
|
$rowtotal); |
$cansrchrow = 1; |
$cansrchrow = 1; |
} |
} |
} |
} |
Line 2958 sub print_contacts {
|
Line 3013 sub print_contacts {
|
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield, |
my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield, |
$maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings); |
$maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings); |
foreach my $type (@mailings) { |
|
$otheremails{$type} = ''; |
|
} |
|
if ($position eq 'top') { |
if ($position eq 'top') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
Line 2972 sub print_contacts {
|
Line 3024 sub print_contacts {
|
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail', |
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail', |
'updatesmail','idconflictsmail'); |
'updatesmail','idconflictsmail'); |
|
foreach my $type (@mailings) { |
|
$otheremails{$type} = ''; |
|
} |
} else { |
} else { |
@mailings = ('helpdeskmail','otherdomsmail'); |
@mailings = ('helpdeskmail','otherdomsmail'); |
|
foreach my $type (@mailings) { |
|
$otheremails{$type} = ''; |
|
} |
$bccemails{'helpdeskmail'} = ''; |
$bccemails{'helpdeskmail'} = ''; |
$bccemails{'otherdomsmail'} = ''; |
$bccemails{'otherdomsmail'} = ''; |
$includestr{'helpdeskmail'} = ''; |
$includestr{'helpdeskmail'} = ''; |
Line 3021 sub print_contacts {
|
Line 3079 sub print_contacts {
|
if (exists($settings->{'helpform'}{'maxsize'})) { |
if (exists($settings->{'helpform'}{'maxsize'})) { |
$maxsize = $settings->{'helpform'}{'maxsize'}; |
$maxsize = $settings->{'helpform'}{'maxsize'}; |
} else { |
} else { |
$maxsize = '1.0'; |
$maxsize = '1.0'; |
} |
} |
} else { |
} else { |
if (ref($fields) eq 'ARRAY') { |
if (ref($fields) eq 'ARRAY') { |
Line 3038 sub print_contacts {
|
Line 3096 sub print_contacts {
|
$to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'}; |
$to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'}; |
$checked{'errormail'}{'adminemail'} = ' checked="checked" '; |
$checked{'errormail'}{'adminemail'} = ' checked="checked" '; |
$checked{'packagesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'packagesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" '; |
Line 3114 sub print_contacts {
|
Line 3172 sub print_contacts {
|
if ($position eq 'middle') { |
if ($position eq 'middle') { |
my %choices; |
my %choices; |
$choices{'reporterrors'} = &mt('E-mail error reports to [_1]', |
$choices{'reporterrors'} = &mt('E-mail error reports to [_1]', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
&mt('LON-CAPA core group - MSU'),600,500)); |
&mt('LON-CAPA core group - MSU'),600,500)); |
$choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]', |
$choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
&mt('LON-CAPA core group - MSU'),600,500)); |
&mt('LON-CAPA core group - MSU'),600,500)); |
Line 3131 sub print_contacts {
|
Line 3189 sub print_contacts {
|
'<td>'.&mt('Extra helpdesk form fields:').'<br />'. |
'<td>'.&mt('Extra helpdesk form fields:').'<br />'. |
&mt('(e-mail, subject, and description always shown)'). |
&mt('(e-mail, subject, and description always shown)'). |
'</td><td class="LC_left_item">'; |
'</td><td class="LC_left_item">'; |
if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && |
if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && |
(ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) { |
(ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) { |
$datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>'; |
$datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>'; |
foreach my $field (@{$fields}) { |
foreach my $field (@{$fields}) { |
Line 3185 sub contacts_javascript {
|
Line 3243 sub contacts_javascript {
|
function screenshotSize(field) { |
function screenshotSize(field) { |
if (document.getElementById('help_screenshotsize')) { |
if (document.getElementById('help_screenshotsize')) { |
if (field.value == 'no') { |
if (field.value == 'no') { |
document.getElementById('help_screenshotsize').style.display="none"; |
document.getElementById('help_screenshotsize').style.display="none"; |
} else { |
} else { |
document.getElementById('help_screenshotsize').style.display=""; |
document.getElementById('help_screenshotsize').style.display=""; |
} |
} |
Line 3219 sub print_helpsettings {
|
Line 3277 sub print_helpsettings {
|
my $css_class; |
my $css_class; |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my (%customroles,%ordered,%current); |
my (%customroles,%ordered,%current); |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%current = %{$settings->{'adhoc'}}; |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
|
%current = %{$settings->{'adhoc'}}; |
|
} |
} |
} |
my $count = 0; |
my $count = 0; |
foreach my $key (sort(keys(%existing))) { |
foreach my $key (sort(keys(%existing))) { |
Line 3247 sub print_helpsettings {
|
Line 3307 sub print_helpsettings {
|
my $context = 'domprefs'; |
my $context = 'domprefs'; |
my $crstype = 'Course'; |
my $crstype = 'Course'; |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @accesstypes = ('all','none'); |
my @accesstypes = ('all','dh','da','none'); |
my ($numstatustypes,@jsarray); |
my ($numstatustypes,@jsarray); |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
if (@{$types} > 0) { |
if (@{$types} > 0) { |
Line 3256 sub print_helpsettings {
|
Line 3316 sub print_helpsettings {
|
@jsarray = ('bystatus'); |
@jsarray = ('bystatus'); |
} |
} |
} |
} |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
if (keys(%domhelpdesk)) { |
if (keys(%domhelpdesk)) { |
push(@accesstypes,('inc','exc')); |
push(@accesstypes,('inc','exc')); |
push(@jsarray,('notinc','notexc')); |
push(@jsarray,('notinc','notexc')); |
Line 3465 function helpdeskAccess(num) {
|
Line 3525 function helpdeskAccess(num) {
|
shown = Array('notinc'); |
shown = Array('notinc'); |
hidden = Array('notexc','bystatus'); |
hidden = Array('notexc','bystatus'); |
} |
} |
if (curraccess == 'all') { |
if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) { |
hidden = Array('notinc','notexc','bystatus'); |
hidden = Array('notinc','notexc','bystatus'); |
} |
} |
} |
} |
Line 3494 function helpdeskAccess(num) {
|
Line 3554 function helpdeskAccess(num) {
|
function toggleHelpdeskItem(num,field) { |
function toggleHelpdeskItem(num,field) { |
if (document.getElementById('helproles_'+num+'_'+field)) { |
if (document.getElementById('helproles_'+num+'_'+field)) { |
if (document.getElementById('helproles_'+num+'_'+field).className.match(/(?:^|\\s)LC_hidden(?!\\S)/)) { |
if (document.getElementById('helproles_'+num+'_'+field).className.match(/(?:^|\\s)LC_hidden(?!\\S)/)) { |
document.getElementById('helproles_'+num+'_'+field).className = |
document.getElementById('helproles_'+num+'_'+field).className = |
document.getElementById('helproles_'+num+'_'+field).className.replace(/(?:^|\\s)LC_hidden(?!\\S)/g ,''); |
document.getElementById('helproles_'+num+'_'+field).className.replace(/(?:^|\\s)LC_hidden(?!\\S)/g ,''); |
if (document.getElementById('helproles_'+num+'_'+field+'_vis')) { |
if (document.getElementById('helproles_'+num+'_'+field+'_vis')) { |
document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{hide}'; |
document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{hide}'; |
Line 3522 sub helpdeskroles_access {
|
Line 3582 sub helpdeskroles_access {
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'rou' => 'Role usage', |
'rou' => 'Role usage', |
'whi' => 'Which helpdesk personnel may use this role?', |
'whi' => 'Which helpdesk personnel may use this role?', |
'all' => 'All', |
'all' => 'All with domain helpdesk or helpdesk assistant role', |
|
'dh' => 'All with domain helpdesk role', |
|
'da' => 'All with domain helpdesk assistant role', |
'none' => 'None', |
'none' => 'None', |
'status' => 'Determined based on institutional status', |
'status' => 'Determined based on institutional status', |
'inc' => 'Include all, but exclude specific personnel', |
'inc' => 'Include all, but exclude specific personnel', |
Line 3620 sub radiobutton_prefs {
|
Line 3682 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">'. |
'<label><input type="radio" name="'. |
'<label><input type="radio" name="'. |
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
Line 3714 sub print_ltitools {
|
Line 3776 sub print_ltitools {
|
if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
$currdisp{'window'} = ' checked="checked"'; |
$currdisp{'window'} = ' checked="checked"'; |
|
} elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') { |
|
$currdisp{'tab'} = ' checked="checked"'; |
} else { |
} else { |
$currdisp{'iframe'} = ' checked="checked"'; |
$currdisp{'iframe'} = ' checked="checked"'; |
} |
} |
Line 3723 sub print_ltitools {
|
Line 3787 sub print_ltitools {
|
if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
$currdisp{'height'} = $1; |
$currdisp{'height'} = $1; |
} |
} |
|
$currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'}; |
|
$currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'}; |
} else { |
} else { |
$currdisp{'iframe'} = ' checked="checked"'; |
$currdisp{'iframe'} = ' checked="checked"'; |
} |
} |
foreach my $disp ('iframe','window') { |
foreach my $disp ('iframe','tab','window') { |
$datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
$datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
$lt{$disp}.'</label>'.(' 'x2); |
$lt{$disp}.'</label>'.(' 'x2); |
} |
} |
Line 3736 sub print_ltitools {
|
Line 3802 sub print_ltitools {
|
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
|
$datatable .= '<br />'. |
|
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
'<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></label></div>'. |
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
|
'<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}. |
|
'</textarea></div><div style=""></div><br />'; |
$datatable .= '<br />'; |
$datatable .= '<br />'; |
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
my $checkedon = ''; |
my $checkedon = ''; |
Line 3817 sub print_ltitools {
|
Line 3889 sub print_ltitools {
|
} |
} |
} |
} |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target') { |
foreach my $item ('label','title','target','linktext','explanation') { |
my $checked; |
my $checked; |
if ($courseconfig{$item}) { |
if ($courseconfig{$item}) { |
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
Line 3885 sub print_ltitools {
|
Line 3957 sub print_ltitools {
|
'<span class="LC_nobreak">'.&mt('Display target:'); |
'<span class="LC_nobreak">'.&mt('Display target:'); |
my %defaultdisp; |
my %defaultdisp; |
$defaultdisp{'iframe'} = ' checked="checked"'; |
$defaultdisp{'iframe'} = ' checked="checked"'; |
foreach my $disp ('iframe','window') { |
foreach my $disp ('iframe','tab','window') { |
$datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
$datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
$lt{$disp}.'</label>'.(' 'x2); |
$lt{$disp}.'</label>'.(' 'x2); |
} |
} |
Line 3895 sub print_ltitools {
|
Line 3967 sub print_ltitools {
|
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$datatable .= '<br />'; |
$datatable .= '<br />'. |
|
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
'<input type="text" name="ltitools_add_linktext" size="5" /></label></div>'. |
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
|
'<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
|
'</div><div style=""></div><br />'; |
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
$datatable .= $lt{$extra}.' '. |
$datatable .= $lt{$extra}.' '. |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
Line 3933 sub print_ltitools {
|
Line 4010 sub print_ltitools {
|
} |
} |
$datatable .= '</tr></table></fieldset>'. |
$datatable .= '</tr></table></fieldset>'. |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target') { |
foreach my $item ('label','title','target','linktext','explanation') { |
$datatable .= '<label>'. |
$datatable .= '<label>'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
} |
} |
$datatable .= '</span></fieldset>'. |
$datatable .= '</span></fieldset>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
Line 3954 sub print_ltitools {
|
Line 4031 sub print_ltitools {
|
|
|
sub ltitools_names { |
sub ltitools_names { |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'title' => 'Title', |
'title' => 'Title', |
'version' => 'Version', |
'version' => 'Version', |
'msgtype' => 'Message Type', |
'msgtype' => 'Message Type', |
'url' => 'URL', |
'url' => 'URL', |
'key' => 'Key', |
'key' => 'Key', |
'secret' => 'Secret', |
'secret' => 'Secret', |
'icon' => 'Icon', |
'icon' => 'Icon', |
'user' => 'Username:domain', |
'user' => 'Username:domain', |
'fullname' => 'Full Name', |
'fullname' => 'Full Name', |
'firstname' => 'First Name', |
'firstname' => 'First Name', |
'lastname' => 'Last Name', |
'lastname' => 'Last Name', |
'email' => 'E-mail', |
'email' => 'E-mail', |
'roles' => 'Role', |
'roles' => 'Role', |
'window' => 'Window/Tab', |
'window' => 'Window', |
'iframe' => 'iFrame', |
'tab' => 'Tab', |
'height' => 'Height', |
'iframe' => 'iFrame', |
'width' => 'Width', |
'height' => 'Height', |
'passback' => 'Tool can return grades:', |
'width' => 'Width', |
'roster' => 'Tool can retrieve roster:', |
'linktext' => 'Default Link Text', |
'crstarget' => 'Display target', |
'explanation' => 'Default Explanation', |
'crslabel' => 'Course label', |
'passback' => 'Tool can return grades:', |
'crstitle' => 'Course title', |
'roster' => 'Tool can retrieve roster:', |
|
'crstarget' => 'Display target', |
|
'crslabel' => 'Course label', |
|
'crstitle' => 'Course title', |
|
'crslinktext' => 'Link Text', |
|
'crsexplanation' => 'Explanation', |
); |
); |
return %lt; |
return %lt; |
} |
} |
Line 4006 sub print_coursedefaults {
|
Line 4088 sub print_coursedefaults {
|
'canuse_pdfforms' => 'off', |
'canuse_pdfforms' => 'off', |
'uselcmath' => 'on', |
'uselcmath' => 'on', |
'usejsme' => 'on', |
'usejsme' => 'on', |
'canclone' => 'none', |
'canclone' => 'none', |
); |
); |
@toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
@toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
Line 4045 sub print_coursedefaults {
|
Line 4127 sub print_coursedefaults {
|
$currcanclone = $settings->{'canclone'}; |
$currcanclone = $settings->{'canclone'}; |
} |
} |
} |
} |
} |
} |
foreach my $option (@cloneoptions) { |
foreach my $option (@cloneoptions) { |
my ($checked,$additional); |
my ($checked,$additional); |
if ($currcanclone eq $option) { |
if ($currcanclone eq $option) { |
Line 4114 sub print_coursedefaults {
|
Line 4196 sub print_coursedefaults {
|
foreach my $type (@types) { |
foreach my $type (@types) { |
if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') { |
if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') { |
if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) { |
if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) { |
$deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type}; |
$deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type}; |
} else { |
} else { |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
} |
} |
Line 4230 sub print_coursedefaults {
|
Line 4312 sub print_coursedefaults {
|
foreach my $type (@types) { |
foreach my $type (@types) { |
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
'<input type="text" name="mysqltables_'.$type.'"'. |
'<input type="text" name="mysqltables_'.$type.'"'. |
' value="'.$currmysql{$type}.'" size="5" /></td>'; |
' value="'.$currmysql{$type}.'" size="8" /></td>'; |
} |
} |
$datatable .= '</tr></table></td></tr>'."\n"; |
$datatable .= '</tr></table></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 4652 sub print_ssl {
|
Line 4734 sub print_ssl {
|
my @domservers = &Apache::lonnet::get_servers($dom); |
my @domservers = &Apache::lonnet::get_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %altids = &id_for_thisdom(%servers); |
my %altids = &id_for_thisdom(%servers); |
if ($position eq 'middle') { |
if (($position eq 'connto') || ($position eq 'connfrom')) { |
|
my $legacy; |
|
unless (ref($settings) eq 'HASH') { |
|
my $name; |
|
if ($position eq 'connto') { |
|
$name = 'loncAllowInsecure'; |
|
} else { |
|
$name = 'londAllowInsecure'; |
|
} |
|
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
if (($primarylibserv ne '') && (!grep(/^\Q$primarylibserv\E$/,@ids))) { |
|
my %what = ( |
|
$name => 1, |
|
); |
|
my ($result,$returnhash) = |
|
&Apache::lonnet::get_remote_globals($primarylibserv,\%what); |
|
if ($result eq 'ok') { |
|
if (ref($returnhash) eq 'HASH') { |
|
$legacy = $returnhash->{$name}; |
|
} |
|
} |
|
} else { |
|
$legacy = $Apache::lonnet::perlvar{$name}; |
|
} |
|
} |
foreach my $type ('dom','intdom','other') { |
foreach my $type ('dom','intdom','other') { |
my %checked; |
my %checked; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
Line 4679 sub print_ssl {
|
Line 4786 sub print_ssl {
|
unless ($skip) { |
unless ($skip) { |
$checked{'yes'} = ' checked="checked"'; |
$checked{'yes'} = ' checked="checked"'; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'connect'}) eq 'HASH') { |
if (ref($settings->{$position}) eq 'HASH') { |
if ($settings->{'connect'}->{$type} =~ /^(no|req)$/) { |
if ($settings->{$position}->{$type} =~ /^(no|req)$/) { |
$checked{$1} = $checked{'yes'}; |
$checked{$1} = $checked{'yes'}; |
delete($checked{'yes'}); |
delete($checked{'yes'}); |
} |
} |
} |
} |
|
} else { |
|
if ($legacy == 0) { |
|
$checked{'req'} = $checked{'yes'}; |
|
delete($checked{'yes'}); |
|
} |
} |
} |
foreach my $option ('no','yes','req') { |
foreach my $option ('no','yes','req') { |
$datatable .= '<span class="LC_nobreak"><label>'. |
$datatable .= '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="connect_'.$type.'" '. |
'<input type="radio" name="'.$position.'_'.$type.'" '. |
'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}. |
'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}. |
'</label></span>'.(' 'x2); |
'</label></span>'.(' 'x2); |
} |
} |
Line 4719 sub ssl_titles {
|
Line 4831 sub ssl_titles {
|
dom => 'LON-CAPA servers/VMs from same domain', |
dom => 'LON-CAPA servers/VMs from same domain', |
intdom => 'LON-CAPA servers/VMs from same "internet" domain', |
intdom => 'LON-CAPA servers/VMs from same "internet" domain', |
other => 'External LON-CAPA servers/VMs', |
other => 'External LON-CAPA servers/VMs', |
connect => 'Connections to other servers', |
connto => 'Connections to other servers', |
|
connfrom => 'Connections from other servers', |
replication => 'Replicating content to other institutions', |
replication => 'Replicating content to other institutions', |
certreq => 'Client certificate required, but specific domains exempt', |
certreq => 'Client certificate required, but specific domains exempt', |
nocertreq => 'No client certificate required, except for specific domains', |
nocertreq => 'No client certificate required, except for specific domains', |
Line 4929 sub spares_row {
|
Line 5042 sub spares_row {
|
<span class="LC_nobreak">'. |
<span class="LC_nobreak">'. |
&mt('[_1] when busy, offloads to:' |
&mt('[_1] when busy, offloads to:' |
,'<b>'.$server.'</b>').'</span><br />'. |
,'<b>'.$server.'</b>').'</span><br />'. |
'<span class="LC_nobreak">'."\n". |
'<span class="LC_nobreak">'."\n". |
'<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'. |
'<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'. |
' '.&mt('Switch active users on next access').'</label></span>'. |
' '.&mt('Switch active users on next access').'</label></span>'. |
"\n"; |
"\n"; |
Line 5293 sub loadbalancing_titles {
|
Line 5406 sub loadbalancing_titles {
|
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'), |
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'), |
); |
); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange'); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange'); |
|
my @available; |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
unshift(@alltypes,@{$types},'default'); |
@available = @{$types}; |
} |
} |
|
unless (grep(/^default$/,@available)) { |
|
push(@available,'default'); |
|
} |
|
unshift(@alltypes,@available); |
my %titles; |
my %titles; |
foreach my $type (@alltypes) { |
foreach my $type (@alltypes) { |
if ($type =~ /^_LC_/) { |
if ($type =~ /^_LC_/) { |
Line 5423 sub contact_titles {
|
Line 5541 sub contact_titles {
|
'errormail' => 'Error reports to be e-mailed to', |
'errormail' => 'Error reports to be e-mailed to', |
'packagesmail' => 'Package update alerts to be e-mailed to', |
'packagesmail' => 'Package update alerts to be e-mailed to', |
'helpdeskmail' => "Helpdesk requests for this domain's users", |
'helpdeskmail' => "Helpdesk requests for this domain's users", |
'otherdomsmail' => 'Helpdesk requests for other (unconfigured) domains', |
'otherdomsmail' => 'Helpdesk requests for other (unconfigured) domains', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
Line 5444 sub helpform_fields {
|
Line 5562 sub helpform_fields {
|
'cc' => 'Cc e-mail', |
'cc' => 'Cc e-mail', |
'course' => 'Course Details', |
'course' => 'Course Details', |
'section' => 'Sections', |
'section' => 'Sections', |
'screenshot' => 'File upload', |
'screenshot' => 'File upload', |
); |
); |
my @fields = ('username','phone','user','course','section','cc','screenshot'); |
my @fields = ('username','phone','user','course','section','cc','screenshot'); |
my %possoptions = ( |
my %possoptions = ( |
username => ['yes','no','req'], |
username => ['yes','no','req'], |
phone => ['yes','no','req'], |
phone => ['yes','no','req'], |
user => ['yes','no'], |
user => ['yes','no'], |
cc => ['yes','no'], |
cc => ['yes','no'], |
course => ['yes','no'], |
course => ['yes','no'], |
section => ['yes','no'], |
section => ['yes','no'], |
screenshot => ['yes','no'], |
screenshot => ['yes','no'], |
Line 5650 sub print_usercreation {
|
Line 5768 sub print_usercreation {
|
|
|
sub print_selfcreation { |
sub print_selfcreation { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my (@selfcreate,$createsettings,$processing,$datatable); |
my (@selfcreate,$createsettings,$processing,$emailoptions,$emailverified, |
|
$emaildomain,$datatable); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'cancreate'}) eq 'HASH') { |
if (ref($settings->{'cancreate'}) eq 'HASH') { |
$createsettings = $settings->{'cancreate'}; |
$createsettings = $settings->{'cancreate'}; |
Line 5667 sub print_selfcreation {
|
Line 5786 sub print_selfcreation {
|
if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') { |
if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') { |
$processing = $createsettings->{'selfcreateprocessing'}; |
$processing = $createsettings->{'selfcreateprocessing'}; |
} |
} |
|
if (ref($createsettings->{'emailoptions'}) eq 'HASH') { |
|
$emailoptions = $createsettings->{'emailoptions'}; |
|
} |
|
if (ref($createsettings->{'emailverified'}) eq 'HASH') { |
|
$emailverified = $createsettings->{'emailverified'}; |
|
} |
|
if (ref($createsettings->{'emaildomain'}) eq 'HASH') { |
|
$emaildomain = $createsettings->{'emaildomain'}; |
|
} |
} |
} |
} |
} |
} |
} |
my %radiohash; |
my %radiohash; |
my $numinrow = 4; |
my $numinrow = 4; |
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate; |
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate; |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
if ($position eq 'top') { |
if ($position eq 'top') { |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
cancreate_login => 'Institutional Login', |
cancreate_login => 'Institutional Login', |
Line 5688 sub print_selfcreation {
|
Line 5817 sub print_selfcreation {
|
\%choices,$itemcount,$onclick); |
\%choices,$itemcount,$onclick); |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
|
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
|
|
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
$dom,$numinrow,$othertitle, |
$dom,$numinrow,$othertitle, |
'statustocreate',$$rowtotal); |
'statustocreate',$rowtotal); |
$$rowtotal ++; |
$$rowtotal ++; |
} |
} |
} |
} |
Line 5739 sub print_selfcreation {
|
Line 5866 sub print_selfcreation {
|
$$rowtotal ++; |
$$rowtotal ++; |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @posstypes; |
$usertypes->{'default'} = $othertitle; |
|
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
push(@{$types},'default'); |
@posstypes = @{$types}; |
$usertypes->{'default'} = $othertitle; |
} |
foreach my $status (@{$types}) { |
unless (grep(/^default$/,@posstypes)) { |
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
push(@posstypes,'default'); |
$numinrow,$$rowtotal,$usertypes); |
} |
$$rowtotal ++; |
my %usertypeshash; |
} |
if (ref($usertypes) eq 'HASH') { |
|
%usertypeshash = %{$usertypes}; |
|
} |
|
$usertypeshash{'default'} = $othertitle; |
|
foreach my $status (@posstypes) { |
|
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
|
$numinrow,$$rowtotal,\%usertypeshash); |
|
$$rowtotal ++; |
} |
} |
} else { |
} else { |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
cancreate_email => 'E-mail address as username', |
'cancreate_email' => 'Non-institutional username (via e-mail verification)', |
); |
); |
my @toggles = sort(keys(%choices)); |
my @toggles = sort(keys(%choices)); |
my %defaultchecked = ( |
my %defaultchecked = ( |
'cancreate_email' => 'off', |
'cancreate_email' => 'off', |
); |
); |
my $itemcount = 0; |
my $customclass = 'LC_selfcreate_email'; |
|
my $classprefix = 'LC_canmodify_emailusername_'; |
|
my $optionsprefix = 'LC_options_emailusername_'; |
my $display = 'none'; |
my $display = 'none'; |
|
my $rowstyle = 'display:none'; |
if (grep(/^\Qemail\E$/,@selfcreate)) { |
if (grep(/^\Qemail\E$/,@selfcreate)) { |
$display = 'block'; |
$display = 'block'; |
|
$rowstyle = 'display:table-row'; |
} |
} |
my $onclick = "toggleDisplay(this.form,'emailoptions');"; |
my $onclick = "toggleRows(this.form,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');"; |
my $additional = '<div id="emailoptions" style="display: '.$display.'">'; |
($datatable,$$rowtotal) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
|
\%choices,$$rowtotal,$onclick); |
|
$datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal,$customclass, |
|
$rowstyle); |
|
$$rowtotal ++; |
|
$datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal,$customclass, |
|
$rowstyle); |
|
$$rowtotal ++; |
|
my (@ordered,@posstypes,%usertypeshash); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my $usertypes = {}; |
my ($emailrules,$emailruleorder) = |
my $order = []; |
&Apache::lonnet::inst_userrules($dom,'email'); |
if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) { |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
$usertypes = $domdefaults{'inststatustypes'}; |
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
$order = $domdefaults{'inststatusguest'}; |
if (ref($types) eq 'ARRAY') { |
} |
@posstypes = @{$types}; |
if (ref($order) eq 'ARRAY') { |
} |
push(@{$order},'default'); |
if (@posstypes) { |
if (@{$order} > 1) { |
unless (grep(/^default$/,@posstypes)) { |
$usertypes->{'default'} = &mt('Other users'); |
push(@posstypes,'default'); |
$additional .= '<table><tr>'; |
} |
foreach my $status (@{$order}) { |
if (ref($usertypes) eq 'HASH') { |
$additional .= '<th>'.$usertypes->{$status}.'</th>'; |
%usertypeshash = %{$usertypes}; |
} |
} |
$additional .= '</tr><tr>'; |
my $currassign; |
foreach my $status (@{$order}) { |
if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') { |
$additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; |
$currassign = { |
|
selfassign => $domdefaults{'inststatusguest'}, |
|
}; |
|
@ordered = @{$domdefaults{'inststatusguest'}}; |
|
} else { |
|
$currassign = { selfassign => [] }; |
|
} |
|
my $onclicktypes = "toggleDataRow(this.form,'selfassign','$customclass','$optionsprefix',);". |
|
"toggleDataRow(this.form,'selfassign','$customclass','$classprefix',1);"; |
|
$datatable .= &insttypes_row($currassign,$types,$usertypes,$dom, |
|
$numinrow,$othertitle,'selfassign', |
|
$rowtotal,$onclicktypes,$customclass, |
|
$rowstyle); |
|
$$rowtotal ++; |
|
$usertypeshash{'default'} = $othertitle; |
|
foreach my $status (@posstypes) { |
|
my $css_class; |
|
if ($$rowtotal%2) { |
|
$css_class = 'LC_odd_row '; |
|
} |
|
$css_class .= $customclass; |
|
my $rowid = $optionsprefix.$status; |
|
my $hidden = 1; |
|
my $currstyle = 'display:none'; |
|
if (grep(/^\Q$status\E$/,@ordered)) { |
|
$currstyle = $rowstyle; |
|
$hidden = 0; |
|
} |
|
$datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain, |
|
$emailrules,$emailruleorder,$settings,$status,$rowid, |
|
$usertypeshash{$status},$css_class,$currstyle,$intdom); |
|
unless ($hidden) { |
|
$$rowtotal ++; |
} |
} |
$additional .= '</tr></table>'; |
|
} else { |
|
$usertypes->{'default'} = &mt('All users'); |
|
$additional .= &email_as_username($rowtotal,$processing); |
|
} |
} |
|
} else { |
|
my $css_class; |
|
if ($$rowtotal%2) { |
|
$css_class = 'LC_odd_row '; |
|
} |
|
$css_class .= $customclass; |
|
$usertypeshash{'default'} = $othertitle; |
|
$datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain, |
|
$emailrules,$emailruleorder,$settings,'default','', |
|
$othertitle,$css_class,$rowstyle,$intdom); |
|
$$rowtotal ++; |
} |
} |
$additional .= '</div>'."\n"; |
|
|
|
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
|
\%choices,$$rowtotal,$onclick,$additional); |
|
$$rowtotal ++; |
|
$datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal); |
|
$$rowtotal ++; |
|
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
$numinrow = 1; |
$numinrow = 1; |
if (ref($order) eq 'ARRAY') { |
if (@posstypes) { |
foreach my $status (@{$order}) { |
foreach my $status (@posstypes) { |
|
my $rowid = $classprefix.$status; |
|
my $datarowstyle = 'display:none'; |
|
if (grep(/^\Q$status\E$/,@ordered)) { |
|
$datarowstyle = $rowstyle; |
|
} |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$numinrow,$$rowtotal,$usertypes,$infofields,$infotitles); |
$numinrow,$$rowtotal,\%usertypeshash,$infofields, |
$$rowtotal ++; |
$infotitles,$rowid,$customclass,$datarowstyle); |
|
unless ($datarowstyle eq 'display:none') { |
|
$$rowtotal ++; |
|
} |
} |
} |
|
} else { |
|
$datatable .= &modifiable_userdata_row('cancreate','emailusername_default',$settings, |
|
$numinrow,$$rowtotal,\%usertypeshash,$infofields, |
|
$infotitles,'',$customclass,$rowstyle); |
} |
} |
my ($emailrules,$emailruleorder) = |
} |
&Apache::lonnet::inst_userrules($dom,'email'); |
return $datatable; |
if (ref($emailrules) eq 'HASH') { |
} |
if (keys(%{$emailrules}) > 0) { |
|
$datatable .= &user_formats_row('email',$settings,$emailrules, |
sub selfcreate_javascript { |
$emailruleorder,$numinrow,$$rowtotal); |
return <<"ENDSCRIPT"; |
$$rowtotal ++; |
|
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function toggleRows(form,radio,checkbox,target,prefix,altprefix) { |
|
var x = document.getElementsByClassName(target); |
|
var insttypes = 0; |
|
var insttypeRegExp = new RegExp(prefix); |
|
if ((x.length != undefined) && (x.length > 0)) { |
|
if (form.elements[radio].length != undefined) { |
|
for (var i=0; i<form.elements[radio].length; i++) { |
|
if (form.elements[radio][i].checked) { |
|
if (form.elements[radio][i].value == 1) { |
|
for (var j=0; j<x.length; j++) { |
|
if (x[j].id == 'undefined') { |
|
x[j].style.display = 'table-row'; |
|
} else if (insttypeRegExp.test(x[j].id)) { |
|
insttypes ++; |
|
} else { |
|
x[j].style.display = 'table-row'; |
|
} |
|
} |
|
} else { |
|
for (var j=0; j<x.length; j++) { |
|
x[j].style.display = 'none'; |
|
} |
|
} |
|
break; |
|
} |
|
} |
|
if (insttypes > 0) { |
|
toggleDataRow(form,checkbox,target,altprefix); |
|
toggleDataRow(form,checkbox,target,prefix,1); |
} |
} |
} |
} |
$datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal); |
|
} |
} |
return $datatable; |
return; |
} |
} |
|
|
sub email_as_username { |
function toggleDataRow(form,checkbox,target,prefix,docount) { |
my ($rowtotal,$processing,$type) = @_; |
if (form.elements[checkbox].length != undefined) { |
my %choices = |
var count = 0; |
&Apache::lonlocal::texthash ( |
if (docount) { |
automatic => 'Automatic approval', |
for (var i=0; i<form.elements[checkbox].length; i++) { |
approval => 'Queued for approval', |
if (form.elements[checkbox][i].checked) { |
); |
count ++; |
my $output; |
} |
foreach my $option ('automatic','approval') { |
} |
my $checked; |
} |
if (ref($processing) eq 'HASH') { |
for (var i=0; i<form.elements[checkbox].length; i++) { |
if ($type eq '') { |
var type = form.elements[checkbox][i].value; |
if (!exists($processing->{'default'})) { |
if (document.getElementById(prefix+type)) { |
if ($option eq 'automatic') { |
if (form.elements[checkbox][i].checked) { |
$checked = ' checked="checked"'; |
document.getElementById(prefix+type).style.display = 'table-row'; |
|
if (count % 2 == 1) { |
|
document.getElementById(prefix+type).className = target+' LC_odd_row'; |
|
} else { |
|
document.getElementById(prefix+type).className = target; |
} |
} |
|
count ++; |
} else { |
} else { |
if ($processing->{'default'} eq $option) { |
document.getElementById(prefix+type).style.display = 'none'; |
$checked = ' checked="checked"'; |
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function toggleEmailOptions(form,radio,prefix,altprefix,status) { |
|
var caller = radio+'_'+status; |
|
if (form.elements[caller].length != undefined) { |
|
for (var i=0; i<form.elements[caller].length; i++) { |
|
if (form.elements[caller][i].checked) { |
|
if (document.getElementById(altprefix+'_inst_'+status)) { |
|
var curr = form.elements[caller][i].value; |
|
if (prefix) { |
|
document.getElementById(prefix+'_'+status).style.display = 'none'; |
|
} |
|
document.getElementById(altprefix+'_inst_'+status).style.display = 'none'; |
|
document.getElementById(altprefix+'_noninst_'+status).style.display = 'none'; |
|
if (curr == 'custom') { |
|
if (prefix) { |
|
document.getElementById(prefix+'_'+status).style.display = 'inline'; |
|
} |
|
} else if (curr == 'inst') { |
|
document.getElementById(altprefix+'_inst_'+status).style.display = 'inline'; |
|
} else if (curr == 'noninst') { |
|
document.getElementById(altprefix+'_noninst_'+status).style.display = 'inline'; |
} |
} |
|
break; |
} |
} |
} else { |
} |
if (!exists($processing->{$type})) { |
} |
if ($option eq 'automatic') { |
} |
$checked = ' checked="checked"'; |
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub noninst_users { |
|
my ($processing,$emailverified,$emailoptions,$emaildomain,$emailrules, |
|
$emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_; |
|
my $class = 'LC_left_item'; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowid) { |
|
$rowid = ' id="'.$rowid.'"'; |
|
} |
|
if ($rowstyle) { |
|
$rowstyle = ' style="'.$rowstyle.'"'; |
|
} |
|
my ($output,$description); |
|
if ($type eq 'default') { |
|
$description = &mt('Requests for: [_1]',$typetitle); |
|
} else { |
|
$description = &mt('Requests for: [_1] (status self-reported)',$typetitle); |
|
} |
|
$output = '<tr'.$css_class.$rowid.$rowstyle.'>'. |
|
"<td>$description</td>\n". |
|
'<td class="'.$class.'" colspan="2">'. |
|
'<table><tr>'; |
|
my %headers = &Apache::lonlocal::texthash( |
|
approve => 'Processing', |
|
email => 'E-mail', |
|
username => 'Username', |
|
); |
|
foreach my $item ('approve','email','username') { |
|
$output .= '<th>'.$headers{$item}.'</th>'; |
|
} |
|
$output .= '</tr><tr>'; |
|
foreach my $item ('approve','email','username') { |
|
$output .= '<td valign="top">'; |
|
my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom); |
|
if ($item eq 'approve') { |
|
%choices = &Apache::lonlocal::texthash ( |
|
automatic => 'Automatically approved', |
|
approval => 'Queued for approval', |
|
); |
|
@options = ('automatic','approval'); |
|
$hashref = $processing; |
|
$defoption = 'automatic'; |
|
$name = 'cancreate_emailprocess_'.$type; |
|
} elsif ($item eq 'email') { |
|
%choices = &Apache::lonlocal::texthash ( |
|
any => 'Any e-mail', |
|
inst => 'Institutional only', |
|
noninst => 'Non-institutional only', |
|
custom => 'Custom restrictions', |
|
); |
|
@options = ('any','inst','noninst'); |
|
my $showcustom; |
|
if (ref($emailrules) eq 'HASH') { |
|
if (keys(%{$emailrules}) > 0) { |
|
push(@options,'custom'); |
|
$showcustom = 'cancreate_emailrule'; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'email_rule'}) eq 'ARRAY') { |
|
foreach my $rule (@{$settings->{'email_rule'}}) { |
|
if (exists($emailrules->{$rule})) { |
|
$hascustom ++; |
|
} |
|
} |
|
} elsif (ref($settings->{'email_rule'}) eq 'HASH') { |
|
if (ref($settings->{'email_rule'}{$type}) eq 'ARRAY') { |
|
foreach my $rule (@{$settings->{'email_rule'}{$type}}) { |
|
if (exists($emailrules->{$rule})) { |
|
$hascustom ++; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
$onclick = ' onclick="toggleEmailOptions(this.form,'."'cancreate_emailoptions','$showcustom',". |
|
"'cancreate_emaildomain','$type'".');"'; |
|
$hashref = $emailoptions; |
|
$defoption = 'any'; |
|
$name = 'cancreate_emailoptions_'.$type; |
|
} elsif ($item eq 'username') { |
|
%choices = &Apache::lonlocal::texthash ( |
|
all => 'Same as e-mail', |
|
first => 'Omit @domain', |
|
free => 'Free to choose', |
|
); |
|
@options = ('all','first','free'); |
|
$hashref = $emailverified; |
|
$defoption = 'all'; |
|
$name = 'cancreate_usernameoptions_'.$type; |
|
} |
|
foreach my $option (@options) { |
|
my $checked; |
|
if (ref($hashref) eq 'HASH') { |
|
if ($type eq '') { |
|
if (!exists($hashref->{'default'})) { |
|
if ($option eq $defoption) { |
|
$checked = ' checked="checked"'; |
|
} |
|
} else { |
|
if ($hashref->{'default'} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
} |
} |
} else { |
} else { |
if ($processing->{$type} eq $option) { |
if (!exists($hashref->{$type})) { |
$checked = ' checked="checked"'; |
if ($option eq $defoption) { |
|
$checked = ' checked="checked"'; |
|
} |
|
} else { |
|
if ($hashref->{$type} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
} |
} |
} |
} |
|
} elsif (($item eq 'email') && ($hascustom)) { |
|
if ($option eq 'custom') { |
|
$checked = ' checked="checked"'; |
|
} |
|
} elsif ($option eq $defoption) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="'.$name.'"'. |
|
$checked.' value="'.$option.'"'.$onclick.' />'. |
|
$choices{$option}.'</label></span><br />'; |
|
if ($item eq 'email') { |
|
if ($option eq 'custom') { |
|
my $id = 'cancreate_emailrule_'.$type; |
|
my $display = 'none'; |
|
if ($checked) { |
|
$display = 'inline'; |
|
} |
|
my $numinrow = 2; |
|
$output .= '<fieldset id="'.$id.'" style="display:'.$display.';">'. |
|
'<legend>'.&mt('Disallow').'</legend><table>'. |
|
&user_formats_row('email',$settings,$emailrules, |
|
$emailruleorder,$numinrow,'',$type); |
|
'</table></fieldset>'; |
|
} elsif (($option eq 'inst') || ($option eq 'noninst')) { |
|
my %text = &Apache::lonlocal::texthash ( |
|
inst => 'must end:', |
|
noninst => 'cannot end:', |
|
); |
|
my $value; |
|
if (ref($emaildomain) eq 'HASH') { |
|
if (ref($emaildomain->{$type}) eq 'HASH') { |
|
$value = $emaildomain->{$type}->{$option}; |
|
} |
|
} |
|
if ($value eq '') { |
|
$value = '@'.$intdom; |
|
} |
|
my $condition = 'cancreate_emaildomain_'.$option.'_'.$type; |
|
my $display = 'none'; |
|
if ($checked) { |
|
$display = 'inline'; |
|
} |
|
$output .= '<div id="'.$condition.'" style="display:'.$display.';">'. |
|
'<span class="LC_domprefs_email">'.$text{$option}.'</span> '. |
|
'<input type="text" name="'.$condition.'" value="'.$value.'" size="10" />'. |
|
'</div>'; |
|
} |
} |
} |
} elsif ($option eq 'automatic') { |
|
$checked = ' checked="checked"'; |
|
} |
|
my $name = 'cancreate_emailprocess'; |
|
if (($type ne '') && ($type ne 'default')) { |
|
$name .= '_'.$type; |
|
} |
|
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="'.$name.'"'. |
|
$checked.' value="'.$option.'" />'. |
|
$choices{$option}.'</label></span>'; |
|
if ($type eq '') { |
|
$output .= ' '; |
|
} else { |
|
$output .= '<br />'; |
|
} |
} |
|
$output .= '</td>'."\n"; |
} |
} |
$$rowtotal ++; |
$output .= "</tr></table></td></tr>\n"; |
return $output; |
return $output; |
} |
} |
|
|
sub captcha_choice { |
sub captcha_choice { |
my ($context,$settings,$itemcount) = @_; |
my ($context,$settings,$itemcount,$customcss,$rowstyle) = @_; |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext, |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext, |
$vertext,$currver); |
$vertext,$currver); |
my %lt = &captcha_phrases(); |
my %lt = &captcha_phrases(); |
Line 5907 sub captcha_choice {
|
Line 6310 sub captcha_choice {
|
} else { |
} else { |
$checked{'original'} = ' checked="checked"'; |
$checked{'original'} = ' checked="checked"'; |
} |
} |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $css_class; |
|
if ($itemcount%2) { |
|
$css_class = 'LC_odd_row'; |
|
} |
|
if ($customcss) { |
|
$css_class .= " $customcss"; |
|
} |
|
$css_class =~ s/^\s+//; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowstyle) { |
|
$css_class .= ' style="'.$rowstyle.'"'; |
|
} |
my $output = '<tr'.$css_class.'>'. |
my $output = '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\n". |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\n". |
'<table><tr><td>'."\n"; |
'<table><tr><td>'."\n"; |
Line 5926 sub captcha_choice {
|
Line 6342 sub captcha_choice {
|
# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain. |
# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain. |
# |
# |
$output .= '</td></tr>'."\n". |
$output .= '</td></tr>'."\n". |
'<tr><td>'."\n". |
'<tr><td class="LC_zero_height">'."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n". |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapub" name="'.$context.'_recaptchapub" value="'. |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapub" name="'.$context.'_recaptchapub" value="'. |
$currpub.'" size="40" /></span><br />'."\n". |
$currpub.'" size="40" /></span><br />'."\n". |
Line 5942 sub captcha_choice {
|
Line 6358 sub captcha_choice {
|
} |
} |
|
|
sub user_formats_row { |
sub user_formats_row { |
my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_; |
my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount,$status) = @_; |
my $output; |
my $output; |
my %text = ( |
my %text = ( |
'username' => 'new usernames', |
'username' => 'new usernames', |
'id' => 'IDs', |
'id' => 'IDs', |
'email' => 'self-created accounts (e-mail)', |
|
); |
); |
my $css_class = $rowcount%2?' class="LC_odd_row"':''; |
unless ($type eq 'email') { |
$output = '<tr '.$css_class.'>'. |
my $css_class = $rowcount%2?' class="LC_odd_row"':''; |
'<td><span class="LC_nobreak">'; |
$output = '<tr '.$css_class.'>'. |
if ($type eq 'email') { |
'<td><span class="LC_nobreak">'. |
$output .= &mt("Formats disallowed for $text{$type}: "); |
&mt("Format rules to check for $text{$type}: "). |
} else { |
'</td><td class="LC_left_item" colspan="2"><table>'; |
$output .= &mt("Format rules to check for $text{$type}: "); |
|
} |
} |
$output .= '</span></td>'. |
|
'<td class="LC_left_item" colspan="2"><table>'; |
|
my $rem; |
my $rem; |
if (ref($ruleorder) eq 'ARRAY') { |
if (ref($ruleorder) eq 'ARRAY') { |
for (my $i=0; $i<@{$ruleorder}; $i++) { |
for (my $i=0; $i<@{$ruleorder}; $i++) { |
Line 5976 sub user_formats_row {
|
Line 6388 sub user_formats_row {
|
if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}})) { |
if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}})) { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
|
} elsif ((ref($settings->{$type.'_rule'}) eq 'HASH') && ($status ne '')) { |
|
if (ref($settings->{$type.'_rule'}->{$status}) eq 'ARRAY') { |
|
if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}->{$status}})) { |
|
$check = ' checked="checked" '; |
|
} |
|
} |
} |
} |
} |
} |
|
my $name = $type.'_rule'; |
|
if ($type eq 'email') { |
|
$name .= '_'.$status; |
|
} |
$output .= '<td class="LC_left_item">'. |
$output .= '<td class="LC_left_item">'. |
'<span class="LC_nobreak"><label>'. |
'<span class="LC_nobreak"><label>'. |
'<input type="checkbox" name="'.$type.'_rule" '. |
'<input type="checkbox" name="'.$name.'"'. |
'value="'.$ruleorder->[$i].'"'.$check.'/>'. |
'value="'.$ruleorder->[$i].'"'.$check.'/>'. |
$rules->{$ruleorder->[$i]}{'name'}.'</label></span></td>'; |
$rules->{$ruleorder->[$i]}{'name'}.'</label></span></td>'; |
} |
} |
} |
} |
$rem = @{$ruleorder}%($numinrow); |
$rem = @{$ruleorder}%($numinrow); |
} |
} |
my $colsleft = $numinrow - $rem; |
my $colsleft; |
|
if ($rem) { |
|
$colsleft = $numinrow - $rem; |
|
} |
if ($colsleft > 1 ) { |
if ($colsleft > 1 ) { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
' </td>'; |
' </td>'; |
} elsif ($colsleft == 1) { |
} elsif ($colsleft == 1) { |
$output .= '<td class="LC_left_item"> </td>'; |
$output .= '<td class="LC_left_item"> </td>'; |
} |
} |
$output .= '</tr></table></td></tr>'; |
$output .= '</tr></table>'; |
|
unless ($type eq 'email') { |
|
$output .= '</td></tr>'; |
|
} |
return $output; |
return $output; |
} |
} |
|
|
Line 6071 sub print_usermodification {
|
Line 6499 sub print_usermodification {
|
sub print_defaults { |
sub print_defaults { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $rownum = 0; |
my $rownum = 0; |
my ($datatable,$css_class); |
my ($datatable,$css_class,$titles); |
|
unless ($position eq 'bottom') { |
|
$titles = &defaults_titles($dom); |
|
} |
if ($position eq 'top') { |
if ($position eq 'top') { |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', |
'datelocale_def','portal_def'); |
'datelocale_def','portal_def'); |
Line 6084 sub print_defaults {
|
Line 6515 sub print_defaults {
|
$defaults{$item} = $domdefaults{$item}; |
$defaults{$item} = $domdefaults{$item}; |
} |
} |
} |
} |
my $titles = &defaults_titles($dom); |
|
foreach my $item (@items) { |
foreach my $item (@items) { |
if ($rownum%2) { |
if ($rownum%2) { |
$css_class = ''; |
$css_class = ''; |
Line 6132 sub print_defaults {
|
Line 6562 sub print_defaults {
|
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
$rownum ++; |
$rownum ++; |
} |
} |
|
} elsif ($position eq 'middle') { |
|
my @items = ('intauth_cost','intauth_check','intauth_switch'); |
|
my %defaults; |
|
if (ref($settings) eq 'HASH') { |
|
%defaults = %{$settings}; |
|
if ($defaults{'intauth_cost'} !~ /^\d+$/) { |
|
$defaults{'intauth_cost'} = 10; |
|
} |
|
if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_check'} = 0; |
|
} |
|
if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_switch'} = 0; |
|
} |
|
} else { |
|
%defaults = ( |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
} |
|
foreach my $item (@items) { |
|
if ($rownum%2) { |
|
$css_class = ''; |
|
} else { |
|
$css_class = ' class="LC_odd_row" '; |
|
} |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td><span class="LC_nobreak">'.$titles->{$item}. |
|
'</span></td><td class="LC_left_item" colspan="3">'; |
|
if ($item eq 'intauth_switch') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
$datatable .= '<table width="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} elsif ($item eq 'intauth_check') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
$datatable .= '<table wisth="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
my $onclick; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($option == 2) { |
|
$onclick = ' onclick="javascript:warnIntAuth(this);"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.$onclick.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} else { |
|
$datatable .= '<input type="text" name="'.$item.'" value="'. |
|
$defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$rownum ++; |
|
} |
} else { |
} else { |
my (%defaults); |
my %defaults; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') && |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
(ref($settings->{'inststatusguest'}) eq 'ARRAY')) { |
|
my $maxnum = @{$settings->{'inststatusorder'}}; |
my $maxnum = @{$settings->{'inststatusorder'}}; |
for (my $i=0; $i<$maxnum; $i++) { |
for (my $i=0; $i<$maxnum; $i++) { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
my $item = $settings->{'inststatusorder'}->[$i]; |
my $item = $settings->{'inststatusorder'}->[$i]; |
my $title = $settings->{'inststatustypes'}->{$item}; |
my $title = $settings->{'inststatustypes'}->{$item}; |
my $guestok; |
|
if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) { |
|
$guestok = 1; |
|
} |
|
my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"'; |
my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"'; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td><span class="LC_nobreak">'. |
'<td><span class="LC_nobreak">'. |
Line 6158 sub print_defaults {
|
Line 6662 sub print_defaults {
|
} |
} |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
my ($checkedon,$checkedoff); |
|
$checkedoff = ' checked="checked"'; |
|
if ($guestok) { |
|
$checkedon = $checkedoff; |
|
$checkedoff = ''; |
|
} |
|
$datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '. |
$datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '. |
'<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'. |
'<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'. |
&mt('delete').'</span></td>'. |
&mt('delete').'</span></td>'. |
'<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed:'). |
'<td class="LC_left_item" colspan="2"><span class="LC_nobreak">'.&mt('Name displayed:'). |
'<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'. |
'<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'. |
'</span></td>'. |
'</span></td></tr>'; |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" value="1" name="inststatus_guest_'.$item.'"'.$checkedon.' />'. |
|
&mt('Yes').'</label>'.(' 'x2). |
|
'<label><input type="radio" value="0" name="inststatus_guest_'.$item.'"'.$checkedoff.' />'. |
|
&mt('No').'</label></span></td></tr>'; |
|
} |
} |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"'; |
my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"'; |
Line 6191 sub print_defaults {
|
Line 6684 sub print_defaults {
|
$datatable .= '</select> '.&mt('Internal ID:'). |
$datatable .= '</select> '.&mt('Internal ID:'). |
'<input type="text" size="10" name="addinststatus" value="" />'. |
'<input type="text" size="10" name="addinststatus" value="" />'. |
' '.&mt('(new)'). |
' '.&mt('(new)'). |
'</span></td><td class="LC_left_item"><span class="LC_nobreak">'. |
'</span></td><td class="LC_left_item" colspan="2"><span class="LC_nobreak">'. |
&mt('Name displayed:'). |
&mt('Name displayed:'). |
'<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'. |
'<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" value="1" name="addinststatus_guest" />'. |
|
&mt('Yes').'</label>'.(' 'x2). |
|
'<label><input type="radio" value="0" name="addinststatus_guest" />'. |
|
&mt('No').'</label></span></td></tr>'; |
|
'</tr>'."\n"; |
'</tr>'."\n"; |
$rownum ++; |
$rownum ++; |
} |
} |
Line 6228 sub defaults_titles {
|
Line 6716 sub defaults_titles {
|
'timezone_def' => 'Default timezone', |
'timezone_def' => 'Default timezone', |
'datelocale_def' => 'Default locale for dates', |
'datelocale_def' => 'Default locale for dates', |
'portal_def' => 'Portal/Default URL', |
'portal_def' => 'Portal/Default URL', |
|
'intauth_cost' => 'Encryption cost for bcrypt (positive integer)', |
|
'intauth_check' => 'Check bcrypt cost if authenticated', |
|
'intauth_switch' => 'Existing crypt-based switched to bcrypt on authentication', |
); |
); |
if ($dom) { |
if ($dom) { |
my $uprimary_id = &Apache::lonnet::domain($dom,'primary'); |
my $uprimary_id = &Apache::lonnet::domain($dom,'primary'); |
Line 6763 sub serverstatus_pages {
|
Line 7254 sub serverstatus_pages {
|
|
|
sub defaults_javascript { |
sub defaults_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
return unless (ref($settings) eq 'HASH'); |
my $intauthcheck = &mt('Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.'); |
|
my $intauthcost = &mt('Warning: bcrypt encryption cost for internal authentication must be an integer.'); |
|
&js_escape(\$intauthcheck); |
|
&js_escape(\$intauthcost); |
|
my $intauthjs = <<"ENDSCRIPT"; |
|
|
|
function warnIntAuth(field) { |
|
if (field.name == 'intauth_check') { |
|
if (field.value == '2') { |
|
alert('$intauthcheck'); |
|
} |
|
} |
|
if (field.name == 'intauth_cost') { |
|
field.value.replace(/\s/g,''); |
|
if (field.value != '') { |
|
var regexdigit=/^\\d+\$/; |
|
if (!regexdigit.test(field.value)) { |
|
alert('$intauthcost'); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
ENDSCRIPT |
|
|
|
if (ref($settings) ne 'HASH') { |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
|
} |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
if ($maxnum eq '') { |
if ($maxnum eq '') { |
Line 6817 $jstext
|
Line 7336 $jstext
|
return; |
return; |
} |
} |
|
|
|
$intauthjs |
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
ENDSCRIPT |
ENDSCRIPT |
|
} else { |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
} |
} |
} |
} |
|
|
Line 7061 sub build_category_rows {
|
Line 7584 sub build_category_rows {
|
} |
} |
|
|
sub modifiable_userdata_row { |
sub modifiable_userdata_row { |
my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref) = @_; |
my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref, |
|
$rowid,$customcss,$rowstyle) = @_; |
my ($role,$rolename,$statustype); |
my ($role,$rolename,$statustype); |
$role = $item; |
$role = $item; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
if ($item =~ /^emailusername_(.+)$/) { |
if ($item =~ /^(emailusername)_(.+)$/) { |
$statustype = $1; |
$role = $1; |
$role = 'emailusername'; |
$statustype = $2; |
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if ($usertypes->{$statustype}) { |
if ($usertypes->{$statustype}) { |
$rolename = &mt('Data provided by [_1]',$usertypes->{$statustype}); |
$rolename = &mt('Data provided by [_1]',$usertypes->{$statustype}); |
Line 7102 sub modifiable_userdata_row {
|
Line 7626 sub modifiable_userdata_row {
|
%fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
%fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
} |
} |
my $output; |
my $output; |
my $css_class = $rowcount%2?' class="LC_odd_row"':''; |
my $css_class; |
$output = '<tr '.$css_class.'>'. |
if ($rowcount%2) { |
|
$css_class = 'LC_odd_row'; |
|
} |
|
if ($customcss) { |
|
$css_class .= " $customcss"; |
|
} |
|
$css_class =~ s/^\s+//; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowstyle) { |
|
$css_class .= ' style="'.$rowstyle.'"'; |
|
} |
|
if ($rowid) { |
|
$rowid = ' id="'.$rowid.'"'; |
|
} |
|
|
|
$output = '<tr '.$css_class.$rowid.'>'. |
'<td><span class="LC_nobreak">'.$rolename.'</span></td>'. |
'<td><span class="LC_nobreak">'.$rolename.'</span></td>'. |
'<td class="LC_left_item" colspan="2"><table>'; |
'<td class="LC_left_item" colspan="2"><table>'; |
my $rem; |
my $rem; |
Line 7137 sub modifiable_userdata_row {
|
Line 7678 sub modifiable_userdata_row {
|
} |
} |
} |
} |
} |
} |
|
|
for (my $i=0; $i<@fields; $i++) { |
my $total = scalar(@fields); |
my $rem = $i%($numinrow); |
for (my $i=0; $i<$total; $i++) { |
|
$rem = $i%($numinrow); |
if ($rem == 0) { |
if ($rem == 0) { |
if ($i > 0) { |
if ($i > 0) { |
$output .= '</tr>'; |
$output .= '</tr>'; |
Line 7181 sub modifiable_userdata_row {
|
Line 7723 sub modifiable_userdata_row {
|
'</label>'; |
'</label>'; |
} |
} |
$output .= '</span></td>'; |
$output .= '</span></td>'; |
$rem = @fields%($numinrow); |
|
} |
} |
my $colsleft = $numinrow - $rem; |
$rem = $total%$numinrow; |
if ($colsleft > 1 ) { |
my $colsleft; |
|
if ($rem) { |
|
$colsleft = $numinrow - $rem; |
|
} |
|
if ($colsleft > 1) { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
' </td>'; |
' </td>'; |
} elsif ($colsleft == 1) { |
} elsif ($colsleft == 1) { |
Line 7195 sub modifiable_userdata_row {
|
Line 7740 sub modifiable_userdata_row {
|
} |
} |
|
|
sub insttypes_row { |
sub insttypes_row { |
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rownum) = @_; |
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick, |
|
$customcss,$rowstyle) = @_; |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
cansearch => 'Users allowed to search', |
cansearch => 'Users allowed to search', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
lockablenames => 'User preference to lock name', |
lockablenames => 'User preference to lock name', |
|
selfassign => 'Self-reportable affiliations', |
); |
); |
my $showdom; |
my $showdom; |
if ($context eq 'cansearch') { |
if ($context eq 'cansearch') { |
Line 7209 sub insttypes_row {
|
Line 7756 sub insttypes_row {
|
if ($context eq 'statustocreate') { |
if ($context eq 'statustocreate') { |
$class = 'LC_right_item'; |
$class = 'LC_right_item'; |
} |
} |
my $css_class = ' class="LC_odd_row"'; |
my $css_class; |
if ($rownum ne '') { |
if ($$rowtotal%2) { |
$css_class = ($rownum%2? ' class="LC_odd_row"':''); |
$css_class = 'LC_odd_row'; |
|
} |
|
if ($customcss) { |
|
$css_class .= ' '.$customcss; |
|
} |
|
$css_class =~ s/^\s+//; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowstyle) { |
|
$css_class .= ' style="'.$rowstyle.'"'; |
|
} |
|
if ($onclick) { |
|
$onclick = 'onclick="'.$onclick.'" '; |
} |
} |
my $output = '<tr'.$css_class.'>'. |
my $output = '<tr'.$css_class.'>'. |
'<td>'.$lt{$context}.$showdom. |
'<td>'.$lt{$context}.$showdom. |
Line 7240 sub insttypes_row {
|
Line 7800 sub insttypes_row {
|
$output .= '<td class="LC_left_item">'. |
$output .= '<td class="LC_left_item">'. |
'<span class="LC_nobreak"><label>'. |
'<span class="LC_nobreak"><label>'. |
'<input type="checkbox" name="'.$context.'" '. |
'<input type="checkbox" name="'.$context.'" '. |
'value="'.$types->[$i].'"'.$check.'/>'. |
'value="'.$types->[$i].'"'.$check.$onclick.' />'. |
$usertypes->{$types->[$i]}.'</label></span></td>'; |
$usertypes->{$types->[$i]}.'</label></span></td>'; |
} |
} |
} |
} |
Line 7267 sub insttypes_row {
|
Line 7827 sub insttypes_row {
|
} |
} |
$output .= '<span class="LC_nobreak"><label>'. |
$output .= '<span class="LC_nobreak"><label>'. |
'<input type="checkbox" name="'.$context.'" '. |
'<input type="checkbox" name="'.$context.'" '. |
'value="default"'.$defcheck.'/>'. |
'value="default"'.$defcheck.$onclick.' />'. |
$othertitle.'</label></span></td>'. |
$othertitle.'</label></span></td>'. |
'</tr></table></td></tr>'; |
'</tr></table></td></tr>'; |
return $output; |
return $output; |
Line 7554 sub modify_login {
|
Line 8114 sub modify_login {
|
} elsif ($currheadtagurls{$lonhost}) { |
} elsif ($currheadtagurls{$lonhost}) { |
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost}; |
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost}; |
if ($currexempt{$lonhost}) { |
if ($currexempt{$lonhost}) { |
if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) { |
if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) { |
$changes{'headtag'}{$lonhost} = 1; |
$changes{'headtag'}{$lonhost} = 1; |
} |
} |
} elsif ($possexempt{$lonhost}) { |
} elsif ($possexempt{$lonhost}) { |
Line 7786 sub modify_login {
|
Line 8346 sub modify_login {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
|
sub check_exempt_addresses { |
sub check_exempt_addresses { |
my ($iplist) = @_; |
my ($iplist) = @_; |
$iplist =~ s/^\s+//; |
$iplist =~ s/^\s+//; |
Line 8697 sub modify_quotas {
|
Line 9256 sub modify_quotas {
|
my $newpos = $env{'form.'.$itemid}; |
my $newpos = $env{'form.'.$itemid}; |
$newpos =~ s/\D+//g; |
$newpos =~ s/\D+//g; |
foreach my $item ('subject','title','publisher','author') { |
foreach my $item ('subject','title','publisher','author') { |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
($type eq 'templates')); |
($type eq 'templates')); |
$confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i}; |
$confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i}; |
if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) { |
if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) { |
Line 8866 sub modify_quotas {
|
Line 9425 sub modify_quotas {
|
} |
} |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
} |
} |
} else { |
} else { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
Line 9272 sub process_textbook_image {
|
Line 9831 sub process_textbook_image {
|
sub modify_ltitools { |
sub modify_ltitools { |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my ($newid,@allpos,%changes,%confhash,$errors,$resulttext); |
my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext); |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
Line 9297 sub modify_ltitools {
|
Line 9856 sub modify_ltitools {
|
foreach my $item ('title','url','key','secret') { |
foreach my $item ('title','url','key','secret') { |
$env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
$env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
if ($env{'form.ltitools_add_'.$item}) { |
if ($env{'form.ltitools_add_'.$item}) { |
$confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
if (($item eq 'key') || ($item eq 'secret')) { |
|
$encconfig{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} else { |
|
$confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
} |
} |
} |
} |
if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') { |
if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') { |
Line 9306 sub modify_ltitools {
|
Line 9869 sub modify_ltitools {
|
if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
$confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
$confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
} |
} |
foreach my $item ('width','height') { |
foreach my $item ('width','height','linktext','explanation') { |
$env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
$env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
$env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
$env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
if (($item eq 'width') || ($item eq 'height')) { |
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
|
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
|
} else { |
|
if ($env{'form.ltitools_add_'.$item} ne '') { |
|
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
} |
} |
} |
} |
if ($env{'form.ltitools_add_target'} eq 'window') { |
if ($env{'form.ltitools_add_target'} eq 'window') { |
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
|
} elsif ($env{'form.ltitools_add_target'} eq 'tab') { |
|
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
} else { |
} else { |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
} |
} |
Line 9398 sub modify_ltitools {
|
Line 9969 sub modify_ltitools {
|
} else { |
} else { |
my $newpos = $env{'form.ltitools_'.$itemid}; |
my $newpos = $env{'form.ltitools_'.$itemid}; |
$newpos =~ s/\D+//g; |
$newpos =~ s/\D+//g; |
foreach my $item ('title','url','key','secret') { |
foreach my $item ('title','url') { |
$confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
$confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
|
foreach my $item ('key','secret') { |
|
$encconfig{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
|
if ($domconfig{$action}{$itemid}{$item} ne $encconfig{$itemid}{$item}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') { |
if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') { |
$confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
$confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
} |
} |
Line 9422 sub modify_ltitools {
|
Line 9999 sub modify_ltitools {
|
} else { |
} else { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
|
} elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$size} ne '') { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
foreach my $item ('linktext','explanation') { |
|
$env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//; |
|
$env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//; |
|
if ($env{'form.ltitools_'.$item.'_'.$i} ne '') { |
|
$confhash{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
|
if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$item} ne $confhash{$itemid}{'display'}{$item}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} else { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$item} ne '') { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
} |
} |
if ($env{'form.ltitools_target_'.$i} eq 'window') { |
if ($env{'form.ltitools_target_'.$i} eq 'window') { |
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
|
} elsif ($env{'form.ltitools_target_'.$i} eq 'tab') { |
|
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
} else { |
} else { |
$confhash{$itemid}{'display'}{'target'} = 'iframe'; |
$confhash{$itemid}{'display'}{'target'} = 'iframe'; |
} |
} |
Line 9445 sub modify_ltitools {
|
Line 10046 sub modify_ltitools {
|
} |
} |
} |
} |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
foreach my $item ('label','title','target') { |
foreach my $item ('label','title','target','linktext','explanation') { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
Line 9584 sub modify_ltitools {
|
Line 10185 sub modify_ltitools {
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
|
my %ltienchash = ( |
|
$action => { %encconfig } |
|
); |
|
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
&Apache::lonnet::do_cache_new('ltitools',$dom,\%confhash,$cachetime); |
my %ltiall = %confhash; |
|
foreach my $id (keys(%ltiall)) { |
|
if (ref($encconfig{$id}) eq 'HASH') { |
|
foreach my $item ('key','secret') { |
|
$ltiall{$id}{$item} = $encconfig{$id}{$item}; |
|
} |
|
} |
|
} |
|
&Apache::lonnet::do_cache_new('ltitools',$dom,\%ltiall,$cachetime); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'ltitools'} = 1; |
$lastactref->{'ltitools'} = 1; |
} |
} |
Line 9610 sub modify_ltitools {
|
Line 10223 sub modify_ltitools {
|
$resulttext .= '</li><ul>'; |
$resulttext .= '</li><ul>'; |
my $position = $pos + 1; |
my $position = $pos + 1; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
foreach my $item ('version','msgtype','url','key') { |
foreach my $item ('version','msgtype','url') { |
if ($confhash{$itemid}{$item} ne '') { |
if ($confhash{$itemid}{$item} ne '') { |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
} |
} |
} |
} |
if ($confhash{$itemid}{'secret'} ne '') { |
if ($encconfig{$itemid}{'key'} ne '') { |
|
$resulttext .= '<li>'.$lt{'key'}.': '.$encconfig{$itemid}{'key'}.'</li>'; |
|
} |
|
if ($encconfig{$itemid}{'secret'} ne '') { |
$resulttext .= '<li>'.$lt{'secret'}.': '; |
$resulttext .= '<li>'.$lt{'secret'}.': '; |
my $num = length($confhash{$itemid}{'secret'}); |
my $num = length($encconfig{$itemid}{'secret'}); |
$resulttext .= ('*'x$num).'</li>'; |
$resulttext .= ('*'x$num).'</li>'; |
} |
} |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
my @possconfig = ('label','title','target'); |
my @possconfig = ('label','title','target','linktext','explanation'); |
my $numconfig = 0; |
my $numconfig = 0; |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
foreach my $item (@possconfig) { |
foreach my $item (@possconfig) { |
if ($confhash{$itemid}{'crsconf'}{$item}) { |
if ($confhash{$itemid}{'crsconf'}{$item}) { |
$numconfig ++; |
$numconfig ++; |
$resulttext .= ' '.$lt{'crs'.$item}; |
$resulttext .= ' "'.$lt{'crs'.$item}.'"'; |
} |
} |
} |
} |
} |
} |
Line 9660 sub modify_ltitools {
|
Line 10276 sub modify_ltitools {
|
$displaylist =~ s/,$//; |
$displaylist =~ s/,$//; |
$resulttext .= '<li>'.$displaylist.'</li>'; |
$resulttext .= '<li>'.$displaylist.'</li>'; |
} |
} |
} |
foreach my $item ('linktext','explanation') { |
|
if ($confhash{$itemid}{'display'}{$item}) { |
|
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{'display'}{$item}.'</li>'; |
|
} |
|
} |
|
} |
if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
my $fieldlist; |
my $fieldlist; |
foreach my $field (@allfields) { |
foreach my $field (@allfields) { |
Line 9875 sub modify_autoenroll {
|
Line 10496 sub modify_autoenroll {
|
} |
} |
if ($changes{'autofailsafe'}) { |
if ($changes{'autofailsafe'}) { |
if ($failsafe ne '') { |
if ($failsafe ne '') { |
$resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>'; |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt("$title{'failsafe'} deleted"); |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted'); |
} |
} |
&Apache::lonnet::get_domain_defaults($dom,1); |
&Apache::lonnet::get_domain_defaults($dom,1); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
Line 10156 sub modify_autocreate {
|
Line 10777 sub modify_autocreate {
|
} |
} |
|
|
sub modify_directorysrch { |
sub modify_directorysrch { |
my ($dom,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,%changes); |
my ($resulttext,%changes); |
my %currdirsrch; |
my %currdirsrch; |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
Line 10167 sub modify_directorysrch {
|
Line 10788 sub modify_directorysrch {
|
my %title = ( available => 'Institutional directory search available', |
my %title = ( available => 'Institutional directory search available', |
localonly => 'Other domains can search institution', |
localonly => 'Other domains can search institution', |
lcavailable => 'LON-CAPA directory search available', |
lcavailable => 'LON-CAPA directory search available', |
lclocalonly => 'Other domains can search LON-CAPA domain', |
lclocalonly => 'Other domains can search LON-CAPA domain', |
searchby => 'Search types', |
searchby => 'Search types', |
searchtypes => 'Search latitude'); |
searchtypes => 'Search latitude'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
Line 10261 sub modify_directorysrch {
|
Line 10882 sub modify_directorysrch {
|
} |
} |
} |
} |
if (exists($currdirsrch{'lcavailable'})) { |
if (exists($currdirsrch{'lcavailable'})) { |
if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) { |
if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) { |
$changes{'lcavailable'} = 1; |
$changes{'lcavailable'} = 1; |
} |
} |
} else { |
} else { |
if ($env{'form.dirsrch_lcavailable'} eq '1') { |
if ($env{'form.dirsrch_lcavailable'} eq '1') { |
$changes{'lcavailable'} = 1; |
$changes{'lcavailable'} = 1; |
} |
} |
} |
} |
if (exists($currdirsrch{'localonly'})) { |
if (exists($currdirsrch{'localonly'})) { |
if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) { |
if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) { |
$changes{'localonly'} = 1; |
$changes{'localonly'} = 1; |
} |
} |
} else { |
} else { |
if ($env{'form.dirsrch_instlocalonly'} eq '1') { |
if ($env{'form.dirsrch_instlocalonly'} eq '1') { |
$changes{'localonly'} = 1; |
$changes{'localonly'} = 1; |
} |
} |
} |
} |
if (exists($currdirsrch{'lclocalonly'})) { |
if (exists($currdirsrch{'lclocalonly'})) { |
if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) { |
if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) { |
$changes{'lclocalonly'} = 1; |
$changes{'lclocalonly'} = 1; |
} |
} |
} else { |
} else { |
if ($env{'form.dirsrch_domlocalonly'} eq '1') { |
if ($env{'form.dirsrch_domlocalonly'} eq '1') { |
$changes{'lclocalonly'} = 1; |
$changes{'lclocalonly'} = 1; |
Line 10300 sub modify_directorysrch {
|
Line 10921 sub modify_directorysrch {
|
} |
} |
if ($changes{'lclocalonly'}) { |
if ($changes{'lclocalonly'}) { |
$resulttext .= '<li>'.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'</li>'; |
} |
} |
if (ref($changes{'cansearch'}) eq 'ARRAY') { |
if (ref($changes{'cansearch'}) eq 'ARRAY') { |
my $chgtext; |
my $chgtext; |
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
Line 10350 sub modify_directorysrch {
|
Line 10971 sub modify_directorysrch {
|
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
|
&Apache::lonnet::do_cache_new('directorysrch',$dom,$dirsrch_hash{'directorysrch'},3600); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'directorysrch'} = 1; |
|
} |
} else { |
} else { |
$resulttext = &mt('No changes made to directory search settings'); |
$resulttext = &mt('No changes made to directory search settings'); |
} |
} |
Line 10383 sub modify_contacts {
|
Line 11008 sub modify_contacts {
|
} else { |
} else { |
$contacts_hash{contacts}{$type}{$item} = 0; |
$contacts_hash{contacts}{$type}{$item} = 0; |
} |
} |
} |
} |
$others{$type} = $env{'form.'.$type.'_others'}; |
$others{$type} = $env{'form.'.$type.'_others'}; |
$contacts_hash{contacts}{$type}{'others'} = $others{$type}; |
$contacts_hash{contacts}{$type}{'others'} = $others{$type}; |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
Line 10441 sub modify_contacts {
|
Line 11066 sub modify_contacts {
|
if ($others{$type} ne $currsetting{$type}{'others'}) { |
if ($others{$type} ne $currsetting{$type}{'others'}) { |
push(@{$changes{$type}},'others'); |
push(@{$changes{$type}},'others'); |
} |
} |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
if ($bcc{$type} ne $currsetting{$type}{'bcc'}) { |
if ($bcc{$type} ne $currsetting{$type}{'bcc'}) { |
push(@{$changes{$type}},'bcc'); |
push(@{$changes{$type}},'bcc'); |
} |
} |
Line 10519 sub modify_contacts {
|
Line 11144 sub modify_contacts {
|
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) { |
if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) { |
Line 10550 sub modify_contacts {
|
Line 11175 sub modify_contacts {
|
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
if (ref($changes{$type}) eq 'ARRAY') { |
if (ref($changes{$type}) eq 'ARRAY') { |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
$resulttext .= '<li>'.$titles->{$type}.' -- '.&mt('sent to').': '; |
$resulttext .= '<li>'.$titles->{$type}.' -- '.&mt('sent to').': '; |
} else { |
} else { |
$resulttext .= '<li>'.$titles->{$type}.': '; |
$resulttext .= '<li>'.$titles->{$type}.': '; |
} |
} |
Line 10569 sub modify_contacts {
|
Line 11194 sub modify_contacts {
|
if ($bcc{$type} ne '') { |
if ($bcc{$type} ne '') { |
my $bcctext; |
my $bcctext; |
if (@text) { |
if (@text) { |
$bcctext = ' '.&mt('with Bcc to'); |
$bcctext = ' '.&mt('with Bcc to'); |
} else { |
} else { |
$bcctext = '(Bcc)'; |
$bcctext = '(Bcc)'; |
} |
} |
Line 10577 sub modify_contacts {
|
Line 11202 sub modify_contacts {
|
} elsif (!@text) { |
} elsif (!@text) { |
$resulttext .= &mt('No one'); |
$resulttext .= &mt('No one'); |
} |
} |
if ($includestr{$type} ne '') { |
if ($includestr{$type} ne '') { |
if ($includeloc{$type} eq 'b') { |
if ($includeloc{$type} eq 'b') { |
$resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type}; |
$resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type}; |
} elsif ($includeloc{$type} eq 's') { |
} elsif ($includeloc{$type} eq 's') { |
Line 10615 sub modify_contacts {
|
Line 11240 sub modify_contacts {
|
next; |
next; |
} |
} |
if ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'yes') { |
if ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'yes') { |
push(@optional,$field); |
push(@optional,$field); |
} elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'no') { |
} elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'no') { |
push(@unused,$field); |
push(@unused,$field); |
} elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'req') { |
} elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'req') { |
push(@required,$field); |
push(@required,$field); |
} |
} |
} |
} |
if (@optional) { |
if (@optional) { |
Line 10650 sub modify_contacts {
|
Line 11275 sub modify_contacts {
|
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to contact information'); |
$resulttext = &mt('No changes made to contacts and form settings'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
Line 10668 sub modify_usercreation {
|
Line 11293 sub modify_usercreation {
|
if ($key eq 'cancreate') { |
if ($key eq 'cancreate') { |
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') { |
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') { |
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
if (($item eq 'selfcreate') || ($item eq 'statustocreate') || |
if (($item eq 'requestcrs') || ($item eq 'course') || ($item eq 'author')) { |
($item eq 'captcha') || ($item eq 'recaptchakeys') || |
|
($item eq 'recaptchaversion')) { |
|
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
|
} else { |
|
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
|
} else { |
|
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
} |
} |
} |
} |
} |
} |
Line 10876 sub modify_usercreation {
|
Line 11499 sub modify_usercreation {
|
} |
} |
|
|
sub modify_selfcreation { |
sub modify_selfcreation { |
my ($dom,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,$warningmsg,%curr_usercreation,%curr_usermodify,%changes,%cancreate); |
my ($resulttext,$warningmsg,%curr_usercreation,%curr_usermodify,%curr_inststatus,%changes,%cancreate); |
my (%save_usercreate,%save_usermodify); |
my (%save_usercreate,%save_usermodify,%save_inststatus,@types,%usertypes); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
if (ref($types) eq 'ARRAY') { |
my ($othertitle,$usertypesref,$typesref) = &Apache::loncommon::sorted_inst_types($dom); |
$usertypes->{'default'} = $othertitle; |
if (ref($typesref) eq 'ARRAY') { |
push(@{$types},'default'); |
@types = @{$typesref}; |
|
} |
|
if (ref($usertypesref) eq 'HASH') { |
|
%usertypes = %{$usertypesref}; |
} |
} |
|
$usertypes{'default'} = $othertitle; |
# |
# |
# Retrieve current domain configuration for self-creation of usernames from $domconfig{'usercreation'}. |
# Retrieve current domain configuration for self-creation of usernames from $domconfig{'usercreation'}. |
# |
# |
Line 10893 sub modify_selfcreation {
|
Line 11520 sub modify_selfcreation {
|
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') { |
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') { |
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
if (($item eq 'selfcreate') || ($item eq 'statustocreate') || |
if (($item eq 'selfcreate') || ($item eq 'statustocreate') || |
($item eq 'captcha') || ($item eq 'recaptchakeys') || |
($item eq 'captcha') || ($item eq 'recaptchakeys') || |
($item eq 'recaptchaversion') || |
($item eq 'recaptchaversion') || ($item eq 'notify') || |
($item eq 'emailusername') || ($item eq 'notify') || |
($item eq 'emailusername') || ($item eq 'shibenv') || |
($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) { |
($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || |
|
($item eq 'emailoptions') || ($item eq 'emaildomain')) { |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
} else { |
} else { |
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
Line 10922 sub modify_selfcreation {
|
Line 11550 sub modify_selfcreation {
|
} |
} |
} |
} |
} |
} |
|
# |
|
# Retrieve current domain configuration for institutional status types from $domconfig{'inststatus'}. |
|
# |
|
if (ref($domconfig{'inststatus'}) eq 'HASH') { |
|
foreach my $key (keys(%{$domconfig{'inststatus'}})) { |
|
if ($key eq 'inststatusguest') { |
|
$curr_inststatus{$key} = $domconfig{'inststatus'}{$key}; |
|
} else { |
|
$save_inststatus{$key} = $domconfig{'inststatus'}{$key}; |
|
} |
|
} |
|
} |
|
|
my @contexts = ('selfcreate'); |
my @contexts = ('selfcreate'); |
@{$cancreate{'selfcreate'}} = (); |
@{$cancreate{'selfcreate'}} = (); |
%{$cancreate{'emailusername'}} = (); |
%{$cancreate{'emailusername'}} = (); |
@{$cancreate{'statustocreate'}} = (); |
if (@types) { |
|
@{$cancreate{'statustocreate'}} = (); |
|
} |
%{$cancreate{'selfcreateprocessing'}} = (); |
%{$cancreate{'selfcreateprocessing'}} = (); |
%{$cancreate{'shibenv'}} = (); |
%{$cancreate{'shibenv'}} = (); |
|
%{$cancreate{'emailverified'}} = (); |
|
%{$cancreate{'emailoptions'}} = (); |
|
%{$cancreate{'emaildomain'}} = (); |
my %selfcreatetypes = ( |
my %selfcreatetypes = ( |
sso => 'users authenticated by institutional single sign on', |
sso => 'users authenticated by institutional single sign on', |
login => 'users authenticated by institutional log-in', |
login => 'users authenticated by institutional log-in', |
email => 'users who provide a valid e-mail address for use as username', |
email => 'users verified by e-mail', |
); |
); |
# |
# |
# Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts |
# Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts |
# is permitted. |
# is permitted. |
# |
# |
|
my ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email'); |
|
|
my @statuses; |
my (@statuses,%email_rule); |
if (ref($domconfig{'inststatus'}) eq 'HASH') { |
|
if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') { |
|
@statuses = @{$domconfig{'inststatus'}{'inststatusguest'}}; |
|
} |
|
} |
|
push(@statuses,'default'); |
|
|
|
foreach my $item ('login','sso','email') { |
foreach my $item ('login','sso','email') { |
if ($item eq 'email') { |
if ($item eq 'email') { |
if ($env{'form.cancreate_email'}) { |
if ($env{'form.cancreate_email'}) { |
push(@{$cancreate{'selfcreate'}},'email'); |
if (@types) { |
push(@contexts,'selfcreateprocessing'); |
my @poss_statuses = &Apache::loncommon::get_env_multiple('form.selfassign'); |
foreach my $type (@statuses) { |
foreach my $status (@poss_statuses) { |
if ($type eq 'default') { |
if (grep(/^\Q$status\E$/,(@types,'default'))) { |
$cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess'}; |
push(@statuses,$status); |
} else { |
} |
$cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type}; |
} |
|
$save_inststatus{'inststatusguest'} = \@statuses; |
|
} else { |
|
push(@statuses,'default'); |
|
} |
|
if (@statuses) { |
|
my %curr_rule; |
|
if (ref($curr_usercreation{'email_rule'}) eq 'ARRAY') { |
|
foreach my $type (@statuses) { |
|
$curr_rule{$type} = $curr_usercreation{'email_rule'}; |
|
} |
|
} elsif (ref($curr_usercreation{'email_rule'}) eq 'HASH') { |
|
foreach my $type (@statuses) { |
|
$curr_rule{$type} = $curr_usercreation{'email_rule'}{$type}; |
|
} |
|
} |
|
push(@{$cancreate{'selfcreate'}},'email'); |
|
push(@contexts,('selfcreateprocessing','emailverified','emailoptions')); |
|
my %curremaildom; |
|
if (ref($curr_usercreation{'cancreate'}{'emaildomain'}) eq 'HASH') { |
|
%curremaildom = %{$curr_usercreation{'cancreate'}{'emaildomain'}}; |
|
} |
|
foreach my $type (@statuses) { |
|
if ($env{'form.cancreate_emailprocess_'.$type} =~ /^(?:approval|automatic)$/) { |
|
$cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type}; |
|
} |
|
if ($env{'form.cancreate_usernameoptions_'.$type} =~ /^(?:all|first|free)$/) { |
|
$cancreate{'emailverified'}{$type} = $env{'form.cancreate_usernameoptions_'.$type}; |
|
} |
|
if ($env{'form.cancreate_emailoptions_'.$type} =~ /^(any|inst|noninst|custom)$/) { |
|
# |
|
# Retrieve rules (if any) governing types of e-mail address which may be used to verify a username. |
|
# |
|
my $chosen = $1; |
|
if (($chosen eq 'inst') || ($chosen eq 'noninst')) { |
|
my $emaildom; |
|
if ($env{'form.cancreate_emaildomain_'.$chosen.'_'.$type} =~ /^\@[^\@]+$/) { |
|
$emaildom = $env{'form.cancreate_emaildomain_'.$chosen.'_'.$type}; |
|
$cancreate{'emaildomain'}{$type}{$chosen} = $emaildom; |
|
if (ref($curremaildom{$type}) eq 'HASH') { |
|
if (exists($curremaildom{$type}{$chosen})) { |
|
if ($curremaildom{$type}{$chosen} ne $emaildom) { |
|
push(@{$changes{'cancreate'}},'emaildomain'); |
|
} |
|
} elsif ($emaildom ne '') { |
|
push(@{$changes{'cancreate'}},'emaildomain'); |
|
} |
|
} elsif ($emaildom ne '') { |
|
push(@{$changes{'cancreate'}},'emaildomain'); |
|
} |
|
} |
|
$cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type}; |
|
} elsif ($chosen eq 'custom') { |
|
my @possemail_rules = &Apache::loncommon::get_env_multiple('form.email_rule_'.$type); |
|
$email_rule{$type} = []; |
|
if (ref($emailrules) eq 'HASH') { |
|
foreach my $rule (@possemail_rules) { |
|
if (exists($emailrules->{$rule})) { |
|
push(@{$email_rule{$type}},$rule); |
|
} |
|
} |
|
} |
|
if (@{$email_rule{$type}}) { |
|
$cancreate{'emailoptions'}{$type} = 'custom'; |
|
if (ref($curr_rule{$type}) eq 'ARRAY') { |
|
if (@{$curr_rule{$type}} > 0) { |
|
foreach my $rule (@{$curr_rule{$type}}) { |
|
if (!grep(/^\Q$rule\E$/,@{$email_rule{$type}})) { |
|
push(@{$changes{'email_rule'}},$type); |
|
} |
|
} |
|
} |
|
foreach my $type (@{$email_rule{$type}}) { |
|
if (!grep(/^\Q$type\E$/,@{$curr_rule{$type}})) { |
|
push(@{$changes{'email_rule'}},$type); |
|
} |
|
} |
|
} else { |
|
push(@{$changes{'email_rule'}},$type); |
|
} |
|
} |
|
} else { |
|
$cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type}; |
|
} |
|
} |
|
} |
|
if (@types) { |
|
if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') { |
|
my @changed = &Apache::loncommon::compare_arrays(\@statuses,$curr_inststatus{'inststatusguest'}); |
|
if (@changed) { |
|
push(@{$changes{'inststatus'}},'inststatusguest'); |
|
} |
|
} else { |
|
push(@{$changes{'inststatus'}},'inststatusguest'); |
|
} |
|
} |
|
} else { |
|
delete($env{'form.cancreate_email'}); |
|
if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') { |
|
if (@{$curr_inststatus{'inststatusguest'}} > 0) { |
|
push(@{$changes{'inststatus'}},'inststatusguest'); |
|
} |
|
} |
|
} |
|
} else { |
|
$save_inststatus{'inststatusguest'} = []; |
|
if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') { |
|
if (@{$curr_inststatus{'inststatusguest'}} > 0) { |
|
push(@{$changes{'inststatus'}},'inststatusguest'); |
} |
} |
} |
} |
} |
} |
Line 10966 sub modify_selfcreation {
|
Line 11713 sub modify_selfcreation {
|
} |
} |
} |
} |
} |
} |
my (@email_rule,%userinfo,%savecaptcha); |
my (%userinfo,%savecaptcha); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
# |
# |
# Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data |
# Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data |
Line 10975 sub modify_selfcreation {
|
Line 11722 sub modify_selfcreation {
|
|
|
if ($env{'form.cancreate_email'}) { |
if ($env{'form.cancreate_email'}) { |
push(@contexts,'emailusername'); |
push(@contexts,'emailusername'); |
if (ref($types) eq 'ARRAY') { |
if (@statuses) { |
foreach my $type (@{$types}) { |
foreach my $type (@statuses) { |
if (ref($infofields) eq 'ARRAY') { |
if (ref($infofields) eq 'ARRAY') { |
foreach my $field (@{$infofields}) { |
foreach my $field (@{$infofields}) { |
if ($env{'form.canmodify_emailusername_'.$type.'_'.$field} =~ /^(required|optional)$/) { |
if ($env{'form.canmodify_emailusername_'.$type.'_'.$field} =~ /^(required|optional)$/) { |
Line 10988 sub modify_selfcreation {
|
Line 11735 sub modify_selfcreation {
|
} |
} |
# |
# |
# Populate $cancreate{'notify'} hash ref with names of Domain Coordinators who are to be notified of |
# Populate $cancreate{'notify'} hash ref with names of Domain Coordinators who are to be notified of |
# queued requests for self-creation of account using e-mail address as username |
# queued requests for self-creation of account verified by e-mail. |
# |
# |
|
|
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.selfcreationnotifyapproval'); |
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.selfcreationnotifyapproval'); |
Line 11008 sub modify_selfcreation {
|
Line 11755 sub modify_selfcreation {
|
push(@{$changes{'cancreate'}},'notify'); |
push(@{$changes{'cancreate'}},'notify'); |
} |
} |
|
|
# |
|
# Retrieve rules (if any) governing types of e-mail address which may be used as a username |
|
# |
|
@email_rule = &Apache::loncommon::get_env_multiple('form.email_rule'); |
|
&process_captcha('cancreate',\%changes,\%savecaptcha,$curr_usercreation{'cancreate'}); |
&process_captcha('cancreate',\%changes,\%savecaptcha,$curr_usercreation{'cancreate'}); |
if (ref($curr_usercreation{'email_rule'}) eq 'ARRAY') { |
|
if (@{$curr_usercreation{'email_rule'}} > 0) { |
|
foreach my $type (@{$curr_usercreation{'email_rule'}}) { |
|
if (!grep(/^\Q$type\E$/,@email_rule)) { |
|
push(@{$changes{'email_rule'}},$type); |
|
} |
|
} |
|
} |
|
if (@email_rule > 0) { |
|
foreach my $type (@email_rule) { |
|
if (!grep(/^\Q$type\E$/,@{$curr_usercreation{'email_rule'}})) { |
|
push(@{$changes{'email_rule'}},$type); |
|
} |
|
} |
|
} |
|
} elsif (@email_rule > 0) { |
|
push(@{$changes{'email_rule'}},@email_rule); |
|
} |
|
} |
} |
# |
# |
# Check if domain default is set appropriately, if self-creation of accounts is to be available for |
# Check if domain default is set appropriately, if self-creation of accounts is to be available for |
# institutional log-in. |
# institutional log-in. |
# |
# |
if (grep(/^login$/,@{$cancreate{'selfcreate'}})) { |
if (grep(/^login$/,@{$cancreate{'selfcreate'}})) { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
|
if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || |
if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || |
($domdefaults{'auth_def'} eq 'localauth'))) { |
($domdefaults{'auth_def'} eq 'localauth'))) { |
$warningmsg = &mt('Although account creation has been set to be available for institutional logins, currently default authentication in this domain has not been set to support this.').' '. |
$warningmsg = &mt('Although account creation has been set to be available for institutional logins, currently default authentication in this domain has not been set to support this.').' '. |
Line 11056 sub modify_selfcreation {
|
Line 11780 sub modify_selfcreation {
|
# which the user may supply, if institutional data is unavailable. |
# which the user may supply, if institutional data is unavailable. |
# |
# |
if (($env{'form.cancreate_login'}) || ($env{'form.cancreate_sso'})) { |
if (($env{'form.cancreate_login'}) || ($env{'form.cancreate_sso'})) { |
if (ref($types) eq 'ARRAY') { |
if (@types) { |
if (@{$types} > 1) { |
@{$cancreate{'statustocreate'}} = &Apache::loncommon::get_env_multiple('form.statustocreate'); |
@{$cancreate{'statustocreate'}} = &Apache::loncommon::get_env_multiple('form.statustocreate'); |
push(@contexts,'statustocreate'); |
push(@contexts,'statustocreate'); |
foreach my $type (@types) { |
} else { |
|
undef($cancreate{'statustocreate'}); |
|
} |
|
foreach my $type (@{$types}) { |
|
my @modifiable = &Apache::loncommon::get_env_multiple('form.canmodify_'.$type); |
my @modifiable = &Apache::loncommon::get_env_multiple('form.canmodify_'.$type); |
foreach my $field (@fields) { |
foreach my $field (@fields) { |
if (grep(/^\Q$field\E$/,@modifiable)) { |
if (grep(/^\Q$field\E$/,@modifiable)) { |
Line 11074 sub modify_selfcreation {
|
Line 11794 sub modify_selfcreation {
|
} |
} |
} |
} |
if (ref($curr_usermodify{'selfcreate'}) eq 'HASH') { |
if (ref($curr_usermodify{'selfcreate'}) eq 'HASH') { |
foreach my $type (@{$types}) { |
foreach my $type (@types) { |
if (ref($curr_usermodify{'selfcreate'}{$type}) eq 'HASH') { |
if (ref($curr_usermodify{'selfcreate'}{$type}) eq 'HASH') { |
foreach my $field (@fields) { |
foreach my $field (@fields) { |
if ($save_usermodify{'selfcreate'}{$type}{$field} ne |
if ($save_usermodify{'selfcreate'}{$type}{$field} ne |
Line 11086 sub modify_selfcreation {
|
Line 11806 sub modify_selfcreation {
|
} |
} |
} |
} |
} else { |
} else { |
foreach my $type (@{$types}) { |
foreach my $type (@types) { |
push(@{$changes{'selfcreate'}},$type); |
push(@{$changes{'selfcreate'}},$type); |
} |
} |
} |
} |
Line 11135 sub modify_selfcreation {
|
Line 11855 sub modify_selfcreation {
|
} |
} |
} elsif (ref($curr_usercreation{'cancreate'}{$item}) eq 'HASH') { |
} elsif (ref($curr_usercreation{'cancreate'}{$item}) eq 'HASH') { |
if (ref($cancreate{$item}) eq 'HASH') { |
if (ref($cancreate{$item}) eq 'HASH') { |
foreach my $curr (keys(%{$curr_usercreation{'cancreate'}{$item}})) { |
foreach my $type (keys(%{$curr_usercreation{'cancreate'}{$item}})) { |
if (ref($curr_usercreation{'cancreate'}{$item}{$curr}) eq 'HASH') { |
if (ref($curr_usercreation{'cancreate'}{$item}{$type}) eq 'HASH') { |
foreach my $field (keys(%{$curr_usercreation{'cancreate'}{$item}{$curr}})) { |
foreach my $field (keys(%{$curr_usercreation{'cancreate'}{$item}{$type}})) { |
unless ($curr_usercreation{'cancreate'}{$item}{$curr}{$field} eq $cancreate{$item}{$curr}{$field}) { |
unless ($curr_usercreation{'cancreate'}{$item}{$type}{$field} eq $cancreate{$item}{$type}{$field}) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
push(@{$changes{'cancreate'}},$item); |
push(@{$changes{'cancreate'}},$item); |
} |
} |
} |
} |
} |
} |
} elsif ($item eq 'selfcreateprocessing') { |
} elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) { |
if ($cancreate{$item}{$curr} ne $curr_usercreation{'cancreate'}{$item}{$curr}) { |
if ($cancreate{$item}{$type} ne $curr_usercreation{'cancreate'}{$item}{$type}) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
|
push(@{$changes{'cancreate'}},$item); |
|
} |
|
} |
|
} else { |
|
if (!$cancreate{$item}{$curr}) { |
|
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
push(@{$changes{'cancreate'}},$item); |
push(@{$changes{'cancreate'}},$item); |
} |
} |
} |
} |
} |
} |
} |
} |
foreach my $field (keys(%{$cancreate{$item}})) { |
foreach my $type (keys(%{$cancreate{$item}})) { |
if (ref($cancreate{$item}{$field}) eq 'HASH') { |
if (ref($cancreate{$item}{$type}) eq 'HASH') { |
foreach my $inner (keys(%{$cancreate{$item}{$field}})) { |
foreach my $field (keys(%{$cancreate{$item}{$type}})) { |
if (ref($curr_usercreation{'cancreate'}{$item}{$field}) eq 'HASH') { |
if (ref($curr_usercreation{'cancreate'}{$item}{$type}) eq 'HASH') { |
unless ($curr_usercreation{'cancreate'}{$item}{$field}{$inner} eq $cancreate{$item}{$field}{$inner}) { |
unless ($curr_usercreation{'cancreate'}{$item}{$type}{$field} eq $cancreate{$item}{$type}{$field}) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
push(@{$changes{'cancreate'}},$item); |
push(@{$changes{'cancreate'}},$item); |
} |
} |
Line 11173 sub modify_selfcreation {
|
Line 11887 sub modify_selfcreation {
|
} |
} |
} |
} |
} |
} |
} elsif ($item eq 'selfcreateprocessing') { |
} elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) { |
if ($cancreate{$item}{$field} ne $curr_usercreation{'cancreate'}{$item}{$field}) { |
if ($cancreate{$item}{$type} ne $curr_usercreation{'cancreate'}{$item}{$type}) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
|
push(@{$changes{'cancreate'}},$item); |
|
} |
|
} |
|
} else { |
|
if (!$curr_usercreation{'cancreate'}{$item}{$field}) { |
|
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
push(@{$changes{'cancreate'}},$item); |
push(@{$changes{'cancreate'}},$item); |
} |
} |
Line 11195 sub modify_selfcreation {
|
Line 11903 sub modify_selfcreation {
|
push(@{$changes{'cancreate'}},$item); |
push(@{$changes{'cancreate'}},$item); |
} |
} |
} |
} |
} elsif (ref($cancreate{$item}) eq 'HASH') { |
} |
if (!$cancreate{$item}{$curr_usercreation{'cancreate'}{$item}}) { |
} elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) { |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
if (ref($cancreate{$item}) eq 'HASH') { |
push(@{$changes{'cancreate'}},$item); |
if (!grep(/^$item$/,@{$changes{'cancreate'}})) { |
} |
push(@{$changes{'cancreate'}},$item); |
} |
} |
} |
} |
} elsif ($item eq 'emailusername') { |
} elsif ($item eq 'emailusername') { |
Line 11232 sub modify_selfcreation {
|
Line 11940 sub modify_selfcreation {
|
if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') { |
if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') { |
$save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'}; |
$save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'}; |
} |
} |
|
if (ref($cancreate{'emailverified'}) eq 'HASH') { |
|
$save_usercreate{'cancreate'}{'emailverified'} = $cancreate{'emailverified'}; |
|
} |
|
if (ref($cancreate{'emailoptions'}) eq 'HASH') { |
|
$save_usercreate{'cancreate'}{'emailoptions'} = $cancreate{'emailoptions'}; |
|
} |
|
if (ref($cancreate{'emaildomain'}) eq 'HASH') { |
|
$save_usercreate{'cancreate'}{'emaildomain'} = $cancreate{'emaildomain'}; |
|
} |
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') { |
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') { |
$save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'}; |
$save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'}; |
} |
} |
Line 11239 sub modify_selfcreation {
|
Line 11956 sub modify_selfcreation {
|
$save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'}; |
$save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'}; |
} |
} |
$save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'}; |
$save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'}; |
$save_usercreate{'emailrule'} = \@email_rule; |
$save_usercreate{'email_rule'} = \%email_rule; |
|
|
my %userconfig_hash = ( |
my %userconfig_hash = ( |
usercreation => \%save_usercreate, |
usercreation => \%save_usercreate, |
usermodification => \%save_usermodify, |
usermodification => \%save_usermodify, |
|
inststatus => \%save_inststatus, |
); |
); |
|
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%userconfig_hash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%userconfig_hash, |
$dom); |
$dom); |
# |
# |
# Accumulate details of changes to domain cofiguration for self-creation of usernames in $resulttext |
# Accumulate details of changes to domain configuration for self-creation of usernames in $resulttext |
# |
# |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
Line 11256 sub modify_selfcreation {
|
Line 11975 sub modify_selfcreation {
|
if (ref($changes{'cancreate'}) eq 'ARRAY') { |
if (ref($changes{'cancreate'}) eq 'ARRAY') { |
my %lt = &selfcreation_types(); |
my %lt = &selfcreation_types(); |
foreach my $type (@{$changes{'cancreate'}}) { |
foreach my $type (@{$changes{'cancreate'}}) { |
my $chgtext; |
my $chgtext = ''; |
if ($type eq 'selfcreate') { |
if ($type eq 'selfcreate') { |
if (@{$cancreate{$type}} == 0) { |
if (@{$cancreate{$type}} == 0) { |
$chgtext .= &mt('Self creation of a new user account is not permitted.'); |
$chgtext .= &mt('Self creation of a new user account is not permitted.'); |
Line 11271 sub modify_selfcreation {
|
Line 11990 sub modify_selfcreation {
|
if (grep(/^(login|sso)$/,@{$cancreate{$type}})) { |
if (grep(/^(login|sso)$/,@{$cancreate{$type}})) { |
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') { |
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') { |
if (@{$cancreate{'statustocreate'}} == 0) { |
if (@{$cancreate{'statustocreate'}} == 0) { |
$chgtext .= '<br />'. |
$chgtext .= '<span class="LC_warning">'. |
'<span class="LC_warning">'. |
&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts via log-in or single sign-on."). |
&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts."). |
'</span><br />'; |
'</span>'; |
|
} |
} |
} |
} |
} |
} |
|
if (grep(/^email$/,@{$cancreate{$type}})) { |
|
if (!@statuses) { |
|
$chgtext .= '<span class="LC_warning">'. |
|
&mt("However, e-mail verification is currently set to 'unavailable' for all user types (including 'other'), so self-creation of accounts is not possible for non-institutional log-in."). |
|
'</span><br />'; |
|
|
|
} |
|
} |
} |
} |
} |
} |
} elsif ($type eq 'shibenv') { |
} elsif ($type eq 'shibenv') { |
if (keys(%{$cancreate{$type}}) == 0) { |
if (keys(%{$cancreate{$type}}) == 0) { |
$chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information'); |
$chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information').'<br />'; |
} else { |
} else { |
$chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:'). |
$chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:'). |
'<ul>'; |
'<ul>'; |
Line 11295 sub modify_selfcreation {
|
Line 12021 sub modify_selfcreation {
|
} |
} |
} |
} |
$chgtext .= '</ul>'; |
$chgtext .= '</ul>'; |
} |
} |
} elsif ($type eq 'statustocreate') { |
} elsif ($type eq 'statustocreate') { |
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') && |
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') && |
(ref($cancreate{'statustocreate'}) eq 'ARRAY')) { |
(ref($cancreate{'statustocreate'}) eq 'ARRAY')) { |
Line 11308 sub modify_selfcreation {
|
Line 12034 sub modify_selfcreation {
|
&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts."). |
&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts."). |
'</span>'; |
'</span>'; |
} |
} |
} elsif (ref($usertypes) eq 'HASH') { |
} elsif (keys(%usertypes) > 0) { |
if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) { |
if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) { |
$chgtext .= &mt('Creation of a new account for an institutional user is restricted to the following institutional affiliation(s):'); |
$chgtext .= &mt('Creation of a new account for an institutional user is restricted to the following institutional affiliation(s):'); |
} else { |
} else { |
Line 11319 sub modify_selfcreation {
|
Line 12045 sub modify_selfcreation {
|
if ($case eq 'default') { |
if ($case eq 'default') { |
$chgtext .= '<li>'.$othertitle.'</li>'; |
$chgtext .= '<li>'.$othertitle.'</li>'; |
} else { |
} else { |
$chgtext .= '<li>'.$usertypes->{$case}.'</li>'; |
$chgtext .= '<li>'.$usertypes{$case}.'</li>'; |
} |
} |
} |
} |
$chgtext .= '</ul>'; |
$chgtext .= '</ul>'; |
if (!grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) { |
if (!grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) { |
$chgtext .= '<br /><span class="LC_warning">'. |
$chgtext .= '<span class="LC_warning">'. |
&mt('However, users authenticated by institutional login/single sign on are not currently permitted to create accounts.'). |
&mt('However, users authenticated by institutional login/single sign on are not currently permitted to create accounts.'). |
'</span>'; |
'</span>'; |
} |
} |
Line 11336 sub modify_selfcreation {
|
Line 12062 sub modify_selfcreation {
|
$chgtext .= &mt('Although institutional affiliations permitted to create accounts were changed, self creation of accounts is not currently permitted for any authentication types.'); |
$chgtext .= &mt('Although institutional affiliations permitted to create accounts were changed, self creation of accounts is not currently permitted for any authentication types.'); |
} |
} |
} |
} |
|
$chgtext .= '<br />'; |
} |
} |
} elsif ($type eq 'selfcreateprocessing') { |
} elsif ($type eq 'selfcreateprocessing') { |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
automatic => 'Automatic approval', |
automatic => 'Automatic approval', |
approval => 'Queued for approval', |
approval => 'Queued for approval', |
); |
); |
if (@statuses > 1) { |
if (@types) { |
$chgtext .= &mt('Processing of requests to create account with e-mail address as username set as follows:'). |
if (@statuses) { |
'<ul>'; |
$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:'). |
foreach my $type (@statuses) { |
'<ul>'; |
if ($type eq 'default') { |
foreach my $status (@statuses) { |
$chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>'; |
if ($status eq 'default') { |
} else { |
$chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>'; |
$chgtext .= '<li>'.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>'; |
} else { |
} |
$chgtext .= '<li>'.$usertypes{$status}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>'; |
} |
} |
$chgtext .= '</ul>'; |
} |
|
$chgtext .= '</ul>'; |
|
} |
|
} else { |
|
$chgtext .= &mt('Processing of requests to create account with e-mail verification set to: "[_1]"', |
|
$choices{$cancreate{'selfcreateprocessing'}{'default'}}); |
|
} |
|
} elsif ($type eq 'emailverified') { |
|
my %options = &Apache::lonlocal::texthash ( |
|
all => 'Same as e-mail', |
|
first => 'Omit @domain', |
|
free => 'Free to choose', |
|
); |
|
if (@types) { |
|
if (@statuses) { |
|
$chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:'). |
|
'<ul>'; |
|
foreach my $status (@statuses) { |
|
if ($type eq 'default') { |
|
$chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>'; |
|
} else { |
|
$chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>'; |
|
} |
|
} |
|
$chgtext .= '</ul>'; |
|
} |
} else { |
} else { |
$chgtext .= &mt('Processing of requests to create account with e-mail address as username set to: "[_1]"', |
$chgtext .= &mt("For self-created accounts verified by e-mail address, user's username is: '[_1]'", |
$choices{$cancreate{'selfcreateprocessing'}{'default'}}); |
$options{$cancreate{'emailverified'}{'default'}}); |
|
} |
|
} elsif ($type eq 'emailoptions') { |
|
my %options = &Apache::lonlocal::texthash ( |
|
any => 'Any e-mail', |
|
inst => 'Institutional only', |
|
noninst => 'Non-institutional only', |
|
custom => 'Custom restrictions', |
|
); |
|
if (@types) { |
|
if (@statuses) { |
|
$chgtext .= &mt('For self-created accounts verified by e-mail address, requirements for e-mail address are as follows:'). |
|
'<ul>'; |
|
foreach my $status (@statuses) { |
|
if ($type eq 'default') { |
|
$chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailoptions'}{$status}}.'</li>'; |
|
} else { |
|
$chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailoptions'}{$status}}.'</li>'; |
|
} |
|
} |
|
$chgtext .= '</ul>'; |
|
} |
|
} else { |
|
if ($cancreate{'emailoptions'}{'default'} eq 'any') { |
|
$chgtext .= &mt('For self-created accounts verified by e-mail address, any e-mail may be used'); |
|
} else { |
|
$chgtext .= &mt('For self-created accounts verified by e-mail address, e-mail restricted to: "[_1]"', |
|
$options{$cancreate{'emailoptions'}{'default'}}); |
|
} |
|
} |
|
} elsif ($type eq 'emaildomain') { |
|
my $output; |
|
if (@statuses) { |
|
foreach my $type (@statuses) { |
|
if (ref($cancreate{'emaildomain'}{$type}) eq 'HASH') { |
|
if ($cancreate{'emailoptions'}{$type} eq 'inst') { |
|
if ($type eq 'default') { |
|
if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') || |
|
($cancreate{'emaildomain'}{$type}{'inst'} eq '')) { |
|
$output = '<li>'.$othertitle.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
|
} else { |
|
$output = '<li>'.$othertitle.' -- '.&mt("User's e-mail address needs to end: [_1]", |
|
$cancreate{'emaildomain'}{$type}{'inst'}).'</li>'; |
|
} |
|
} else { |
|
if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') || |
|
($cancreate{'emaildomain'}{$type}{'inst'} eq '')) { |
|
$output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
|
} else { |
|
$output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address needs to end: [_1]", |
|
$cancreate{'emaildomain'}{$type}{'inst'}).'</li>'; |
|
} |
|
} |
|
} elsif ($cancreate{'emailoptions'}{$type} eq 'noninst') { |
|
if ($type eq 'default') { |
|
if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') || |
|
($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) { |
|
$output = '<li>'.$othertitle.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
|
} else { |
|
$output = '<li>'.$othertitle.' -- '.&mt("User's e-mail address must not end: [_1]", |
|
$cancreate{'emaildomain'}{$type}{'noninst'}).'</li>'; |
|
} |
|
} else { |
|
if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') || |
|
($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) { |
|
$output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>'; |
|
} else { |
|
$output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address must not end: [_1]", |
|
$cancreate{'emaildomain'}{$type}{'noninst'}).'</li>'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($output ne '') { |
|
$chgtext .= &mt('For self-created accounts verified by e-mail address:'). |
|
'<ul>'.$output.'</ul>'; |
} |
} |
} elsif ($type eq 'captcha') { |
} elsif ($type eq 'captcha') { |
if ($savecaptcha{$type} eq 'notused') { |
if ($savecaptcha{$type} eq 'notused') { |
Line 11392 sub modify_selfcreation {
|
Line 12221 sub modify_selfcreation {
|
} |
} |
} elsif ($type eq 'emailusername') { |
} elsif ($type eq 'emailusername') { |
if (ref($cancreate{'emailusername'}) eq 'HASH') { |
if (ref($cancreate{'emailusername'}) eq 'HASH') { |
if (ref($types) eq 'ARRAY') { |
if (@statuses) { |
foreach my $type (@{$types}) { |
foreach my $type (@statuses) { |
if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') { |
if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') { |
if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) { |
if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) { |
$chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',"'$usertypes->{$type}'"). |
$chgtext .= &mt('When self-creating account with e-mail verification, the following information will be provided by [_1]:',"'$usertypes{$type}'"). |
'<ul>'; |
'<ul>'; |
foreach my $field (@{$infofields}) { |
foreach my $field (@{$infofields}) { |
if ($cancreate{'emailusername'}{$type}{$field}) { |
if ($cancreate{'emailusername'}{$type}{$field}) { |
Line 11405 sub modify_selfcreation {
|
Line 12234 sub modify_selfcreation {
|
} |
} |
$chgtext .= '</ul>'; |
$chgtext .= '</ul>'; |
} else { |
} else { |
$chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />'; |
$chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />'; |
} |
} |
} else { |
} else { |
$chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />'; |
$chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />'; |
} |
} |
} |
} |
} |
} |
} |
} |
} elsif ($type eq 'notify') { |
} elsif ($type eq 'notify') { |
$chgtext = &mt('No Domain Coordinators will receive notification of username requests requiring approval.'); |
my $numapprove = 0; |
if (ref($changes{'cancreate'}) eq 'ARRAY') { |
if (ref($changes{'cancreate'}) eq 'ARRAY') { |
if ((grep(/^notify$/,@{$changes{'cancreate'}})) && (ref($cancreate{'notify'}) eq 'HASH')) { |
if ((grep(/^notify$/,@{$changes{'cancreate'}})) && (ref($cancreate{'notify'}) eq 'HASH')) { |
if ($cancreate{'notify'}{'approval'}) { |
if ($cancreate{'notify'}{'approval'}) { |
$chgtext = &mt('Notification of username requests requiring approval will be sent to: ').$cancreate{'notify'}{'approval'}; |
$chgtext .= &mt('Notification of username requests requiring approval will be sent to: ').$cancreate{'notify'}{'approval'}; |
|
$numapprove ++; |
} |
} |
} |
} |
} |
} |
|
unless ($numapprove) { |
|
$chgtext .= &mt('No Domain Coordinators will receive notification of username requests requiring approval.'); |
|
} |
} |
} |
if ($chgtext) { |
if ($chgtext) { |
$resulttext .= '<li>'.$chgtext.'</li>'; |
$resulttext .= '<li>'.$chgtext.'</li>'; |
} |
} |
} |
} |
} |
} |
if (ref($changes{'email_rule'}) eq 'ARRAY') { |
if ((ref($changes{'email_rule'}) eq 'ARRAY') && (@{$changes{'email_rule'}} > 0)) { |
my ($emailrules,$emailruleorder) = |
my ($emailrules,$emailruleorder) = |
&Apache::lonnet::inst_userrules($dom,'email'); |
&Apache::lonnet::inst_userrules($dom,'email'); |
my $chgtext = '<ul>'; |
foreach my $type (@{$changes{'email_rule'}}) { |
foreach my $type (@email_rule) { |
if (ref($email_rule{$type}) eq 'ARRAY') { |
if (ref($emailrules->{$type}) eq 'HASH') { |
my $chgtext = '<ul>'; |
$chgtext .= '<li>'.$emailrules->{$type}{'name'}.'</li>'; |
foreach my $rule (@{$email_rule{$type}}) { |
|
if (ref($emailrules->{$rule}) eq 'HASH') { |
|
$chgtext .= '<li>'.$emailrules->{$rule}{'name'}.'</li>'; |
|
} |
|
} |
|
$chgtext .= '</ul>'; |
|
if (@types) { |
|
my $typename; |
|
if ($type eq 'default') { |
|
$typename = $othertitle; |
|
} else { |
|
$typename = $usertypes{$type}; |
|
} |
|
$chgtext .= &mt('(Affiliation: [_1])',$typename); |
|
} |
|
if (@{$email_rule{$type}} > 0) { |
|
$resulttext .= '<li>'. |
|
&mt('Accounts may not be created by users verified by e-mail, for e-mail addresses of the following types: ', |
|
$usertypes{$type}). |
|
$chgtext. |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'. |
|
&mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.', |
|
$usertypes{$type}). |
|
'</li>'. |
|
&mt('(Affiliation: [_1])',$type); |
|
} |
} |
} |
} |
} |
$chgtext .= '</ul>'; |
} |
if (@email_rule > 0) { |
if (ref($changes{'inststatus'}) eq 'ARRAY') { |
$resulttext .= '<li>'. |
if (ref($save_inststatus{'inststatusguest'}) eq 'ARRAY') { |
&mt('Accounts may not be created by users self-enrolling with e-mail addresses of the following types: '). |
if (@{$save_inststatus{'inststatusguest'}} > 0) { |
$chgtext. |
my $chgtext = '<ul>'; |
'</li>'; |
foreach my $type (@{$save_inststatus{'inststatusguest'}}) { |
} else { |
$chgtext .= '<li>'.$usertypes{$type}.'</li>'; |
$resulttext .= '<li>'. |
} |
&mt('There are now no restrictions on e-mail addresses which may be used as a username when self-enrolling.'). |
$chgtext .= '</ul>'; |
'</li>'; |
$resulttext .= '<li>'. |
|
&mt('A user will self-report one of the following affiliations when requesting an account verified by e-mail: '). |
|
$chgtext. |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'. |
|
&mt('No affiliations available for self-reporting when requesting an account verified by e-mail.'). |
|
'</li>'; |
|
} |
} |
} |
} |
} |
if (ref($changes{'selfcreate'}) eq 'ARRAY') { |
if (ref($changes{'selfcreate'}) eq 'ARRAY') { |
Line 11454 sub modify_selfcreation {
|
Line 12322 sub modify_selfcreation {
|
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
foreach my $type (@{$changes{'selfcreate'}}) { |
foreach my $type (@{$changes{'selfcreate'}}) { |
my $typename = $type; |
my $typename = $type; |
if (ref($usertypes) eq 'HASH') { |
if (keys(%usertypes) > 0) { |
if ($usertypes->{$type} ne '') { |
if ($usertypes{$type} ne '') { |
$typename = $usertypes->{$type}; |
$typename = $usertypes{$type}; |
} |
} |
} |
} |
my @modifiable; |
my @modifiable; |
Line 11479 sub modify_selfcreation {
|
Line 12347 sub modify_selfcreation {
|
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
|
my $cachetime = 24*60*60; |
|
$domdefaults{'inststatusguest'} = $save_inststatus{'inststatusguest'}; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
} else { |
} else { |
$resulttext = &mt('No changes made to self-creation settings'); |
$resulttext = &mt('No changes made to self-creation settings'); |
} |
} |
Line 11675 sub modify_defaults {
|
Line 12549 sub modify_defaults {
|
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def'); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def', |
|
'portal_def','intauth_cost','intauth_check','intauth_switch'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
foreach my $item (@items) { |
foreach my $item (@items) { |
$newvalues{$item} = $env{'form.'.$item}; |
$newvalues{$item} = $env{'form.'.$item}; |
Line 11717 sub modify_defaults {
|
Line 12592 sub modify_defaults {
|
push(@errors,$item); |
push(@errors,$item); |
} |
} |
} |
} |
|
} elsif ($item eq 'intauth_cost') { |
|
if ($newvalues{$item} ne '') { |
|
if ($newvalues{$item} =~ /\D/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_switch') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
} |
} |
if (grep(/^\Q$item\E$/,@errors)) { |
if (grep(/^\Q$item\E$/,@errors)) { |
$newvalues{$item} = $domdefaults{$item}; |
$newvalues{$item} = $domdefaults{$item}; |
Line 11743 sub modify_defaults {
|
Line 12636 sub modify_defaults {
|
} |
} |
my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete'); |
my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete'); |
my @allpos; |
my @allpos; |
my %guests; |
|
my %alltypes; |
my %alltypes; |
my ($currtitles,$currguests,$currorder); |
my @inststatusguest; |
|
if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') { |
|
foreach my $type (@{$currinststatus->{'inststatusguest'}}) { |
|
unless (grep(/^\Q$type\E$/,@todelete)) { |
|
push(@inststatusguest,$type); |
|
} |
|
} |
|
} |
|
my ($currtitles,$currorder); |
if (ref($currinststatus) eq 'HASH') { |
if (ref($currinststatus) eq 'HASH') { |
if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') { |
if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') { |
foreach my $type (@{$currinststatus->{'inststatusorder'}}) { |
foreach my $type (@{$currinststatus->{'inststatusorder'}}) { |
Line 11760 sub modify_defaults {
|
Line 12660 sub modify_defaults {
|
$allpos[$position] = $type; |
$allpos[$position] = $type; |
$alltypes{$type} = $env{'form.inststatus_title_'.$type}; |
$alltypes{$type} = $env{'form.inststatus_title_'.$type}; |
$alltypes{$type} =~ s/`//g; |
$alltypes{$type} =~ s/`//g; |
if ($env{'form.inststatus_guest_'.$type}) { |
|
$guests{$type} = 1; |
|
} |
|
} |
} |
} |
} |
if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') { |
|
$currguests = join(',',@{$currinststatus->{'inststatusguest'}}); |
|
} |
|
$currorder = join(',',@{$currinststatus->{'inststatusorder'}}); |
$currorder = join(',',@{$currinststatus->{'inststatusorder'}}); |
$currtitles =~ s/,$//; |
$currtitles =~ s/,$//; |
} |
} |
Line 11776 sub modify_defaults {
|
Line 12670 sub modify_defaults {
|
my $newtype = $env{'form.addinststatus'}; |
my $newtype = $env{'form.addinststatus'}; |
$newtype =~ s/\W//g; |
$newtype =~ s/\W//g; |
unless (exists($alltypes{$newtype})) { |
unless (exists($alltypes{$newtype})) { |
if ($env{'form.addinststatus_guest'}) { |
|
$guests{$newtype} = 1; |
|
} |
|
$alltypes{$newtype} = $env{'form.addinststatus_title'}; |
$alltypes{$newtype} = $env{'form.addinststatus_title'}; |
$alltypes{$newtype} =~ s/`//g; |
$alltypes{$newtype} =~ s/`//g; |
my $position = $env{'form.addinststatus_pos'}; |
my $position = $env{'form.addinststatus_pos'}; |
Line 11788 sub modify_defaults {
|
Line 12679 sub modify_defaults {
|
} |
} |
} |
} |
} |
} |
my (@orderedstatus,@orderedguests); |
my @orderedstatus; |
foreach my $type (@allpos) { |
foreach my $type (@allpos) { |
unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) { |
unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) { |
push(@orderedstatus,$type); |
push(@orderedstatus,$type); |
if ($guests{$type}) { |
|
push(@orderedguests,$type); |
|
} |
|
} |
} |
} |
} |
foreach my $type (keys(%alltypes)) { |
foreach my $type (keys(%alltypes)) { |
Line 11805 sub modify_defaults {
|
Line 12693 sub modify_defaults {
|
$defaults_hash{'inststatus'} = { |
$defaults_hash{'inststatus'} = { |
inststatustypes => \%alltypes, |
inststatustypes => \%alltypes, |
inststatusorder => \@orderedstatus, |
inststatusorder => \@orderedstatus, |
inststatusguest => \@orderedguests, |
inststatusguest => \@inststatusguest, |
}; |
}; |
if (ref($defaults_hash{'inststatus'}) eq 'HASH') { |
if (ref($defaults_hash{'inststatus'}) eq 'HASH') { |
foreach my $item ('inststatustypes','inststatusorder','inststatusguest') { |
foreach my $item ('inststatustypes','inststatusorder','inststatusguest') { |
Line 11815 sub modify_defaults {
|
Line 12703 sub modify_defaults {
|
if ($currorder ne join(',',@orderedstatus)) { |
if ($currorder ne join(',',@orderedstatus)) { |
$changes{'inststatus'}{'inststatusorder'} = 1; |
$changes{'inststatus'}{'inststatusorder'} = 1; |
} |
} |
if ($currguests ne join(',',@orderedguests)) { |
|
$changes{'inststatus'}{'inststatusguest'} = 1; |
|
} |
|
my $newtitles; |
my $newtitles; |
foreach my $item (@orderedstatus) { |
foreach my $item (@orderedstatus) { |
$newtitles .= $alltypes{$item}.','; |
$newtitles .= $alltypes{$item}.','; |
Line 11836 sub modify_defaults {
|
Line 12721 sub modify_defaults {
|
foreach my $item (sort(keys(%changes))) { |
foreach my $item (sort(keys(%changes))) { |
if ($item eq 'inststatus') { |
if ($item eq 'inststatus') { |
if (ref($changes{'inststatus'}) eq 'HASH') { |
if (ref($changes{'inststatus'}) eq 'HASH') { |
if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) { |
if (@orderedstatus) { |
$resulttext .= '<li>'.&mt('Institutional user status types set to:').' '; |
$resulttext .= '<li>'.&mt('Institutional user status types set to:').' '; |
foreach my $type (@orderedstatus) { |
foreach my $type (@orderedstatus) { |
$resulttext .= $alltypes{$type}.', '; |
$resulttext .= $alltypes{$type}.', '; |
} |
} |
$resulttext =~ s/, $//; |
$resulttext =~ s/, $//; |
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
} |
} else { |
if ($changes{'inststatus'}{'inststatusguest'}) { |
$resulttext .= '<li>'.&mt('Institutional user status types deleted').'</li>'; |
$resulttext .= '<li>'; |
|
if (@orderedguests) { |
|
$resulttext .= &mt('Types assignable to "non-institutional" usernames set to:').' '; |
|
foreach my $type (@orderedguests) { |
|
$resulttext .= $alltypes{$type}.', '; |
|
} |
|
$resulttext =~ s/, $//; |
|
} else { |
|
$resulttext .= &mt('Types assignable to "non-institutional" usernames set to none.'); |
|
} |
|
$resulttext .= '</li>'; |
|
} |
} |
} |
} |
} else { |
} else { |
Line 11871 sub modify_defaults {
|
Line 12745 sub modify_defaults {
|
localauth => 'loc', |
localauth => 'loc', |
); |
); |
$value = $authnames{$shortauth{$value}}; |
$value = $authnames{$shortauth{$value}}; |
|
} elsif ($item eq 'intauth_switch') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
} |
} |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
Line 12455 sub modify_helpsettings {
|
Line 13351 sub modify_helpsettings {
|
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my (@allpos,%newsettings,%changedprivs,$newrole); |
my (@allpos,%newsettings,%changedprivs,$newrole); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @accesstypes = ('all','none','status','inc','exc'); |
my @accesstypes = ('all','dh','da','none','status','inc','exc'); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
s => 'system', |
s => 'system', |
d => 'domain', |
d => 'domain', |
order => 'Display order', |
order => 'Display order', |
access => 'Role usage', |
access => 'Role usage', |
all => 'All', |
all => 'All with domain helpdesk or helpdesk assistant role', |
|
dh => 'All with domain helpdesk role', |
|
da => 'All with domain helpdesk assistant role', |
none => 'None', |
none => 'None', |
status => 'Determined based on institutional status', |
status => 'Determined based on institutional status', |
inc => 'Include all, but exclude specific personnel', |
inc => 'Include all, but exclude specific personnel', |
Line 12498 sub modify_helpsettings {
|
Line 13396 sub modify_helpsettings {
|
$identifier = 'custhelp'.$num; |
$identifier = 'custhelp'.$num; |
my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier); |
my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier); |
my %currprivs; |
my %currprivs; |
($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) = |
($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) = |
split(/\_/,$existing{'rolesdef_'.$rolename}); |
split(/\_/,$existing{'rolesdef_'.$rolename}); |
foreach my $level ('c','d','s') { |
foreach my $level ('c','d','s') { |
if ($newprivs{$level} ne $currprivs{$level}) { |
if ($newprivs{$level} ne $currprivs{$level}) { |
Line 12540 sub modify_helpsettings {
|
Line 13438 sub modify_helpsettings {
|
if ($access eq 'status') { |
if ($access eq 'status') { |
my @statuses = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_status'); |
my @statuses = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_status'); |
if (scalar(@statuses) == 0) { |
if (scalar(@statuses) == 0) { |
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none'; |
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none'; |
} else { |
} else { |
my (@shownstatus,$numtypes); |
my (@shownstatus,$numtypes); |
$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = []; |
$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = []; |
Line 12613 sub modify_helpsettings {
|
Line 13511 sub modify_helpsettings {
|
if (ref($current{'adhoc'}{$rolename}) eq 'HASH') { |
if (ref($current{'adhoc'}{$rolename}) eq 'HASH') { |
if ($current{'adhoc'}{$rolename}{'order'} ne $idx) { |
if ($current{'adhoc'}{$rolename}{'order'} ne $idx) { |
$changes{'customrole'}{$rolename}{'order'} = 1; |
$changes{'customrole'}{$rolename}{'order'} = 1; |
$newsettings{$rolename}{'order'} = $idx+1; |
$newsettings{$rolename}{'order'} = $idx+1; |
} |
} |
} |
} |
} |
} |
Line 12659 sub modify_helpsettings {
|
Line 13557 sub modify_helpsettings {
|
order => 'Order', |
order => 'Order', |
desc => 'Role description', |
desc => 'Role description', |
access => 'Role usage', |
access => 'Role usage', |
status => 'Allowed instituional types', |
status => 'Allowed institutional types', |
exc => 'Allowed personnel', |
exc => 'Allowed personnel', |
inc => 'Disallowed personnel', |
inc => 'Disallowed personnel', |
); |
); |
Line 12811 sub modify_coursedefaults {
|
Line 13709 sub modify_coursedefaults {
|
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} elsif ($item =~ /^(uploadquota|mysqltables)_/) { |
} elsif ($item =~ /^(uploadquota|mysqltables)_/) { |
my $setting = $1; |
my $setting = $1; |
unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) { |
$changes{$setting} = 1; |
$changes{$setting} = 1; |
} |
} |
Line 12826 sub modify_coursedefaults {
|
Line 13724 sub modify_coursedefaults {
|
} |
} |
} |
} |
my $newclone; |
my $newclone; |
if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) { |
if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) { |
$newclone = $env{'form.canclone'}; |
$newclone = $env{'form.canclone'}; |
} |
} |
if ($newclone eq 'instcode') { |
if ($newclone eq 'instcode') { |
Line 12849 sub modify_coursedefaults {
|
Line 13747 sub modify_coursedefaults {
|
$newclone eq ''; |
$newclone eq ''; |
} |
} |
} elsif ($newclone ne '') { |
} elsif ($newclone ne '') { |
$defaultshash{'coursedefaults'}{'canclone'} = $newclone; |
$defaultshash{'coursedefaults'}{'canclone'} = $newclone; |
} |
} |
if ($newclone ne $currclone) { |
if ($newclone ne $currclone) { |
$changes{'canclone'} = 1; |
$changes{'canclone'} = 1; |
} |
} |
Line 12868 sub modify_coursedefaults {
|
Line 13766 sub modify_coursedefaults {
|
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
} |
} |
} else { |
} else { |
if ($env{'form.coursecredits'} eq '1') { |
if ($env{'form.coursecredits'} eq '1') { |
foreach my $type (@types) { |
foreach my $type (@types) { |
unless ($type eq 'community') { |
unless ($type eq 'community') { |
if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) { |
if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) { |
$changes{'coursecredits'} = 1; |
$changes{'coursecredits'} = 1; |
} |
} |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
Line 12914 sub modify_coursedefaults {
|
Line 13812 sub modify_coursedefaults {
|
} |
} |
if (exists($currtimeout{$type})) { |
if (exists($currtimeout{$type})) { |
if ($timeout ne $currtimeout{$type}) { |
if ($timeout ne $currtimeout{$type}) { |
$changes{'postsubmit'} = 1; |
$changes{'postsubmit'} = 1; |
} |
} |
} elsif ($timeout ne '') { |
} elsif ($timeout ne '') { |
$changes{'postsubmit'} = 1; |
$changes{'postsubmit'} = 1; |
Line 12943 sub modify_coursedefaults {
|
Line 13841 sub modify_coursedefaults {
|
if ($changes{$item}) { |
if ($changes{$item}) { |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
} |
} |
} |
} |
if ($changes{'coursecredits'}) { |
if ($changes{'coursecredits'}) { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) { |
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) { |
Line 13006 sub modify_coursedefaults {
|
Line 13904 sub modify_coursedefaults {
|
if ($env{'form.'.$item} eq '1') { |
if ($env{'form.'.$item} eq '1') { |
$resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>'; |
$resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>'; |
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>'; |
} |
} |
} elsif ($item eq 'anonsurvey_threshold') { |
} elsif ($item eq 'anonsurvey_threshold') { |
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>'; |
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>'; |
Line 13041 sub modify_coursedefaults {
|
Line 13939 sub modify_coursedefaults {
|
$resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.'); |
$resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.'); |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Submit button(s) disabled on page after student makes submission').'; '; |
$resulttext .= '<li>'.&mt('Submit button(s) disabled on page after student makes submission').'; '; |
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
$resulttext .= &mt('durations:').'<ul>'; |
$resulttext .= &mt('durations:').'<ul>'; |
foreach my $type (@types) { |
foreach my $type (@types) { |
$resulttext .= '<li>'; |
$resulttext .= '<li>'; |
Line 13072 sub modify_coursedefaults {
|
Line 13970 sub modify_coursedefaults {
|
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} |
} |
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
} |
} |
} elsif ($item eq 'coursecredits') { |
} elsif ($item eq 'coursecredits') { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
Line 13100 sub modify_coursedefaults {
|
Line 13998 sub modify_coursedefaults {
|
} elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') { |
} elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') { |
$resulttext .= '<li>'.&mt('By default, a course requester can clone any course from his/her domain.').'</li>'; |
$resulttext .= '<li>'.&mt('By default, a course requester can clone any course from his/her domain.').'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>'; |
$resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>'; |
} |
} |
} |
} |
} |
} |
Line 13335 sub modify_selfenrollment {
|
Line 14233 sub modify_selfenrollment {
|
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
} |
} |
if ((exists($changes{'admin'})) || (exists($changes{'default'}))) { |
} |
my $cachetime = 24*60*60; |
if ((exists($changes{'admin'})) || (exists($changes{'default'}))) { |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
my $cachetime = 24*60*60; |
if (ref($lastactref) eq 'HASH') { |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
$lastactref->{'domdefaults'} = 1; |
if (ref($lastactref) eq 'HASH') { |
} |
$lastactref->{'domdefaults'} = 1; |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 13555 sub modify_usersessions {
|
Line 14453 sub modify_usersessions {
|
} |
} |
} |
} |
unless ($changes{'offloadnow'}) { |
unless ($changes{'offloadnow'}) { |
foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) { |
foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) { |
unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) { |
unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) { |
$changes{'offloadnow'} = 1; |
$changes{'offloadnow'} = 1; |
last; |
last; |
Line 13586 sub modify_usersessions {
|
Line 14484 sub modify_usersessions {
|
} |
} |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
&Apache::lonnet::do_cache_new('usersessions',$dom,$defaultshash{'usersessions'},3600); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domdefaults'} = 1; |
$lastactref->{'domdefaults'} = 1; |
|
$lastactref->{'usersessions'} = 1; |
} |
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my %lt = &usersession_titles(); |
my %lt = &usersession_titles(); |
Line 13688 sub modify_ssl {
|
Line 14588 sub modify_ssl {
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%defaultshash,%changes); |
my (%defaultshash,%changes); |
my $action = 'ssl'; |
my $action = 'ssl'; |
my @prefixes = ('connect','replication'); |
my @prefixes = ('connto','connfrom','replication'); |
foreach my $prefix (@prefixes) { |
foreach my $prefix (@prefixes) { |
$defaultshash{$action}{$prefix} = {}; |
$defaultshash{$action}{$prefix} = {}; |
} |
} |
Line 13698 sub modify_ssl {
|
Line 14598 sub modify_ssl {
|
my @reptypes = ('certreq','nocertreq'); |
my @reptypes = ('certreq','nocertreq'); |
my @connecttypes = ('dom','intdom','other'); |
my @connecttypes = ('dom','intdom','other'); |
my %types = ( |
my %types = ( |
connect => \@connecttypes, |
connto => \@connecttypes, |
replication => \@reptypes, |
connfrom => \@connecttypes, |
|
replication => \@reptypes, |
); |
); |
foreach my $prefix (sort(keys(%types))) { |
foreach my $prefix (sort(keys(%types))) { |
foreach my $type (@{$types{$prefix}}) { |
foreach my $type (@{$types{$prefix}}) { |
if ($prefix eq 'connect') { |
if (($prefix eq 'connto') || ($prefix eq 'connfrom')) { |
my $value = 'yes'; |
my $value = 'yes'; |
if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) { |
if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) { |
$value = $env{'form.'.$prefix.'_'.$type}; |
$value = $env{'form.'.$prefix.'_'.$type}; |
Line 13792 sub modify_ssl {
|
Line 14693 sub modify_ssl {
|
if (ref($defaultshash{$action}{'replication'}) eq 'HASH') { |
if (ref($defaultshash{$action}{'replication'}) eq 'HASH') { |
$domdefaults{'replication'} = $defaultshash{$action}{'replication'}; |
$domdefaults{'replication'} = $defaultshash{$action}{'replication'}; |
} |
} |
if (ref($defaultshash{$action}{'connect'}) eq 'HASH') { |
if (ref($defaultshash{$action}{'connto'}) eq 'HASH') { |
$domdefaults{'connect'} = $domconfig{$action}{'connect'}; |
$domdefaults{'connto'} = $domconfig{$action}{'connto'}; |
|
} |
|
if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') { |
|
$domdefaults{'connfrom'} = $domconfig{$action}{'connfrom'}; |
} |
} |
} |
} |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
Line 13812 sub modify_ssl {
|
Line 14716 sub modify_ssl {
|
my $newvalue; |
my $newvalue; |
if (ref($defaultshash{$action}) eq 'HASH') { |
if (ref($defaultshash{$action}) eq 'HASH') { |
if (ref($defaultshash{$action}{$prefix})) { |
if (ref($defaultshash{$action}{$prefix})) { |
if ($prefix eq 'connect') { |
if (($prefix eq 'connto') || ($prefix eq 'connfrom')) { |
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}}; |
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}}; |
} elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') { |
} elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') { |
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) { |
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) { |
Line 14073 sub modify_loadbalancing {
|
Line 14977 sub modify_loadbalancing {
|
} |
} |
if ($rule eq 'specific') { |
if ($rule eq 'specific') { |
my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
if (exists($servers{$specifiedhost})) { |
if (exists($servers{$specifiedhost})) { |
$rule = $specifiedhost; |
$rule = $specifiedhost; |
} |
} |
} |
} |
Line 14149 sub modify_loadbalancing {
|
Line 15053 sub modify_loadbalancing {
|
if ($rule eq '') { |
if ($rule eq '') { |
$balancetext = $ruletitles{'default'}; |
$balancetext = $ruletitles{'default'}; |
} elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') || |
} elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') || |
($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
Line 14270 sub recurse_cat_deletes {
|
Line 15174 sub recurse_cat_deletes {
|
|
|
sub active_dc_picker { |
sub active_dc_picker { |
my ($dom,$numinrow,$inputtype,$name,%currhash) = @_; |
my ($dom,$numinrow,$inputtype,$name,%currhash) = @_; |
my %domcoords = &get_active_dcs($dom); |
my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']); |
my @domcoord = keys(%domcoords); |
my @domcoord = keys(%domcoords); |
if (keys(%currhash)) { |
if (keys(%currhash)) { |
foreach my $dc (keys(%currhash)) { |
foreach my $dc (keys(%currhash)) { |
Line 14876 function updateCaptcha(caller,context) {
|
Line 15780 function updateCaptcha(caller,context) {
|
privtext.innerHTML = "$lt{'priv'}"; |
privtext.innerHTML = "$lt{'priv'}"; |
versionitem.type = 'text'; |
versionitem.type = 'text'; |
versionitem.size = '3'; |
versionitem.size = '3'; |
versiontext.innerHTML = "$lt{'ver'}"; |
versiontext.innerHTML = "$lt{'ver'}"; |
} else { |
} else { |
pubitem.type = 'hidden'; |
pubitem.type = 'hidden'; |
privitem.type = 'hidden'; |
privitem.type = 'hidden'; |
Line 14908 function toggleDisplay(domForm,caller) {
|
Line 15812 function toggleDisplay(domForm,caller) {
|
var optionsElement = domForm.coursecredits; |
var optionsElement = domForm.coursecredits; |
var checkval = 1; |
var checkval = 1; |
var dispval = 'block'; |
var dispval = 'block'; |
|
var selfcreateRegExp = /^cancreate_emailverified/; |
if (caller == 'emailoptions') { |
if (caller == 'emailoptions') { |
optionsElement = domForm.cancreate_email; |
optionsElement = domForm.cancreate_email; |
} |
} |
Line 14918 function toggleDisplay(domForm,caller) {
|
Line 15823 function toggleDisplay(domForm,caller) {
|
optionsElement = domForm.canclone; |
optionsElement = domForm.canclone; |
checkval = 'instcode'; |
checkval = 'instcode'; |
} |
} |
|
if (selfcreateRegExp.test(caller)) { |
|
optionsElement = domForm.elements[caller]; |
|
checkval = 'other'; |
|
dispval = 'inline' |
|
} |
if (optionsElement.length) { |
if (optionsElement.length) { |
var currval; |
var currval; |
for (var i=0; i<optionsElement.length; i++) { |
for (var i=0; i<optionsElement.length; i++) { |
Line 14949 sub captcha_phrases {
|
Line 15859 sub captcha_phrases {
|
original => 'original (CAPTCHA)', |
original => 'original (CAPTCHA)', |
recaptcha => 'successor (ReCAPTCHA)', |
recaptcha => 'successor (ReCAPTCHA)', |
notused => 'unused', |
notused => 'unused', |
ver => 'ReCAPTCHA version (1 or 2)', |
ver => 'ReCAPTCHA version (1 or 2)', |
); |
); |
} |
} |
|
|
Line 14959 sub devalidate_remote_domconfs {
|
Line 15869 sub devalidate_remote_domconfs {
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
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'); |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions','directorysrch'); |
if (keys(%servers)) { |
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |